aicortexpy 0.1.0__tar.gz → 0.2.1__tar.gz

aicortexpy-0.2.1/PKG-INFO

@@ -0,0 +1,87 @@
+Metadata-Version: 2.2
+Name: aicortexpy
+Version: 0.2.1
+Summary: AICortex Python CLI and local agent runtime daemon (Go CLI compatible)
+Author: AICortex
+License: Apache-2.0
+Project-URL: Homepage, https://gitee.com/seacozz2007/aicortex
+Project-URL: Repository, https://gitee.com/seacozz2007/aicortex
+Project-URL: Issues, https://gitee.com/seacozz2007/aicortex/issues
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+Requires-Dist: websocket-client>=1.6
+Provides-Extra: dev
+Requires-Dist: pytest>=7.0; extra == "dev"
+Requires-Dist: build>=1.0; extra == "dev"
+Requires-Dist: twine>=5.0; extra == "dev"
+
+# aicortexpy
+
+Python **CLI + local agent runtime** for AICortex。在无法使用 Go `aicortex` 二进制时，可作为完整替代：
+
+```powershell
+pip install -U aicortexpy
+aicortex login --token mul_...
+aicortex daemon start
+aicortex issue list --output json
+```
+
+也可用 `python -m aicortexpy`（与 `aicortex` / `aicortexpy` 入口等价）。
+
+| | |
+|--|--|
+| PyPI / 模块 | `aicortexpy` |
+| Console scripts | `aicortex`、`aicortexpy`（`aicortex` 刻意同名，供 Agent 提示词零改动） |
+| 配置 | 与 Go 共用 `~/.aicortex/config.json` |
+
+## 安装
+
+```powershell
+pip install -U aicortexpy
+# 源码：
+cd python-daemon
+pip install -e .
+```
+
+## 常用命令（对齐 Go CLI）
+
+```powershell
+aicortex login --token mul_xxx
+aicortex auth status
+aicortex config show
+aicortex workspace list --output json
+aicortex issue get MUL-123 --output json
+aicortex issue comment add MUL-123 --content "done"
+aicortex daemon start
+aicortex daemon status
+aicortex version
+```
+
+Agent 任务内：daemon 会把 `aicortex` shim 前置到 PATH，子进程执行 `aicortex issue ...` 即本包，无需 Go 二进制。
+
+## Daemon
+
+```powershell
+$env:AICORTEX_DAEMON_BACKEND = "python"   # 若仍用 Go 包装器拉起
+aicortex daemon start
+# 或
+python -m aicortexpy daemon start --foreground
+```
+
+Health 默认端口 **19514**。不要与 Go daemon 同时跑。
+
+## 发布
+
+```powershell
+cd python-daemon
+python -m build
+python -m twine upload dist/*
+```
+
+版本：`pyproject.toml` 与 `aicortexpy/__init__.py` 的 `__version__` 保持一致。
+
+## 相对 Go CLI
+
+已覆盖 Agent/日常平台命令（issue/workspace/agent/squad/project/label/attachment/autopilot/meeting/skill/memory/graph/runtime/repo/auth/config/daemon）。
+
+尚未：浏览器 OAuth login、`update` 二进制自更新（请用 `pip install -U aicortexpy`）。

aicortexpy-0.2.1/README.md

@@ -0,0 +1,70 @@
+# aicortexpy
+
+Python **CLI + local agent runtime** for AICortex。在无法使用 Go `aicortex` 二进制时，可作为完整替代：
+
+```powershell
+pip install -U aicortexpy
+aicortex login --token mul_...
+aicortex daemon start
+aicortex issue list --output json
+```
+
+也可用 `python -m aicortexpy`（与 `aicortex` / `aicortexpy` 入口等价）。
+
+| | |
+|--|--|
+| PyPI / 模块 | `aicortexpy` |
+| Console scripts | `aicortex`、`aicortexpy`（`aicortex` 刻意同名，供 Agent 提示词零改动） |
+| 配置 | 与 Go 共用 `~/.aicortex/config.json` |
+
+## 安装
+
+```powershell
+pip install -U aicortexpy
+# 源码：
+cd python-daemon
+pip install -e .
+```
+
+## 常用命令（对齐 Go CLI）
+
+```powershell
+aicortex login --token mul_xxx
+aicortex auth status
+aicortex config show
+aicortex workspace list --output json
+aicortex issue get MUL-123 --output json
+aicortex issue comment add MUL-123 --content "done"
+aicortex daemon start
+aicortex daemon status
+aicortex version
+```
+
+Agent 任务内：daemon 会把 `aicortex` shim 前置到 PATH，子进程执行 `aicortex issue ...` 即本包，无需 Go 二进制。
+
+## Daemon
+
+```powershell
+$env:AICORTEX_DAEMON_BACKEND = "python"   # 若仍用 Go 包装器拉起
+aicortex daemon start
+# 或
+python -m aicortexpy daemon start --foreground
+```
+
+Health 默认端口 **19514**。不要与 Go daemon 同时跑。
+
+## 发布
+
+```powershell
+cd python-daemon
+python -m build
+python -m twine upload dist/*
+```
+
+版本：`pyproject.toml` 与 `aicortexpy/__init__.py` 的 `__version__` 保持一致。
+
+## 相对 Go CLI
+
+已覆盖 Agent/日常平台命令（issue/workspace/agent/squad/project/label/attachment/autopilot/meeting/skill/memory/graph/runtime/repo/auth/config/daemon）。
+
+尚未：浏览器 OAuth login、`update` 二进制自更新（请用 `pip install -U aicortexpy`）。

