tagword-codeagent 1.1.36__tar.gz → 1.2.0__tar.gz

{tagword_codeagent-1.1.36/tagword_codeagent.egg-info → tagword_codeagent-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tagword-codeagent
-Version: 1.1.36
+Version: 1.2.0
 Summary: Autonomous AI coding agent driven by Markdown config — DeepSeek-ready, CLI + Web UI, 45+ tools, self-hosted
 License: MIT
 Project-URL: Homepage, https://github.com/tagword/codeagent
@@ -26,7 +26,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: seed-kernel
-Requires-Dist: seed-model-providers
+Requires-Dist: seed-model-providers>=1.0.3
 Requires-Dist: seed-toolbox[code]
 Requires-Dist: uvicorn[standard]>=0.30.0
 Requires-Dist: starlette>=0.37.0

tagword_codeagent-1.2.0/codeagent/__init__.py

@@ -0,0 +1,25 @@
+"""
+CodeAgent — Personality layer
+
+Architecture:
+  - seed/   : Core engine (LLM execution, tool system, session management)
+  - codeagent/ : Personality layer (CLI, server, web UI, skills, per-agent config)
+"""
+
+# 版本号从包元数据动态读取，避免 pyproject.toml 与 __init__ 写死值不同步
+# 注意：发行名（tagword-codeagent）与历史 editable 安装的 dist-info 名（codeagent）
+# 可能不一致，两者都尝试，避免静默回落到 0.0.0。
+def _resolve_version() -> str:
+    from importlib.metadata import PackageNotFoundError
+    from importlib.metadata import version as _pkg_version
+
+    for dist_name in ("tagword-codeagent", "codeagent"):
+        try:
+            return _pkg_version(dist_name)
+        except PackageNotFoundError:
+            continue
+    return "0.0.0"
+
+
+__version__ = _resolve_version()
+

{tagword_codeagent-1.1.36 → tagword_codeagent-1.2.0}/codeagent/cli/entrypoint.py

@@ -3,9 +3,10 @@ import argparse
 import sys
 from datetime import datetime
 
+from seed_tools import setup_builtin_tools
+
 from seed.core.persistence import ensure_session_dir, list_sessions, save_session
 from seed.core.routing import find_commands, get_all_commands
-from seed_tools import setup_builtin_tools
 
 # Prefer ``python -m codeagent`` / ``codeagent.cli.main`` — kept for compatibility.
 

{tagword_codeagent-1.1.36 → tagword_codeagent-1.2.0}/codeagent/cli/main.py

@@ -184,7 +184,11 @@ def main():
         formatter_class=argparse.RawDescriptionHelpFormatter
     )
 
-    parser.add_argument('--version', action='version', version='CodeAgent v1.1.0')
+    from codeagent import __version__ as _codeagent_version
+
+    parser.add_argument(
+        '--version', action='version', version=f'CodeAgent v{_codeagent_version}'
+    )
     subparsers = parser.add_subparsers(dest='command', help='Available commands')
 
     # Run command
@@ -307,6 +311,15 @@ def main():
         metavar='PRESET_ID',
         help='Video generation preset for video_generate (or CODEAGENT_VIDEO_GEN_PRESET_ID)',
     )
