code-agnostic 0.3.13__tar.gz → 0.3.15__tar.gz

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-agnostic
-Version: 0.3.13
+Version: 0.3.15
 Summary: Centralized hub for LLM coding config: MCP, skills, rules, and agents.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -171,6 +171,7 @@ If managed outputs need repair after an apply, restore the active synced revisio
 ```bash
 code-agnostic restore
 code-agnostic restore -w myproject
+code-agnostic restore --project myproject
 ```
 
 ### MCP management
@@ -179,11 +180,14 @@ Add, remove, and list MCP servers without editing JSON by hand.
 
 ```bash
 code-agnostic mcp add github --command npx --args @modelcontextprotocol/server-github --env GITHUB_TOKEN
+code-agnostic mcp add local-docs --command uvx --args docs-mcp --cwd ~/code/docs
 code-agnostic mcp list
 code-agnostic mcp remove github
 ```
 
 Env vars without a value (`--env GITHUB_TOKEN`) are stored as `${GITHUB_TOKEN}` references.
+Cursor-local MCP `envFile` can be represented in source config and is reported
+as lossy for targets that do not support environment files.
 
 ### Rules with metadata
 
@@ -230,7 +234,8 @@ code-agnostic skills list
 code-agnostic agents list
 ```
 
-Install a local skill directory into managed source:
+Install copies a skill into managed source first for the chosen scope. Run
+`plan` / `apply` afterward to generate target app files.
 
 ```bash
 code-agnostic skills install ./my-skill --global
@@ -241,6 +246,20 @@ code-agnostic plan
 code-agnostic apply
 ```
 
+Remote GitHub-style sources are also supported:
+
+```bash
+code-agnostic skills install owner/repo --global
+code-agnostic skills install https://github.com/owner/repo --workspace myworkspace
+code-agnostic skills install https://github.com/owner/repo/tree/main/path/to/skills --skill reviewer --skill triage --project myproject
+```
+
+Remote sources may be an `owner/repo` shorthand, a GitHub repository URL, or a
+GitHub tree URL. When a remote source contains multiple skill candidates,
+repeat `--skill` to select the intended skills; otherwise install fails instead
+of guessing. Remote installs still copy the selected skill into the
+`code-agnostic` source of truth before any generated target outputs are written.
+
 Global skills live under `~/.config/code-agnostic/skills`. Workspace-local
 skills live under `~/.config/code-agnostic/workspaces/<name>/skills` and can be
 inspected with `code-agnostic skills list -w <name>`. Project-local skills live
@@ -252,7 +271,7 @@ skills and agents are written under `~/.claude/skills` and `~/.claude/agents`,
 with workspace/project copies under repo-local `.claude/skills` and
 `.claude/agents`.
 
-Project-local skills are not first-class source inputs in `code-agnostic` yet. If a target app discovers repo-local skill folders such as `.agents/skills`, `.opencode/skills`, or user-created `.claude/skills`, treat those as unmanaged app inputs. Workspace sync writes only the exact generated paths recorded in `.sync-state.json`.
+If a target app discovers user-created repo-local skill folders such as `.agents/skills`, `.opencode/skills`, or `.claude/skills`, treat those as unmanaged app inputs unless they were generated from `code-agnostic` project source. Workspace and project sync write only the exact generated paths recorded in their `.sync-state.json` files.
 
 Planned convenience command:
 
@@ -266,7 +285,7 @@ first implementation slice.
 
 ### Workspaces
 
-Register workspace directories. Workspace rules are compiled into a canonical `AGENTS.md` at the workspace root. Repos keep their own repo-specific `AGENTS.md`; Codex receives the workspace rules through generated, git-excluded `AGENTS.override.md` files, while OpenCode workspace configs write project-root `opencode.json` files that reference the shared workspace file through `instructions`. Claude receives generated `CLAUDE.local.md` files and project MCP entries in `~/.claude.json["projects"][absolute_repo_path]["mcpServers"]`. Workspace source config, skills, and agents are propagated into repo-local generated paths for OpenCode, Cursor, Codex, and Claude; user-created project-local skill folders remain unmanaged until project-scoped installs are supported.
+Register workspace directories. Workspace rules are compiled into a canonical `AGENTS.md` at the workspace root. Repos keep their own repo-specific `AGENTS.md`; Codex receives the workspace rules through generated, git-excluded `AGENTS.override.md` files, while OpenCode workspace configs write project-root `opencode.json` files that reference the shared workspace file through `instructions`. Claude receives generated `CLAUDE.local.md` files and project MCP entries in `~/.claude.json["projects"][absolute_repo_path]["mcpServers"]`. Workspace source config, skills, and agents are propagated into repo-local generated paths for OpenCode, Cursor, Codex, and Claude; user-created target app skill folders remain unmanaged unless they were generated from managed source.
 
 Cursor propagation intentionally stays to repo-local MCP, skills, and agents; it does not copy the shared workspace `AGENTS.md` into child repos.
 
@@ -302,7 +321,8 @@ code-agnostic import plan -a codex -i    # interactive TUI picker
 only the selected sections. Conflicts are skipped by default, so rerun with
 `--on-conflict overwrite` only after reviewing the preview. Use `--include`,
 `--exclude`, `--source-root`, and `--follow-symlinks` to narrow what gets
-imported.
+imported. `--source-root` means the source app config root to read from, not the
+`code-agnostic` hub root.
 
 ### CLI conventions
 
@@ -334,7 +354,7 @@ The compiler migration is documented in:
 - [x] Per-workspace git-exclude customization
 - [x] Interactive TUI for import selection
 - [x] Claude Code support
-- [ ] Project-scoped skill installs and sync
+- [x] Project-scoped skill installs and sync
 - [ ] `rules add` / `skills add` / `agents add` commands (open `$EDITOR` with template)
 - [ ] Shell auto-complete
 - [ ] Full TUI mode (command palette + menus)

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/README.md

@@ -146,6 +146,7 @@ If managed outputs need repair after an apply, restore the active synced revisio
 ```bash
 code-agnostic restore
 code-agnostic restore -w myproject
