mycode-cli 0.7.0__tar.gz → 0.7.1__tar.gz

{mycode_cli-0.7.0 → mycode_cli-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mycode-cli
-Version: 0.7.0
+Version: 0.7.1
 Summary: Minimal coding agent CLI and web UI built on mycode-sdk.
 Project-URL: Homepage, https://github.com/legibet/mycode
 Project-URL: Repository, https://github.com/legibet/mycode
@@ -22,7 +22,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development
 Requires-Python: >=3.12
 Requires-Dist: fastapi>=0.115.0
-Requires-Dist: mycode-sdk==0.7.0
+Requires-Dist: mycode-sdk==0.7.1
 Requires-Dist: prompt-toolkit>=3.0.52
 Requires-Dist: pyyaml>=6.0.0
 Requires-Dist: rich>=14.2.0
@@ -89,7 +89,7 @@ Run `/model` in tui to see the available models.
 
 A config file is optional — API keys from the environment are usually sufficient.
 
-Create `~/.mycode/config.json` (global) or `<workspace>/.mycode/config.json` (project, takes precedence) to:
+Create `~/.mycode/config.json` (global) or `.mycode/config.json` under the current project to:
 
 - set a default provider, model, and reasoning effort
 - expose additional models on an existing provider (e.g. OpenRouter's catalog)

{mycode_cli-0.7.0 → mycode_cli-0.7.1}/README.md

@@ -57,7 +57,7 @@ Run `/model` in tui to see the available models.
 
 A config file is optional — API keys from the environment are usually sufficient.
 
-Create `~/.mycode/config.json` (global) or `<workspace>/.mycode/config.json` (project, takes precedence) to:
+Create `~/.mycode/config.json` (global) or `.mycode/config.json` under the current project to:
 
 - set a default provider, model, and reasoning effort
 - expose additional models on an existing provider (e.g. OpenRouter's catalog)

{mycode_cli-0.7.0 → mycode_cli-0.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "mycode-cli"
-version = "0.7.0"
+version = "0.7.1"
 description = "Minimal coding agent CLI and web UI built on mycode-sdk."
 requires-python = ">=3.12"
 license = "MIT"
@@ -26,7 +26,7 @@ classifiers = [
 ]
 keywords = ["agent", "cli", "llm", "coding-agent", "fastapi"]
 dependencies = [
-    "mycode-sdk==0.7.0",
+    "mycode-sdk==0.7.1",
     "fastapi>=0.115.0",
     "uvicorn[standard]>=0.32.0",
     "rich>=14.2.0",

{mycode_cli-0.7.0 → mycode_cli-0.7.1}/src/mycode_cli/config.py

@@ -84,7 +84,7 @@ class Settings:
     default_model: str | None
     port: int
     cwd: str
-    workspace_root: str
+    project: str
     default_reasoning_effort: str | None = None
     compact_threshold: float | None = None
     permission: PermissionConfig = field(default_factory=PermissionConfig)
@@ -103,16 +103,6 @@ class ResolvedProvider:
     provider_name: str | None = None
 
 
-def find_workspace_root(cwd: str) -> Path:
-    """Resolve the project/workspace root for the current cwd."""
-
-    current = Path(cwd).expanduser().resolve(strict=False)
-    for parent in [current, *current.parents]:
-        if (parent / ".git").exists():
-            return parent
-    return current
-
-
 def _load_json(path: Path) -> dict[str, Any] | None:
     if not path.is_file():
         return None
@@ -123,6 +113,32 @@ def _load_json(path: Path) -> dict[str, Any] | None:
     return data if isinstance(data, dict) else None
 
 
+def resolve_project(cwd: str) -> Path:
+    """Return the nearest Git project root, or cwd when no .git is found."""
+
+    cwd_path = Path(cwd).expanduser().resolve(strict=False)
+    for path in (cwd_path, *cwd_path.parents):
+        if (path / ".git").exists():
+            return path
+    return cwd_path
+
+
+def project_dirs(cwd: str, project: str | Path | None = None) -> list[Path]:
+    """Return directories from project to cwd, inclusive."""
+
+    cwd_path = Path(cwd).expanduser().resolve(strict=False)
+    project_path = Path(project).expanduser().resolve(strict=False) if project is not None else resolve_project(cwd)
+
+    dirs = [cwd_path]
+    while dirs[-1] != project_path:
+        parent = dirs[-1].parent
+        if parent == dirs[-1]:
+            break
+        dirs.append(parent)
+
+    return list(reversed(dirs))
+
+
 def _normalize_models(value: Any) -> dict[str, ModelConfig]:
     if not isinstance(value, dict):
         return {}
@@ -264,12 +280,10 @@ def provider_has_api_key(provider: ProviderConfig) -> bool:
     return bool(provider.api_key or provider_api_key_from_env(provider.type))
 
 
-def _candidate_config_paths(cwd: str) -> list[Path]:
-    workspace_root = find_workspace_root(cwd)
-    return [
-        resolve_mycode_home() / "config.json",
-        workspace_root / ".mycode" / "config.json",
-    ]
+def _candidate_config_paths(cwd: str, project: str | Path) -> list[Path]:
+    paths = [resolve_mycode_home() / "config.json"]
+    paths.extend(path / ".mycode" / "config.json" for path in project_dirs(cwd, project))
+    return paths
 
 
 def _build_providers(raw_providers: dict[str, dict[str, Any]]) -> dict[str, ProviderConfig]:
@@ -302,10 +316,10 @@ def _build_providers(raw_providers: dict[str, dict[str, Any]]) -> dict[str, Prov
 
 
 def get_settings(cwd: str | None = None) -> Settings:
-    """Load settings from global and workspace config files."""
+    """Load settings from global and project config files."""
 
     resolved_cwd = str(Path(cwd or os.getcwd()).expanduser().resolve(strict=False))
-    workspace_root = find_workspace_root(resolved_cwd)
+    resolved_project = str(resolve_project(resolved_cwd))
 
     raw_providers: dict[str, dict[str, Any]] = {}
     default_provider: str | None = None
@@ -315,7 +329,7 @@ def get_settings(cwd: str | None = None) -> Settings:
     permission = PermissionConfig()
     config_paths: list[str] = []
 
-    for path in _candidate_config_paths(resolved_cwd):
+    for path in _candidate_config_paths(resolved_cwd, resolved_project):
         data = _load_json(path)
         if data is None:
             continue
@@ -373,7 +387,7 @@ def get_settings(cwd: str | None = None) -> Settings:
         permission=permission,
         port=int(os.environ.get("PORT", "8000")),
         cwd=resolved_cwd,
-        workspace_root=str(workspace_root),
+        project=resolved_project,
         config_paths=config_paths,
     )
 
@@ -418,7 +432,7 @@ def resolve_provider(
     checked = ", ".join(env_names) or "<api key env>"
     raise ValueError(
         "no available providers found; set one of the supported API key env vars "
-        + f"({checked}) or configure a provider in ~/.mycode/config.json or <workspace>/.mycode/config.json"
+        + f"({checked}) or configure a provider in ~/.mycode/config.json or a project .mycode/config.json"
     )
 
 

{mycode_cli-0.7.0 → mycode_cli-0.7.1}/src/mycode_cli/permissions.py

@@ -76,12 +76,11 @@ def build_permission_hooks(
     on_user_denied: Callable[[], None] | None = None,
 ) -> Hooks:
     hooks = Hooks()
-    workspace_root = Path(settings.workspace_root).resolve(strict=False)
     skill_roots = [Path(s.path).parent.resolve(strict=False) for s in discover_skills(settings.cwd)]
 
     @hooks.before_tool
     async def check_permission(ctx: ToolHookContext) -> ToolExecutionResult | None:
-        check = classify_tool(ctx, cwd=settings.cwd, workspace_root=workspace_root, skill_roots=skill_roots)
+        check = classify_tool(ctx, cwd=settings.cwd, project=settings.project, skill_roots=skill_roots)
         decision = permission_decision(settings.permission, check.tier)
         if decision == "allow":
             return None
@@ -118,7 +117,7 @@ def classify_tool(
     ctx: ToolHookContext,
     *,
     cwd: str,
-    workspace_root: Path,
+    project: str,
     skill_roots: list[Path],
 ) -> PermissionCheck:
     name = ctx.tool_name.lower()
@@ -130,10 +129,11 @@ def classify_tool(
     if name in {"read", "write", "edit"}:
         raw = str(ctx.tool_input.get("path") or "")
         path = Path(resolve_path(raw, cwd=cwd)).resolve(strict=False)
+        project_path = Path(project).resolve(strict=False)
         preview = raw or str(path)
         if name == "read" and any(path.is_relative_to(root) for root in skill_roots):
             return PermissionCheck("readonly", preview)
-        if not path.is_relative_to(workspace_root):
+        if not path.is_relative_to(project_path):
             return PermissionCheck("yolo", preview)
         return PermissionCheck("readonly" if name == "read" else "safe", preview)
 

{mycode_cli-0.7.0 → mycode_cli-0.7.1}/src/mycode_cli/server/routers/chat.py

@@ -358,6 +358,6 @@ async def get_config(cwd: str | None = None):
         "default_reasoning_effort": settings.default_reasoning_effort,
         "reasoning_effort_options": REASONING_EFFORT_OPTIONS,
         "cwd": resolved_cwd,
-        "workspace_root": settings.workspace_root,
+        "project": settings.project,
         "config_paths": settings.config_paths,
     }

{mycode_cli-0.7.0 → mycode_cli-0.7.1}/src/mycode_cli/system_prompt.py

@@ -3,7 +3,7 @@
 This module owns the full runtime system prompt:
 
 - base prompt text (inlined below as _BASE_PROMPT)
-- workspace instructions from AGENTS.md
+- project instructions from AGENTS.md
 - available skills from SKILL.md files
 """
 
@@ -18,7 +18,7 @@ from pathlib import Path
 
 import yaml
 
-from mycode_cli.config import Settings, get_settings, resolve_mycode_home
+from mycode_cli.config import Settings, get_settings, project_dirs, resolve_mycode_home, resolve_project
 
 logger = logging.getLogger(__name__)
 
@@ -47,7 +47,7 @@ You have four tools: read, write, edit, bash.
 
 
 def build_system_prompt(cwd: str, settings: Settings | None = None) -> str:
-    """Build the full runtime system prompt for the current workspace."""
+    """Build the full runtime system prompt for the current directory."""
 
     resolved_cwd = str(Path(cwd).resolve(strict=False))
     resolved_settings = settings or get_settings(resolved_cwd)
@@ -67,29 +67,30 @@ def build_system_prompt(cwd: str, settings: Settings | None = None) -> str:
 
 
 # ---------------------------------------------------------------------
-# Workspace instructions from AGENTS.md
+# Project instructions from AGENTS.md
 # ---------------------------------------------------------------------
 
 
 def discover_instruction_files(cwd: str, settings: Settings | None = None) -> list[Path]:
-    """Discover standard AGENTS.md files from global scope to current cwd."""
+    """Discover global AGENTS.md and project AGENTS.md files."""
 
     resolved_cwd = settings.cwd if settings else cwd
-    local_dir = Path(resolved_cwd).expanduser().resolve(strict=False)
+    project = settings.project if settings else str(resolve_project(resolved_cwd))
     home = Path.home().resolve(strict=False)
     mycode_home = resolve_mycode_home()
     files: list[Path] = []
 
     global_candidate = mycode_home / "AGENTS.md"
-    compat_candidate = home / ".agents" / "AGENTS.md"
+    compat_global_candidate = home / ".agents" / "AGENTS.md"
     if global_candidate.is_file():
         files.append(global_candidate)
-    elif compat_candidate.is_file():
-        files.append(compat_candidate)
+    elif compat_global_candidate.is_file():
+        files.append(compat_global_candidate)
 
-    local_candidate = local_dir / "AGENTS.md"
-    if local_candidate.is_file():
-        files.append(local_candidate)
+    for directory in project_dirs(resolved_cwd, project):
+        local_candidate = directory / "AGENTS.md"
+        if local_candidate.is_file():
+            files.append(local_candidate)
 
     return files
 
@@ -115,11 +116,11 @@ def load_instructions_prompt(cwd: str, settings: Settings | None = None) -> str:
 
     return "\n".join(
         [
-            "<workspace_instructions>",
-            "Ordered from global to project; later instructions take precedence.",
+            "<project_instructions>",
+            "Ordered from global to project to cwd; later instructions take precedence.",
             "",
             "\n\n".join(sections),
-            "</workspace_instructions>",
+            "</project_instructions>",
         ]
     )
 
@@ -269,20 +270,20 @@ def _scan_skill_root(root: Path, source: str) -> list[Skill]:
 
 
 def discover_skills(cwd: str) -> list[Skill]:
-    """Discover skills from global and current-cwd roots. Later roots override earlier ones."""
+    """Discover skills from global and project config roots."""
 
     home = Path.home()
     mycode_home = resolve_mycode_home()
-    cwd_path = Path(cwd).expanduser().resolve(strict=False)
 
-    # Later roots win. This lets native mycode paths override compat paths, and
-    # current-cwd config override global config with the same skill name.
+    # Later roots win, so native mycode paths override compat paths and
+    # nearer project config overrides global and parent project config.
     roots: list[tuple[Path, str]] = [
         (home / ".agents" / "skills", "global"),
         (mycode_home / "skills", "global"),
-        (cwd_path / ".agents" / "skills", "project"),
-        (cwd_path / ".mycode" / "skills", "project"),
     ]
+    for directory in project_dirs(cwd):
+        roots.append((directory / ".agents" / "skills", "project"))
+        roots.append((directory / ".mycode" / "skills", "project"))
 
     skills_by_name: dict[str, Skill] = {}
     seen_paths: set[str] = set()