+    chat_parser.add_argument(
+        '--project-id',
+        default=None,
+        help=(
+            'Project id this chat belongs to. When set, the session is registered '
+            'under that project in the Web UI (instead of 未分类), so dispatched '
+            'tasks stay grouped with their project.'
+        ),
+    )
 
     serve_parser = subparsers.add_parser(
         'serve',
@@ -471,9 +484,8 @@ def _cli_vision_preset_id(args) -> str:
 
 
 def _cli_stage_path_attachment(path: str, *, agent_id: str, session_id: str):
-    from pathlib import Path
-
     import mimetypes
+    from pathlib import Path
 
     from codeagent.core.attachments import save_attachment
 
@@ -541,10 +553,8 @@ def _cli_startup_attachments(args, *, agent_id: str, session_id: str, project_ro
 
 def _cli_handle_slash_attach(line: str, *, agent_id: str, session_id: str, project_root):
     """Return (handled, attachments, image_dir_tag, message_text)."""
-    from pathlib import Path
 
     from codeagent.core import env as ca_env
-    from codeagent.core.attachments import scan_image_directory
 
     low = line.strip().lower()
     if low in ('/clear-vision', '/clear_vision'):
@@ -575,14 +585,19 @@ def _cmd_chat_llm(args):
 
     from seed_tools import setup_builtin_tools
 
+    from codeagent.runtime.prompt_enrichment import (
+        build_skills_suffix,
+        get_cached_system_prompt,
+        record_chat_turn_diary,
+    )
     from seed.core.agent_context import (
         set_active_agent_id,
         set_active_audio_preset,
         set_active_image_gen_preset,
         set_active_llm_session,
-        set_active_vision_preset,
         set_active_music_preset,
         set_active_video_gen_preset,
+        set_active_vision_preset,
     )
     from seed.core.agent_runtime import (
         build_api_projection_messages,
@@ -592,12 +607,6 @@ def _cmd_chat_llm(args):
         run_llm_tool_loop,
         strip_ephemeral_message_fields,
     )
-    from codeagent.runtime.prompt_enrichment import (
-        build_skills_suffix,
-        fresh_system_prompt,
-        get_cached_system_prompt,
-        record_chat_turn_diary,
-    )
     from seed.core.llm_exec import LLMError
     from seed.core.llm_presets import llm_executor_from_resolved, resolve_preset
     from seed.core.llm_sess import (
@@ -624,7 +633,14 @@ def _cmd_chat_llm(args):
     audio_preset_id = _cli_audio_preset_id(args)
     music_preset_id = _cli_music_preset_id(args)
     video_gen_preset_id = _cli_video_gen_preset_id(args)
-    chat_sess = load_or_create_chat_session(name, agent_id)
+    # 项目归属：显式 --project-id 优先；其次沿用会话已存的 project_id，
+    # 让既有会话也能"重新归类"到新项目（不会清空历史）。
+    project_id = getattr(args, 'project_id', None)
+    chat_sess = load_or_create_chat_session(
+        name,
+        agent_id,
+        project_id=project_id,
+    )
     fresh_sys = get_cached_system_prompt(chat_sess, agent_id=agent_id)
     chat_sess.messages[:] = merge_fresh_system(chat_sess.messages, fresh_sys)
 
@@ -691,7 +707,6 @@ def _cmd_chat_llm(args):
             message_has_video_attachments,
         )
         from codeagent.core.audio_models import preset_supports_audio_id
-        from codeagent.core.vision_models import preset_supports_vision_id
 
         user_msg = build_user_message(
             message_text,
@@ -700,21 +715,24 @@ def _cmd_chat_llm(args):
         )
         from codeagent.core.image_understanding import image_attachment_allowed, video_attachment_allowed
 
-        if message_has_image_attachments(user_msg) or pending_dir_tag:
-            if not image_attachment_allowed(vision_preset_id or ""):
-                print(
-                    '[error] 发送图片需要 --vision-llm（supports_vision）'
-                    ' 或已配置 MiniMax MCP（understand_image）'
-                )
-                continue
-        if message_has_video_attachments(user_msg):
-            if not video_attachment_allowed(vision_preset_id or ""):
-                print('[error] 发送视频需要有效的 --vision-llm 或 CODEAGENT_VISION_PRESET_ID')
-                continue
-        if message_has_audio_attachments(user_msg):
-            if not audio_preset_id or not preset_supports_audio_id(audio_preset_id):
-                print('[error] 发送音频需要有效的 --audio-llm 或 CODEAGENT_AUDIO_PRESET_ID')
-                continue
+        if (message_has_image_attachments(user_msg) or pending_dir_tag) and not image_attachment_allowed(
+            vision_preset_id or ""
+        ):
+            print(
+                '[error] 发送图片需要 --vision-llm（supports_vision）'
+                ' 或已配置 MiniMax MCP（understand_image）'
+            )
+            continue
+        if message_has_video_attachments(user_msg) and not video_attachment_allowed(
+            vision_preset_id or ""
+        ):
+            print('[error] 发送视频需要有效的 --vision-llm 或 CODEAGENT_VISION_PRESET_ID')
+            continue
+        if message_has_audio_attachments(user_msg) and (
+            not audio_preset_id or not preset_supports_audio_id(audio_preset_id)
+        ):
+            print('[error] 发送音频需要有效的 --audio-llm 或 CODEAGENT_AUDIO_PRESET_ID')
+            continue
 
         pending_attachments = []
         pending_dir_tag = ''
@@ -728,17 +746,33 @@ def _cmd_chat_llm(args):
             chat_sess.messages,
             skills_suffix=_skills_suffix,
         )
-        compact_result = maybe_compact_context_messages(api_msgs, llm)
+        _persisted_usage = (
+            chat_sess.metadata.get("context_usage")
+            if isinstance(chat_sess.metadata, dict)
+            else None
+        )
+        compact_result = maybe_compact_context_messages(
+            api_msgs,
+            llm,
+            persisted_context_usage=_persisted_usage,
+        )
         persist_compact_summary(chat_sess.messages, compact_result)
         strip_ephemeral_message_fields(api_msgs)
         if not isinstance(chat_sess.metadata, dict):
             chat_sess.metadata = {}
+        # CLI --project-id 优先；其次回退到会话已存的 project_id。
+        # finalize_episodic_for_llm 会保留既有项目归属（不会强行覆盖）。
+        effective_project_id = project_id
+        if effective_project_id is None and isinstance(chat_sess.metadata, dict):
+            existing = chat_sess.metadata.get('project_id')
+            if isinstance(existing, str) and existing:
+                effective_project_id = existing
         finalize_episodic_for_llm(
             api_msgs,
             chat_sess.metadata,
             agent_id=agent_id,
             session_id=name,
-            project_id=None,
+            project_id=effective_project_id,
             compact_happened=compact_result is not None,
         )
         set_active_llm_session(f'{agent_id}::{name}')
@@ -759,7 +793,25 @@ def _cmd_chat_llm(args):
                     max_tool_rounds=max_rounds,
                 )
             )