+code-agnostic restore --project myproject
 ```
 
 ### MCP management
@@ -154,11 +155,14 @@ Add, remove, and list MCP servers without editing JSON by hand.
 
 ```bash
 code-agnostic mcp add github --command npx --args @modelcontextprotocol/server-github --env GITHUB_TOKEN
+code-agnostic mcp add local-docs --command uvx --args docs-mcp --cwd ~/code/docs
 code-agnostic mcp list
 code-agnostic mcp remove github
 ```
 
 Env vars without a value (`--env GITHUB_TOKEN`) are stored as `${GITHUB_TOKEN}` references.
+Cursor-local MCP `envFile` can be represented in source config and is reported
+as lossy for targets that do not support environment files.
 
 ### Rules with metadata
 
@@ -205,7 +209,8 @@ code-agnostic skills list
 code-agnostic agents list
 ```
 
-Install a local skill directory into managed source:
+Install copies a skill into managed source first for the chosen scope. Run
+`plan` / `apply` afterward to generate target app files.
 
 ```bash
 code-agnostic skills install ./my-skill --global
@@ -216,6 +221,20 @@ code-agnostic plan
 code-agnostic apply
 ```
 
+Remote GitHub-style sources are also supported:
+
+```bash
+code-agnostic skills install owner/repo --global
+code-agnostic skills install https://github.com/owner/repo --workspace myworkspace
+code-agnostic skills install https://github.com/owner/repo/tree/main/path/to/skills --skill reviewer --skill triage --project myproject
+```
+
+Remote sources may be an `owner/repo` shorthand, a GitHub repository URL, or a
+GitHub tree URL. When a remote source contains multiple skill candidates,
+repeat `--skill` to select the intended skills; otherwise install fails instead
+of guessing. Remote installs still copy the selected skill into the
+`code-agnostic` source of truth before any generated target outputs are written.
+
 Global skills live under `~/.config/code-agnostic/skills`. Workspace-local
 skills live under `~/.config/code-agnostic/workspaces/<name>/skills` and can be
 inspected with `code-agnostic skills list -w <name>`. Project-local skills live
