aicortexpy 0.2.5__tar.gz → 0.2.7__tar.gz

{aicortexpy-0.2.5/aicortexpy.egg-info → aicortexpy-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: aicortexpy
-Version: 0.2.5
+Version: 0.2.7
 Summary: AICortex Python CLI and local agent runtime daemon (Go CLI compatible)
 Author: AICortex
 License: Apache-2.0

{aicortexpy-0.2.5 → aicortexpy-0.2.7}/aicortexpy/__init__.py

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

{aicortexpy-0.2.5 → aicortexpy-0.2.7}/aicortexpy/daemon.py

@@ -307,11 +307,20 @@ class Daemon:
             p = Path(prior)
             roots.append(p.parent if p.name == "workdir" else p)
         if task.project_id.strip():
-            from .pinned_workdir import extract_local_path, pinned_workdir_path
+            from .pinned_workdir import pinned_workdir_path, select_local_path
 
-            local = extract_local_path(task.project_resources)
-            if local:
-                roots.append(Path(local))
+            local, _explicit = select_local_path(
+                task.project_resources, self.cfg.daemon_id
+            )
+            local_path = Path(local) if local else None
+            exists = False
+            if local_path is not None:
+                try:
+                    exists = local_path.is_dir()
+                except OSError:
+                    exists = False
+            if exists and local_path is not None:
+                roots.append(local_path)
             else:
                 roots.append(
                     pinned_workdir_path(self.cfg.workspaces_root, ws, task.project_id)

{aicortexpy-0.2.5 → aicortexpy-0.2.7}/aicortexpy/execenv.py

@@ -13,7 +13,11 @@ from .client import Task
 from .codex_config import ensure_codex_multi_agent_config, sanitize_copied_codex_config
 from .openclaw_config import prepare_openclaw_config
 from .app_workdir import app_uses_pinned_workdir, prepare_app_workdir
-from .pinned_workdir import prepare_pinned_workdir, project_uses_pinned_workdir
+from .pinned_workdir import (
+    narrow_local_path_resources,
+    prepare_pinned_workdir,
+    project_uses_pinned_workdir,
+)
 from .prompt import build_prompt
 from .runtime_config import (
     inject_runtime_config,
@@ -51,9 +55,13 @@ def prepare_environment(
     workspaces_root: Path,
     task: Task,
     provider: str,
+    *,
+    daemon_id: str = "",
 ) -> Environment:
     ws = task.workspace_id or "default"
     env_updates: dict[str, str] = {}
+    # None leaves project resources unchanged. "" means local_path was not used.
+    used_local: str | None = None
 
     # Priority 0: App edit/run pinned workdir (same layout as Go daemon).
     if app_uses_pinned_workdir(task):
@@ -67,7 +75,7 @@ def prepare_environment(
             task.app_mode,
         )
     elif project_uses_pinned_workdir(task):
-        work_dir = prepare_pinned_workdir(workspaces_root, task)
+        work_dir, used_local = prepare_pinned_workdir(workspaces_root, task, daemon_id)
         root_dir = work_dir
         pinned = True
     else:
@@ -94,6 +102,8 @@ def prepare_environment(
 
     agent = task.agent or {}
     ctx = task_context_from_task(task)
+    if used_local is not None:
+        ctx.project_resources = narrow_local_path_resources(ctx.project_resources, used_local)
     runtime_brief = inject_runtime_config(work_dir, provider, ctx)
     write_project_sidecar(work_dir, ctx)
 

aicortexpy-0.2.7/aicortexpy/pinned_workdir.py

@@ -0,0 +1,127 @@
+"""Shared project workdir layout."""
+
+from __future__ import annotations
+
+import json
+import logging
+from pathlib import Path
+from typing import Any
+
+from .client import Task
+
+log = logging.getLogger("aicortexpy.pinned")
+
+
+def project_uses_pinned_workdir(task: Task) -> bool:
+    return bool(task.project_id.strip())
+
+
+def _local_path_payload(resources: list[dict[str, Any]]) -> tuple[str, dict[str, str]] | None:
+    for r in resources:
+        rtype = str(r.get("resource_type") or r.get("type") or "")
+        if rtype != "local_path":
+            continue
+        ref = r.get("resource_ref")
+        if ref is None:
+            ref = r.get("ref") or {}
+        if isinstance(ref, str):
+            try:
+                ref = json.loads(ref)
+            except json.JSONDecodeError:
+                return "", {}
+        if not isinstance(ref, dict):
+            return "", {}
+        path = str(ref.get("path") or "").strip()
+        by_daemon: dict[str, str] = {}
+        raw = ref.get("by_daemon") or {}
+        if isinstance(raw, dict):
+            for key, value in raw.items():
+                daemon_id = str(key).strip()
+                directory = str(value).strip() if value is not None else ""
+                if daemon_id and directory:
+                    by_daemon[daemon_id] = directory
+        return path, by_daemon
+    return None
+
+
+def select_local_path(resources: list[dict[str, Any]], daemon_id: str) -> tuple[str, bool]:
+    """Return (path, explicit). explicit is true when by_daemon names this daemon.
+
+    Other daemons use the default path, so each machine does not need a row.
+    """
+    parsed = _local_path_payload(resources)
+    if parsed is None:
+        return "", False
+    path, by_daemon = parsed
+    daemon_id = (daemon_id or "").strip()
+    if daemon_id and by_daemon.get(daemon_id):
+        return by_daemon[daemon_id], True
+    return path, False
+
+
+def extract_local_path(resources: list[dict[str, Any]]) -> str:
+    path, _explicit = select_local_path(resources, "")
+    return path
+
+
+def narrow_local_path_resources(resources: list[dict[str, Any]], used_path: str) -> list[dict[str, Any]]:
+    """Keep a single local_path ref of {path: used_path}. Drop it when unused."""
+    used_path = (used_path or "").strip()
+    out: list[dict[str, Any]] = []
+    kept = False
+    for r in resources:
+        rtype = str(r.get("resource_type") or r.get("type") or "")
+        if rtype != "local_path":
+            out.append(r)
+            continue
+        if not used_path or kept:
+            continue
+        copied = dict(r)
+        copied["resource_ref"] = {"path": used_path}
+        out.append(copied)
+        kept = True
+    return out
+
+
+def pinned_workdir_path(workspaces_root: Path, workspace_id: str, project_id: str) -> Path:
+    return workspaces_root / workspace_id / "projects" / project_id
+
+
+def ensure_project_layout(root: Path) -> None:
+    """Create the project workdir itself. Do not add stage subdirectories."""
+    root.mkdir(parents=True, exist_ok=True)
+
+
+def _dir_exists(path: Path) -> bool:
+    try:
+        return path.is_dir()
+    except OSError:
+        return False
+
+
+def prepare_pinned_workdir(
+    workspaces_root: Path,
+    task: Task,
+    daemon_id: str = "",
+) -> tuple[Path, str]:
+    """Return (workdir, used_local_path). used_local_path is empty on fallback."""
+    local, explicit = select_local_path(task.project_resources, daemon_id)
+    if local:
+        root = Path(local)
+        if _dir_exists(root):
+            ensure_project_layout(root)
+            log.info("using local_path project workdir %s explicit=%s", root, explicit)
+            return root, local
+        if explicit or not project_uses_pinned_workdir(task):
+            raise RuntimeError(
+                f"project local_path: working directory {local!r} is not accessible"
+            )
+        log.warning(
+            "default local_path %s is not on this machine; using the daemon project directory",
+            local,
+        )
+    root = pinned_workdir_path(
+        workspaces_root, task.workspace_id or "default", task.project_id
+    )
+    ensure_project_layout(root)
+    return root, ""

{aicortexpy-0.2.5 → aicortexpy-0.2.7}/aicortexpy/runner.py

@@ -300,7 +300,10 @@ def run_agent(
 ) -> RunResult:
     from .security import default_security_policy
 
-    env_info: Environment = prepare_environment(workspaces_root, task, provider)
+    daemon_id = cfg.daemon_id if cfg is not None else ""
+    env_info: Environment = prepare_environment(
+        workspaces_root, task, provider, daemon_id=daemon_id
+    )
     work_dir = env_info.work_dir
     policy = security_policy or default_security_policy()
     roots = [str(work_dir)]

{aicortexpy-0.2.5 → aicortexpy-0.2.7}/aicortexpy/runtime_config.py

@@ -272,6 +272,7 @@ def _format_project_resource(r: dict[str, Any]) -> str:
         if hint:
             out += f" (default branch: `{hint}`)"
     elif rtype == "local_path":
+        # by_daemon is resolved before this runs; only this machine's path is shown.
         out = f"**Local path**: `{ref.get('path') or ''}`"
     else:
         out = f"**{rtype}**: `{json.dumps(ref, ensure_ascii=False)}`"
@@ -280,11 +281,37 @@ def _format_project_resource(r: dict[str, Any]) -> str:
     return out
 
 
-def _project_has_local_path(ctx: TaskContextForEnv) -> bool:
+def _project_local_path(ctx: TaskContextForEnv) -> str:
+    """Resolved local_path for this claim (by_daemon already narrowed)."""
     for r in ctx.project_resources:
-        if str(r.get("resource_type") or r.get("type") or "") == "local_path":
-            return True
-    return False
+        if str(r.get("resource_type") or r.get("type") or "") != "local_path":
+            continue
+        ref = r.get("resource_ref") or r.get("ref") or {}
+        if isinstance(ref, str):
+            try:
+                ref = json.loads(ref)
+            except json.JSONDecodeError:
+                ref = {}
+        if not isinstance(ref, dict):
+            continue
+        path = str(ref.get("path") or "").strip()
+        if path:
+            return path
+    return ""
+
+
+def _project_has_local_path(ctx: TaskContextForEnv) -> bool:
+    return bool(_project_local_path(ctx))
+
+
+def _project_workdir_line(ctx: TaskContextForEnv) -> str:
+    """Path agents should treat as the project root; local_path overrides logical alias."""
+    path = _project_local_path(ctx)
+    if path:
+        return f"Project working directory: `{path}`\n\n"
+    if ctx.project_id:
+        return f"Project working directory (logical): `/workspace/{ctx.project_id}/`\n\n"
+    return ""
 
 
 def _has_project_context(ctx: TaskContextForEnv) -> bool:
@@ -320,17 +347,7 @@ def _project_context_section(ctx: TaskContextForEnv) -> str:
     parts = ["## Project Context\n\n"]
     if ctx.project_title:
         parts.append(f"This {scope} belongs to **{ctx.project_title}**.\n\n")
-    if ctx.project_id:
-        parts.append(f"Project working directory (logical): `/workspace/{ctx.project_id}/`\n\n")
-        parts.append(
-            "Use this shared layout:\n\n"
-            "- `docs/` — project materials\n"
-            "- `design/` — design HTML and static mockups\n"
-            "- `app/` — application / development code\n"
-            "- `test/` — tests, fixtures, and reports\n"
-            "- `release/` — build artifacts and release notes\n\n"
-            "Write only in the directory that matches the current task.\n\n"
-        )
+    parts.append(_project_workdir_line(ctx))
     if ctx.project_resources:
         parts.append("Project resources (also at `.aicortex/project/resources.json`):\n\n")
         for r in ctx.project_resources:
@@ -572,11 +589,7 @@ def _design_studio_runtime(provider: str, ctx: TaskContextForEnv) -> str:
         parts.append("## Design project context\n\n")
         if ctx.project_title:
             parts.append(f"This design session belongs to **{ctx.project_title}**.\n\n")
-        if ctx.project_id:
-            parts.append(
-                f"Project working directory (logical): `/workspace/{ctx.project_id}/`\n"
-                "Write design HTML under `design/`.\n\n"
-            )
+        parts.append(_project_workdir_line(ctx))
         if ctx.project_resources:
             parts.append("Project resources (tokens/branding only):\n\n")
             for r in ctx.project_resources:

{aicortexpy-0.2.5 → aicortexpy-0.2.7/aicortexpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: aicortexpy
-Version: 0.2.5
+Version: 0.2.7
 Summary: AICortex Python CLI and local agent runtime daemon (Go CLI compatible)
 Author: AICortex
 License: Apache-2.0

{aicortexpy-0.2.5 → aicortexpy-0.2.7}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 # PyPI + import + console script entry for full Go CLI replacement.
 name = "aicortexpy"
-version = "0.2.5"
+version = "0.2.7"
 description = "AICortex Python CLI and local agent runtime daemon (Go CLI compatible)"
 readme = "README.md"
 license = { text = "Apache-2.0" }

aicortexpy-0.2.5/aicortexpy/pinned_workdir.py

@@ -1,60 +0,0 @@
-"""Shared project workdir layout."""
-
-from __future__ import annotations
-
-import json
-import logging
-from pathlib import Path
-from typing import Any
-
-from .client import Task
-
-log = logging.getLogger("aicortexpy.pinned")
-
-STAGE_DIRS = ("docs", "design", "app", "test", "release")
-
-
-def project_uses_pinned_workdir(task: Task) -> bool:
-    return bool(task.project_id.strip())
-
-
-def extract_local_path(resources: list[dict[str, Any]]) -> str:
-    for r in resources:
-        if r.get("resource_type") != "local_path":
-            continue
-        ref = r.get("resource_ref")
-        if isinstance(ref, str):
-            try:
-                ref = json.loads(ref)
-            except json.JSONDecodeError:
-                continue
-        if isinstance(ref, dict) and ref.get("path"):
-            return str(ref["path"])
-    return ""
-
-
-def pinned_workdir_path(workspaces_root: Path, workspace_id: str, project_id: str) -> Path:
-    return workspaces_root / workspace_id / "projects" / project_id
-
-
-def ensure_project_layout(root: Path) -> None:
-    root.mkdir(parents=True, exist_ok=True)
-    for name in STAGE_DIRS:
-        (root / name).mkdir(parents=True, exist_ok=True)
-
-
-def prepare_pinned_workdir(
-    workspaces_root: Path,
-    task: Task,
-) -> Path:
-    local = extract_local_path(task.project_resources)
-    if local:
-        root = Path(local)
-        ensure_project_layout(root)
-        log.info("using local_path project workdir %s", root)
-        return root
-    root = pinned_workdir_path(
-        workspaces_root, task.workspace_id or "default", task.project_id
-    )
-    ensure_project_layout(root)
-    return root