-            tail = merge_llm_tail_into_full(chat_sess.messages, api_msgs, n_before)
+            merge_llm_tail_into_full(chat_sess.messages, api_msgs, n_before)
+            # 落盘本轮峰值用量，供下一轮 maybe_compact_context_messages 的
+            # persisted_context_usage 来源使用（CLI 路径此前完全缺失此来源）。
+            with contextlib.suppress(Exception):
+                if isinstance(_loop_meta, dict):
+                    _peak = int(_loop_meta.get("peak_prompt_tokens") or 0)
+                    if _peak > 0:
+                        if not isinstance(chat_sess.metadata, dict):
+                            chat_sess.metadata = {}
+                        _prev = chat_sess.metadata.get("context_usage")
+                        _prev_peak = (
+                            int(_prev.get("peak_prompt_tokens") or 0)
+                            if isinstance(_prev, dict)
+                            else 0
+                        )
+                        chat_sess.metadata["context_usage"] = {
+                            "peak_prompt_tokens": max(_peak, _prev_peak),
+                            "compact_count": int(_loop_meta.get("compact_count") or 0),
+                        }
             print(reply)
             if tools_used:
                 print(f"  [tools] {', '.join(tools_used)}")
@@ -801,10 +853,9 @@ def _cmd_chat_llm(args):
 def cmd_webui_token(args):
     import secrets
 
-    from codeagent.web.auth_impl import TOKEN_FILENAME
-
     # cmd_webui_token can be invoked directly; ensure env file is loaded.
     from codeagent.core.bootstrap import bootstrap_codeagent_runtime
+    from codeagent.web.auth_impl import TOKEN_FILENAME
 
     bootstrap_codeagent_runtime()
     from seed.core.config_plane import project_root as _project_root