@@ -227,7 +246,7 @@ skills and agents are written under `~/.claude/skills` and `~/.claude/agents`,
 with workspace/project copies under repo-local `.claude/skills` and
 `.claude/agents`.
 
-Project-local skills are not first-class source inputs in `code-agnostic` yet. If a target app discovers repo-local skill folders such as `.agents/skills`, `.opencode/skills`, or user-created `.claude/skills`, treat those as unmanaged app inputs. Workspace sync writes only the exact generated paths recorded in `.sync-state.json`.
+If a target app discovers user-created repo-local skill folders such as `.agents/skills`, `.opencode/skills`, or `.claude/skills`, treat those as unmanaged app inputs unless they were generated from `code-agnostic` project source. Workspace and project sync write only the exact generated paths recorded in their `.sync-state.json` files.
 
 Planned convenience command:
 
@@ -241,7 +260,7 @@ first implementation slice.
 
 ### Workspaces
 
-Register workspace directories. Workspace rules are compiled into a canonical `AGENTS.md` at the workspace root. Repos keep their own repo-specific `AGENTS.md`; Codex receives the workspace rules through generated, git-excluded `AGENTS.override.md` files, while OpenCode workspace configs write project-root `opencode.json` files that reference the shared workspace file through `instructions`. Claude receives generated `CLAUDE.local.md` files and project MCP entries in `~/.claude.json["projects"][absolute_repo_path]["mcpServers"]`. Workspace source config, skills, and agents are propagated into repo-local generated paths for OpenCode, Cursor, Codex, and Claude; user-created project-local skill folders remain unmanaged until project-scoped installs are supported.
+Register workspace directories. Workspace rules are compiled into a canonical `AGENTS.md` at the workspace root. Repos keep their own repo-specific `AGENTS.md`; Codex receives the workspace rules through generated, git-excluded `AGENTS.override.md` files, while OpenCode workspace configs write project-root `opencode.json` files that reference the shared workspace file through `instructions`. Claude receives generated `CLAUDE.local.md` files and project MCP entries in `~/.claude.json["projects"][absolute_repo_path]["mcpServers"]`. Workspace source config, skills, and agents are propagated into repo-local generated paths for OpenCode, Cursor, Codex, and Claude; user-created target app skill folders remain unmanaged unless they were generated from managed source.
 
 Cursor propagation intentionally stays to repo-local MCP, skills, and agents; it does not copy the shared workspace `AGENTS.md` into child repos.
 
@@ -277,7 +296,8 @@ code-agnostic import plan -a codex -i    # interactive TUI picker
 only the selected sections. Conflicts are skipped by default, so rerun with
 `--on-conflict overwrite` only after reviewing the preview. Use `--include`,
 `--exclude`, `--source-root`, and `--follow-symlinks` to narrow what gets
-imported.
+imported. `--source-root` means the source app config root to read from, not the
+`code-agnostic` hub root.
 
 ### CLI conventions
 
@@ -309,7 +329,7 @@ The compiler migration is documented in:
 - [x] Per-workspace git-exclude customization
 - [x] Interactive TUI for import selection
 - [x] Claude Code support
-- [ ] Project-scoped skill installs and sync
+- [x] Project-scoped skill installs and sync
 - [ ] `rules add` / `skills add` / `agents add` commands (open `$EDITOR` with template)
 - [ ] Shell auto-complete
 - [ ] Full TUI mode (command palette + menus)

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/code_agnostic/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["__version__"]
 
-__version__ = "0.3.13"
+__version__ = "0.3.15"

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/code_agnostic/apps/claude/mapper.py

