yycode 0.3.3__tar.gz → 0.3.4__tar.gz

{yycode-0.3.3 → yycode-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yycode
-Version: 0.3.3
+Version: 0.3.4
 Summary: Terminal coding agent with TUI, plain input mode, tools, skills, and ACP support
 Requires-Python: >=3.10
 Requires-Dist: anthropic>=0.40.0
@@ -9,4 +9,4 @@ Requires-Dist: tiktoken>=0.12.0
 Requires-Dist: langgraph>=0.2.0
 Requires-Dist: langchain-core>=0.3.0
 Requires-Dist: python-dotenv>=1.0.0
-Requires-Dist: textual>=0.80.0
+Requires-Dist: textual==8.2.4

{yycode-0.3.3 → yycode-0.3.4}/README.md

@@ -155,9 +155,11 @@ uv run python main.py -s              # 查看当前工作区可恢复的 sessio
 uv run python main.py -r <session-id> # 恢复指定 session
 uv run python main.py -x <session-id> # 删除指定 session
 uv run python main.py -t              # 临时会话，不保存 messages
+uv run python main.py --update-skills # 用内置 skills 覆盖同步用户数据目录中的同路径文件
 uv run python main.py --acp           # 启动 ACP stdio server
 uv run python main.py acp             # 同上，便于作为子命令使用
 yycode --plain                        # 安装发行包后的普通终端输入模式
+yycode --update-skills                # 更新用户数据目录中的默认 skills，保留用户自定义文件
 yycode --acp                          # 安装发行包后的 ACP stdio server
 ```
 
@@ -257,10 +259,10 @@ PyPI token 只应通过本地命令、CI secret 或凭据管理器使用，不
 | `API_BASE` | 可选，自定义 API Base/Base URL | `https://api.openai.com/v1` |
 | `AI_MODEL` | 模型名称 | Anthropic 默认 `claude-3-5-sonnet-20241022`，OpenAI 默认 `gpt-4o` |
 | `YOYO_CONTEXT_WINDOW_TOKENS` | 可选，覆盖上下文窗口大小，用于 TUI/CLI 提示符统计；未设置时会按模型推断 | Claude `200000`，Doubao Code `224000`，GPT-4o/4.1/5 `128000` |
-| `YOYO_APP_ROOT` | 可选，覆盖 yoyoagent 应用根目录；默认是源码/发行目录 | `/path/to/yoyoagent` |
-| `YOYO_RUNTIME_DATA_DIR` | 可选，覆盖运行数据目录；默认等于 `app_root` | `/path/to/yoyoagent` |
+| `YOYO_APP_ROOT` | 可选，覆盖 yycode 内置资源来源目录；通常不需要设置 | `/path/to/yycode-install` |
+| `YOYO_RUNTIME_DATA_DIR` | 可选，覆盖用户数据目录；默认使用系统用户数据目录 | macOS: `~/Library/Application Support/yycode` |
 | `YOYO_SESSION_DIR` | 可选，覆盖 session messages 保存目录 | `~/.yoyoagent/sessions` |
-| `YOYO_SKILL_DIRS` | 可选，额外技能目录，多个目录用逗号分隔；默认技能目录是 `{app_root}/skills` | `../shared-skills` |
+| `YOYO_SKILL_DIRS` | 可选，额外技能目录，多个目录用逗号分隔；默认技能目录是用户数据目录下的 `skills` | `../shared-skills` |
 | `YOYO_SILENT` / `YOYO_AUTO_APPROVE` | 可选，启用后自动批准高风险操作 | `true` |
 
 高级重试配置：

yycode-0.3.4/agent/app_paths.py

@@ -0,0 +1,113 @@
+"""Application-level path helpers."""
+
+from __future__ import annotations
+
+import os
+import shutil
+import sys
+from pathlib import Path
+from typing import NamedTuple
+
+
+def resolve_app_root(raw_app_root: str | Path | None = None) -> Path:
+    """Resolve the yoyoagent application root directory."""
+    raw = raw_app_root or os.environ.get("YOYO_APP_ROOT")
+    if raw:
+        return Path(raw).expanduser().resolve()
+    return Path(__file__).resolve().parents[1]
+
+
+def resolve_resource_root(raw_app_root: str | Path | None = None) -> Path:
+    """Resolve the bundled yycode resource root for default files."""
+    raw = raw_app_root or os.environ.get("YOYO_APP_ROOT")
+    if raw:
+        return Path(raw).expanduser().resolve()
+
+    source_root = Path(__file__).resolve().parents[1]
+    if (source_root / "skills").is_dir():
+        return source_root
+
+    prefix_root = Path(sys.prefix).resolve()
+    if (prefix_root / "skills").is_dir():
+        return prefix_root
+
+    return source_root
+
+
+def resolve_runtime_data_dir(
+    app_root: Path,
+    raw_runtime_data_dir: str | Path | None = None,
+) -> Path:
+    """Resolve the user-editable runtime data directory for yycode-owned data."""
+    raw = raw_runtime_data_dir or os.environ.get("YOYO_RUNTIME_DATA_DIR")
+    if raw:
+        return Path(raw).expanduser().resolve()
+    return default_user_data_dir()
+
+
+def default_user_data_dir() -> Path:
+    """Return the default per-user yycode data directory."""
+    if sys.platform == "darwin":
+        return (Path.home() / "Library" / "Application Support" / "yycode").resolve()
+    if os.name == "nt":
+        base = os.environ.get("APPDATA")
+        if base:
+            return (Path(base).expanduser() / "yycode").resolve()
+        return (Path.home() / "AppData" / "Roaming" / "yycode").resolve()
+    base = os.environ.get("XDG_DATA_HOME")
+    if base:
+        return (Path(base).expanduser() / "yycode").resolve()
+    return (Path.home() / ".local" / "share" / "yycode").resolve()
+
+
+def ensure_default_skills_dir(runtime_data_dir: Path, resource_root: Path) -> Path:
+    """Initialize the user-editable skills directory from bundled defaults if needed."""
+    skills_dir = runtime_data_dir / "skills"
+    if skills_dir.exists():
+        return skills_dir
+
+    bundled_skills = resource_root / "skills"
+    if bundled_skills.is_dir():
+        skills_dir.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copytree(bundled_skills, skills_dir)
+    else:
+        skills_dir.mkdir(parents=True, exist_ok=True)
+    return skills_dir
+
+
+class SkillSyncResult(NamedTuple):
+    """Summary of a bundled skill sync into the user data directory."""
+
+    source_dir: Path
+    target_dir: Path
+    copied: list[Path]
+    updated: list[Path]
+    skipped: list[Path]
+
+
+def sync_default_skills_dir(runtime_data_dir: Path, resource_root: Path) -> SkillSyncResult:
+    """Copy bundled skills into user data, overwriting matching bundled files only."""
+    source_dir = resource_root / "skills"
+    target_dir = runtime_data_dir / "skills"
+    copied: list[Path] = []
+    updated: list[Path] = []
+    skipped: list[Path] = []
+
+    if not source_dir.is_dir():
+        target_dir.mkdir(parents=True, exist_ok=True)
+        return SkillSyncResult(source_dir, target_dir, copied, updated, skipped)
+
+    for source_path in sorted(path for path in source_dir.rglob("*") if path.is_file()):
+        relative_path = source_path.relative_to(source_dir)
+        target_path = target_dir / relative_path
+        target_path.parent.mkdir(parents=True, exist_ok=True)
+        if target_path.exists():
+            if target_path.read_bytes() == source_path.read_bytes():
+                skipped.append(relative_path)
+                continue
+            updated.append(relative_path)
+        else:
+            copied.append(relative_path)
+        shutil.copy2(source_path, target_path)
+
+    return SkillSyncResult(source_dir, target_dir, copied, updated, skipped)

{yycode-0.3.3 → yycode-0.3.4}/agent/runtime/workflow_guard.py

@@ -171,17 +171,6 @@ class WorkflowGuard:
     def after_batch_messages(self, tool_calls_data: list) -> list[HumanMessage]:
         """Return extra HumanMessages to append after a tools batch."""
         additional_messages = []
-        todo_manager = self.runtime.todo_manager
-        if todo_manager.needs_reminder():
-            additional_messages.append(
-                HumanMessage(
-                    content=todo_manager.consume_reminder_message(),
-                    additional_kwargs={
-                        "context_ephemeral": True,
-                        "ephemeral_kind": "task_reminder",
-                    },
-                )
-            )
         if self.state.needs_verify and not any(tc.name == "verify" for tc in tool_calls_data):
             additional_messages.append(
                 HumanMessage(

{yycode-0.3.3 → yycode-0.3.4}/agent/session.py

@@ -14,7 +14,12 @@ from langchain_core.messages import (
 )
 
 from agent.approval import ApprovalCallback, ApprovalDenied
-from agent.app_paths import resolve_app_root, resolve_runtime_data_dir
+from agent.app_paths import (
+    ensure_default_skills_dir,
+    resolve_app_root,
+    resolve_resource_root,
+    resolve_runtime_data_dir,
+)
 from agent.session_replay import ReplayEvent, build_session_replay
 from agent.graph import build_graph
 from agent.llm_retry import LLMCallError
@@ -65,7 +70,9 @@ class Session:
         self.provider = provider
         self.workdir = (workdir or Path.cwd()).expanduser().resolve()
         self.app_root = resolve_app_root(app_root)
+        self.resource_root = resolve_resource_root(app_root)
         self.runtime_data_dir = resolve_runtime_data_dir(self.app_root, runtime_data_dir)
+        self.default_skill_dir = ensure_default_skills_dir(self.runtime_data_dir, self.resource_root)
         self.skill_dirs = self._resolve_skill_dirs(skill_dirs)
         self.skill_registry = SkillRegistry(self.workdir, self.skill_dirs)
         self.skill_catalog_prompt = self.skill_registry.format_skill_catalog_prompt()
@@ -114,7 +121,7 @@ class Session:
         self.task_summary_memory_builder = TaskSummaryMemoryBuilder()
 
     def _resolve_skill_dirs(self, skill_dirs: Optional[Iterable[str]]) -> list[str]:
-        default_dir = str(self.app_root / "skills")
+        default_dir = str(self.default_skill_dir)
         if skill_dirs is None:
             return [default_dir]
         return [default_dir, *[str(path) for path in skill_dirs]]

{yycode-0.3.3 → yycode-0.3.4}/agent/tui/renderers.py

@@ -423,9 +423,9 @@ def render_brand_text(state: TuiState | None = None, width: int = 100) -> str:
     """Render the compact app brand block."""
     W = max(72, min(width, 180))
     brand_line = (
-        "[bold #c9a6ff]YOYOAGENT[/] "
+        "[bold #c9a6ff]YYCode[/] "
         "[#7f8794]code assistant[/] "
-        "[#3f4652]" + ("─" * max(4, W - 29)) + "[/]"
+        "[#3f4652]" + ("─" * max(4, W - 26)) + "[/]"
     )
     if state is None:
         return brand_line
@@ -1275,7 +1275,7 @@ def _render_timeline_item(item: TimelineItem, state: TuiState | None = None, *,
     if item.event_type == "context_compressed":
         return f"{role_prefix}[#7f8794][context] {_safe_text(item.content)}[/]"
     if item.event_type == "context_summarized":
-        return f"{role_prefix}[#8fd6a3][context] {_safe_text(item.content)}[/]"
+        return f"{role_prefix}[#7f8794][context] {_safe_text(item.content)}[/]"
     if item.event_type == "llm_waiting":
         return _render_llm_waiting_item(item, role_prefix, state)
     if item.event_type == "llm_timeout":
@@ -1598,19 +1598,13 @@ def _is_task_state_result(item: TimelineItem) -> bool:
 
 def _render_task_state_summary(role_prefix: str, item: TimelineItem) -> str:
     counts = _task_state_counts(item.content)
-    summary = "Task plan"
+    parts = [f"{role_prefix}[bold #8fd6a3]● Plan Progress[/]"]
     if counts["total"]:
-        summary = f"{counts['completed']}/{counts['total']} done"
-        if counts["active"]:
-            summary += " · current"
-    lines = [
-        f"{role_prefix}[bold #8fd6a3]● Task Plan[/]",
-        f"  [#7f8794]{_safe_text(summary)}[/]",
-    ]
+        parts.append(f"[#7f8794]{counts['completed']}/{counts['total']} done[/]")
     if counts["active"]:
-        lines.append(f"  [#d7dae0]{_safe_text(counts['active'])}[/]")
-    lines.append("  [#7f8794]Ctrl+T full plan[/]")
-    return "\n".join(lines)
+        parts.append(f"[#d7dae0]{_safe_text(counts['active'])}[/]")
+    parts.append("[#7f8794][Ctrl+T][/]")
+    return " [#7f8794]·[/] ".join(parts)
 
 
 def _task_state_counts(content: str) -> dict[str, int | str]:

{yycode-0.3.3 → yycode-0.3.4}/agent/tui/state.py

@@ -385,7 +385,7 @@ class TuiState:
                 continue
             if item.event_type == "llm_waiting" and item.status in {"running", "retrying", "timeout", None}:
                 item.status = "completed"
-                item.title = "Model response started"
+                item.title = "Thinking"
                 item.invalidate_render_cache()
                 return
             if item.event_type in {"text_delta", "tool_start", "tool_result", "tool_end", "user_message"}:

yycode-0.3.4/agent/tui/styles.tcss

@@ -0,0 +1,280 @@
+Screen {
+    layout: vertical;
+    background: #101216;
+    color: #d7dae0;
+}
+
+#root-layout {
+    height: 1fr;
+    width: 1fr;
+    margin: 0 0;
+    padding: 1 2;
+    background: #101216;
+}
+
+#top-panel {
+    height: 3;
+    padding: 0 0;
+    color: #e6e8ee;
+    background: #101216;
+    margin-bottom: 1;
+}
+
+#timeline-panel {
+    height: 1fr;
+    padding: 0 0;
+    background: #101216;
+    color: #d7dae0;
+    margin-bottom: 1;
+    border: none;
+}
+
+#timeline-panel.selectable {
+    background: #101216;
+}
+
+#timeline-panel.selectable:focus {
+    background: #121419;
+}
+
+#skill-completion {
+    display: none;
+    height: auto;
+    max-height: 10;
+    margin-bottom: 1;
+    padding: 1 2;
+    border: round #3f4652;
+    background: #14171d;
+    color: #d7dae0;
+}
+
+#input-shell {
+    height: 8;
+    background: #101216;
+    margin-top: 1;
+}
+
+#input-shell.approving {
+    height: 6;
+    background: #101216;
+}
+
+#input-top-rule,
+#input-bottom-rule {
+    height: 1;
+    color: #3f4652;
+    background: #101216;
+}
+
+#input-shell.approving #input-top-rule,
+#input-shell.approving #input-bottom-rule {
+    color: #d7ba7d;
+}
+
+#approval-inline {
+    display: none;
+    height: 5;
+    padding: 0 0;
+    background: transparent;
+}
+
+#input-status-bar {
+    height: 1;
+    color: #d7dae0;
+    background: #101216;
+    padding: 0 0;
+}
+
+#input-row {
+    height: 5;
+    background: #101216;
+}
+
+#input-prompt {
+    height: 5;
+    color: #c9a6ff;
+    padding: 0 0;
+    width: 3;
+    background: #101216;
+    content-align: left top;
+}
+
+#prompt-input {
+    height: 5;
+    border: none;
+    background: #101216;
+    color: #e6e8ee;
+    padding: 0 0;
+    width: 1fr;
+}
+
+#help-dialog {
+    width: 1fr;
+    height: 1fr;
+    margin: 1 2;
+    padding: 1 2;
+    border: round #3f4652;
+    background: #101216;
+}
+
+#help-body {
+    width: 1fr;
+    height: 1fr;
+    color: #d7dae0;
+    background: #101216;
+}
+
+#task-plan-dialog {
+    width: 1fr;
+    height: 1fr;
+    margin: 1 2;
+    padding: 1 2;
+    border: round #3f4652;
+    background: #101216;
+}
+
+#task-plan-body {
+    width: 1fr;
+    height: 1fr;
+    color: #d7dae0;
+    background: #101216;
+}
+
+#timeline-text-dialog {
+    width: 1fr;
+    height: 1fr;
+    margin: 1 2;
+    padding: 1 2;
+    border: round #3f4652;
+    background: #101216;
+}
+
+#timeline-text-header {
+    width: 1fr;
+    height: 1;
+    color: #7f8794;
+    background: #101216;
+    margin-bottom: 1;
+}
+
+#timeline-text-body {
+    width: 1fr;
+    height: 1fr;
+    color: #d7dae0;
+    background: #101216;
+    scrollbar-size: 1 1;
+}
+
+#changed-files-dialog {
+    width: 1fr;
+    height: 1fr;
+    margin: 1 2;
+    padding: 1 2;
+    border: round #3f4652;
+    background: #101216;
+}
+
+#changed-files-header {
+    width: 1fr;
+    height: 1;
+    color: #d7dae0;
+    background: #101216;
+}
+
+#changed-files-split {
+    width: 1fr;
+    height: 1fr;
+    background: #101216;
+}
+
+#changed-files-list {
+    width: 36;
+    height: 1fr;
+    background: #101216;
+    color: #d7dae0;
+    scrollbar-size: 1 1;
+    margin-right: 1;
+}
+
+#changed-files-diff {
+    width: 1fr;
+    height: 1fr;
+    color: #d7dae0;
+    background: #101216;
+    scrollbar-size: 1 1;
+}
+
+#message-token-dialog {
+    width: 1fr;
+    height: 1fr;
+    margin: 1 2;
+    padding: 1 2;
+    border: round #3f4652;
+    background: #101216;
+}
+
+#message-token-header {
+    width: 1fr;
+    height: 3;
+    padding: 0 1;
+    color: #d7dae0;
+    background: #14171d;
+    border: round #2f3540;
+    margin-bottom: 1;
+}
+
+#message-token-split {
+    width: 1fr;
+    height: 1fr;
+    background: #101216;
+}
+
+#message-token-list {
+    width: 52;
+    height: 1fr;
+    background: #101216;
+    color: #d7dae0;
+    scrollbar-size: 1 1;
+    margin-right: 1;
+    border: round #2f3540;
+}
+
+#message-token-list:focus {
+    border: round #c9a6ff;
+}
+
+#message-token-detail {
+    width: 1fr;
+    height: 1fr;
+    color: #d7dae0;
+    background: #101216;
+    scrollbar-size: 1 1;
+    border: round #2f3540;
+    padding: 1 2;
+}
+
+#message-token-footer {
+    width: 1fr;
+    height: 1;
+    color: #7f8794;
+    background: #101216;
+    margin-top: 1;
+}
+
+#approval-title {
+    width: 1fr;
+    height: 1;
+    color: #e6e8ee;
+}
+
+#approval-detail {
+    width: 1fr;
+    height: 2;
+    color: #d7dae0;
+}
+
+#approval-actions {
+    width: 1fr;
+    height: 1;
+    color: #7f8794;
+}