{tagword_codeagent-1.1.36 → tagword_codeagent-1.2.0}/codeagent/core/attachments.py

@@ -6,10 +6,10 @@ import fnmatch
 import mimetypes
 import os
 import re
-from dataclasses import asdict, dataclass, field
+from dataclasses import asdict, dataclass
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 from codeagent.core import env as ca_env
 
@@ -33,7 +33,7 @@ class AttachmentMeta:
     filename: str
     size_bytes: int
     path: str = ""
-    extracted_text: Optional[str] = None
+    extracted_text: str | None = None
 
     def to_dict(self) -> dict[str, Any]:
         return {k: v for k, v in asdict(self).items() if v is not None}
@@ -101,9 +101,10 @@ def extract_document_text(raw: bytes, mime: str, filename: str = "") -> str:
         return raw.decode("utf-8", errors="replace").strip()
     if m == "application/pdf" or name.endswith(".pdf"):
         try:
-            from pypdf import PdfReader
             import io
 
+            from pypdf import PdfReader
+
             reader = PdfReader(io.BytesIO(raw))
             parts = []
             for page in reader.pages:
@@ -159,14 +160,14 @@ def save_attachment(
     )
 
 
-def resolve_attachment_path(agent_id: str, session_id: str, attachment_id: str) -> Optional[Path]:
+def resolve_attachment_path(agent_id: str, session_id: str, attachment_id: str) -> Path | None:
     from seed.core.media_store import resolve_session_media_path
 
     p = resolve_session_media_path(agent_id, session_id, attachment_id)
     return p
 
 
-def load_attachment_meta(agent_id: str, session_id: str, attachment_id: str) -> Optional[AttachmentMeta]:
+def load_attachment_meta(agent_id: str, session_id: str, attachment_id: str) -> AttachmentMeta | None:
     p = resolve_attachment_path(agent_id, session_id, attachment_id)
     if not p or not p.is_file():
         return None
@@ -245,8 +246,8 @@ def scan_image_directory(
     workspace_root: Path,
     rel_path: str,
     *,
-    pattern: Optional[str] = None,
-    max_files: Optional[int] = None,
+    pattern: str | None = None,
+    max_files: int | None = None,
 ) -> tuple[list[Path], bool]:
     """Return (image paths, truncated). Paths resolved under workspace_root."""
     root = workspace_root.resolve()