aicortexpy-0.2.1/aicortexpy/__init__.py

@@ -0,0 +1,3 @@
+"""AICortex Python CLI + local agent runtime daemon."""
+
+__version__ = "0.2.1"

{aicortexpy-0.1.0 → aicortexpy-0.2.1}/aicortexpy/acp_client.py

@@ -236,7 +236,9 @@ class ACPClient:
             if self.on_message:
                 self.on_message(
                     {
-                        "type": "tool-use",
+                        # Server/UI wire format uses underscores (Go daemon maps
+                        # internal "tool-use" → "tool_use" before ReportTaskMessages).
+                        "type": "tool_use",
                         "tool": tool_name,
                         "call_id": call_id,
                         "input": raw_input,
@@ -271,8 +273,18 @@ class ACPClient:
         output = str(data.get("rawOutput") or data.get("output") or "")
         if not output:
             output = _extract_tool_call_text(content)
+        tool_name = ""
+        if pending is not None:
+            tool_name = pending.tool_name or ""
         if self.on_message:
-            self.on_message({"type": "tool-result", "call_id": call_id, "output": output})
+            self.on_message(
+                {
+                    "type": "tool_result",
+                    "tool": tool_name or "tool",
+                    "call_id": call_id,
+                    "output": output,
+                }
+            )
 
     def _emit_deferred_tool_use(self, pending: _PendingTool | None, call_id: str, data: dict) -> None:
         if pending is not None and pending.emitted:
@@ -300,7 +312,12 @@ class ACPClient:
             inp = {}
         if self.on_message:
             self.on_message(
-                {"type": "tool-use", "tool": tool_name, "call_id": call_id, "input": inp}
+                {
+                    "type": "tool_use",
+                    "tool": tool_name,
+                    "call_id": call_id,
+                    "input": inp,
+                }
             )
 
     def _track_tool(self, call_id: str, p: _PendingTool) -> None:

{aicortexpy-0.1.0 → aicortexpy-0.2.1}/aicortexpy/acp_conn.py

@@ -226,9 +226,9 @@ class _BaseACPConn:
             typ = msg.get("type")
             if typ == "text":
                 output_parts.append(str(msg.get("content") or ""))
-            elif typ == "tool-use":
+            elif typ in ("tool_use", "tool-use"):
                 in_flight_tools["n"] += 1
-            elif typ == "tool-result":
+            elif typ in ("tool_result", "tool-result"):
                 in_flight_tools["n"] = max(0, in_flight_tools["n"] - 1)
             messages.append(msg)
             if on_message:

{aicortexpy-0.1.0 → aicortexpy-0.2.1}/aicortexpy/agent_env.py

@@ -33,12 +33,49 @@ def is_blocked_env_key(key: str) -> bool:
 
 
 def _aicortex_bin_dir() -> str | None:
-    which = shutil.which("aicortexpy")
-    if which:
-        return str(Path(which).resolve().parent)
+    """Prefer Scripts dir that contains console_scripts aicortex / aicortexpy."""
+    for name in ("aicortex", "aicortexpy"):
+        which = shutil.which(name)
+        if which:
+            return str(Path(which).resolve().parent)
+    # Fallback: directory of this interpreter's Scripts (pip install --user / venv)
+    try:
+        import sysconfig
+
+        scripts = sysconfig.get_path("scripts")
+        if scripts and Path(scripts).is_dir():
+            return scripts
+    except Exception:
+        pass
     return None
 
 
+def ensure_cli_shim_dir(state_dir: Path) -> Path | None:
+    """Write a tiny aicortex shim so agents resolve to python -m aicortexpy."""
+    shim_dir = state_dir / "py-cli-shim"
+    try:
+        shim_dir.mkdir(parents=True, exist_ok=True)
+    except OSError:
+        return None
+    import sys
+
+    py = sys.executable
+    if sys.platform == "win32":
+        cmd = shim_dir / "aicortex.cmd"
+        cmd.write_text(
+            f'@echo off\r\n"{py}" -m aicortexpy %*\r\n',
+            encoding="utf-8",
+        )
+    else:
+        sh = shim_dir / "aicortex"
+        sh.write_text(f'#!/bin/sh\nexec "{py}" -m aicortexpy "$@"\n', encoding="utf-8")
+        try:
+            sh.chmod(0o755)
+        except OSError:
+            pass
+    return shim_dir
+
+
 def build_agent_environ(
     base: dict[str, str],
     *,
@@ -55,7 +92,7 @@ def build_agent_environ(
 
     environ["AICORTEX_TOKEN"] = cfg.token
     environ["AICORTEX_SERVER_URL"] = cfg.server_base_url
-    environ["aicortex_PORT"] = str(cfg.health_port)
+    environ["AICORTEX_DAEMON_PORT"] = str(cfg.health_port)
     environ["AICORTEX_WORKSPACE_ID"] = task.workspace_id or ""
     environ["AICORTEX_AGENT_NAME"] = agent_name
     environ["AICORTEX_AGENT_ID"] = agent_id
@@ -69,10 +106,16 @@ def build_agent_environ(
     if task.quick_create_prompt:
         environ["AICORTEX_QUICK_CREATE_TASK_ID"] = task.id
 
+    prepend: list[str] = []
+    shim = ensure_cli_shim_dir(cfg.state_dir)
+    if shim:
+        prepend.append(str(shim))
     bin_dir = _aicortex_bin_dir()
-    if bin_dir:
+    if bin_dir and bin_dir not in prepend:
+        prepend.append(bin_dir)
+    if prepend:
         prev = environ.get("PATH") or os.environ.get("PATH") or ""
-        environ["PATH"] = bin_dir + os.pathsep + prev
+        environ["PATH"] = os.pathsep.join(prepend) + os.pathsep + prev
 
     if extra:
         environ.update({str(k): str(v) for k, v in extra.items()})

{aicortexpy-0.1.0 → aicortexpy-0.2.1}/aicortexpy/attachments.py

@@ -61,7 +61,9 @@ def materialize_attachments(
         if not att_id:
             continue
         try:
-            body, header_name = client.fetch_attachment_bytes(att_id)
+            body, header_name = client.fetch_attachment_bytes(
+                att_id, task.workspace_id
+            )
         except Exception as e:
             log.warning("fetch attachment failed id=%s: %s", att_id, e)
             continue

aicortexpy-0.2.1/aicortexpy/cli.py

@@ -0,0 +1,177 @@
+"""Root CLI: python -m aicortexpy / aicortex — Go CLI compatible surface + daemon."""
+
+from __future__ import annotations
+
+import argparse
+import logging
+import sys
+
+from . import __version__
+from .commands import (
+    agent_cmd,
+    attachment_cmd,
+    auth_cmd,
+    autopilot_cmd,
+    config_cmd,
+    daemon_cmd,
+    graph_cmd,
+    issue_cmd,
+    label_cmd,
+    meeting_cmd,
+    memory_cmd,
+    project_cmd,
+    repo_cmd,
+    runtime_cmd,
+    setup_cmd,
+    skill_cmd,
+    squad_cmd,
+    update_cmd,
+    version_cmd,
+    workspace_cmd,
+)
+
+# Legacy top-level daemon verbs (pre-0.2) → forward to daemon *
+_LEGACY_DAEMON = {
+    "start",
+    "run",
+    "stop",
+    "status",
+    "restart",
+    "capabilities",
+    "sandbox-info",
+    "disk-usage",
+}
+
+
+def _setup_logging(
+    verbose: bool = False,
+    *,
+    log_level: str = "",
+    daemon_mode: bool = False,
+) -> None:
+    """Configure root logging.
+
+    - CLI one-shots default to WARNING (quiet).
+    - Daemon run defaults to INFO (useful in python-daemon.log).
+    - `-v` or `--log-level DEBUG` enables DEBUG.
+    """
+    if log_level:
+        level = getattr(logging, log_level.upper(), logging.INFO)
+    elif verbose:
+        level = logging.DEBUG
+    elif daemon_mode:
+        level = logging.INFO
+    else:
+        level = logging.WARNING
+    logging.basicConfig(
+        level=level,
+        format="%(asctime)s %(levelname)s %(name)s: %(message)s",
+        datefmt="%H:%M:%S",
+        force=True,
+    )
+
+
+def build_parser() -> argparse.ArgumentParser:
+    p = argparse.ArgumentParser(
+        prog="aicortexpy",
+        description="AICortex Python CLI + local agent runtime (Go CLI compatible)",
+    )
+    p.add_argument("--version", action="version", version=f"aicortexpy {__version__}")
+    p.add_argument("--profile", default="", help="Configuration profile name")
+    p.add_argument("--server-url", default="", help="Override server URL")
+    p.add_argument("--workspace-id", default="", help="Override workspace id")
+    p.add_argument("-v", "--verbose", action="store_true")
+
+    sub = p.add_subparsers(dest="command", required=True)
+
+    issue_cmd.add_parser(sub)
+    agent_cmd.add_parser(sub)
+    workspace_cmd.add_parser(sub)
+    project_cmd.add_parser(sub)
+    squad_cmd.add_parser(sub)
+    label_cmd.add_parser(sub)
+    autopilot_cmd.add_parser(sub)
+    meeting_cmd.add_parser(sub)
+    skill_cmd.add_parser(sub)
+    memory_cmd.add_parser(sub)
+    graph_cmd.add_parser(sub)
+    repo_cmd.add_parser(sub)
+    attachment_cmd.add_parser(sub)
+    auth_cmd.add_parser(sub)
+    config_cmd.add_parser(sub)
+    daemon_cmd.add_parser(sub)
+    runtime_cmd.add_parser(sub)
+    setup_cmd.add_parser(sub)
+    update_cmd.add_parser(sub)
+    version_cmd.add_parser(sub)
+    return p
+
+
+def main(argv: list[str] | None = None) -> int:
+    argv = list(sys.argv[1:] if argv is None else argv)
+    # rewrite legacy: aicortexpy start → daemon start
+    if argv and argv[0] in _LEGACY_DAEMON:
+        print(
+            f"note: `{argv[0]}` is deprecated; use `aicortexpy daemon {argv[0]}`",
+            file=sys.stderr,
+        )
+        argv = ["daemon", *argv]
+
+    parser = build_parser()
+    try:
+        ns = parser.parse_args(argv)
+    except SystemExit as e:
+        return int(e.code) if isinstance(e.code, int) else 1
+
+    cmd = ns.command
+    _setup_logging(
+        getattr(ns, "verbose", False),
+        log_level=str(getattr(ns, "log_level", "") or ""),
+        daemon_mode=(
+            cmd == "daemon"
+            and getattr(ns, "daemon_command", "") in {"start", "run", "restart"}
+        ),
+    )
+
+    handlers = {
+        "issue": issue_cmd.run,
+        "agent": agent_cmd.run,
+        "workspace": workspace_cmd.run,
+        "project": project_cmd.run,
+        "squad": squad_cmd.run,
+        "label": label_cmd.run,
+        "autopilot": autopilot_cmd.run,
+        "meeting": meeting_cmd.run,
+        "skill": skill_cmd.run,
+        "memory": memory_cmd.run,
+        "graph": graph_cmd.run,
+        "repo": repo_cmd.run,
+        "attachment": attachment_cmd.run,
+        "config": config_cmd.run,
+        "daemon": daemon_cmd.run,
+        "runtime": runtime_cmd.run,
+        "version": version_cmd.run,
+        "login": auth_cmd.run_login,
+        "auth": auth_cmd.run_auth,
+        "setup": setup_cmd.run,
+        "update": update_cmd.run,
+    }
+    handler = handlers.get(cmd)
+    if not handler:
+        parser.print_help()
+        return 2
+    try:
+        return int(handler(ns) or 0)
+    except SystemExit as e:
+        if e.code not in (0, None):
+            msg = e.args[0] if e.args else str(e.code)
+            if isinstance(msg, str) and msg not in {"0", "1", "2"}:
+                print(msg, file=sys.stderr)
+            return int(e.code) if isinstance(e.code, int) else 1
+        return 0
+    except KeyboardInterrupt:
+        return 130
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

aicortexpy-0.2.1/aicortexpy/cli_context.py

@@ -0,0 +1,99 @@
+"""Resolve PlatformClient from flags / env / ~/.aicortex/config.json."""
+
+from __future__ import annotations
+
+import argparse
+import json
+import os
+from pathlib import Path
+from typing import Any
+
+from . import __version__
+from .config import (
+    CLIConfig,
+    DEFAULT_SERVER_URL,
+    cli_config_path,
+    load_cli_config,
+    normalize_http_base,
+    profile_dir,
+)
+from .platform_client import PlatformClient
+
+
+def save_cli_config(cfg: CLIConfig, profile: str = "") -> Path:
+    path = cli_config_path(profile)
+    path.parent.mkdir(parents=True, exist_ok=True)
+    data: dict[str, Any] = {}
+    if cfg.server_url:
+        data["server_url"] = cfg.server_url
+    if cfg.app_url:
+        data["app_url"] = cfg.app_url
+    if cfg.workspace_id:
+        data["workspace_id"] = cfg.workspace_id
+    if cfg.token:
+        data["token"] = cfg.token
+    tmp = path.with_suffix(".json.tmp")
+    tmp.write_text(json.dumps(data, indent=2, ensure_ascii=False) + "\n", encoding="utf-8")
+    tmp.replace(path)
+    return path
+
+
+def profile_of(ns: argparse.Namespace) -> str:
+    return str(getattr(ns, "profile", None) or "").strip()
+
+
+def resolve_server_url(ns: argparse.Namespace) -> str:
+    flag = str(getattr(ns, "server_url", None) or "").strip()
+    if flag:
+        return normalize_http_base(flag)
+    env = os.environ.get("AICORTEX_SERVER_URL", "").strip()
+    if env:
+        return normalize_http_base(env)
+    cfg = load_cli_config(profile_of(ns))
+    return normalize_http_base(cfg.server_url or DEFAULT_SERVER_URL)
+
+
+def resolve_workspace_id(ns: argparse.Namespace) -> str:
+    flag = str(getattr(ns, "workspace_id", None) or "").strip()
+    if flag:
+        return flag
+    env = os.environ.get("AICORTEX_WORKSPACE_ID", "").strip()
+    if env:
+        return env
+    return load_cli_config(profile_of(ns)).workspace_id
+
+
+def resolve_token(ns: argparse.Namespace) -> str:
+    env = os.environ.get("AICORTEX_TOKEN", "").strip()
+    if env:
+        return env
+    return load_cli_config(profile_of(ns)).token
+
+
+def require_client(ns: argparse.Namespace, *, require_workspace: bool = True) -> PlatformClient:
+    token = resolve_token(ns)
+    if not token:
+        raise SystemExit("Not authenticated. Run `aicortexpy login --token mul_...` or set AICORTEX_TOKEN.")
+    ws = resolve_workspace_id(ns)
+    if require_workspace and not ws:
+        raise SystemExit("No workspace_id. Set via `aicortexpy config set workspace_id <id>` or --workspace-id.")
+    return PlatformClient(
+        resolve_server_url(ns),
+        token,
+        ws,
+        version=__version__,
+    )
+
+
+def read_text_flag(ns: argparse.Namespace, name: str = "content") -> str:
+    """Resolve --content / --content-stdin / --content-file (and description*)."""
+    file_attr = f"{name}_file"
+    stdin_attr = f"{name}_stdin"
+    if getattr(ns, stdin_attr, False):
+        import sys
+
+        return sys.stdin.read()
+    path = getattr(ns, file_attr, None)
+    if path:
+        return Path(path).read_text(encoding="utf-8")
+    return str(getattr(ns, name, None) or "")

{aicortexpy-0.1.0 → aicortexpy-0.2.1}/aicortexpy/client.py

@@ -422,10 +422,17 @@ class DaemonClient:
         data = self.get(f"/api/daemon/workspaces/{workspace_id}/repos")
         return data if isinstance(data, dict) else {}
 
-    def fetch_attachment_bytes(self, attachment_id: str) -> tuple[bytes, str]:
+    def fetch_attachment_bytes(
+        self, attachment_id: str, workspace_id: str = ""
+    ) -> tuple[bytes, str]:
         path = f"/api/daemon/attachments/{attachment_id}/bytes"
         url = self.base_url + path
-        req = urllib.request.Request(url, headers=self._headers(), method="GET")
+        headers = self._headers()
+        wid = (workspace_id or "").strip()
+        if wid:
+            # PAT/JWT daemon auth has no workspace in context; server requires it.
+            headers["X-Workspace-ID"] = wid
+        req = urllib.request.Request(url, headers=headers, method="GET")
         try:
             with urllib.request.urlopen(req, timeout=self.timeout, context=self._ctx) as resp:
                 body = resp.read(MAX_ATTACHMENT_BYTES + 1)

aicortexpy-0.2.1/aicortexpy/commands/__init__.py

@@ -0,0 +1 @@
+"""CLI command modules."""