{yycode-0.3.3 → yycode-0.3.4}/main.py

@@ -14,7 +14,12 @@ from dotenv import load_dotenv
 
 from agent import Session
 from agent.approval import ApprovalRequest
-from agent.app_paths import resolve_app_root, resolve_runtime_data_dir
+from agent.app_paths import (
+    resolve_app_root,
+    resolve_resource_root,
+    resolve_runtime_data_dir,
+    sync_default_skills_dir,
+)
 from agent.logger import setup_logging
 from agent.session_store import FileSessionStore
 from agent.streaming import colorize_diff
@@ -221,11 +226,12 @@ Examples:
   yycode -r bugfix-123
   yycode -x bugfix-123
   yycode ~/project -t
+  yycode --update-skills
   yycode -a
   yycode --plain
 
 Session data:
-  Messages are saved by default under {app_root}/sessions/{workspace_hash}/{session_id}.json.
+  Messages are saved by default under {data_dir}/sessions/{workspace_hash}/{session_id}.json.
   Use -s/--sessions to inspect saved sessions for WORKDIR.
   Use -r/--resume ID to continue a previous conversation in the same workspace.
   Use -x/--delete ID to delete a saved session for WORKDIR.
@@ -235,10 +241,10 @@ Environment:
   API_KEY                     API key for the selected provider.
   API_BASE                    Optional custom API base URL.
   AI_MODEL                    Model name override.
