illusion-code 0.2.10__tar.gz → 0.2.12__tar.gz

{illusion_code-0.2.10 → illusion_code-0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: illusion-code
-Version: 0.2.10
+Version: 0.2.12
 Summary: Open-source Python port of Claude Code - an AI-powered CLI coding assistant
 Project-URL: Homepage, https://github.com/YunTaiHua/illusion-code
 Project-URL: Repository, https://github.com/YunTaiHua/illusion-code

{illusion_code-0.2.10 → illusion_code-0.2.12}/frontend/terminal/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@illusion/terminal",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@illusion/terminal",
-      "version": "0.2.10",
+      "version": "0.2.12",
       "dependencies": {
         "chalk": "^5.6.2",
         "ink": "^5.1.0",

{illusion_code-0.2.10 → illusion_code-0.2.12}/frontend/terminal/package.json

@@ -24,5 +24,5 @@
     "tsx": "^4.19.2",
     "typescript": "^5.7.3"
   },
-  "version": "0.2.10"
+  "version": "0.2.12"
 }

{illusion_code-0.2.10 → illusion_code-0.2.12}/frontend/terminal/src/version.ts

@@ -6,4 +6,4 @@
  */
 
 /** 当前版本号 */
-export const VERSION = '0.2.10';
+export const VERSION = '0.2.12';

