sci-agent 0.2.0__tar.gz → 0.3.0__tar.gz

{sci_agent-0.2.0 → sci_agent-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sci-agent
-Version: 0.2.0
+Version: 0.3.0
 Summary: Agent-first lightweight CI/CD tool
 Requires-Python: >=3.12
 Requires-Dist: fastapi>=0.110.0
@@ -8,4 +8,5 @@ Requires-Dist: uvicorn>=0.29.0
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: jinja2>=3.1.0
+Requires-Dist: python-multipart>=0.0.20
 Requires-Dist: python-dotenv>=1.0.0

{sci_agent-0.2.0 → sci_agent-0.3.0}/README.md

@@ -23,6 +23,19 @@ uvx --from sci-agent sci-agent server --port 9090 --token xxx
 ```
 
 For production-like usage, prefer `SCI_AGENT_TOKEN` over passing the token on the command line.
+Set the target server workspace base directory with `--base-dir`:
+
+```powershell
+uvx --from sci-agent sci-agent server --port 9090 --token xxx --base-dir /opt/sci-agent
+```
+
+Or with an environment variable:
+
+```bash
+SCI_AGENT_BASE_DIR=/opt/sci-agent sci-agent server --port 9090 --token xxx
+```
+
+The priority is: `--base-dir > SCI_AGENT_BASE_DIR > current working directory`.
 
 ## Configuration layout
 
@@ -83,6 +96,53 @@ branch = "release"
 credential = "gitlab-ai-threat"
 ```
 
+## Target server tools
+
+The target server can store uploaded tool archives, extract them under the server `base_dir`, maintain a manifest, and return stable paths relative to `<base_dir>`. This is useful for tools such as Maven or JDK that pipelines need to reference explicitly.
+
+For `base_dir=/opt/sci-agent`, the server-managed layout is:
+
+```text
+/opt/sci-agent/
+└── tools/
+    ├── packages/
+    │   └── apache-maven-3.9.9-bin.tar.gz
+    ├── installed/
+    │   ├── maven/
+    │   └── jdk/
+    └── manifest.json
+```
+
+Tool configuration belongs in the local target TOML. Do not put server `base_dir` in target tool configuration; the server decides `base_dir` only at startup.
+
+```toml
+[tools.maven]
+archive = "packages/apache-maven-3.9.9-bin.tar.gz"
+strip_root = true
+
+[tools.maven.bins]
+mvn = "bin/mvn"
+
+[tools.jdk]
+archive = "packages/jdk-8u333-linux-x64.tar.gz"
+strip_root = true
+
+[tools.jdk.bins]
+java = "bin/java"
+javac = "bin/javac"
+```
+
+Upload, list, and remove tools:
+
+```powershell
+uvx --from sci-agent sci-agent tools list --env 10-50-10-18
+uvx --from sci-agent sci-agent tools upload --env 10-50-10-18 --tool maven
+uvx --from sci-agent sci-agent tools upload --env 10-50-10-18 --all
+uvx --from sci-agent sci-agent tools remove --env 10-50-10-18 --tool maven --purge-package
+```
+
+This feature does not automatically inject `PATH`, `JAVA_HOME`, or `MAVEN_HOME`. Pipelines should explicitly reference returned paths such as `tools/installed/maven/bin/mvn` or configure their own environment variables in pipeline steps.
+
 ## Running pipelines
 
 Inspect the resolved plan without executing it:

{sci_agent-0.2.0 → sci_agent-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sci-agent"
-version = "0.2.0"
+version = "0.3.0"
 description = "Agent-first lightweight CI/CD tool"
 requires-python = ">=3.12"
 dependencies = [
@@ -13,6 +13,7 @@ dependencies = [
   "httpx>=0.27.0",
   "pyyaml>=6.0",
   "jinja2>=3.1.0",
+  "python-multipart>=0.0.20",
   "python-dotenv>=1.0.0",
 ]
 
@@ -30,4 +31,4 @@ where = ["src"]
 include = ["simple_ci*"]
 
 [tool.setuptools.package-data]
-simple_ci = ["ui/static/*.html", "ui/static/*.js", "ui/static/*.css"]
+simple_ci = ["ui/static/*.html", "ui/static/*.js", "ui/static/*.css"]

{sci_agent-0.2.0 → sci_agent-0.3.0}/src/sci_agent.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sci-agent
-Version: 0.2.0
+Version: 0.3.0
 Summary: Agent-first lightweight CI/CD tool
 Requires-Python: >=3.12
 Requires-Dist: fastapi>=0.110.0
@@ -8,4 +8,5 @@ Requires-Dist: uvicorn>=0.29.0
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: jinja2>=3.1.0
+Requires-Dist: python-multipart>=0.0.20
 Requires-Dist: python-dotenv>=1.0.0

{sci_agent-0.2.0 → sci_agent-0.3.0}/src/sci_agent.egg-info/SOURCES.txt

@@ -24,12 +24,14 @@ src/simple_ci/cli/config.py
 src/simple_ci/cli/history.py
 src/simple_ci/cli/main.py
 src/simple_ci/cli/render.py
+src/simple_ci/cli/tools.py
 src/simple_ci/server/__init__.py
 src/simple_ci/server/app.py
 src/simple_ci/server/auth.py
 src/simple_ci/server/executor.py
 src/simple_ci/server/main.py
 src/simple_ci/server/store.py
+src/simple_ci/server/tools.py
 src/simple_ci/ui/__init__.py
 src/simple_ci/ui/server.py
 src/simple_ci/ui/static/index.html
@@ -41,4 +43,6 @@ tests/test_history.py
 tests/test_hooks.py
 tests/test_render.py
 tests/test_server_api.py
+tests/test_server_tools.py
+tests/test_tools_cli.py
 tests/test_version.py

{sci_agent-0.2.0 → sci_agent-0.3.0}/src/sci_agent.egg-info/requires.txt

@@ -3,4 +3,5 @@ uvicorn>=0.29.0
 httpx>=0.27.0
 pyyaml>=6.0
 jinja2>=3.1.0
+python-multipart>=0.0.20
 python-dotenv>=1.0.0

sci_agent-0.3.0/src/simple_ci/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.0"

sci_agent-0.3.0/src/simple_ci/__main__.py

@@ -0,0 +1,74 @@
+from __future__ import annotations
+
+import ctypes
+import sys
+
+
+TOP_LEVEL_HELP = """usage: sci-agent [-h] [--root ROOT] [--host HOST] [--port PORT] [--open]
+       sci-agent run [-h] [--env ENV] [--project PROJECT] [--pipeline PIPELINE] ...
+       sci-agent server [-h] [--host HOST] [--port PORT] [--token TOKEN]
+       sci-agent tools [-h] {list,upload,remove} ...
+
+Agent-first lightweight CI/CD tool.
+
+commands:
+  run       Run CI pipelines, inspect configuration, and view local history.
+  server    Run the target execution API server.
+  tools     Manage target-side tool packages.
+
+default:
+  Without a command, sci-agent starts the local Web UI.
+
+common examples:
+  sci-agent
+  sci-agent run --targets
+  sci-agent run --env 10-50-10-18 --project ai-threat --pipeline server-openapi --yes
+  sci-agent server --host 0.0.0.0 --port 9090 --token <token>
+  sci-agent tools list --env 10-50-10-18
+
+Use "sci-agent run --help", "sci-agent server --help", or "sci-agent tools --help" for command-specific options.
+"""
+
+
+def _configure_stdio_encoding() -> None:
+    if sys.platform == "win32":
+        try:
+            kernel32 = ctypes.windll.kernel32
+            kernel32.SetConsoleOutputCP(65001)
+            kernel32.SetConsoleCP(65001)
+        except Exception:
+            pass
+
+    for stream in (sys.stdout, sys.stderr, sys.stdin):
+        try:
+            stream.reconfigure(encoding="utf-8", errors="replace")
+        except Exception:
+            pass
+
+
+def main() -> None:
+    _configure_stdio_encoding()
+
+    argv = sys.argv[1:]
+    if argv and argv[0] in {"-h", "--help"}:
+        print(TOP_LEVEL_HELP)
+    elif argv and argv[0] == "server":
+        from simple_ci.server.main import handle_server
+
+        handle_server(argv[1:])
+    elif argv and argv[0] == "run":
+        from simple_ci.cli.main import handle_run
+
+        handle_run(argv[1:])
+    elif argv and argv[0] == "tools":
+        from simple_ci.cli.tools import handle_tools
+
+        handle_tools(argv[1:])
+    else:
+        from simple_ci.ui.server import run_ui
+
+        run_ui(argv)
+
+
+if __name__ == "__main__":
+    main()

{sci_agent-0.2.0 → sci_agent-0.3.0}/src/simple_ci/actions/__init__.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+from pathlib import Path
 from typing import Any
 
 from simple_ci.actions import base
@@ -12,10 +13,18 @@ from simple_ci.actions.image import build_image_command, build_push_command
 from simple_ci.actions.source import build_git_pull_command
 from simple_ci.actions.target import build_target_shell_command
 
-ActionHandler = Callable[[dict[str, Any], dict[str, Any]], base.ActionResult]
+ActionHandler = Callable[
+    [dict[str, Any], dict[str, Any], str | Path | None],
+    base.ActionResult,
+]
 
 
-def dispatch_action(step: dict[str, Any], payload: dict[str, Any]) -> dict[str, Any]:
+def dispatch_action(
+    step: dict[str, Any],
+    payload: dict[str, Any],
+    *,
+    base_dir: str | Path | None = None,
+) -> dict[str, Any]:
     """根据 step.uses 分发内置动作，并返回可 JSON 序列化的动作结果。"""
 
     action_name = str(step.get("uses") or step.get("action") or "")
@@ -26,7 +35,7 @@ def dispatch_action(step: dict[str, Any], payload: dict[str, Any]) -> dict[str,
             exit_code=1,
             stderr_tail=f"Unknown action: {action_name or '<missing>'}",
         ).to_dict()
-    return handler(step, payload).to_dict()
+    return handler(step, payload, base_dir).to_dict()
 
 
 def _params(step: dict[str, Any]) -> dict[str, Any]:
@@ -40,13 +49,15 @@ def _run_built_command(
     command: list[str] | list[list[str]] | str,
     params: dict[str, Any],
     *,
+    base_dir: str | Path | None = None,
     allow_shell: bool = False,
+    cwd_keys: tuple[str, ...] = ("cwd", "workdir", "work_dir", "working_dir"),
 ) -> base.ActionResult:
     """统一执行命令并注入动作参数中的敏感值用于结果脱敏。"""
 
     return base.run_command(
         command,
-        cwd=params.get("cwd") or params.get("workdir"),
+        cwd=base.resolve_process_cwd(params, base_dir=base_dir, cwd_keys=cwd_keys),
         env=params.get("env"),
         secret_values=base.collect_secret_values(params),
         timeout_seconds=float(params.get("timeout_seconds", 300)),
@@ -54,28 +65,59 @@ def _run_built_command(
     )
 
 
-def _source_git_pull(step: dict[str, Any], _payload: dict[str, Any]) -> base.ActionResult:
+def _source_git_pull(
+    step: dict[str, Any],
+    _payload: dict[str, Any],
+    base_dir: str | Path | None,
+) -> base.ActionResult:
     params = _params(step)
     if isinstance(params.get("credential"), str):
         message = "Unresolved credential id for source.git_pull; CLI must send a credential dict."
         return base.ActionResult(rendered_command="", exit_code=1, stderr_tail=message, error=message)
-    return _run_built_command(build_git_pull_command(params), params)
+    command_params = dict(params)
+    if "work_dir" in command_params and "directory" not in command_params and "checkout_dir" not in command_params:
+        command_params["directory"] = command_params["work_dir"]
+    process_cwd = base.resolve_process_cwd(
+        command_params,
+        base_dir=base_dir,
+        cwd_keys=("cwd", "workdir", "working_dir"),
+    )
+    if process_cwd is not None:
+        command_params["cwd"] = process_cwd
+    return _run_built_command(
+        build_git_pull_command(command_params),
+        command_params,
+        base_dir=base_dir,
+        cwd_keys=("cwd", "workdir", "working_dir"),
+    )
 
 
-def _build_maven(step: dict[str, Any], _payload: dict[str, Any]) -> base.ActionResult:
+def _build_maven(
+    step: dict[str, Any],
+    _payload: dict[str, Any],
+    base_dir: str | Path | None,
+) -> base.ActionResult:
     params = _params(step)
-    return _run_built_command(build_maven_command(params), params)
+    return _run_built_command(build_maven_command(params), params, base_dir=base_dir)
 
 
-def _shell_action(step: dict[str, Any], _payload: dict[str, Any]) -> base.ActionResult:
+def _shell_action(
+    step: dict[str, Any],
+    _payload: dict[str, Any],
+    base_dir: str | Path | None,
+) -> base.ActionResult:
     params = _params(step)
     command = params.get("command") or step.get("command")
     if not isinstance(command, (str, list)):
         return base.ActionResult(rendered_command="", exit_code=1, stderr_tail="Missing shell command.")
-    return _run_built_command(command, params, allow_shell=True)
+    return _run_built_command(command, params, base_dir=base_dir, allow_shell=True)
 
 
-def _target_shell(step: dict[str, Any], payload: dict[str, Any]) -> base.ActionResult:
+def _target_shell(
+    step: dict[str, Any],
+    payload: dict[str, Any],
+    base_dir: str | Path | None,
+) -> base.ActionResult:
     """执行目标脚本或 inline 命令；script 模式使用 argv，inline 字符串保留 shell 能力。"""
 
     params = _params(step)
@@ -83,28 +125,44 @@ def _target_shell(step: dict[str, Any], payload: dict[str, Any]) -> base.ActionR
         command = build_target_shell_command(params, payload)
     except ValueError as exc:
         return base.ActionResult(rendered_command="", exit_code=1, stderr_tail=str(exc), error=str(exc))
-    return _run_built_command(command, params, allow_shell=isinstance(command, str))
+    return _run_built_command(command, params, base_dir=base_dir, allow_shell=isinstance(command, str))
 
 
-def _image_build(step: dict[str, Any], _payload: dict[str, Any]) -> base.ActionResult:
+def _image_build(
+    step: dict[str, Any],
+    _payload: dict[str, Any],
+    base_dir: str | Path | None,
+) -> base.ActionResult:
     params = _params(step)
-    result = _run_built_command(build_image_command(params), params)
+    result = _run_built_command(build_image_command(params), params, base_dir=base_dir)
     if result.exit_code == 0:
         result.image_tag = f"{params['image']}:{params.get('tag', 'latest')}"
     return result
 
 
-def _image_push(step: dict[str, Any], _payload: dict[str, Any]) -> base.ActionResult:
+def _image_push(
+    step: dict[str, Any],
+    _payload: dict[str, Any],
+    base_dir: str | Path | None,
+) -> base.ActionResult:
     params = _params(step)
-    return _run_built_command(build_push_command(params), params)
+    return _run_built_command(build_push_command(params), params, base_dir=base_dir)
 
 
-def _deploy_compose(step: dict[str, Any], _payload: dict[str, Any]) -> base.ActionResult:
+def _deploy_compose(
+    step: dict[str, Any],
+    _payload: dict[str, Any],
+    base_dir: str | Path | None,
+) -> base.ActionResult:
     params = _params(step)
-    return _run_built_command(build_compose_command(params), params)
+    return _run_built_command(build_compose_command(params), params, base_dir=base_dir)
 
 
-def _deploy_healthcheck(step: dict[str, Any], _payload: dict[str, Any]) -> base.ActionResult:
+def _deploy_healthcheck(
+    step: dict[str, Any],
+    _payload: dict[str, Any],
+    _base_dir: str | Path | None,
+) -> base.ActionResult:
     """执行 HTTP 健康检查；失败时以非零退出码进入流水线短路。"""
 
     params = _params(step)

{sci_agent-0.2.0 → sci_agent-0.3.0}/src/simple_ci/actions/base.py

@@ -6,6 +6,7 @@ import re
 import subprocess
 import time
 from dataclasses import dataclass
+from pathlib import Path
 from typing import Any
 from urllib.parse import quote, urlsplit, urlunsplit
 
@@ -145,6 +146,29 @@ def run_command(
     )
 
 
+def resolve_process_cwd(
+    params: dict[str, Any],
+    *,
+    base_dir: str | Path | None = None,
+    cwd_keys: tuple[str, ...] = ("cwd", "workdir", "work_dir", "working_dir"),
+) -> str | None:
+    """解析动作进程 cwd；未显式配置时默认使用服务端 base_dir。"""
+
+    configured_cwd = next(
+        (params[key] for key in cwd_keys if params.get(key) not in (None, "")),
+        None,
+    )
+    if configured_cwd is None:
+        return str(Path(base_dir).resolve()) if base_dir is not None else None
+
+    cwd_path = Path(str(configured_cwd))
+    if cwd_path.is_absolute():
+        return str(cwd_path.resolve())
+    if base_dir is not None:
+        return str((Path(base_dir) / cwd_path).resolve())
+    return str(cwd_path)
+
+
 def _normalize_commands(command: list[str] | list[list[str]] | str) -> list[list[str] | str]:
     """把单命令或多命令统一为顺序执行列表。"""
 

{sci_agent-0.2.0 → sci_agent-0.3.0}/src/simple_ci/cli/client.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
+import json
 import time
+from pathlib import Path
 from typing import Any
 
 import httpx
@@ -50,6 +52,50 @@ class SimpleCiClient:
 
         return self._request_json("GET", f"/api/v1/runs/{run_id}/logs")
 
+    def list_tools(self) -> dict[str, Any]:
+        """查询服务端已安装工具列表。"""
+
+        return self._request_json("GET", "/api/v1/tools")
+
+    def get_tool(self, tool_id: str) -> dict[str, Any]:
+        """查询指定 tool_id 的工具详情。"""
+
+        return self._request_json("GET", f"/api/v1/tools/{tool_id}")
+
+    def remove_tool(self, tool_id: str, purge_package: bool = False) -> dict[str, Any]:
+        """删除指定工具；默认保留原始归档包。"""
+
+        return self._request_json(
+            "DELETE",
+            f"/api/v1/tools/{tool_id}",
+            params={"purge_package": str(purge_package).lower()},
+        )
+
+    def upload_tool(
+        self,
+        tool_id: str,
+        archive_path: str | Path,
+        strip_root: bool,
+        bins: dict[str, Any],
+        force: bool = False,
+    ) -> dict[str, Any]:
+        """以 multipart 方式上传工具归档包并安装。"""
+
+        archive = Path(archive_path)
+        data = {
+            "tool_id": tool_id,
+            "strip_root": str(strip_root).lower(),
+            "bins": json.dumps(bins, ensure_ascii=False),
+            "force": str(force).lower(),
+        }
+        with archive.open("rb") as archive_file:
+            return self._request_json(
+                "POST",
+                "/api/v1/tools/upload",
+                data=data,
+                files={"archive": (archive.name, archive_file, "application/octet-stream")},
+            )
+
     def run_and_poll(
         self,
         payload: dict[str, Any],

{sci_agent-0.2.0 → sci_agent-0.3.0}/src/simple_ci/cli/config.py

@@ -17,7 +17,7 @@ import yaml
 from dotenv import dotenv_values
 
 from simple_ci.errors import ConfigError
-from simple_ci.models import Credential, Pipeline, Project, ProjectSource, Step, Target, TargetServer
+from simple_ci.models import Credential, Pipeline, Project, ProjectSource, Step, Target, TargetServer, TargetTool
 
 
 @dataclass
@@ -109,10 +109,31 @@ def _load_targets(targets_dir: Path, env: Mapping[str, str]) -> dict[str, Target
             vars=_optional_mapping(data, "vars", f"target {target_id}"),
             description=_optional_str(data, "description"),
             policy=_optional_mapping(data, "policy", f"target {target_id}"),
+            tools=_load_target_tools(data, f"target {target_id}"),
         )
     return targets
 
 
+def _load_target_tools(data: Mapping[str, Any], context: str) -> dict[str, TargetTool]:
+    raw_tools = data.get("tools", {})
+    if not isinstance(raw_tools, dict):
+        raise ConfigError(f"{context} field tools must be a table")
+
+    tools: dict[str, TargetTool] = {}
+    for tool_id, raw_tool in raw_tools.items():
+        section = _require_mapping(raw_tool, f"{context}.tools.{tool_id}")
+        archive = _require_str(section, "archive", f"{context}.tools.{tool_id}")
+        strip_root = bool(section.get("strip_root", True))
+        bins = _optional_mapping(section, "bins", f"{context}.tools.{tool_id}")
+        tools[tool_id] = TargetTool(
+            id=tool_id,
+            archive=archive,
+            strip_root=strip_root,
+            bins={str(key): str(value) for key, value in bins.items()},
+        )
+    return tools
+
+
 def _build_target_server(target_id: str, server: Mapping[str, Any], env: Mapping[str, str]) -> TargetServer:
     normalized_id = _normalize_env_id(target_id)
     url_env = _optional_str(server, "url_env") or f"SERVER_{normalized_id}_URL"