-  YOYO_APP_ROOT               Yoyo Agent app/release directory.
-  YOYO_RUNTIME_DATA_DIR       Runtime data directory; defaults to app_root.
+  YOYO_APP_ROOT               Bundled yycode resource root override.
+  YOYO_RUNTIME_DATA_DIR       User data directory; skills, sessions, and logs live here.
   YOYO_SESSION_DIR            Session messages directory override.
-  YOYO_SKILL_DIRS             Extra skill directories, separated by comma/pathsep.
+  YOYO_SKILL_DIRS             Extra skill directories appended after {data_dir}/skills.
   YOYO_CONTEXT_WINDOW_TOKENS  Context window size override for token pressure.
   YOYO_SILENT                 Auto-approve risky actions when truthy.
   YOYO_AUTO_APPROVE           Alias for YOYO_SILENT.
@@ -321,6 +327,11 @@ Environment:
         metavar="ID",
         help="Delete a persisted session id for WORKDIR and exit.",
     )
+    parser.add_argument(
+        "--update-skills",
+        action="store_true",
+        help="Copy bundled skills into the user data skills directory, overwriting matching files.",
+    )
     parser.add_argument(
         "--no-persist",
         dest="temp",
@@ -389,6 +400,25 @@ def delete_session_for_workdir(workdir: Path, session_id: str) -> str:
     return f"Deleted session for workspace {workdir}: {session_id}"
 
 
+def update_default_skills() -> str:
+    """Overwrite user data skills with bundled defaults where bundled files exist."""
+    app_root = resolve_app_root()
+    resource_root = resolve_resource_root(app_root)
+    runtime_data_dir = resolve_runtime_data_dir(app_root)
+    result = sync_default_skills_dir(runtime_data_dir, resource_root)
+    lines = [
+        "Updated yycode skills.",
+        f"Source: {result.source_dir}",
+        f"Target: {result.target_dir}",
+        f"Copied: {len(result.copied)}",
+        f"Updated: {len(result.updated)}",
+        f"Unchanged: {len(result.skipped)}",
+    ]
+    preserved_note = "User-created files without matching bundled paths were preserved."
+    lines.append(preserved_note)
+    return "\n".join(lines)
+
+
 def create_session_store_for_workdir(workdir: Path) -> FileSessionStore:
     """Create the default file session store for a workspace."""
     app_root = resolve_app_root()
@@ -420,6 +450,9 @@ def main() -> None:
     parser = build_arg_parser()
     args = parser.parse_args()
     log_file_path = resolve_log_file_path()
+    if args.update_skills:
+        print(update_default_skills())
+        return
     if args.acp or args.workdir == "acp":
         setup_logging(debug=args.debug, log_to_file=args.log_file, log_file=log_file_path)
         load_dotenv(override=True)

{yycode-0.3.3 → yycode-0.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "yycode"
-version = "0.3.3"
+version = "0.3.4"
 description = "Terminal coding agent with TUI, plain input mode, tools, skills, and ACP support"
 requires-python = ">=3.10"
 dependencies = [
@@ -10,7 +10,7 @@ dependencies = [
     "langgraph>=0.2.0",
     "langchain-core>=0.3.0",
     "python-dotenv>=1.0.0",
-    "textual>=0.80.0",
+    "textual==8.2.4"
 ]
 
 [project.scripts]
@@ -23,6 +23,9 @@ py-modules = ["main"]
 include = ["agent*", "tools*", "utils*"]
 exclude = ["sessions*", "output*", "tests*", "examples*", "docs*", "changes*"]
 
+[tool.setuptools.package-data]
+"agent.tui" = ["*.tcss"]
+
 [tool.setuptools.data-files]
 "skills" = ["skills/*.md"]
 "skills/drawio" = ["skills/drawio/SKILL.md"]
@@ -31,7 +34,8 @@ exclude = ["sessions*", "output*", "tests*", "examples*", "docs*", "changes*"]
 "skills/drawio/assets" = ["skills/drawio/assets/*"]
 "skills/drawio/docs" = ["skills/drawio/docs/*"]
 "skills/drawio/references" = ["skills/drawio/references/*"]
-"skills/drawio/styles" = ["skills/drawio/styles/*"]
+"skills/drawio/styles" = ["skills/drawio/styles/*.json"]
+"skills/drawio/styles/built-in" = ["skills/drawio/styles/built-in/*.json"]
 
 [tool.ruff]
 line-length = 100