@@ -40,6 +40,9 @@ class ClaudeMCPMapper(IAppMCPMapper):
                     type=MCPServerType.STDIO,
                     command=command,
                     args=_as_list(server.get("args")),
+                    cwd=server.get("cwd")
+                    if isinstance(server.get("cwd"), str)
+                    else None,
                     env=_as_str_dict(server.get("env")),
                     headers=_as_str_dict(server.get("headers")),
                     timeout_ms=_timeout(server.get("timeout")),
@@ -70,6 +73,8 @@ class ClaudeMCPMapper(IAppMCPMapper):
                 out["command"] = server.command
                 if server.args:
                     out["args"] = deepcopy(server.args)
+                if server.cwd is not None:
+                    out["cwd"] = server.cwd
             else:
                 if not server.url:
                     continue

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/code_agnostic/apps/codex/mapper.py

@@ -82,6 +82,7 @@ class CodexMCPMapper(IAppMCPMapper):
                 args=[str(item) for item in server.get("args", [])]
                 if isinstance(server.get("args"), list)
                 else [],
+                cwd=server.get("cwd") if isinstance(server.get("cwd"), str) else None,
                 url=url if isinstance(url, str) else None,
                 timeout_ms=_coerce_timeout_ms(server.get("tool_timeout_sec")),
                 headers=headers,
@@ -100,6 +101,8 @@ class CodexMCPMapper(IAppMCPMapper):
                 out["command"] = server.command
                 if server.args:
                     out["args"] = deepcopy(server.args)
+                if server.cwd is not None:
+                    out["cwd"] = server.cwd
             else:
                 if not server.url:
                     continue

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/code_agnostic/apps/codex/schema.json

@@ -210,6 +210,14 @@
       "additionalProperties": false,
       "description": "Default settings that apply to all apps.",
       "properties": {
+        "approvals_reviewer": {
+          "allOf": [
+            {
+              "$ref": "#/definitions/ApprovalsReviewer"
+            }
+          ],
+          "description": "Reviewer for approval prompts unless overridden by per-app settings."
+        },
         "destructive_enabled": {
           "description": "Whether tools with `destructive_hint = true` are allowed by default.",
           "type": "boolean"
@@ -576,6 +584,9 @@
             "request_rule": {
               "type": "boolean"
             },
+            "resize_all_images": {
+              "type": "boolean"
+            },
             "responses_websockets": {
               "type": "boolean"
             },
@@ -588,6 +599,9 @@
             "search_tool": {
               "type": "boolean"
             },
+            "secret_auth_storage": {
+              "type": "boolean"
+            },
             "shell_snapshot": {
               "type": "boolean"
             },
@@ -621,6 +635,9 @@
             "terminal_visualization_instructions": {
               "type": "boolean"
             },
+            "token_budget": {
+              "type": "boolean"
+            },
             "tool_call_mcp_elicitation": {
               "type": "boolean"
             },
@@ -2436,6 +2453,13 @@
       },
       "type": "object"
     },
