yee88 0.6.2__tar.gz → 0.7.0__tar.gz

{yee88-0.6.2 → yee88-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yee88
-Version: 0.6.2
+Version: 0.7.0
 Summary: Telegram bridge for Codex, Claude Code, and other agent CLIs.
 Project-URL: Homepage, https://github.com/banteg/yee88
 Project-URL: Documentation, https://yee88.dev/

{yee88-0.6.2 → yee88-0.7.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "yee88"
 authors = [{name = "yee.wang"}]
-version = "0.6.2"
+version = "0.7.0"
 description = "Telegram bridge for Codex, Claude Code, and other agent CLIs."
 readme = "README.md"
 license = { file = "LICENSE" }

{yee88-0.6.2 → yee88-0.7.0}/src/yee88/cli/__init__.py

@@ -92,6 +92,7 @@ from .config import (
     config_unset,
 )
 from .cron import app as cron_app
+from .handoff import app as handoff_app
 from .reload import reload_command
 
 
@@ -215,6 +216,7 @@ def create_app() -> typer.Typer:
     app.command(name="plugins")(plugins_cmd)
     app.add_typer(config_app, name="config")
     app.add_typer(cron_app, name="cron")
+    app.add_typer(handoff_app, name="handoff")
     app.command(name="reload")(reload_command)
     app.callback()(app_main)
     for engine_id in _engine_ids_for_cli():

yee88-0.7.0/src/yee88/cli/handoff.py

@@ -0,0 +1,302 @@
+from __future__ import annotations
+
+import json
+import subprocess
+from dataclasses import dataclass
+from datetime import datetime
+from pathlib import Path
+
+import anyio
+import typer
+
+from ..context import RunContext
+from ..model import ResumeToken
+from ..settings import load_settings_if_exists
+from ..telegram.client import TelegramClient
+from ..telegram.topic_state import TopicStateStore, resolve_state_path
+
+app = typer.Typer(help="Handoff session context to Telegram")
+
+OPENCODE_STORAGE = Path.home() / ".local" / "share" / "opencode" / "storage"
+
+
+@dataclass
+class SessionInfo:
+    id: str
+    directory: str
+    updated: float
+    title: str
+    
+    @property
+    def project_name(self) -> str:
+        return Path(self.directory).name if self.directory else "unknown"
+    
+    @property
+    def updated_str(self) -> str:
+        return datetime.fromtimestamp(self.updated / 1000).strftime("%m-%d %H:%M")
+
+
+def _get_recent_sessions(limit: int = 10) -> list[SessionInfo]:
+    try:
+        result = subprocess.run(
+            ["opencode", "session", "list", "--format", "json", "-n", str(limit)],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        data = json.loads(result.stdout)
+        return [
+            SessionInfo(
+                id=s.get("id", ""),
+                directory=s.get("directory", ""),
+                updated=s.get("updated", 0),
+                title=s.get("title", ""),
+            )
+            for s in data
+        ]
+    except (subprocess.CalledProcessError, json.JSONDecodeError, FileNotFoundError):
+        return []
+
+
+def _get_session_messages(session_id: str, limit: int = 5) -> list[dict]:
+    message_dir = OPENCODE_STORAGE / "message" / session_id
+    if not message_dir.exists():
+        return []
+    
+    messages: list[tuple[int, str, str]] = []
+    for msg_file in message_dir.glob("msg_*.json"):
+        try:
+            data = json.loads(msg_file.read_text())
+            created = data.get("time", {}).get("created", 0)
+            role = data.get("role", "unknown")
+            msg_id = data.get("id", "")
+            messages.append((created, role, msg_id))
+        except (json.JSONDecodeError, OSError):
+            continue
+    
+    messages.sort(key=lambda x: x[0], reverse=True)
+    messages = messages[:limit]
+    messages.reverse()
+    
+    result = []
+    for _, role, msg_id in messages:
+        part_dir = OPENCODE_STORAGE / "part" / msg_id
+        if not part_dir.exists():
+            continue
+        for part_file in part_dir.glob("prt_*.json"):
+            try:
+                part_data = json.loads(part_file.read_text())
+                if part_data.get("type") == "text":
+                    text = part_data.get("text", "")
+                    if text.startswith('"') and text.endswith('"\n'):
+                        text = json.loads(text.rstrip('\n'))
+                    result.append({"role": role, "text": text})
+                    break
+            except (json.JSONDecodeError, OSError):
+                continue
+    
+    return result
+
+
+def _format_handoff_message(
+    session_id: str,
+    messages: list[dict],
+    project: str | None = None,
+) -> str:
+    lines = ["📱 **会话接力**", ""]
+    
+    if project:
+        lines.append(f"📁 项目: `{project}`")
+    lines.append(f"🔗 Session: `{session_id}`")
+    lines.append("")
+    lines.append("---")
+    lines.append("")
+    
+    for msg in messages:
+        role = msg.get("role", "unknown")
+        text = msg.get("text", "")
+        role_label = "👤" if role == "user" else "🤖"
+        if len(text) > 500:
+            text = text[:500] + "..."
+        lines.append(f"{role_label} **{role}**:")
+        lines.append(text)
+        lines.append("")
+    
+    total_len = sum(len(line) for line in lines)
+    if total_len > 3500:
+        lines = lines[:20]
+        lines.append("... (truncated)")
+    
+    lines.append("---")
+    lines.append("")
+    lines.append("💡 直接在此 Topic 发消息即可继续对话")
+    
+    return "\n".join(lines)
+
+
+async def _create_handoff_topic(
+    token: str,
+    chat_id: int,
+    session_id: str,
+    project: str,
+    config_path: Path,
+) -> int | None:
+    title = f"📱 {project} handoff"
+    
+    client = TelegramClient(token)
+    try:
+        result = await client.create_forum_topic(chat_id, title)
+        if result is None:
+            return None
+        
+        thread_id = result.message_thread_id
+        
+        state_path = resolve_state_path(config_path)
+        store = TopicStateStore(state_path)
+        
+        context = RunContext(project=project.lower(), branch=None)
+        await store.set_context(chat_id, thread_id, context, topic_title=title)
+        
+        resume_token = ResumeToken(engine="opencode", value=session_id)
+        await store.set_session_resume(chat_id, thread_id, resume_token)
+        
+        return thread_id
+    finally:
+        await client.close()
+
+
+async def _send_to_telegram(
+    token: str,
+    chat_id: int,
+    message: str,
+    thread_id: int | None = None,
+) -> bool:
+    client = TelegramClient(token)
+    try:
+        result = await client.send_message(
+            chat_id=chat_id,
+            text=message,
+            message_thread_id=thread_id,
+            parse_mode="Markdown",
+        )
+        return result is not None
+    finally:
+        await client.close()
+
+
+@app.command()
+def send(
+    session: str | None = typer.Option(
+        None, "--session", "-s", help="Session ID (defaults to latest)"
+    ),
+    limit: int = typer.Option(
+        3, "--limit", "-n", help="Number of messages to include"
+    ),
+    project: str | None = typer.Option(
+        None, "--project", "-p", help="Project name for context"
+    ),
+) -> None:
+    result = load_settings_if_exists()
+    if result is None:
+        typer.echo("❌ 未找到 yee88 配置文件", err=True)
+        raise typer.Exit(1)
+    
+    settings, config_path = result
+    telegram_cfg = settings.transports.telegram
+    
+    token = telegram_cfg.bot_token
+    chat_id = telegram_cfg.chat_id
+    
+    if not token or not chat_id:
+        typer.echo("❌ Telegram 配置不完整 (需要 bot_token 和 chat_id)", err=True)
+        raise typer.Exit(1)
+    
+    if not telegram_cfg.topics.enabled:
+        typer.echo("❌ Topics 未启用，请先运行: yee88 config set transports.telegram.topics.enabled true", err=True)
+        raise typer.Exit(1)
+    
+    session_id = session
+    session_project = project
+    if session_id is None:
+        sessions = _get_recent_sessions(limit=10)
+        if not sessions:
+            typer.echo("❌ 未找到 OpenCode 会话", err=True)
+            raise typer.Exit(1)
+        
+        typer.echo("\n📋 最近的会话:\n")
+        for i, s in enumerate(sessions[:10], 1):
+            title_display = s.title[:40] if s.title else s.project_name
+            typer.echo(f"  [{i}] {s.updated_str}  {title_display}")
+        typer.echo("")
+        
+        choice = typer.prompt("选择会话 (1-10)", default="1")
+        try:
+            idx = int(choice) - 1
+            if idx < 0 or idx >= len(sessions):
+                typer.echo("❌ 无效选择", err=True)
+                raise typer.Exit(1)
+        except ValueError:
+            typer.echo("❌ 请输入数字", err=True)
+            raise typer.Exit(1)
+        
+        selected = sessions[idx]
+        session_id = selected.id
+        if session_project is None:
+            session_project = selected.project_name
+    
+    if not session_id:
+        typer.echo("❌ 会话 ID 为空", err=True)
+        raise typer.Exit(1)
+    
+    typer.echo(f"📖 读取会话 {session_id[:20]}...")
+    
+    messages = _get_session_messages(session_id, limit=limit)
+    if not messages:
+        typer.echo("❌ 无法读取会话消息", err=True)
+        raise typer.Exit(1)
+    
+    typer.echo("🆕 创建新 Topic...")
+    
+    async def do_handoff() -> tuple[bool, int | None]:
+        thread_id = await _create_handoff_topic(
+            token=token,
+            chat_id=chat_id,
+            session_id=session_id,
+            project=session_project or "unknown",
+            config_path=config_path,
+        )
+        if thread_id is None:
+            return False, None
+        
+        handoff_msg = _format_handoff_message(
+            session_id=session_id,
+            messages=messages,
+            project=session_project,
+        )
+        
+        success = await _send_to_telegram(
+            token=token,
+            chat_id=chat_id,
+            message=handoff_msg,
+            thread_id=thread_id,
+        )
+        return success, thread_id
+    
+    success, thread_id = anyio.run(do_handoff)
+    
+    if success:
+        typer.echo("✅ 已发送到 Telegram！")
+        typer.echo(f"   Session: {session_id}")
+        typer.echo(f"   Project: {session_project}")
+        typer.echo(f"   Topic ID: {thread_id}")
+        typer.echo(f"   消息数: {limit}")
+    else:
+        typer.echo("❌ 发送失败", err=True)
+        raise typer.Exit(1)
+
+
+@app.callback(invoke_without_command=True)
+def main(ctx: typer.Context) -> None:
+    """Handoff session context to Telegram for mobile continuation."""
+    if ctx.invoked_subcommand is None:
+        ctx.invoke(send, session=None, limit=3, project=None)

{yee88-0.6.2 → yee88-0.7.0}/src/yee88/cron/manager.py

@@ -2,25 +2,54 @@ import tomllib
 import tomli_w
 from pathlib import Path
 from typing import List, Optional
+from zoneinfo import ZoneInfo
 from croniter import croniter
 from datetime import datetime
 from .models import CronJob
 
+BEIJING_TZ = ZoneInfo("Asia/Shanghai")
+
 
 class CronManager:
-    def __init__(self, config_dir: Path):
+    def __init__(self, config_dir: Path, timezone: str = "Asia/Shanghai"):
         self.file = config_dir / "cron.toml"
         self.jobs: List[CronJob] = []
+        self.timezone = ZoneInfo(timezone)
 
     def _validate_project(self, project: str) -> None:
         if not project:
             return
+        
         path = Path(project).expanduser().resolve()
         if path.exists() and path.is_dir():
-            git_dir = path / ".git"
-            if git_dir.exists():
-                return
-            raise ValueError(f"不是 git 仓库: {project}")
+            return
+        
+        from ..settings import load_settings_if_exists
+        from ..engines import list_backend_ids
+        
+        result = load_settings_if_exists()
+        if result is None:
+            return
+        
+        settings, config_path = result
+        engine_ids = list_backend_ids()
+        projects_config = settings.to_projects_config(
+            config_path=config_path,
+            engine_ids=engine_ids
+        )
+        
+        if project.lower() in projects_config.projects:
+            return
+        
+        available = list(projects_config.projects.keys())
+        if available:
+            raise ValueError(
+                f"未知项目: {project}。可用项目: {', '.join(available)}"
+            )
+        else:
+            raise ValueError(
+                f"未知项目: {project}。请先使用 'yee88 init' 注册项目"
+            )
 
     def load(self):
         if not self.file.exists():
@@ -99,7 +128,7 @@ class CronManager:
         return False
 
     def get_due_jobs(self) -> List[CronJob]:
-        now = datetime.now()
+        now = datetime.now(self.timezone)
         due = []
         one_time_completed = []
 
@@ -107,30 +136,38 @@ class CronManager:
             if not job.enabled:
                 continue
 
-            # 一次性任务处理
             if job.one_time:
                 try:
                     exec_time = datetime.fromisoformat(job.schedule)
+                    if exec_time.tzinfo is None:
+                        exec_time = exec_time.replace(tzinfo=self.timezone)
                     if exec_time <= now:
                         due.append(job)
                         one_time_completed.append(job.id)
                 except Exception:
                     continue
             else:
-                # 周期性任务处理
                 try:
-                    base = datetime.fromisoformat(job.last_run) if job.last_run else now
-                    itr = croniter(job.schedule, base)
-                    next_run = itr.get_next(datetime)
-
-                    if next_run <= now:
-                        due.append(job)
-                        job.last_run = now.isoformat()
-                        job.next_run = itr.get_next(datetime).isoformat()
+                    if job.last_run:
+                        base = datetime.fromisoformat(job.last_run)
+                        if base.tzinfo is None:
+                            base = base.replace(tzinfo=self.timezone)
+                        itr = croniter(job.schedule, base)
+                        next_run = itr.get_next(datetime)
+                        if next_run <= now:
+                            due.append(job)
+                            job.last_run = now.isoformat()
+                            job.next_run = itr.get_next(datetime).isoformat()
+                    else:
+                        itr = croniter(job.schedule, now)
+                        prev_run = itr.get_prev(datetime)
+                        if prev_run.date() == now.date():
+                            due.append(job)
+                            job.last_run = now.isoformat()
+                            job.next_run = itr.get_next(datetime).isoformat()
                 except Exception:
                     continue
 
-        # 删除已完成的一次性任务
         if one_time_completed:
             self.jobs = [j for j in self.jobs if j.id not in one_time_completed]
 

{yee88-0.6.2 → yee88-0.7.0}/src/yee88/skills/yee88/SKILL.md

@@ -36,13 +36,38 @@ description: 当用户说"提醒我"、"X分钟/小时后"、"定时"、"每天/
 
 ## ⛔ 默认不传 --project！除非用户明确要求
 
-**简单规则：不知道项目别名就不传 `--project`，让 yee88 使用默认上下文。**
+### 🧠 COT：判断是否需要 --project
 
-| 场景 | 做法 |
-|------|------|
-| 用户只说"1分钟后提醒我..." | `yee88 cron add reminder "+1m" "..." -o` （不传 --project） |
-| 用户说"在 takopi 项目提醒我..." | `yee88 cron add reminder "+1m" "..." --project takopi -o` |
-| 不确定项目别名 | **不传 --project** |
+**收到定时任务请求时，先在脑中过一遍这个决策流程：**
+
+```
+1. 用户有没有提到具体项目名？
+   - "在 takopi 项目下..."  → 需要 --project
+   - "帮我在 work 项目..."  → 需要 --project
+   - "提醒我喝水"          → 不需要 --project
+   - "每天9点提醒站会"      → 不需要 --project
+
+2. 用户有没有说"在某个项目下运行"？
+   - "在 xxx 下执行..."    → 需要 --project
+   - "切到 xxx 项目..."    → 需要 --project
+   - 没有提到项目上下文    → 不需要 --project
+
+3. 这个任务是通用提醒还是项目相关？
+   - 喝水、休息、开会     → 通用，不需要 --project
+   - 代码审查、部署、PR   → 可能需要，但除非用户说了项目名，否则不传
+```
+
+**结论：99% 的情况不需要 --project。只有用户明确说了项目名才传。**
+
+### 决策表
+
+| 用户说的话 | 需要 --project? | 命令 |
+|-----------|----------------|------|
+| "1分钟后提醒我喝水" | ❌ 不需要 | `yee88 cron add reminder "+1m" "喝水" -o` |
+| "每天9点提醒我站会" | ❌ 不需要 | `yee88 cron add standup "0 9 * * *" "站会时间"` |
+| "30分钟后提醒我休息" | ❌ 不需要 | `yee88 cron add break "+30m" "休息一下" -o` |
+| "在 takopi 项目下每天9点跑测试" | ✅ 需要 | `yee88 cron add test "0 9 * * *" "跑测试" --project takopi` |
+| "帮我在 work 项目设个提醒" | ✅ 需要 | `yee88 cron add reminder "+1h" "..." --project work -o` |
 
 **⚠️ --project 只接受项目别名，不是路径！**
 

{yee88-0.6.2 → yee88-0.7.0}/src/yee88/telegram/commands/model.py

@@ -29,7 +29,7 @@ MODEL_SELECT_CALLBACK_PREFIX = "yee88:model_select:"
 
 MODEL_USAGE = (
     "usage: `/model`, `/model status`, `/model set <model>`, "
-    "`/model set <engine> <model>`, or `/model clear [engine]`"
+    "`/model set <engine> <model>`, `/model clear [engine]`, or `/model reset`"
 )
 
 
@@ -339,4 +339,45 @@ async def _handle_model_command(
         await reply(text="chat model override cleared.")
         return
 
+    if action == "reset":
+        if len(tokens) > 1:
+            await reply(text=MODEL_USAGE)
+            return
+        if not await require_admin_or_private(
+            cfg,
+            msg,
+            missing_sender="cannot verify sender for model overrides.",
+            failed_member="failed to verify model override permissions.",
+            denied="changing model overrides is restricted to group admins.",
+        ):
+            return
+        
+        cleared_engines = []
+        for engine in engine_ids:
+            scope = await apply_engine_override(
+                reply=reply,
+                tkey=tkey,
+                topic_store=topic_store,
+                chat_prefs=chat_prefs,
+                chat_id=msg.chat_id,
+                engine=engine,
+                update=lambda current: EngineOverrides(
+                    model=None,
+                    reasoning=current.reasoning if current is not None else None,
+                ),
+                topic_unavailable="topic model overrides are unavailable.",
+                chat_unavailable="chat model overrides are unavailable (no config path).",
+            )
+            if scope is not None:
+                cleared_engines.append(engine)
+        
+        if cleared_engines:
+            engines_list = ", ".join(cleared_engines)
+            await reply(
+                text=f"all model overrides reset to default for engines: {engines_list}"
+            )
+        else:
+            await reply(text="no model overrides to reset.")
+        return
+
     await reply(text=MODEL_USAGE)

{yee88-0.6.2 → yee88-0.7.0}/src/yee88/telegram/loop.py

@@ -1077,7 +1077,8 @@ async def run_main_loop(
                 tg.start_soon(run_config_watch)
 
             if config_path is not None:
-                cron_manager = CronManager(config_path.parent)
+                cron_manager = CronManager(config_path.parent, timezone="Asia/Shanghai")
+                logger.info("cron.manager.initialized", timezone="Asia/Shanghai")
 
                 async def _execute_cron_job(job: CronJob) -> None:
                     try: