aicortexpy 0.2.1__tar.gz → 0.2.2__tar.gz

{aicortexpy-0.2.1 → aicortexpy-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: aicortexpy
-Version: 0.2.1
+Version: 0.2.2
 Summary: AICortex Python CLI and local agent runtime daemon (Go CLI compatible)
 Author: AICortex
 License: Apache-2.0
@@ -26,20 +26,23 @@ aicortex daemon start
 aicortex issue list --output json
 ```
 
-也可用 `python -m aicortexpy`（与 `aicortex` / `aicortexpy` 入口等价）。
+等价入口：`python -m aicortex`（推荐）/ `python -m aicortexpy` / `aicortexpy`。
 
 | | |
 |--|--|
-| PyPI / 模块 | `aicortexpy` |
-| Console scripts | `aicortex`、`aicortexpy`（`aicortex` 刻意同名，供 Agent 提示词零改动） |
+| PyPI 包名 | `aicortexpy` |
+| 模块 | `aicortex`（`-m`）、`aicortexpy` |
+| PATH 命令 | Windows：`aicortex.cmd` → `python -m aicortex`（**不**生成 `aicortex.exe`，避免与 Go 安装器 / `.exe` 探测冲突）；另有 `aicortexpy.exe` |
 | 配置 | 与 Go 共用 `~/.aicortex/config.json` |
 
 ## 安装
 
 ```powershell
 pip install -U aicortexpy
+# 若以前装过会留下 Scripts\aicortex.exe，可手动删掉，让 aicortex.cmd 生效：
+#   Remove-Item "$env:LOCALAPPDATA\Programs\Python\Python3*\Scripts\aicortex.exe" -ErrorAction SilentlyContinue
 # 源码：
-cd python-daemon
+cd python-aicortex
 pip install -e .
 ```
 
@@ -73,7 +76,7 @@ Health 默认端口 **19514**。不要与 Go daemon 同时跑。
 ## 发布
 
 ```powershell
-cd python-daemon
+cd python-aicortex
 python -m build
 python -m twine upload dist/*
 ```
@@ -84,4 +87,4 @@ python -m twine upload dist/*
 
 已覆盖 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`）。
+相对 Go：`setup` / `update`(pip) / OAuth login / 平台命令已对齐；二进制自更新请用 `pip install -U aicortexpy`。

{aicortexpy-0.2.1 → aicortexpy-0.2.2}/README.md

@@ -9,20 +9,23 @@ aicortex daemon start
 aicortex issue list --output json
 ```
 
-也可用 `python -m aicortexpy`（与 `aicortex` / `aicortexpy` 入口等价）。
+等价入口：`python -m aicortex`（推荐）/ `python -m aicortexpy` / `aicortexpy`。
 
 | | |
 |--|--|
-| PyPI / 模块 | `aicortexpy` |
-| Console scripts | `aicortex`、`aicortexpy`（`aicortex` 刻意同名，供 Agent 提示词零改动） |
+| PyPI 包名 | `aicortexpy` |
+| 模块 | `aicortex`（`-m`）、`aicortexpy` |
+| PATH 命令 | Windows：`aicortex.cmd` → `python -m aicortex`（**不**生成 `aicortex.exe`，避免与 Go 安装器 / `.exe` 探测冲突）；另有 `aicortexpy.exe` |
 | 配置 | 与 Go 共用 `~/.aicortex/config.json` |
 
 ## 安装
 
 ```powershell
 pip install -U aicortexpy
+# 若以前装过会留下 Scripts\aicortex.exe，可手动删掉，让 aicortex.cmd 生效：
+#   Remove-Item "$env:LOCALAPPDATA\Programs\Python\Python3*\Scripts\aicortex.exe" -ErrorAction SilentlyContinue
 # 源码：
-cd python-daemon
+cd python-aicortex
 pip install -e .
 ```
 
@@ -56,7 +59,7 @@ Health 默认端口 **19514**。不要与 Go daemon 同时跑。
 ## 发布
 
 ```powershell
-cd python-daemon
+cd python-aicortex
 python -m build
 python -m twine upload dist/*
 ```
@@ -67,4 +70,4 @@ python -m twine upload dist/*
 
 已覆盖 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`）。
+相对 Go：`setup` / `update`(pip) / OAuth login / 平台命令已对齐；二进制自更新请用 `pip install -U aicortexpy`。

aicortexpy-0.2.2/aicortex/__init__.py

@@ -0,0 +1,9 @@
+"""Top-level alias package so `python -m aicortex` works after install.
+
+The implementation lives in ``aicortexpy``; this package exists only as the
+``-m aicortex`` / PATH shim target (especially on Windows via ``aicortex.cmd``).
+"""
+
+from aicortexpy import __version__
+
+__all__ = ["__version__"]

aicortexpy-0.2.2/aicortex/__main__.py

@@ -0,0 +1,5 @@
+"""Allow `python -m aicortex` (same as `python -m aicortexpy`)."""
+
+from aicortexpy.cli import main
+
+raise SystemExit(main())

{aicortexpy-0.2.1 → aicortexpy-0.2.2}/aicortexpy/__init__.py

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

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

@@ -51,7 +51,15 @@ class _PendingTool:
 class ACPClient:
     """Thread-safe JSON-RPC client for one ACP child process."""
 
-    def __init__(self, stdin: TextIO, *, tool_name_fn: Callable[[str, str], str] | None = None) -> None:
+    def __init__(
+        self,
+        stdin: TextIO,
+        *,
+        tool_name_fn: Callable[[str, str], str] | None = None,
+        security_policy: Any = None,
+        permissions: Any = None,
+        task_id: str = "",
+    ) -> None:
         self._stdin = stdin
         self._write_lock = threading.Lock()
         self._mu = threading.Lock()
@@ -60,6 +68,9 @@ class ACPClient:
         self._tool_mu = threading.Lock()
         self._pending_tools: dict[str, _PendingTool] = {}
         self.tool_name_fn = tool_name_fn or default_tool_name
+        self.security_policy = security_policy
+        self.permissions = permissions
+        self.task_id = task_id
         self.session_id = ""
         self.on_message: MessageCB | None = None
         self.on_prompt_done: PromptDoneCB | None = None
@@ -155,9 +166,9 @@ class ACPClient:
         method = str(raw.get("method") or "")
         req_id = raw.get("id")
         if method == "session/request_permission":
-            option_id = _select_permission_option_id(raw.get("params"))
+            params = raw.get("params")
+            option_id = self._resolve_permission_option(params)
             result = {"outcome": {"outcome": "selected", "optionId": option_id}}
-            log.debug("auto-approved permission option_id=%s", option_id)
         elif method == "cursor/ask_question":
             result = {
                 "outcome": {
@@ -194,6 +205,83 @@ class ACPClient:
         except OSError as e:
             log.warning("write agent-request response failed: %s", e)
 
+    def _resolve_permission_option(self, params: Any) -> str:
+        from .permission import (
+            DEFAULT_PERMISSION_TIMEOUT,
+            extract_tool_meta,
+            parse_permission_options,
+        )
+        from .security import (
+            extract_permission_paths,
+            permission_should_deny,
+            select_reject_permission_option_id,
+        )
+
+        policy = self.security_policy
+        if policy is not None and permission_should_deny(policy, params):
+            option_id = select_reject_permission_option_id(params)
+            log.info("denied permission outside allowed roots option_id=%s", option_id)
+            return option_id
+
+        permit_all = True if policy is None else bool(getattr(policy, "permit_all", True))
+        if permit_all or self.permissions is None:
+            option_id = _select_permission_option_id(params)
+            log.debug("auto-approved permission option_id=%s", option_id)
+            return option_id
+
+        title, tool_call_id = extract_tool_meta(params)
+        options = parse_permission_options(params)
+        permission_id, wait_ev = self.permissions.register("")
+        paths = extract_permission_paths(params)
+        input_payload = {
+            "permission_id": permission_id,
+            "task_id": self.task_id,
+            "options": [o.to_dict() for o in options],
+            "paths": paths,
+            "tool_call_id": tool_call_id,
+        }
+        if self.on_message is not None:
+            self.on_message(
+                {
+                    "type": "permission-request",
+                    "tool": title,
+                    "call_id": permission_id,
+                    "content": title,
+                    "input": input_payload,
+                }
+            )
+
+        option_id = self.permissions.wait(
+            permission_id, wait_ev, DEFAULT_PERMISSION_TIMEOUT
+        )
+        if not option_id:
+            option_id = select_reject_permission_option_id(params)
+            log.info(
+                "permission request timed out or cancelled; denying permission_id=%s option_id=%s",
+                permission_id,
+                option_id,
+            )
+        else:
+            log.info(
+                "permission resolved by user permission_id=%s option_id=%s",
+                permission_id,
+                option_id,
+            )
+        if self.on_message is not None:
+            self.on_message(
+                {
+                    "type": "permission-result",
+                    "tool": title,
+                    "call_id": permission_id,
+                    "content": option_id,
+                    "input": {
+                        "permission_id": permission_id,
+                        "option_id": option_id,
+                    },
+                }
+            )
+        return option_id
+
     def _handle_notification(self, raw: dict[str, Any]) -> None:
         method = str(raw.get("method") or "")
         if method not in ("session/update", "session/notification"):
@@ -414,6 +502,7 @@ def _select_permission_option_id(params: Any) -> str:
     return fallback
 
 
+
 def _normalize_update(data: Any) -> tuple[str, Any]:
     if not isinstance(data, dict):
         return "", data

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

@@ -25,6 +25,7 @@ from .acp_client import (
 )
 from .acp_errors import ACPProviderErrorSniffer, promote_acp_result_on_provider_error
 from .procutil import kill_process_tree, popen_kwargs_for_killable_group
+from .security import SecurityPolicy, build_cursor_acp_global_flags, default_security_policy
 
 log = logging.getLogger("aicortexpy.acp")
 
@@ -203,6 +204,8 @@ class _BaseACPConn:
         on_message: MessageCB | None = None,
         idle_watchdog: float = 0,
         cancel_event: threading.Event | None = None,
+        permissions: Any = None,
+        task_id: str = "",
     ) -> ACPPromptResult:
         if self._closed or not self._client or not self._session_id:
             return ACPPromptResult(
@@ -211,6 +214,10 @@ class _BaseACPConn:
                 error=f"{self.provider} acp connection closed",
             )
         client = self._client
+        if permissions is not None:
+            client.permissions = permissions
+        if task_id:
+            client.task_id = task_id
         output_parts: list[str] = []
         messages: list[dict[str, Any]] = []
         prompt_done = threading.Event()
@@ -368,6 +375,7 @@ class _BaseACPConn:
         env: dict[str, str] | None,
         *,
         tool_name_fn: Callable[[str, str], str],
+        security_policy: SecurityPolicy | None = None,
     ) -> None:
         kwargs = popen_kwargs_for_killable_group()
         kwargs.update(_hide_window())
@@ -393,7 +401,11 @@ class _BaseACPConn:
             write_through=True,
             line_buffering=True,
         )
-        self._client = ACPClient(self._stdin_text, tool_name_fn=tool_name_fn)
+        self._client = ACPClient(
+            self._stdin_text,
+            tool_name_fn=tool_name_fn,
+            security_policy=security_policy or default_security_policy(),
+        )
         threading.Thread(target=self._read_stdout, name=f"{self.provider}-acp-out", daemon=True).start()
         threading.Thread(target=self._read_stderr, name=f"{self.provider}-acp-err", daemon=True).start()
         log.info("%s acp started pid=%s cwd=%s", self.provider, self._proc.pid, cwd)
@@ -557,16 +569,26 @@ class CursorACPConn(_BaseACPConn):
         timeout: float = 0,
         env: dict[str, str] | None = None,
         allow_resume: bool = False,
+        security_policy: SecurityPolicy | None = None,
     ) -> CursorACPConn:
         path = shutil.which(executable) or executable
+        policy = security_policy or default_security_policy()
         blocked = {"acp", "--yolo", "--force", "--sandbox", "--trust"}
         filtered = _filter_blocked(list(custom_args or []), blocked, {"--sandbox"})
-        acp_args = ["--yolo", "--trust", "--sandbox", "disabled", "acp", *filtered]
+        acp_args = [*build_cursor_acp_global_flags(policy), "acp", *filtered]
         argv0, cmd_args = choose_cursor_invocation(path, acp_args)
         argv = [argv0, *cmd_args]
         conn = cls()
         work = cwd or str(Path.cwd())
-        conn._start_process(argv, work, env, tool_name_fn=hermes_tool_name_from_title)
+        if policy.allowed_roots_enabled and work and work not in policy.allowed_roots:
+            policy.allowed_roots = [*policy.allowed_roots, work]
+        conn._start_process(
+            argv,
+            work,
+            env,
+            tool_name_fn=hermes_tool_name_from_title,
+            security_policy=policy,
+        )
         hs = HANDSHAKE_TIMEOUT
         if timeout > 0:
             hs = min(hs, timeout)
@@ -600,16 +622,29 @@ class KiroACPConn(_BaseACPConn):
         custom_args: list[str] | None = None,
         timeout: float = 0,
         env: dict[str, str] | None = None,
+        security_policy: SecurityPolicy | None = None,
     ) -> KiroACPConn:
         path = shutil.which(executable) or executable
+        policy = security_policy or default_security_policy()
         blocked = {"acp", "-a", "--trust-all-tools", "--trust-tools"}
         filtered = _filter_blocked(
             list(custom_args or []), blocked, {"--trust-tools"}
         )
-        argv = [path, "acp", "--trust-all-tools", *filtered]
+        argv = [path, "acp"]
+        if policy.permit_all:
+            argv.append("--trust-all-tools")
+        argv.extend(filtered)
         conn = cls()
         work = cwd or str(Path.cwd())
-        conn._start_process(argv, work, env, tool_name_fn=kiro_tool_name)
+        if policy.allowed_roots_enabled and work and work not in policy.allowed_roots:
+            policy.allowed_roots = [*policy.allowed_roots, work]
+        conn._start_process(
+            argv,
+            work,
+            env,
+            tool_name_fn=kiro_tool_name,
+            security_policy=policy,
+        )
         hs = timeout if timeout > 0 else HANDSHAKE_TIMEOUT
         try:
             conn._handshake(
@@ -754,6 +789,7 @@ def open_acp_conn(
     custom_args: list[str] | None = None,
     timeout: float = 0,
     env: dict[str, str] | None = None,
+    security_policy: SecurityPolicy | None = None,
 ) -> _BaseACPConn:
     if provider == "cursor":
         return CursorACPConn.open(
@@ -765,6 +801,7 @@ def open_acp_conn(
             timeout=timeout,
             env=env,
             allow_resume=False,
+            security_policy=security_policy,
         )
     if provider == "kiro":
         return KiroACPConn.open(
@@ -775,6 +812,7 @@ def open_acp_conn(
             custom_args=custom_args,
             timeout=timeout,
             env=env,
+            security_policy=security_policy,
         )
     if provider == "hermes":
         return HermesACPConn.open(
@@ -824,6 +862,9 @@ def run_acp_oneshot(
     on_message: MessageCB | None = None,
     cancel_event: threading.Event | None = None,
     idle_watchdog: float = 0,
+    security_policy: SecurityPolicy | None = None,
+    permissions: Any = None,
+    task_id: str = "",
 ) -> ACPPromptResult:
     """One-shot ACP turn (open → prompt → close). Used for non-chat kiro/hermes/kimi/dsh."""
     t = timeout if timeout > 0 else PROMPT_TIMEOUT
@@ -837,6 +878,7 @@ def run_acp_oneshot(
             custom_args=custom_args,
             timeout=t,
             env=env,
+            security_policy=security_policy,
         )
     except Exception as e:
         return ACPPromptResult(status="failed", output="", error=f"{provider} acp open failed: {e}")
@@ -848,6 +890,8 @@ def run_acp_oneshot(
             on_message=on_message,
             idle_watchdog=idle_watchdog,
             cancel_event=cancel_event,
+            permissions=permissions,
+            task_id=task_id,
         )
     finally:
         conn.close()

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

@@ -51,7 +51,11 @@ def _aicortex_bin_dir() -> str | None:
 
 
 def ensure_cli_shim_dir(state_dir: Path) -> Path | None:
-    """Write a tiny aicortex shim so agents resolve to python -m aicortexpy."""
+    """Write a tiny aicortex shim so agents resolve to `python -m aicortex`.
+
+    Prefer .cmd on Windows so PATH resolution does not depend on aicortex.exe
+    (pip console_scripts launcher / Go installer binary detection).
+    """
     shim_dir = state_dir / "py-cli-shim"
     try:
         shim_dir.mkdir(parents=True, exist_ok=True)
@@ -63,12 +67,19 @@ def ensure_cli_shim_dir(state_dir: Path) -> Path | None:
     if sys.platform == "win32":
         cmd = shim_dir / "aicortex.cmd"
         cmd.write_text(
-            f'@echo off\r\n"{py}" -m aicortexpy %*\r\n',
+            f'@echo off\r\n"{py}" -m aicortex %*\r\n',
             encoding="utf-8",
         )
+        # Drop a stale pip console_scripts aicortex.exe in this shim dir if any.
+        stale = shim_dir / "aicortex.exe"
+        if stale.is_file():
+            try:
+                stale.unlink()
+            except OSError:
+                pass
     else:
         sh = shim_dir / "aicortex"
-        sh.write_text(f'#!/bin/sh\nexec "{py}" -m aicortexpy "$@"\n', encoding="utf-8")
+        sh.write_text(f'#!/bin/sh\nexec "{py}" -m aicortex "$@"\n', encoding="utf-8")
         try:
             sh.chmod(0o755)
         except OSError:

{aicortexpy-0.2.1 → aicortexpy-0.2.2}/aicortexpy/chat_acp_pool.py

@@ -17,6 +17,7 @@ from .acp_conn import (
     kiro_acp_supported,
 )
 from .config import AgentEntry, Config
+from .security import SecurityPolicy
 
 log = logging.getLogger("aicortexpy.acp_pool")
 
@@ -101,6 +102,9 @@ class ChatACPPool:
         on_message: Any | None = None,
         idle_watchdog: float = 0,
         system_prompt: str = "",
+        security_policy: SecurityPolicy | None = None,
+        permissions: Any = None,
+        task_id: str = "",
     ) -> ACPPromptResult:
         key = pool_key(provider, chat_session_id, agent_id, work_dir)
         entry = self._get_or_create(key, provider, chat_session_id, agent_id, work_dir, model)
@@ -121,6 +125,7 @@ class ChatACPPool:
                         custom_args=custom_args,
                         timeout=timeout,
                         env=env,
+                        security_policy=security_policy,
                     )
                     entry.model = model
                     log.info("%s chat acp pool miss chat=%s", provider, chat_session_id[:8])
@@ -144,6 +149,8 @@ class ChatACPPool:
                 on_message=on_message,
                 idle_watchdog=idle_watchdog,
                 cancel_event=cancel_event,
+                permissions=permissions,
+                task_id=task_id,
             )
 
             if not result.session_id and entry.conn.session_id():
@@ -173,6 +180,7 @@ class ChatACPPool:
         custom_args: list[str],
         timeout: float,
         env: dict[str, str] | None,
+        security_policy: SecurityPolicy | None = None,
     ) -> ACPChatConn:
         entry = self._agents.get(provider)
         if not entry:
@@ -186,6 +194,7 @@ class ChatACPPool:
                 custom_args=custom_args,
                 timeout=timeout,
                 env=env,
+                security_policy=security_policy,
             )
         if provider == "kiro":
             return KiroACPConn.open(
@@ -196,6 +205,7 @@ class ChatACPPool:
                 custom_args=custom_args,
                 timeout=timeout,
                 env=env,
+                security_policy=security_policy,
             )
         raise RuntimeError(f"chat acp pool: unsupported provider {provider!r}")
 

{aicortexpy-0.2.1 → aicortexpy-0.2.2}/aicortexpy/cli.py

@@ -52,7 +52,7 @@ def _setup_logging(
     """Configure root logging.
 
     - CLI one-shots default to WARNING (quiet).
-    - Daemon run defaults to INFO (useful in python-daemon.log).
+    - Daemon run defaults to INFO (useful in python-aicortex.log).
     - `-v` or `--log-level DEBUG` enables DEBUG.
     """
     if log_level:

{aicortexpy-0.2.1 → aicortexpy-0.2.2}/aicortexpy/config.py

@@ -225,7 +225,7 @@ def discover_agents() -> dict[str, AgentEntry]:
 def default_daemon_id() -> str:
     host = socket.gethostname() or "local"
     # Stable-ish id per machine for python daemon
-    seed = f"python-daemon:{host}:{platform.node()}"
+    seed = f"python-aicortex:{host}:{platform.node()}"
     return "py-" + uuid.uuid5(uuid.NAMESPACE_DNS, seed).hex[:12]
 
 

{aicortexpy-0.2.1 → aicortexpy-0.2.2}/aicortexpy/daemon.py

@@ -48,6 +48,7 @@ class Daemon:
         self.runtime_index: dict[str, dict[str, Any]] = {}
         self.workspace_runtimes: dict[str, list[str]] = {}
         self.workspace_names: dict[str, str] = {}
+        self.workspace_settings: dict[str, dict] = {}
         self._reregister_backoff: dict[str, float] = {}
         self.active_tasks = 0
         self._health: HealthServer | None = None
@@ -56,6 +57,10 @@ class Daemon:
         self.active_env_roots = ActiveEnvRoots()
         self.repo_allowlist = RepoAllowlist()
         self.wakeup_hub = WakeupHub()
+        from .permission import PermissionBroker
+
+        self.permissions = PermissionBroker()
+        self.wakeup_hub.permissions = self.permissions
 
     def stop(self) -> None:
         self._stop.set()
@@ -200,6 +205,10 @@ class Daemon:
             if not wid:
                 continue
             self.workspace_names[wid] = name
+            settings = w.get("settings")
+            self.workspace_settings[wid] = (
+                settings if isinstance(settings, dict) else {}
+            )
             with self._lock:
                 has = wid in self.workspace_runtimes and self.workspace_runtimes[wid]
             if has:
@@ -212,6 +221,7 @@ class Daemon:
                 rids = self.workspace_runtimes.pop(wid, [])
                 for rid in rids:
                     self.runtime_index.pop(rid, None)
+            self.workspace_settings.pop(wid, None)
             self.repo_allowlist.drop_workspace(wid)
             log.info("dropped workspace %s", wid)
 
@@ -239,7 +249,7 @@ class Daemon:
                     "legacy_daemon_ids": [],
                     "device_name": self.cfg.device_name,
                     "cli_version": self.cfg.cli_version,
-                    "launched_by": "python-daemon",
+                    "launched_by": "python-aicortex",
                     "timezone": detect_local_timezone(),
                     "runtimes": runtimes,
                 }
@@ -549,6 +559,12 @@ class Daemon:
         marked_roots = self._predict_env_roots(task)
         for root in marked_roots:
             self.active_env_roots.mark(root)
+        from .security import parse_workspace_security_settings
+
+        sec = parse_workspace_security_settings(
+            self.workspace_settings.get(task.workspace_id) or {}
+        )
+        # Roots filled inside run_agent once work_dir is known.
         result = None
         try:
             with self._lock:
@@ -567,6 +583,9 @@ class Daemon:
                 on_session=on_session,
                 acp_pool=self.chat_acp_pool,
                 idle_watchdog=self.cfg.agent_idle_watchdog,
+                security_policy=sec,
+                # HITL permission prompts are Chat-only; Issue tasks auto-approve.
+                permissions=self.permissions if task.chat_session_id else None,
             )
         except Exception as e:
             log.exception("run_agent crashed: %s", e)