@@ -277,7 +278,7 @@ def scan_image_directory(
     return found, truncated
 
 
-def _parse_globs(pattern: Optional[str]) -> tuple[str, ...]:
+def _parse_globs(pattern: str | None) -> tuple[str, ...]:
     if pattern and pattern.strip():
         return tuple(g.strip() for g in pattern.split(",") if g.strip())
     raw = ca_env.pick_default(
@@ -289,10 +290,7 @@ def _parse_globs(pattern: Optional[str]) -> tuple[str, ...]:
 
 def _matches_globs(name: str, globs: tuple[str, ...]) -> bool:
     low = name.lower()
-    for g in globs:
-        if fnmatch.fnmatch(low, g.lower()):
-            return True
-    return False
+    return any(fnmatch.fnmatch(low, g.lower()) for g in globs)
 
 
 def message_has_image_attachments(msg: dict[str, Any]) -> bool:
@@ -301,9 +299,7 @@ def message_has_image_attachments(msg: dict[str, Any]) -> bool:
         for a in atts:
             if isinstance(a, dict) and a.get("kind") == "image":
                 return True
-    if IMAGE_DIR_TAG_RE.search(str(msg.get("content") or "")):
-        return True
-    return False
+    return bool(IMAGE_DIR_TAG_RE.search(str(msg.get("content") or "")))
 
 
 def message_has_video_attachments(msg: dict[str, Any]) -> bool:

{tagword_codeagent-1.1.36 → tagword_codeagent-1.2.0}/codeagent/core/audio_models.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Optional
+from typing import Any
 
 from codeagent.core import env as ca_env
 
@@ -29,7 +29,7 @@ def preset_supports_audio_id(preset_id: str) -> bool:
     return False
 
 
-def resolve_audio_preset(preset_id: Optional[str] = None) -> dict[str, Any]:
+def resolve_audio_preset(preset_id: str | None = None) -> dict[str, Any]:
     from seed.core.llm_presets import load_presets
 
     pid = (preset_id or "").strip()

{tagword_codeagent-1.1.36 → tagword_codeagent-1.2.0}/codeagent/core/bootstrap.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 import logging
 import os
 from pathlib import Path
-from typing import Optional
 
 from codeagent.core.env import apply_default_product_home
 from codeagent.core.seed_bridge import bridge_codeagent_env_to_seed
@@ -127,7 +126,7 @@ def _ensure_codeagent_bootstrap_md(home: Path) -> None:
     dest.write_text(_CODEAGENT_BOOTSTRAP_MD, encoding="utf-8")
 
 
-def bootstrap_codeagent_runtime(base: Optional[Path] = None) -> Path:
+def bootstrap_codeagent_runtime(base: Path | None = None) -> Path:
     """
     1. Default data root ``~/.codeagent`` (or ``CODEAGENT_HOME``)
     2. Set ``SEED_PROJECT_ROOT`` so Seed / seed-tools use the same tree

{tagword_codeagent-1.1.36 → tagword_codeagent-1.2.0}/codeagent/core/default_presets.py

@@ -16,7 +16,6 @@ from __future__ import annotations
 import json
 import logging
 from pathlib import Path
-from typing import Dict
 
 logger = logging.getLogger(__name__)
 
@@ -70,7 +69,7 @@ def _read_legacy_single_id() -> str:
         return ""
 
 
-def get_default_preset_ids() -> Dict[str, str]:
+def get_default_preset_ids() -> dict[str, str]:
     """Return a mapping ``{slot: preset_id}`` for every slot that has a default.
 
     Reads the new JSON map first; falls back to ``codeagent.default_preset_ids.json``
@@ -83,7 +82,7 @@ def get_default_preset_ids() -> Dict[str, str]:
         except (json.JSONDecodeError, OSError):
             data = {}
         if isinstance(data, dict):
-            out: Dict[str, str] = {}
+            out: dict[str, str] = {}
             for slot in SLOTS:
                 v = data.get(slot)
                 if isinstance(v, str) and v.strip():
@@ -97,7 +96,7 @@ def get_default_preset_ids() -> Dict[str, str]:
         except (json.JSONDecodeError, OSError):
             data = {}
         if isinstance(data, dict):
-            out: Dict[str, str] = {}
+            out: dict[str, str] = {}
             for slot in SLOTS:
                 v = data.get(slot)
                 if isinstance(v, str) and v.strip():
@@ -124,9 +123,9 @@ def set_default_preset_id_for_slot(slot: str, preset_id: str) -> None:
     _write_default_preset_ids(cur)
 
 
-def set_default_preset_ids(mapping: Dict[str, str]) -> None:
+def set_default_preset_ids(mapping: dict[str, str]) -> None:
     """Bulk-replace the entire default map (ignoring unknown slots)."""
-    out: Dict[str, str] = {}
+    out: dict[str, str] = {}
     for slot in SLOTS:
         if slot in mapping:
             v = mapping[slot]
@@ -135,7 +134,7 @@ def set_default_preset_ids(mapping: Dict[str, str]) -> None:
     _write_default_preset_ids(out)
 
 
-def _write_default_preset_ids(mapping: Dict[str, str]) -> None:
+def _write_default_preset_ids(mapping: dict[str, str]) -> None:
     p = _new_path()
     p.parent.mkdir(parents=True, exist_ok=True)
     try:

{tagword_codeagent-1.1.36 → tagword_codeagent-1.2.0}/codeagent/core/folder_picker.py

@@ -6,7 +6,6 @@ import os
 import subprocess
 import sys
 from pathlib import Path
-from typing import Optional, Tuple
 
 
 def has_graphical_session() -> bool:
@@ -20,7 +19,7 @@ def has_graphical_session() -> bool:
     )
 
 
-def pick_directory_sync() -> Tuple[str, bool, str]:
+def pick_directory_sync() -> tuple[str, bool, str]:
     """
     Blocking folder picker.
 
@@ -36,7 +35,7 @@ def pick_directory_sync() -> Tuple[str, bool, str]:
     return _pick_linux()
 
 
-def _pick_darwin() -> Tuple[str, bool, str]:
+def _pick_darwin() -> tuple[str, bool, str]:
     script = (
         'POSIX path of (choose folder with prompt '
         '"选择目录" default location (path to desktop folder))'
@@ -63,7 +62,7 @@ def _pick_darwin() -> Tuple[str, bool, str]:
     return "", False, ""
 
 
-def _pick_windows() -> Tuple[str, bool, str]:
+def _pick_windows() -> tuple[str, bool, str]:
     ps = r"""
 Add-Type -AssemblyName System.Windows.Forms
 $top = New-Object System.Windows.Forms.Form
@@ -103,7 +102,7 @@ try {
     return "", True, "PowerShell not found for folder picker"
 
 
-def _pick_linux() -> Tuple[str, bool, str]:
+def _pick_linux() -> tuple[str, bool, str]:
     if not has_graphical_session():
         return (
             "",
@@ -145,7 +144,7 @@ def _pick_linux() -> Tuple[str, bool, str]:
     return "", True, hint
 
 
-def _which(name: str) -> Optional[str]:
+def _which(name: str) -> str | None:
     from shutil import which as _w
 
     return _w(name)

{tagword_codeagent-1.1.36 → tagword_codeagent-1.2.0}/codeagent/core/image_understanding.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 from seed.integrations.mcp_config import MINIMAX_MCP_SERVER_ID, get_server_config
 
@@ -12,7 +12,7 @@ MINIMAX_UNDERSTAND_IMAGE_TOOL = "understand_image"
 MCP_QUALIFIED_UNDERSTAND_IMAGE = f"mcp__{MINIMAX_MCP_SERVER_ID}__{MINIMAX_UNDERSTAND_IMAGE_TOOL}"
 
 
-def minimax_mcp_configured(base: Optional[Path] = None) -> bool:
+def minimax_mcp_configured(base: Path | None = None) -> bool:
     """MiniMax MCP server enabled in config with a non-empty API key."""
     from seed.integrations.mcp_client import mcp_globally_enabled
 
@@ -26,10 +26,10 @@ def minimax_mcp_configured(base: Optional[Path] = None) -> bool:
 
 
 def minimax_mcp_understand_image_ready(
-    base: Optional[Path] = None,
+    base: Path | None = None,
     *,
     probe: bool = False,
-    servers_status: Optional[list[dict[str, Any]]] = None,
+    servers_status: list[dict[str, Any]] | None = None,
 ) -> bool:
     """True when MiniMax MCP can run ``understand_image`` (configured; optionally probed)."""
     if not minimax_mcp_configured(base):
@@ -51,7 +51,7 @@ def minimax_mcp_understand_image_ready(
     return False
 
 
-def image_attachment_allowed(vision_llm_id: str, base: Optional[Path] = None) -> bool:
+def image_attachment_allowed(vision_llm_id: str, base: Path | None = None) -> bool:
     """User may send image attachments when a vision preset or MiniMax MCP is available."""
     vid = (vision_llm_id or "").strip()
     if vid == MCP_VISION_SENTINEL:
@@ -72,10 +72,10 @@ def video_attachment_allowed(vision_llm_id: str) -> bool:
 
 
 def image_understanding_status(
-    base: Optional[Path] = None,
+    base: Path | None = None,
     *,
     probe: bool = False,
-    servers_status: Optional[list[dict[str, Any]]] = None,
+    servers_status: list[dict[str, Any]] | None = None,
 ) -> dict[str, Any]:
     configured = minimax_mcp_configured(base)
     ready = minimax_mcp_understand_image_ready(