{illusion_code-0.2.10 → illusion_code-0.2.12}/frontend/web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@illusion/web",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@illusion/web",
-      "version": "0.2.10",
+      "version": "0.2.12",
       "dependencies": {
         "highlight.js": "^11.11.0",
         "react": "^18.3.1",

{illusion_code-0.2.10 → illusion_code-0.2.12}/frontend/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@illusion/web",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "private": true,
   "type": "module",
   "scripts": {

{illusion_code-0.2.10 → illusion_code-0.2.12}/frontend/web/src/version.ts

@@ -6,4 +6,4 @@
  */
 
 /** 当前版本号 */
-export const VERSION = '0.2.10';
+export const VERSION = '0.2.12';

{illusion_code-0.2.10 → illusion_code-0.2.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "illusion-code"
-version = "0.2.10"
+version = "0.2.12"
 description = "Open-source Python port of Claude Code - an AI-powered CLI coding assistant"
 readme = "README.md"
 license = "MIT"

{illusion_code-0.2.10 → illusion_code-0.2.12}/src/illusion/__init__.py

@@ -23,4 +23,4 @@ IllusionCode 是一个 AI 驱动的编程助手，提供交互式会话和命令
 
 from __future__ import annotations
 
-__version__ = "0.2.10"
+__version__ = "0.2.12"

{illusion_code-0.2.10 → illusion_code-0.2.12}/src/illusion/channels/__init__.py

@@ -21,6 +21,7 @@ from typing import TYPE_CHECKING, Any, cast
 
 from illusion.channels.config import load_channels_config
 from illusion.utils.atomic_write import atomic_write_text
+from illusion.utils.ref_count import add_ref
 
 if TYPE_CHECKING:
     from illusion.channels.base import Channel, InboundMessage
@@ -35,6 +36,8 @@ logger = logging.getLogger(__name__)
 def _config_fingerprint(cfg: "ChannelsConfig") -> str:
     """计算渠道配置指纹（用于检测配置变更后重启守护进程）
 
+    遍历 ChannelRegistry，对每个已启用渠道调用其 fingerprint_factory 生成标识。
+
     Args:
         cfg: 渠道配置
 
@@ -44,14 +47,14 @@ def _config_fingerprint(cfg: "ChannelsConfig") -> str:
     import hashlib
     import json as _json
 
-    # 只取影响守护进程行为的字段
+    from illusion.channels.registry import ChannelRegistry
+
+    # 遍历 registry 调用各渠道的 fingerprint_factory
     enabled_channels = []
-    if cfg.feishu.enabled:
-        enabled_channels.append(f"feishu:{cfg.feishu.app_id}")
-    if cfg.weixin.enabled:
-        enabled_channels.append(f"weixin:{cfg.weixin.account_id}:{cfg.weixin.token}")
-    if cfg.qq.enabled:
-        enabled_channels.append(f"qq:{cfg.qq.app_id}:{cfg.qq.client_secret}")
+    for desc in ChannelRegistry.all_descriptors():
+        channel_cfg = getattr(cfg, desc.config_attr, None)
+        if channel_cfg is not None and channel_cfg.enabled:
+            enabled_channels.append(desc.fingerprint_factory(channel_cfg))
     raw = _json.dumps(sorted(enabled_channels), ensure_ascii=False)
     return hashlib.md5(raw.encode()).hexdigest()
 
@@ -86,7 +89,9 @@ def maybe_spawn_channel_daemon() -> subprocess.Popen[bytes] | None:
         except (FileNotFoundError, OSError):
             pass
         if stored_fp == current_fp:
-            return None  # 配置未变，跳过
+            # 配置未变，跳过 spawn，但追加引用
+            add_ref(data_dir / "daemon.refs", os.getpid())
+            return None
 
         # 配置已变，终止旧守护进程后重启（is_running 已确认存活）
         from illusion.channels.pid import read_pid
@@ -138,6 +143,7 @@ def maybe_spawn_channel_daemon() -> subprocess.Popen[bytes] | None:
         )
         pid_file.acquire(proc.pid)
         atomic_write_text(fingerprint_path, current_fp)
+        add_ref(data_dir / "daemon.refs", os.getpid())
         return proc
     except OSError as exc:
         logger.warning("启动渠道守护进程失败: %s", exc)
@@ -145,32 +151,23 @@ def maybe_spawn_channel_daemon() -> subprocess.Popen[bytes] | None:
 
 
 def kill_channel_daemon(proc: "subprocess.Popen[bytes] | None") -> None:
-    """终止渠道守护进程子进程并释放 PID 文件。
-
-    供主命令（`illusion`）和 web 命令（`illusion web`）在退出时调用，
-    确保 ctrl+c / 正常退出后清理守护进程，避免孤儿进程。
+    """已废弃的渠道守护进程终止函数（noop）
 
-    幂等：proc 为 None 或已退出时仅尝试释放 PID 文件。
+    .. deprecated::
+        此函数为向后兼容保留。新方案采用引用计数：
+        主程序退出时调用 remove_ref，守护进程自监控 refs 为空时自动退出。
+        不再需要主动 kill 守护进程。
 
     Args:
-        proc: `maybe_spawn_channel_daemon` 返回的 Popen 实例；None 时仅清 PID 文件
+        proc: 已废弃，忽略不处理
     """
-    try:
-        if proc is not None and proc.poll() is None:
-            proc.terminate()
-            try:
-                proc.wait(timeout=3)
-            except Exception:  # noqa: BLE001
-                proc.kill()
-    except Exception:  # noqa: BLE001
-        pass
-    finally:
-        try:
-            from illusion.channels.pid import PidFile
-            from illusion.config.paths import get_channels_data_dir
-            PidFile(get_channels_data_dir() / "daemon.pid").release()
-        except Exception:  # noqa: BLE001
-            pass
+    import warnings
+    warnings.warn(
+        "kill_channel_daemon() 已废弃，请使用 remove_ref + 引用计数机制",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    return
 
 
 def is_channel_daemon_running() -> bool:
@@ -178,6 +175,10 @@ def is_channel_daemon_running() -> bool:
 
     用于退出时判断是否需要询问用户是否一同退出渠道。
 
+    Note:
+        新方案采用引用计数后，此函数仅用于诊断/查询。
+        退出处理已改为 remove_ref + 自监控，不再依赖此函数。
+
     Returns:
         bool: 守护进程在运行返回 True
     """
@@ -188,51 +189,23 @@ def is_channel_daemon_running() -> bool:
 
 
 def stop_channel_daemon_by_pid() -> bool:
-    """通过 PID 文件停止渠道守护进程（不依赖 proc 引用）
-
-    供退出时交互式确认使用：无论当前进程是否是 spawn 者，
-    都可以通过 PID 文件停止守护进程。
+    """已废弃的渠道守护进程停止函数（noop）
 
-    Windows 上用 taskkill /T /F 终止整个进程树（守护进程可能 spawn 了
-    aiohttp/WS 子线程，单独 TerminateProcess 可能留下孤儿线程）。
-    Unix 上用 SIGTERM 终止进程组。
+    .. deprecated::
+        此函数为向后兼容保留。新方案采用引用计数：
+        守护进程通过自监控 refs 为空时自动退出，
+        不再需要通过 PID 主动停止。
 
     Returns:
-        bool: 成功停止返回 True，守护进程不存在或已停止返回 False
+        bool: 始终返回 False
     """
-    from illusion.config.paths import get_channels_data_dir
-    from illusion.channels.pid import PidFile, read_pid
-
-    pid_file = PidFile(get_channels_data_dir() / "daemon.pid")
-    if not pid_file.is_running():
-        pid_file.release()
-        return False
-
-    old_pid = read_pid(pid_file.path)
-    if old_pid is not None:
-        try:
-            if os.name == "nt":
-                # Windows: 用 taskkill /T /F 终止整个进程树
-                # /T = 终止子进程，/F = 强制终止
-                import subprocess as _sp
-                _sp.run(
-                    ["taskkill", "/PID", str(old_pid), "/T", "/F"],
-                    capture_output=True, timeout=5,
-                )
-            else:
-                # Unix: 用 SIGTERM 终止进程组
-                import signal
-                os.kill(old_pid, signal.SIGTERM)
-        except (OSError, ProcessLookupError, Exception):  # noqa: BLE001
-            pass
-        # 等待进程退出，最多 3 秒
-        for _ in range(30):
-            if not pid_file.is_running():
-                break
-            import time as _time
-            _time.sleep(0.1)
-    pid_file.release()
-    return True
+    import warnings
+    warnings.warn(
+        "stop_channel_daemon_by_pid() 已废弃，请使用 remove_ref + 引用计数机制",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    return False
 
 
 class ChannelRunner:
@@ -318,23 +291,6 @@ class ChannelRunner:
         Args:
             msg: 入站消息
         """
-        # 检查 /delete 信号：先执行 /new（清所有会话+发确认），再处理消息
-        # 信号触发后直接 return，避免继续走 try_handle 处理 /new 命令
-        # 导致"已开启新的对话"反馈消息发送两次
-        if self.session_store.check_signal():
-            for path in self.session_store.data_dir.glob("*.json"):
-                try:
-                    path.unlink()
-                except OSError:
-                    pass
-            from illusion.config.i18n import t as _t
-            # 统一使用 cmd_new，避免渠道专属文案不一致
-            await self.channel.send_text(
-                msg.chat_id, _t("cmd_new"), reply_to=msg.message_id,
-            )
-            self.session_store.clear_signal()
-            return
-
         # 1. 待回复的权限/询问——不加锁，让回复立即送达
         # （agent turn 持锁等待回复时，下一条消息作为回复立即 set_result，
         #   不会因锁阻塞导致 300s 超时）
@@ -398,27 +354,16 @@ class ChannelRunner:
     def _get_command_handler(self) -> Any:
         """按渠道类型返回对应的斜杠命令处理器
 
+        遍历 ChannelRegistry，匹配 adapter_class 后调用 command_handler_factory。
+
         Returns:
             BaseCommandHandler 实例或 None（未知渠道）
         """
-        from illusion.channels.feishu.adapter import FeishuChannel
-        from illusion.channels.feishu.commands import FeishuCommandHandler
-        if isinstance(self.channel, FeishuChannel):
-            return FeishuCommandHandler(self.channel, self.session_store)
-        try:
-            from illusion.channels.weixin.adapter import WeixinChannel
-            from illusion.channels.weixin.commands import WeixinCommandHandler
-            if isinstance(self.channel, WeixinChannel):
-                return WeixinCommandHandler(self.channel, self.session_store)
-        except ImportError:
-            pass  # 微信模块不可用时跳过
-        try:
-            from illusion.channels.qq.adapter import QQChannel
-            from illusion.channels.qq.commands import QQCommandHandler
-            if isinstance(self.channel, QQChannel):
-                return QQCommandHandler(self.channel, self.session_store)
-        except ImportError:
-            pass  # QQ 模块不可用时跳过
+        from illusion.channels.registry import ChannelRegistry
+
+        for desc in ChannelRegistry.all_descriptors():
+            if isinstance(self.channel, desc.adapter_class):
+                return desc.command_handler_factory(self.channel, self.session_store)
         return None
 
     async def _handle_stop(self, msg: "InboundMessage") -> None:
@@ -547,6 +492,14 @@ class ChannelRunner:
         key = self.session_store.build_session_key(msg)
         session = self.session_store.get_or_create(key, msg.user_id, msg.chat_type)
 
+        # 提前落盘会话索引（仅当文件尚不存在时）：确保 session_id 落盘，
+        # 这样进程崩溃后下次启动 get_or_create 能命中该会话记录接续，
+        # 而非新建会话。注意：绝不覆盖已有 messages（否则会清空历史）。
+        try:
+            self.session_store.ensure_indexed(session)
+        except Exception as exc:  # noqa: BLE001
+            logger.warning("会话索引提前落盘失败: %s", exc)
+
         # 检测渠道是否支持消息编辑（仅飞书支持卡片 patch）
         from illusion.channels.feishu.adapter import FeishuChannel
         from illusion.channels.qq.adapter import QQChannel
@@ -600,18 +553,12 @@ class ChannelRunner:
             await streaming_controller.start()
         elif qq_c2c_streaming and qq_channel is not None:
             # QQ C2C：用 stream_messages API 流式（首次有文本时才启动）
-            # 确保 token 已获取
-            if not qq_channel._token:
-                from illusion.channels.qq.api import ensure_token
-                qq_channel._token = await ensure_token(
-                    qq_channel._session,
-                    qq_channel.config.app_id,
-                    qq_channel.config.client_secret,
-                )
+            # 确保 token 已获取（通过 _get_token，重连后自动刷新）
+            token = await qq_channel._get_token()
             from illusion.channels.qq.streaming import QQStreamingController
             qq_streaming_controller = QQStreamingController(
                 session=qq_channel._session,
-                token=qq_channel._token,
+                token=token,
                 openid=msg.chat_id,
                 msg_id=msg.message_id,
             )
@@ -889,10 +836,8 @@ def _create_session_store(
 ) -> Any:
     """根据渠道类型创建对应的 SessionStore
 
-    飞书 → FeishuSessionStore
-    QQ → QQSessionStore
-    微信 → WeixinSessionStore
-    未知 → FeishuSessionStore（向后兼容）
+    遍历 ChannelRegistry，匹配 adapter_class 后调用 session_store_factory。
+    未知渠道回退到 FeishuSessionStore（向后兼容）。
 
     Args:
         channel: 渠道实例
@@ -902,30 +847,13 @@ def _create_session_store(
     Returns:
         对应渠道的 SessionStore 实例
     """
-    from illusion.channels.feishu.adapter import FeishuChannel
-    if isinstance(channel, FeishuChannel):
-        from illusion.channels.feishu.session_map import FeishuSessionStore
-        return FeishuSessionStore(
-            data_dir=data_dir,
-            group_sessions_per_user=group_sessions_per_user,
-        )
-    try:
-        from illusion.channels.qq.adapter import QQChannel
-        if isinstance(channel, QQChannel):
-            from illusion.channels.qq.session_map import QQSessionStore
-            return QQSessionStore(
-                data_dir=data_dir,
-                group_sessions_per_user=group_sessions_per_user,
+    from illusion.channels.registry import ChannelRegistry
+
+    for desc in ChannelRegistry.all_descriptors():
+        if isinstance(channel, desc.adapter_class):
+            return desc.session_store_factory(
+                channel, data_dir, group_sessions_per_user
             )
-    except ImportError:
-        pass
-    try:
-        from illusion.channels.weixin.adapter import WeixinChannel
-        if isinstance(channel, WeixinChannel):
-            from illusion.channels.weixin.session_map import WeixinSessionStore
-            return WeixinSessionStore(data_dir=data_dir)
-    except ImportError:
-        pass
     # 未知渠道回退到飞书（向后兼容）
     from illusion.channels.feishu.session_map import FeishuSessionStore
     return FeishuSessionStore(

{illusion_code-0.2.10 → illusion_code-0.2.12}/src/illusion/channels/config.py

@@ -161,24 +161,34 @@ class ChannelsConfig(BaseModel):
     def has_enabled_channels(self) -> bool:
         """是否有任何已启用的渠道
 
+        遍历 ChannelRegistry 检查每个渠道的 enabled 字段。
+
         Returns:
             bool: 任一渠道 enabled 为 True 时返回 True
         """
-        return self.feishu.enabled or self.weixin.enabled or self.qq.enabled
+        from illusion.channels.registry import ChannelRegistry
+
+        for desc in ChannelRegistry.all_descriptors():
+            channel_cfg = getattr(self, desc.config_attr, None)
+            if channel_cfg is not None and channel_cfg.enabled:
+                return True
+        return False
 
     def enabled_channel_names(self) -> list[str]:
         """返回所有已启用渠道的名称列表
 
+        遍历 ChannelRegistry 收集已启用渠道名。
+
         Returns:
             list[str]: 已启用渠道名列表
         """
+        from illusion.channels.registry import ChannelRegistry
+
         names: list[str] = []
-        if self.feishu.enabled:
-            names.append("feishu")
-        if self.weixin.enabled:
-            names.append("weixin")
-        if self.qq.enabled:
-            names.append("qq")
+        for desc in ChannelRegistry.all_descriptors():
+            channel_cfg = getattr(self, desc.config_attr, None)
+            if channel_cfg is not None and channel_cfg.enabled:
+                names.append(desc.name)
         return names