+    "RealtimeConversationArchitecture": {
+      "enum": [
+        "realtimeapi",
+        "avas"
+      ],
+      "type": "string"
+    },
     "RealtimeConversationVersion": {
       "enum": [
         "v1",
@@ -2446,6 +2470,9 @@
     "RealtimeToml": {
       "additionalProperties": false,
       "properties": {
+        "architecture": {
+          "$ref": "#/definitions/RealtimeConversationArchitecture"
+        },
         "transport": {
           "$ref": "#/definitions/RealtimeTransport"
         },
@@ -4482,6 +4509,10 @@
       "description": "Experimental / do not use. Replaces the built-in realtime start instructions inserted into developer messages when realtime becomes active.",
       "type": "string"
     },
+    "experimental_realtime_webrtc_call_base_url": {
+      "description": "Experimental / do not use. Overrides only the WebRTC realtime call creation base URL. This is separate from `experimental_realtime_ws_base_url` because WebRTC call creation is HTTP, while sideband control is websocket.",
+      "type": "string"
+    },
     "experimental_realtime_ws_backend_prompt": {
       "description": "Experimental / do not use. Overrides only the realtime conversation websocket transport instructions (the `Op::RealtimeConversation` `/ws` session.update instructions) without changing normal prompts.",
       "type": "string"
@@ -4708,6 +4739,9 @@
         "request_rule": {
           "type": "boolean"
         },
+        "resize_all_images": {
+          "type": "boolean"
+        },
         "responses_websockets": {
           "type": "boolean"
         },
@@ -4720,6 +4754,9 @@
         "search_tool": {
           "type": "boolean"
         },
+        "secret_auth_storage": {
+          "type": "boolean"
+        },
         "shell_snapshot": {
           "type": "boolean"
         },
@@ -4753,6 +4790,9 @@
         "terminal_visualization_instructions": {
           "type": "boolean"
         },
+        "token_budget": {
+          "type": "boolean"
+        },
         "tool_call_mcp_elicitation": {
           "type": "boolean"
         },

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/code_agnostic/apps/common/models.py

@@ -22,6 +22,8 @@ class MCPServerDTO:
     type: MCPServerType
     command: str | None = None
     args: list[str] = field(default_factory=list)
+    cwd: str | None = None
+    env_file: str | None = None
     url: str | None = None
     timeout_ms: int | None = None
     headers: dict[str, str] = field(default_factory=dict)

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/code_agnostic/apps/common/utils.py

@@ -67,6 +67,8 @@ def common_mcp_to_dto(mcp_servers: dict[str, Any]) -> dict[str, MCPServerDTO]:
 
         command = raw.get("command")
         args = raw.get("args")
+        cwd = raw.get("cwd")
+        env_file = raw.get("envFile")
         url = raw.get("url")
         timeout_ms = _coerce_timeout_ms(raw.get("timeout"))
 
@@ -96,6 +98,8 @@ def common_mcp_to_dto(mcp_servers: dict[str, Any]) -> dict[str, MCPServerDTO]:
                 type=MCPServerType.STDIO,
                 command=command,
                 args=[str(item) for item in args] if isinstance(args, list) else [],
+                cwd=cwd if isinstance(cwd, str) else None,
+                env_file=env_file if isinstance(env_file, str) else None,
                 timeout_ms=timeout_ms,
                 headers={str(k): str(v) for k, v in headers.items()}
                 if isinstance(headers, dict)
@@ -133,6 +137,10 @@ def dto_to_common_mcp(servers: dict[str, MCPServerDTO]) -> dict[str, Any]:
         if server.command:
             item["command"] = server.command
             item["args"] = [str(arg) for arg in server.args]
+            if server.cwd is not None:
+                item["cwd"] = server.cwd
+            if server.env_file is not None:
+                item["envFile"] = server.env_file
         elif server.url:
             item["url"] = server.url
         else:

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/code_agnostic/apps/cursor/mapper.py

@@ -22,6 +22,9 @@ class CursorMCPMapper(IAppMCPMapper):
                         for item in server.get("args", [])
                         if isinstance(item, (str, int, float, bool))
                     ],
+                    env_file=server.get("envFile")
+                    if isinstance(server.get("envFile"), str)
+                    else None,
                     timeout_ms=(
                         int(server["timeout"])
                         if isinstance(server.get("timeout"), int)
@@ -82,9 +85,12 @@ class CursorMCPMapper(IAppMCPMapper):
             if server.type == MCPServerType.STDIO:
                 if not server.command:
                     continue
+                out["type"] = "stdio"
                 out["command"] = server.command
                 if server.args:
                     out["args"] = deepcopy(server.args)
+                if server.env_file is not None:
+                    out["envFile"] = server.env_file
             else:
                 if not server.url:
                     continue

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/code_agnostic/apps/cursor/schema.json

@@ -23,12 +23,14 @@
       "type": "object",
       "required": ["command"],
       "properties": {
+        "type": { "const": "stdio" },
         "command": { "type": "string", "minLength": 1 },
         "args": {
           "type": "array",
           "items": { "type": "string" }
         },
         "timeout": { "type": "integer", "minimum": 0 },
+        "envFile": { "type": "string", "minLength": 1 },
         "env": { "$ref": "#/$defs/stringMap" },
         "headers": { "$ref": "#/$defs/stringMap" },
         "auth": { "$ref": "#/$defs/stringMap" }

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/code_agnostic/apps/opencode/mapper.py

@@ -32,6 +32,9 @@ class OpenCodeMCPMapper(IAppMCPMapper):
                     type=MCPServerType.STDIO,
                     command=command,
                     args=args,
+                    cwd=server.get("cwd")
+                    if isinstance(server.get("cwd"), str)
+                    else None,
                     timeout_ms=(
                         int(server["timeout"])
                         if isinstance(server.get("timeout"), int)
@@ -90,6 +93,8 @@ class OpenCodeMCPMapper(IAppMCPMapper):
                     continue
                 out["type"] = "local"
                 out["command"] = [server.command, *server.args]
+                if server.cwd is not None:
+                    out["cwd"] = server.cwd
             else:
                 if not server.url:
                     continue

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/code_agnostic/apps/opencode/schema.json

@@ -564,6 +564,10 @@
           },
           "description": "Command and arguments to run the MCP server"
         },
+        "cwd": {
+          "type": "string",
+          "description": "Working directory for the MCP server process. Relative paths resolve from the workspace directory."
+        },
         "environment": {
           "type": "object",
           "additionalProperties": {

code_agnostic-0.3.15/code_agnostic/cli/commands/apply.py

@@ -0,0 +1,83 @@
+"""Apply command."""
+
+import click
+from rich.console import Console
+
+from code_agnostic.apps.apps_service import AppsService
+from code_agnostic.cli.options import app_option, verbose_option
+from code_agnostic.core.repository import CoreRepository
+from code_agnostic.models import SyncPlan
+from code_agnostic.tui import SyncConsoleUI
+
+
+def _apply_next_steps(plan: SyncPlan, target: str) -> str | None:
+    if not plan.actions:
+        return None
+
+    normalized_target = target.lower()
+    target_flag = "" if normalized_target == "all" else f" -a {normalized_target}"
+    lines = [
+        "Managed outputs were written. Check drift after target files change.",
+        f"- code-agnostic status{target_flag}",
+    ]
+
+    restore_lines = []
+    if any(
+        action.workspace is None and action.project is None for action in plan.actions
+    ):
+        restore_lines.append("- code-agnostic restore")
+
+    workspace_names = sorted(
+        {action.workspace for action in plan.actions if action.workspace}
+    )
+    for workspace_name in workspace_names[:3]:
+        restore_lines.append(f"- code-agnostic restore -w {workspace_name}")
+    if len(workspace_names) > 3:
+        restore_lines.append("- code-agnostic restore -w <workspace>")
+
+    if restore_lines:
+        lines.append("Repair global/workspace outputs from the active synced revision.")
+        lines.extend(restore_lines)
+
+    if any(action.project is not None for action in plan.actions):
+        lines.append(
+            "Project outputs are checked by status; project restore is not available yet."
+        )
+
+    return "\n".join(lines)
+
+
+@click.command(help="Apply planned sync changes.")
+@app_option()
+@verbose_option()
+@click.pass_obj
+def apply(obj: dict[str, str], app: str, verbose: bool) -> None:
+    target = app or "all"
+    ui = SyncConsoleUI(Console())
+    core = CoreRepository()
+    apps = AppsService(core)
+
+    try:
+        scoped_plan = apps.plan_for_target(target)
+    except Exception as exc:
+        raise click.ClickException(f"Fatal: {exc}")
+
+    ui.render_plan(scoped_plan, mode=f"apply:{target.lower()}", verbose=verbose)
+
+    if not scoped_plan.actions and not scoped_plan.errors:
+        ui.render_apply_result(applied=0, failed=0, failures=[])
+        return
+
+    if scoped_plan.errors:
+        raise click.ClickException(
+            "Apply aborted due to planning/parsing errors above."
+        )
+
+    applied, failed, failures = apps.execute_plan(scoped_plan)
+    next_steps = (
+        _apply_next_steps(scoped_plan, target) if applied > 0 and failed == 0 else None
+    )
+    ui.render_apply_result(applied, failed, failures, next_steps=next_steps)
+
+    if failed:
+        raise click.exceptions.Exit(1)

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/code_agnostic/cli/commands/import_.py

@@ -45,7 +45,11 @@ def import_group() -> None:
     default=ConflictPolicy.SKIP.value,
     show_default=True,
 )
-@click.option("--source-root", type=click.Path(path_type=Path))
+@click.option(
+    "--source-root",
+    type=click.Path(path_type=Path),
+    help="Source app config root to read from.",
+)
 @click.option("--follow-symlinks", is_flag=True, default=False)
 @click.option(
     "-i",
@@ -125,7 +129,11 @@ def import_plan(
     default=ConflictPolicy.SKIP.value,
     show_default=True,
 )
-@click.option("--source-root", type=click.Path(path_type=Path))
+@click.option(
+    "--source-root",
+    type=click.Path(path_type=Path),
+    help="Source app config root to read from.",
+)
 @click.option("--follow-symlinks", is_flag=True, default=False)
 @click.option(
     "-i",

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/code_agnostic/cli/commands/mcp.py

@@ -63,6 +63,7 @@ def mcp_list(obj: dict[str, str], workspace: str | None) -> None:
 @click.option(
     "--args", "args_str", default=None, help="Comma-separated args for stdio server."
 )
+@click.option("--cwd", default=None, help="Working directory for stdio server.")
 @click.option("--url", default=None, help="URL for HTTP/SSE server.")
 @click.option(
     "--timeout-ms",
@@ -92,6 +93,7 @@ def mcp_add(
     name: str,
     command: str | None,
     args_str: str | None,
+    cwd: str | None,
     url: str | None,
     timeout_ms: int | None,
     env_pairs: tuple[str, ...],
@@ -110,6 +112,7 @@ def mcp_add(
             name=name,
             command=command,
             args=args or None,
+            cwd=cwd,
             url=url,
             timeout_ms=timeout_ms,
             env=env or None,

{code_agnostic-0.3.13 → code_agnostic-0.3.15}/code_agnostic/cli/commands/restore.py

@@ -2,26 +2,31 @@
 
 import click
 
-from code_agnostic.cli.helpers import require_workspace_entry
-from code_agnostic.cli.options import workspace_option
+from code_agnostic.cli.helpers import require_project_entry, require_workspace_entry
+from code_agnostic.cli.options import project_option, workspace_option
 from code_agnostic.core.repository import CoreRepository
 from code_agnostic.executor import SyncExecutor
 
 
 @click.command(
-    help="Restore the active synced revision for the global root or a workspace."
+    help="Restore the active synced revision for the global root, a workspace, or a project."
 )
+@project_option()
 @workspace_option()
 @click.pass_obj
-def restore(obj: dict[str, str], workspace: str | None) -> None:
+def restore(obj: dict[str, str], workspace: str | None, project: str | None) -> None:
     core = CoreRepository()
 
+    if workspace is not None and project is not None:
+        raise click.ClickException("Choose only one scope: --workspace or --project.")
     if workspace is not None:
         require_workspace_entry(core, workspace)
+    if project is not None:
+        require_project_entry(core, project)
 
     executor = SyncExecutor(core=core)
     try:
-        result = executor.restore_active_revision(workspace=workspace)
+        result = executor.restore_active_revision(workspace=workspace, project=project)
     except FileNotFoundError as exc:
         raise click.ClickException(str(exc))