From f7fadfa2b561a44fa2c4dc041ab07ccde0d8e6ef Mon Sep 17 00:00:00 2001 From: root Date: Thu, 22 Oct 2026 09:46:23 +0000 Subject: [PATCH 1/4] feat: harden app update automation Add fast network probing with remote egress fallback, auto port selection for app deploys, DB lifecycle checks, richer app-info facts, and explicit no-credential metadata. Update skills and docs for appstore sync and fewer repeated repository reads. --- AGENTS.md | 5 +- apps/drupal/.env | 2 +- apps/drupal/CHANGELOG.md | 5 + apps/drupal/README.md | 3 + apps/drupal/variables.json | 12 + cli/libs/app.py | 78 ++++++ cli/libs/app_deploy.py | 237 ++++++++++++++++-- cli/libs/app_tests.py | 11 +- cli/libs/http.py | 134 ++++++++++ cli/libs/main.py | 8 +- cli/libs/remote.py | 12 +- cli/libs/sources.py | 55 ++-- cli/libs/validate.py | 107 ++++++++ cli/libs/versioning.py | 57 ++++- cli/tests/test_app.py | 46 ++++ cli/tests/test_app_deploy.py | 46 ++++ cli/tests/test_app_tests.py | 13 +- cli/tests/test_consistency.py | 14 ++ cli/tests/test_http.py | 56 +++++ cli/tests/test_readme.py | 22 ++ cli/tests/test_validate.py | 51 ++++ cli/tests/test_versioning.py | 24 ++ docs/ai-sdlc/03-update-pipeline.md | 11 +- docs/appstore-release-spec.md | 1 + docs/runbook.md | 2 +- docs/upstream-spec.md | 1 + metadata/templates/new-app/.env.tmpl | 6 +- .../templates/new-app/docker-compose.yml.tmpl | 4 +- metadata/templates/readme.jinja2 | 3 + metadata/variables.schema.json | 8 + skills/app-update/SKILL.md | 13 +- skills/app-update/checklist.md | 2 + skills/batch-app-update/report-template.md | 8 + skills/deploy-validation/SKILL.md | 11 +- skills/deploy-validation/checklist.md | 1 + skills/new-app/SKILL.md | 8 +- skills/new-app/checklist.md | 2 + skills/update-assessment/SKILL.md | 21 +- 38 files changed, 1007 insertions(+), 93 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 8f93bfd69..fb2668fe6 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -22,12 +22,15 @@ Read in this order: ## Core Rules - Treat each `apps/` directory as one deployable unit. +- Start app work with `libs app-info --app --json`. It returns version, database lifecycle, ports, images, credentials, and tests in one call; open app files only for details it does not cover. - Keep changes minimal and app-local unless the task is explicitly cross-cutting. - Prefer official images or trusted upstream images. - If `docker-compose.yml` references `./src/...`, the file must exist. - Follow env conventions. The canonical `W9_*` reference is `docs/w9-env-spec.md` (semantics + decision rules); use `metadata/templates/new-app/.env.tmpl` for layout. Read both before editing `.env` or `docker-compose.yml`. - Runtime/scaffold apps follow `docs/runtime-app-spec.md` (entrypoint hooks + optional `DATABASE_URL`). -- Validate by deployment when the task changes runnable behavior. +- Validate by deployment when the task changes runnable behavior. `libs app-deploy` auto-selects a free 9000-9999 host port on conflict and returns `base_url`; pass that URL to `libs app-tests --base-url`. +- Quick network checks use a 2s per-attempt budget with at most 2 retries. If a target URL is unreachable locally, switch to the remote host's egress instead of extending local timeouts. +- After a successful app update or new app with substantive changes, run `libs appstore-sync --app ` to push it to the test server's websoft9 store. Preflight the `websoft9` container with a <= 10s check and skip the sync when it is absent. - When `.secrets/remote.env` exists, prefer remote-first for all runtime, deployment, debugging, and validation work; do not default to local container execution unless the user explicitly asks for local reproduction. ## i18n diff --git a/apps/drupal/.env b/apps/drupal/.env index 6dc32934e..2c27b67e4 100644 --- a/apps/drupal/.env +++ b/apps/drupal/.env @@ -14,7 +14,7 @@ W9_HTTP_PORT_SET=9001 # Container name's suffix must use one of the value W9_DB_EXPOSE=mysql -W9_DB_VERSION=8.0 +W9_DB_VERSION=8.4 W9_URL=example.youdomain.com W9_NETWORK=websoft9 diff --git a/apps/drupal/CHANGELOG.md b/apps/drupal/CHANGELOG.md index a6909ef58..cd5569c35 100644 --- a/apps/drupal/CHANGELOG.md +++ b/apps/drupal/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## 2026-10-22 + +- Confirmed the Drupal package stays on the stable `11.4-apache` line, which resolves to upstream `11.4.11`. +- Updated the bundled database from MySQL `8.0` (EOL 2026-04-30) to the supported MySQL `8.4` LTS line. + ## 2026-10-13 - Confirmed the Drupal package stays on the stable `11.4-apache` image line while upstream Drupal 11 latest stable is `11.4.9`. diff --git a/apps/drupal/README.md b/apps/drupal/README.md index 37e3f4956..704953569 100644 --- a/apps/drupal/README.md +++ b/apps/drupal/README.md @@ -6,6 +6,9 @@ 1. In the [Websoft9](https://www.websoft9.com) console, open **My Apps** and select **Drupal**. 2. In the **Access** tab, get the login URL and credentials. + + No preset administrator credentials are shipped; create the admin account in the setup wizard. + 3. Open the login URL in a browser and sign in to confirm the app works. diff --git a/apps/drupal/variables.json b/apps/drupal/variables.json index 8deabab45..9d5af9cdd 100644 --- a/apps/drupal/variables.json +++ b/apps/drupal/variables.json @@ -30,5 +30,17 @@ "https://www.drupal.org/project/drupal/releases", "https://github.com/docker-library/docs/blob/master/drupal/README.md" ] + }, + "credentials": { + "none": true + }, + "externalDB": { + "11.4": { + "mysql": { + "min": "8.0", + "recommended": "8.4", + "reason": "Drupal 11 supports MySQL 8.0+; MySQL 8.4 is the current supported LTS track." + } + } } } diff --git a/cli/libs/app.py b/cli/libs/app.py index 7b0a8a7eb..1f56fd320 100644 --- a/cli/libs/app.py +++ b/cli/libs/app.py @@ -80,6 +80,60 @@ def _app_scope(app_name: str) -> str: return variables.get("scope", "public") +def _env_values(path: Path) -> dict[str, str]: + values: dict[str, str] = {} + if not path.exists(): + return values + for raw_line in path.read_text(encoding="utf-8").splitlines(): + line = raw_line.strip() + if not line or line.startswith("#") or "=" not in line: + continue + key, value = line.split("=", 1) + values[key.strip()] = value.strip().strip("'").strip('"') + return values + + +def _compose_summary(path: Path) -> dict: + if not path.exists(): + return {"services": [], "images": [], "ports": []} + compose = yaml.safe_load(path.read_text(encoding="utf-8")) or {} + services = compose.get("services") or {} + images = [] + ports = [] + for service_name, service in services.items(): + if not isinstance(service, dict): + continue + image = service.get("image") + if isinstance(image, str): + images.append({"service": str(service_name), "image": image}) + for entry in service.get("ports", []) or []: + if isinstance(entry, dict): + ports.append({ + "service": str(service_name), + "published": entry.get("published"), + "target": entry.get("target"), + }) + elif isinstance(entry, str): + ports.append({"service": str(service_name), "published": entry, "target": None}) + return {"services": sorted(str(name) for name in services), "images": images, "ports": ports} + + +def _test_summary(path: Path) -> dict: + if not path.exists(): + return {"declared": False, "cases": []} + payload = yaml.safe_load(path.read_text(encoding="utf-8")) or {} + cases = [] + for group in ("skip", "optional", "custom"): + for case in payload.get(group) or []: + if isinstance(case, dict): + cases.append({ + "group": group, + "id": case.get("id"), + "type": case.get("type"), + }) + return {"declared": True, "cases": cases} + + def collect_app_info(app_name: str) -> dict: target = app_dir(app_name) if not target: @@ -88,6 +142,12 @@ def collect_app_info(app_name: str) -> dict: variables_path = target / "variables.json" variables = json.loads(variables_path.read_text(encoding="utf-8")) if variables_path.exists() else {} metadata = resolve_app_metadata(app_name) + env_values = _env_values(target / ".env") + compose_summary = _compose_summary(target / "docker-compose.yml") + + from libs.app_deploy import _compose_published_ports + from libs.validate import _database_result + return { "name": app_name, "path": relative_repo_path(target), @@ -98,8 +158,26 @@ def collect_app_info(app_name: str) -> dict: "trademark": variables.get("trademark"), "release": variables.get("release"), "upstream_image": (variables.get("upstream") or {}).get("image"), + "upstream": variables.get("upstream"), "requirements": variables.get("requirements"), "external_db": variables.get("externalDB"), + "version": { + "w9_version": env_values.get("W9_VERSION"), + "declared": [ + str(value) + for edition in variables.get("edition", []) + if edition.get("dist") == "community" + for value in edition.get("version", []) + ], + }, + "ports": compose_summary["ports"], + "published_ports": _compose_published_ports(target, env_values), + "services": compose_summary["services"], + "images": compose_summary["images"], + "credentials": variables.get("credentials"), + "database": _database_result(target), + "tests": _test_summary(target / "tests" / "cases.yml"), + "env_keys": sorted(env_values), } diff --git a/cli/libs/app_deploy.py b/cli/libs/app_deploy.py index 81f7595d2..57036bb79 100644 --- a/cli/libs/app_deploy.py +++ b/cli/libs/app_deploy.py @@ -20,6 +20,11 @@ W9_VERSION_RE = re.compile(r"^W9_VERSION=.*$", re.MULTILINE) IMAGE_TAG_RE = re.compile(r"[A-Za-z0-9][A-Za-z0-9._-]*") +PORT_REF_RE = re.compile(r"^\$\{?([A-Z0-9_]+)\}?$") +DOCKER_PORT_RE = re.compile(r"(?:0\.0\.0\.0|127\.0\.0\.1|\[::\]|::):(\d+)->") +SS_PORT_RE = re.compile(r":(\d+)\s+\S+\s*$") +FREE_PORT_LOW = 9000 +FREE_PORT_HIGH = 9999 def _run(command: list[str], *, progress: ProgressWriter | None = None, verbose: bool = False) -> subprocess.CompletedProcess: @@ -120,18 +125,198 @@ def _validate_tag(version: str) -> str: return version -def _patched_env_file(app_name: str, version: str) -> Path: - _validate_tag(version) +def _env_map(env_path: Path) -> dict[str, str]: + values: dict[str, str] = {} + if not env_path.exists(): + return values + for raw_line in env_path.read_text(encoding="utf-8").splitlines(): + line = raw_line.strip() + if not line or line.startswith("#") or "=" not in line: + continue + key, value = line.split("=", 1) + values[key.strip()] = value.strip().strip("'").strip('"') + return values + + +def _compose_published_ports(target: Path, env_map: dict[str, str]) -> list[dict]: + """Return published host ports declared by the app's compose file.""" + compose_path = target / "docker-compose.yml" + if not compose_path.exists(): + return [] + compose = yaml.safe_load(compose_path.read_text(encoding="utf-8")) or {} + rows: list[dict] = [] + for service_name, service in (compose.get("services") or {}).items(): + if not isinstance(service, dict): + continue + for entry in service.get("ports", []) or []: + service_name_value = str(service_name) + if isinstance(entry, dict): + published = entry.get("published") + target_port = entry.get("target") + if published is None or target_port is None: + continue + raw = str(published) + env_name = _port_env_name(raw) + value = _resolve_env_value(raw, env_map) + if value is None: + continue + rows.append({ + "service": service_name_value, + "env": env_name, + "published": int(value), + "target": target_port, + }) + continue + if not isinstance(entry, str): + continue + text = entry.strip().strip("'\"") + parts = text.split(":") + if len(parts) < 2: + continue + host_part = parts[-2] + target_part = parts[-1].split("/", 1)[0] + env_name = _port_env_name(host_part) + value = _resolve_env_value(host_part, env_map) + if value is None: + continue + try: + rows.append({ + "service": service_name_value, + "env": env_name, + "published": int(value), + "target": int(target_part), + }) + except ValueError: + continue + return rows + + +def _port_env_name(value: str) -> str | None: + match = PORT_REF_RE.match(value.strip()) + return match.group(1) if match else None + + +def _resolve_env_value(value: str, env_map: dict[str, str]) -> str | None: + value = value.strip() + match = PORT_REF_RE.match(value) + if match: + resolved = env_map.get(match.group(1)) + return resolved if resolved and resolved.isdigit() else None + return value if value.isdigit() else None + + +def _name_is_own(name: str, prefixes: list[str]) -> bool: + return any(name == prefix or name.startswith(f"{prefix}-") for prefix in prefixes) + + +def _parse_occupied_ports(text: str, exclude_prefixes: list[str] | None = None) -> set[int]: + prefixes = exclude_prefixes or [] + ports: set[int] = set() + excluded: set[int] = set() + for line in text.splitlines(): + if "|" in line: + name, raw_ports = line.split("|", 1) + found = {int(match.group(1)) for match in DOCKER_PORT_RE.finditer(raw_ports)} + if _name_is_own(name.strip(), prefixes): + excluded |= found + else: + ports |= found + continue + match = SS_PORT_RE.search(line) + if match: + ports.add(int(match.group(1))) + return ports - excluded + + +def _occupied_ports_local(exclude_prefixes: list[str] | None = None) -> set[int]: + text = "" + docker_ps = _run(["docker", "ps", "--format", "{{.Names}}|{{.Ports}}"]) + if docker_ps.returncode == 0: + text += docker_ps.stdout + ss = _run(["ss", "-ltnH"]) + if ss.returncode == 0: + text += "\n" + ss.stdout + return _parse_occupied_ports(text, exclude_prefixes) + + +def _occupied_ports_remote(host: str, user: str, secret_path: Path, exclude_prefixes: list[str] | None = None) -> set[int]: + result = _run_remote(host, user, secret_path, "docker ps --format '{{.Names}}|{{.Ports}}'; ss -ltnH 2>/dev/null || true") + if result.returncode != 0: + return set() + return _parse_occupied_ports(result.stdout, exclude_prefixes) + + +def _pick_free_port(occupied: set[int], preferred: int | None = None) -> int: + start = preferred if preferred and FREE_PORT_LOW <= preferred <= FREE_PORT_HIGH else FREE_PORT_LOW + for port in range(start, FREE_PORT_HIGH + 1): + if port not in occupied: + return port + for port in range(FREE_PORT_LOW, start): + if port not in occupied: + return port + raise RuntimeError(f"no free port in {FREE_PORT_LOW}-{FREE_PORT_HIGH}") + + +def _port_overrides(target: Path, env_map: dict[str, str], occupied: set[int]) -> dict[str, int]: + overrides: dict[str, int] = {} + for row in _compose_published_ports(target, env_map): + env_name = row.get("env") + published = row["published"] + if not env_name or env_name in overrides: + continue + if published in occupied: + selected = _pick_free_port(occupied | set(overrides.values()), published) + overrides[env_name] = selected + return overrides + + +def _effective_env_map(env_map: dict[str, str], overrides: dict[str, int]) -> dict[str, str]: + effective = dict(env_map) + for key, value in overrides.items(): + effective[key] = str(value) + return effective + + +def _base_url(target: Path, env_map: dict[str, str], overrides: dict[str, int], host: str | None) -> str | None: + effective = _effective_env_map(env_map, overrides) + ports = _compose_published_ports(target, effective) + if not ports: + return None + for row in ports: + if row.get("env") == "W9_HTTP_PORT_SET" or row.get("target") == 80: + scheme = "https" if row.get("env") == "W9_HTTPS_PORT_SET" else "http" + address = host or "localhost" + return f"{scheme}://{address}:{row['published']}" + first = ports[0] + scheme = "https" if first.get("env") == "W9_HTTPS_PORT_SET" else "http" + address = host or "localhost" + return f"{scheme}://{address}:{first['published']}" + + +def _patched_env_text(text: str, version: str | None, overrides: dict[str, int]) -> str: + if version: + _validate_tag(version) + text = W9_VERSION_RE.sub(f"W9_VERSION='{version}'", text) + for key, value in overrides.items(): + pattern = re.compile(rf"^{re.escape(key)}=.*$", re.MULTILINE) + if pattern.search(text): + text = pattern.sub(f"{key}={value}", text) + else: + text = text.rstrip("\n") + f"\n{key}={value}\n" + return text + + +def _patched_env_file(app_name: str, version: str | None, overrides: dict[str, int] | None = None) -> Path | None: + overrides = overrides or {} + if not version and not overrides: + return None source = app_dir(app_name) if not source: raise FileNotFoundError(app_name) env_path = source / ".env" if not env_path.exists(): raise FileNotFoundError(env_path) - text = env_path.read_text(encoding="utf-8") - if not W9_VERSION_RE.search(text): - raise ValueError(f".env has no W9_VERSION to override: {env_path}") - text = W9_VERSION_RE.sub(f"W9_VERSION='{version}'", text) + text = _patched_env_text(env_path.read_text(encoding="utf-8"), version, overrides) fd, name = tempfile.mkstemp(prefix=f"libs-deploy-{app_name}-", suffix=".env") with os.fdopen(fd, "w", encoding="utf-8") as handle: handle.write(text) @@ -143,16 +328,23 @@ def _patch_remote_env( user: str, secret_path: Path, app_target: str, - version: str, + version: str | None, + overrides: dict[str, int] | None = None, *, progress: ProgressWriter | None = None, verbose: bool = False, ) -> None: - _validate_tag(version) - script = f"sed -i \"s/^W9_VERSION=.*/W9_VERSION='{version}'/\" {app_target}/.env" - result = _run_remote(host, user, secret_path, script, progress=progress, verbose=verbose) + commands: list[str] = [] + if version: + _validate_tag(version) + commands.append(f"sed -i \"s/^W9_VERSION=.*/W9_VERSION='{version}'/\" {app_target}/.env") + for key, value in (overrides or {}).items(): + commands.append(f"sed -i \"s/^{re.escape(key)}=.*/{key}={value}/\" {app_target}/.env") + if not commands: + return + result = _run_remote(host, user, secret_path, " && ".join(commands), progress=progress, verbose=verbose) if result.returncode != 0: - raise RuntimeError(result.stderr.strip() or result.stdout.strip() or "remote version patch failed") + raise RuntimeError(result.stderr.strip() or result.stdout.strip() or "remote env patch failed") def _announce(progress: ProgressWriter | None, index: int, total: int, message: str) -> None: @@ -195,6 +387,7 @@ def deploy( deploy_root: str | None = None, version: str | None = None, down: bool = False, + auto_port: bool = True, progress: ProgressWriter | None = None, verbose: bool = False, ) -> dict: @@ -206,10 +399,17 @@ def deploy( action = "down -v" if down else "up -d" needs_build = app_build.can_build(app_name) pull_services = _pull_services(app_name, source) + env_map = _env_map(source / ".env") + published_ports = _compose_published_ports(source, env_map) + own_prefixes = [env_map.get("W9_ID", app_name)] if mode == "local": target_path = repo_path("apps", app_name) - env_file = _patched_env_file(app_name, version) if version else None + overrides: dict[str, int] = {} + if auto_port and not down and published_ports: + overrides = _port_overrides(target_path, env_map, _occupied_ports_local(own_prefixes)) + env_file = _patched_env_file(app_name, version, overrides) + base_url = _base_url(target_path, env_map, overrides, None) try: step = 1 total = 3 if down else (6 if needs_build else 5) @@ -261,6 +461,8 @@ def deploy( "deploy_root": str(repo_path("apps")), "app_target": str(target_path), "action": action, + "port_overrides": {key: str(value) for key, value in overrides.items()}, + "base_url": base_url, "ps": ps.stdout.strip(), } finally: @@ -277,6 +479,11 @@ def deploy( deploy_root_value = remote.deploy_root(deploy_root) app_target = f"{deploy_root_value}/{app_name}" + overrides: dict[str, int] = {} + if auto_port and not down and published_ports: + overrides = _port_overrides(source, env_map, _occupied_ports_remote(host, user, secret_path, own_prefixes)) + base_url = _base_url(source, env_map, overrides, host) + step = 1 total = 4 if down else (7 if needs_build else 6) @@ -284,8 +491,8 @@ def deploy( _sync_app_dir(app_name, host, user, secret_path, deploy_root_value, progress=progress, verbose=verbose) step += 1 - if version: - _patch_remote_env(host, user, secret_path, app_target, version, progress=progress, verbose=verbose) + if version or overrides: + _patch_remote_env(host, user, secret_path, app_target, version, overrides, progress=progress, verbose=verbose) if not down: _announce(progress, step, total, "ensuring shared network") @@ -340,5 +547,7 @@ def deploy( "app_target": app_target, "version": version, "action": action, + "port_overrides": {key: str(value) for key, value in overrides.items()}, + "base_url": base_url, "ps": ps.stdout.strip(), } diff --git a/cli/libs/app_tests.py b/cli/libs/app_tests.py index 022f3b851..7e707d633 100644 --- a/cli/libs/app_tests.py +++ b/cli/libs/app_tests.py @@ -7,6 +7,7 @@ import time from collections.abc import Callable from pathlib import Path +from urllib.parse import urlsplit import requests import yaml @@ -234,9 +235,15 @@ def _remote_script_command(remote_ctx: dict, app_name: str, script_name: str, en """ app_target = remote_ctx["app_target"] remote_base_url = base_url or "" - port = env.get("W9_HTTP_PORT_SET") - if port: + env_port = env.get("W9_HTTP_PORT_SET") + if base_url and env_port: + try: + port = urlsplit(base_url).port or env_port + except ValueError: + port = env_port remote_base_url = f"http://localhost:{port}" + elif not base_url and env_port: + remote_base_url = f"http://localhost:{env_port}" script_rel = f"tests/{script_name}" return ( f"cd {shlex.quote(app_target)} && " diff --git a/cli/libs/http.py b/cli/libs/http.py index 5746fd8fc..7c6765034 100644 --- a/cli/libs/http.py +++ b/cli/libs/http.py @@ -1,13 +1,19 @@ from __future__ import annotations +import json import os +import shlex +import time +from dataclasses import dataclass from pathlib import Path +from urllib.parse import urlencode import requests PROXY_KEYS = ("https_proxy", "HTTPS_PROXY", "http_proxy", "HTTP_PROXY", "all_proxy", "ALL_PROXY") REPO_CONFIG_PATH = Path(__file__).resolve().parent.parent / "proxy.conf" +_REMOTE_ONLY = False def default_timeout() -> tuple[float, float]: @@ -65,3 +71,131 @@ def get(url: str, params: dict | None = None, timeout: tuple[float, float] | Non if timeout is None: timeout = default_timeout() return requests.get(url, params=params, timeout=timeout, headers=headers) + + +@dataclass(frozen=True) +class Reachability: + """Result of a fast reachability probe. + + Any HTTP response (including 4xx/5xx) counts as reachable: it proves the + host is routable and an HTTP server answered. Timeouts and connection + errors count as unreachable. + """ + + ok: bool + url: str + attempts: int + elapsed_ms: int + status: int | None = None + error: str | None = None + + +def probe_url( + url: str, + *, + timeout: float = 2.0, + retries: int = 2, +) -> Reachability: + """Probe a URL with a hard 2s per-attempt budget and at most 2 retries. + + The default worst case is 3 attempts x 2s. Do not raise this default in + automation: if the local path is blocked, callers should switch to the + remote-egress fallback instead of waiting for a long HTTP timeout. + """ + attempts_allowed = max(1, retries + 1) + started = time.monotonic() + last_error = None + status = None + for attempt in range(1, attempts_allowed + 1): + try: + response = requests.get( + url, + timeout=(timeout, timeout), + stream=True, + allow_redirects=True, + ) + status = response.status_code + response.close() + return Reachability( + ok=True, + url=url, + attempts=attempt, + elapsed_ms=int((time.monotonic() - started) * 1000), + status=status, + ) + except Exception as error: # requests wraps DNS/proxy/TLS/timeout errors + last_error = str(error) + if attempt < attempts_allowed: + time.sleep(0.05) + return Reachability( + ok=False, + url=url, + attempts=attempts_allowed, + elapsed_ms=int((time.monotonic() - started) * 1000), + status=status, + error=last_error, + ) + + +def remote_get_json(url: str, params: dict | None, headers: dict | None) -> tuple[object | None, dict | None, str | None]: + # Import lazily so http.py stays usable without a remote profile. + from libs import remote + + host = remote.ssh_host() + if not host: + return None, None, "local network unreachable and no remote SSH host configured" + secret_path = remote.resolve_secret_path() + if not secret_path.exists(): + return None, None, f"local network unreachable and SSH secret not found: {secret_path}" + + target = url + if params: + target = f"{target}{'&' if '?' in target else '?'}{urlencode(params)}" + parts = ["curl", "-fsSL", "--connect-timeout", "5", "--max-time", "20"] + for key, value in (headers or {}).items(): + parts.extend(["-H", f"{key}: {value}"]) + parts.append(target) + script = " ".join(shlex.quote(part) for part in parts) + result = remote.run_ssh(host, remote.ssh_user(), secret_path, script, connect_timeout=5) + if result.returncode != 0: + return None, None, (result.stderr or result.stdout or "remote fetch failed").strip() + try: + return json.loads(result.stdout), {}, None + except json.JSONDecodeError as error: + return None, None, f"remote response was not JSON: {error}" + + +def get_json_with_fallback( + url: str, + params: dict | None = None, + headers: dict | None = None, + *, + timeout: tuple[float, float] | None = None, +) -> tuple[object | None, dict | None, str | None]: + """Fetch JSON locally, falling back to the configured remote host's egress. + + The local path gets one fast probe (2s x at most 3 attempts). Only network + failures trigger the remote fallback; HTTP 4xx/5xx responses are returned to + the caller as normal responses so it can apply endpoint-specific handling. + After one successful remote fallback, later calls in the same process skip + the local probe and go straight to the remote path. + """ + global _REMOTE_ONLY + + if not _REMOTE_ONLY: + probe = probe_url(url) + if probe.ok: + try: + response = get(url, params, timeout=timeout, headers=headers) + if response.status_code == 429: + time.sleep(1) + response = get(url, params, timeout=timeout, headers=headers) + response.raise_for_status() + return response.json(), dict(response.headers), None + except Exception as error: + return None, None, str(error) + + data, response_headers, error = remote_get_json(url, params, headers) + if not error: + _REMOTE_ONLY = True + return data, response_headers, error diff --git a/cli/libs/main.py b/cli/libs/main.py index 2871c999e..42792f01a 100644 --- a/cli/libs/main.py +++ b/cli/libs/main.py @@ -185,7 +185,7 @@ def scan_command( @app.command("app-check") def check_command( app_name: str = typer.Option(..., "--app", help="App name"), - gate: str = typer.Option("all", "--gate", help="all | structure | policy | version"), + gate: str = typer.Option("all", "--gate", help="all | structure | policy | version | database"), as_json: bool = typer.Option(False, "--json", help="Machine-readable output"), ) -> None: """Run quality gate checks for one app.""" @@ -209,7 +209,11 @@ def report_command( "structure": check["structure"], "policy": check["policy"], "version": check["version"], + "database": check["database"], }, + "advisories": [ + item for item in check["database"].get("databases", []) if item.get("status") == "eol" + ], "owner_e2e_focus": [], } print_output(payload, as_json) @@ -594,6 +598,7 @@ def app_deploy_command( deploy_root: str | None = typer.Option(None, "--deploy-root", help="Remote deploy root"), version: str | None = typer.Option(None, "--version", help="Deploy a specific image tag by overriding W9_VERSION; repo .env is not modified"), down: bool = typer.Option(False, "--down", help="Tear the app down with docker compose down -v instead of up -d"), + auto_port: bool = typer.Option(True, "--auto-port/--no-auto-port", help="Automatically use a free 9000-9999 host port when a published port is occupied"), progress: bool = typer.Option(False, "--progress", help="Show step progress on stderr"), verbose: bool = typer.Option(False, "--verbose", help="Show step progress and raw subprocess output on stderr"), as_json: bool = typer.Option(False, "--json", help="Machine-readable output"), @@ -610,6 +615,7 @@ def app_deploy_command( deploy_root=deploy_root, version=version, down=down, + auto_port=auto_port, progress=progress_writer, verbose=verbose, ) diff --git a/cli/libs/remote.py b/cli/libs/remote.py index 90ddc0b17..ba60f0381 100644 --- a/cli/libs/remote.py +++ b/cli/libs/remote.py @@ -83,7 +83,7 @@ def secret_mode(secret_path: Path) -> str: return "password" -def ssh_connect_options() -> list[str]: +def ssh_connect_options(connect_timeout: int = 15) -> list[str]: # Dedicated ephemeral test servers: their public IP may be reimaged, so a # stale entry in the global ~/.ssh/known_hosts must never block automation. # Disable host-key checking and use /dev/null so no shared known_hosts is @@ -94,11 +94,11 @@ def ssh_connect_options() -> list[str]: "-o", "UserKnownHostsFile=/dev/null", "-o", - "ConnectTimeout=15", + f"ConnectTimeout={connect_timeout}", ] -def ssh_base(host: str, user: str, secret_path: Path) -> list[str]: +def ssh_base(host: str, user: str, secret_path: Path, connect_timeout: int = 15) -> list[str]: base: list[str] = [] if secret_mode(secret_path) == "key": base.extend(["ssh", "-i", str(secret_path)]) @@ -106,7 +106,7 @@ def ssh_base(host: str, user: str, secret_path: Path) -> list[str]: if not shutil.which("sshpass"): raise FileNotFoundError("sshpass is required for password-based SSH; provide a key file or install sshpass") base.extend(["sshpass", "-f", str(secret_path), "ssh"]) - return base + ssh_connect_options() + [f"{user}@{host}"] + return base + ssh_connect_options(connect_timeout) + [f"{user}@{host}"] def scp_base(host: str, user: str, secret_path: Path) -> list[str]: @@ -143,8 +143,8 @@ def run_command(command: list[str]) -> subprocess.CompletedProcess: return scrub_completed_process(result) -def run_ssh(host: str, user: str, secret_path: Path, script: str) -> subprocess.CompletedProcess: - return run_command(ssh_base(host, user, secret_path) + [script]) +def run_ssh(host: str, user: str, secret_path: Path, script: str, connect_timeout: int = 15) -> subprocess.CompletedProcess: + return run_command(ssh_base(host, user, secret_path, connect_timeout) + [script]) def stream_command(command: list[str], on_line=None) -> subprocess.CompletedProcess: diff --git a/cli/libs/sources.py b/cli/libs/sources.py index 43a5764a9..15b8f91d0 100644 --- a/cli/libs/sources.py +++ b/cli/libs/sources.py @@ -5,7 +5,7 @@ from packaging import version -from libs.http import get +from libs.http import get, get_json_with_fallback, probe_url, remote_get_json from libs.versioning import find_latest_version, normalize_tag @@ -54,16 +54,13 @@ def _major_prefix(version_str: str) -> str | None: return f"{match.group(1)}." -def _get_json(url: str, params: dict | None = None) -> tuple[dict | list | None, str | None]: - try: - response = get(url, params) - if response.status_code == 429: - time.sleep(1) - response = get(url, params) - response.raise_for_status() - return response.json(), None - except Exception as error: - return None, str(error) +def _get_json( + url: str, + params: dict | None = None, + headers: dict | None = None, +) -> tuple[dict | list | None, str | None]: + data, _headers, error = get_json_with_fallback(url, params, headers) + return data, error def _dockerhub_api_url(url: str) -> str | None: @@ -159,24 +156,24 @@ def _ghcr_tags_page(namespace: str, image: str, token: str, page_size: int, last params = {"n": min(page_size, 1000)} if last: params["last"] = last - try: - response = get( - f"https://ghcr.io/v2/{namespace}/{image}/tags/list", - params, - headers={"Authorization": f"Bearer {token}"}, - ) - if response.status_code == 429: - time.sleep(1) - response = get( - f"https://ghcr.io/v2/{namespace}/{image}/tags/list", - params, - headers={"Authorization": f"Bearer {token}"}, - ) - response.raise_for_status() - data = response.json() - return (data or {}).get("tags") or [], response.headers.get("Link"), None - except Exception as error: - return [], None, str(error) + url = f"https://ghcr.io/v2/{namespace}/{image}/tags/list" + headers = {"Authorization": f"Bearer {token}"} + probe = probe_url(url) + if probe.ok: + try: + response = get(url, params, headers=headers) + if response.status_code == 429: + time.sleep(1) + response = get(url, params, headers=headers) + response.raise_for_status() + data = response.json() + return (data or {}).get("tags") or [], response.headers.get("Link"), None + except Exception as error: + return [], None, str(error) + data, _headers, error = remote_get_json(url, params, headers) + if error: + return [], None, error + return (data or {}).get("tags") or [], None, None def _fetch_ghcr(url: str, current_version: str, major_ahead: int, page_size: int) -> tuple[dict | None, str | None]: diff --git a/cli/libs/validate.py b/cli/libs/validate.py index ff9a01a01..877c58d9b 100644 --- a/cli/libs/validate.py +++ b/cli/libs/validate.py @@ -2,6 +2,7 @@ import json import re +from datetime import date from pathlib import Path import typer @@ -29,6 +30,16 @@ DEPENDENCY_IMAGE_RE = re.compile(r"^(?P[^:@]+(?:/[^:@]+)*):(?P[^@\s]+)(?:@(?Psha256:[a-f0-9]+))?$") PATCH_TAG_RE = re.compile(r"^\d+\.\d+\.\d+(?:[-_][A-Za-z0-9._-]+)?$") DEPENDENCY_TAG_HINT_RE = re.compile(r"(redis|postgres|postgresql|mysql|mariadb|pgvector)", re.IGNORECASE) +ENV_REF_RE = re.compile(r"\$\{?([A-Z0-9_]+)\}?") +IMAGE_ENGINE_HINTS = ( + ("mariadb", "mariadb"), + ("mysql", "mysql"), + ("pgvector", "postgresql"), + ("postgres", "postgresql"), + ("redis", "redis"), + ("mongo", "mongodb"), + ("clickhouse", "clickhouse"), +) def _read_compose(path: Path) -> dict: @@ -274,6 +285,98 @@ def _version_result(target: Path) -> dict: } +def _resolve_env_refs(value: str, env_map: dict[str, str]) -> str: + def replace(match: re.Match) -> str: + return env_map.get(match.group(1), match.group(0)) + + return ENV_REF_RE.sub(replace, value) + + +def _db_engine(repository: str) -> str | None: + lowered = repository.lower() + for hint, engine in IMAGE_ENGINE_HINTS: + if hint in lowered: + return engine + return None + + +def _db_track(engine: str, tag: str, tracks: list[dict]) -> dict | None: + cleaned = tag.strip().lstrip("v") + if engine == "postgresql" and cleaned.startswith("pg"): + cleaned = cleaned[2:] + for track in tracks: + candidate = str(track.get("version") or "") + if cleaned == candidate or cleaned.startswith(candidate + "."): + return track + return None + + +def _database_result(target: Path) -> dict: + """Check bundled database images against metadata/db-lifecycle.json.""" + compose_path = target / "docker-compose.yml" + env_path = target / ".env" + compose = _read_compose(compose_path) if compose_path.exists() else {} + env_map: dict[str, str] = {} + if env_path.exists(): + for raw_line in env_path.read_text(encoding="utf-8").splitlines(): + line = raw_line.strip() + if not line or line.startswith("#") or "=" not in line: + continue + key, value = line.split("=", 1) + env_map[key.strip()] = value.strip().strip("'").strip('"') + + lifecycle_path = repo_path("metadata", "db-lifecycle.json") + lifecycle = json.loads(lifecycle_path.read_text(encoding="utf-8")) if lifecycle_path.exists() else {} + engines = lifecycle.get("engines") or {} + today = date.today() + findings = [] + for service_name, service in (compose.get("services") or {}).items(): + if not isinstance(service, dict): + continue + image = service.get("image") + if not isinstance(image, str): + continue + resolved = _resolve_env_refs(image.strip(), env_map) + resolved = resolved.split("@", 1)[0] + if ":" not in resolved: + continue + repository, tag = resolved.rsplit(":", 1) + engine = _db_engine(repository) + if not engine or engine not in engines: + continue + tracks = engines[engine].get("tracks") or [] + track = _db_track(engine, tag, tracks) + finding = { + "service": str(service_name), + "engine": engine, + "image": resolved, + "current": tag, + } + if not track: + finding.update({"status": "unknown", "eol": None, "track": None}) + findings.append(finding) + continue + eol = track.get("eol") + status = "ok" + if eol: + try: + if date.fromisoformat(str(eol)[:10]) < today: + status = "eol" + except ValueError: + status = "unknown" + finding.update({"status": status, "eol": eol, "track": track.get("track")}) + findings.append(finding) + + if not findings: + return {"ok": True, "status": "not_applicable", "databases": []} + eol_findings = [item for item in findings if item["status"] == "eol"] + return { + "ok": not eol_findings, + "status": "eol" if eol_findings else "ok", + "databases": findings, + } + + def _resolve_app_or_exit(app_name: str) -> Path: target = app_dir(app_name) if not target: @@ -286,6 +389,7 @@ def check_app(app_name: str, gate: str = "all") -> dict: structure = _structure_result(target) policy = _policy_result(target) version = _version_result(target) + database = _database_result(target) if gate == "structure": return {"app": app_name, "gate": gate, "result": structure, "ok": structure["ok"]} @@ -293,12 +397,15 @@ def check_app(app_name: str, gate: str = "all") -> dict: return {"app": app_name, "gate": gate, "result": policy, "ok": policy["ok"]} if gate == "version": return {"app": app_name, "gate": gate, "result": version, "ok": version["ok"]} + if gate in ("database", "db"): + return {"app": app_name, "gate": "database", "result": database, "ok": database["ok"]} return { "app": app_name, "structure": structure, "policy": policy, "version": version, + "database": database, "ok": structure["ok"] and policy["ok"], } diff --git a/cli/libs/versioning.py b/cli/libs/versioning.py index 51bef9dc5..65801ff87 100644 --- a/cli/libs/versioning.py +++ b/cli/libs/versioning.py @@ -5,11 +5,37 @@ from packaging import version +VARIANT_SUFFIX_RE = re.compile( + r"^v?(\d+(?:\.\d+)*)(?:[-_]?(rc|alpha|beta|dev|pre)[.-]?(\d+)?)?(?:[-_].*)?$", + re.IGNORECASE, +) + + def normalize_tag(name: str) -> str: + """Return the comparable version part of an image or release tag. + + Handles common official-image variants such as ``11.4-apache``, + ``7.1-fpm``, ``11-alpine``, ``9.0-cli-ls84`` and + ``11.4.11-php8.3-apache``. If the original value is already a valid + PEP 440 version (for example ``12.0-rc`` or ``1.2rc1``), it is preserved + so prerelease filtering still works. + """ normalized = re.sub(r"-ls\d+$", "", name) if normalized.endswith("-cli"): normalized = normalized[:-4] - return normalized + try: + version.parse(normalized) + return normalized + except version.InvalidVersion: + match = VARIANT_SUFFIX_RE.match(normalized) + if not match: + return normalized + base = match.group(1) + prerelease = match.group(2) + number = match.group(3) + if prerelease: + return f"{base}-{prerelease}{number or ''}" + return base def get_current_versions(edition: list[dict]): @@ -32,6 +58,31 @@ def get_current_versions(edition: list[dict]): return valid_versions, all_versions +def _variant_tokens(name: str) -> set[str]: + normalized = normalize_tag(name).lower() + lowered = name.lower() + index = lowered.find(normalized) + tail = lowered[index + len(normalized):] if index >= 0 else lowered + return {token for token in re.split(r"[-_.]", tail) if token and not token.isdigit()} + + +def _prefer_variant(tags: list[dict], candidates: list[tuple], current_version: str) -> tuple: + preferred = _variant_tokens(current_version) + if not preferred: + return min(candidates, key=lambda item: (len(item[1].split("-")), len(item[1]), item[1])) + + def score(item): + _version_value, tag_name, _last_updated = item + tokens = _variant_tokens(tag_name) + shared = len(tokens & preferred) + extra = len(tokens - preferred) + return (-shared, extra) + + best_score = min(score(item) for item in candidates) + best_group = [item for item in candidates if score(item) == best_score] + return max(best_group, key=lambda item: (item[2], -len(item[1]), item[1])) + + def find_latest_version(tags: list[dict], current_version: str) -> dict | None: current_ver = version.parse(normalize_tag(current_version)) minor_candidates = [] @@ -59,7 +110,9 @@ def find_latest_version(tags: list[dict], current_version: str) -> dict | None: if not pool: return None - best = max(pool, key=lambda item: item[0]) + best_version = max(item[0] for item in pool) + same_version = [item for item in pool if item[0] == best_version] + best = _prefer_variant(tags, same_version, current_version) return { "version": best[1], "last_updated": best[2], diff --git a/cli/tests/test_app.py b/cli/tests/test_app.py index d9a01f241..0bfcdcbb9 100644 --- a/cli/tests/test_app.py +++ b/cli/tests/test_app.py @@ -141,3 +141,49 @@ def run(payload): assert {"owncloud", "posthog", "python", "signoz"}.issubset(archived_apps) for name in ("owncloud", "posthog", "python", "signoz"): assert updated_archive["overrides"][name] == {"archive_reason": "batch-archive"} + + +def test_collect_app_info_includes_operational_facts(repo_fixture, app_factory): + import json + + (repo_fixture / "metadata" / "db-lifecycle.json").write_text( + json.dumps({ + "version": 1, + "engines": {"mysql": {"tracks": [{"version": "8.4", "track": "lts", "eol": "2032-04-30"}]}}, + }), + encoding="utf-8", + ) + app = app_factory( + "demo", + env="W9_ID=demo\nW9_VERSION=1.0\nW9_HTTP_PORT_SET=9001\nW9_DB_VERSION=8.4\n", + compose=( + "services:\n" + " demo:\n" + " image: demo:1\n" + " ports:\n" + " - \"${W9_HTTP_PORT_SET}:80\" # Web Console\n" + " mysql:\n" + " image: mysql:${W9_DB_VERSION}\n" + ), + variables={ + "name": "demo", + "trademark": "Demo", + "release": True, + "upstream": {"image": "https://hub.docker.com/_/demo/tags"}, + "edition": [{"dist": "community", "version": ["1.0"]}], + "credentials": {"none": True}, + }, + ) + tests_dir = app / "tests" + tests_dir.mkdir() + (tests_dir / "cases.yml").write_text("custom:\n - id: smoke\n type: script\n script: smoke.sh\n", encoding="utf-8") + + result = app_module.collect_app_info("demo") + + assert result["version"] == {"w9_version": "1.0", "declared": ["1.0"]} + assert result["ports"][0]["published"] == "${W9_HTTP_PORT_SET}:80" + assert result["published_ports"] == [{"service": "demo", "env": "W9_HTTP_PORT_SET", "published": 9001, "target": 80}] + assert result["services"] == ["demo", "mysql"] + assert result["credentials"] == {"none": True} + assert result["database"]["status"] == "ok" + assert result["tests"]["cases"] == [{"group": "custom", "id": "smoke", "type": "script"}] diff --git a/cli/tests/test_app_deploy.py b/cli/tests/test_app_deploy.py index 5f88025dc..6f5e16f90 100644 --- a/cli/tests/test_app_deploy.py +++ b/cli/tests/test_app_deploy.py @@ -198,3 +198,49 @@ def fake_run(command, *, progress=None, verbose=False): "[5/5] showing container status", ] assert not any(command[:4] == ["docker", "compose", "--progress", "plain"] for command in calls) + + +def test_compose_published_ports_resolves_env_reference(repo_fixture, app_factory): + app = app_factory( + "demo", + env="W9_HTTP_PORT_SET=9011\n", + compose="services:\n demo:\n image: demo:1\n ports:\n - \"${W9_HTTP_PORT_SET}:80\"\n", + ) + + rows = app_deploy._compose_published_ports(app, app_deploy._env_map(app / ".env")) + + assert rows == [{"service": "demo", "env": "W9_HTTP_PORT_SET", "published": 9011, "target": 80}] + + +def test_parse_occupied_ports_excludes_own_containers(): + text = "drupal|0.0.0.0:9001->80/tcp\nwordpress|0.0.0.0:9002->80/tcp\n" + + assert app_deploy._parse_occupied_ports(text, ["drupal"]) == {9002} + + +def test_pick_free_port_skips_occupied_ports(): + assert app_deploy._pick_free_port({9001, 9002}, 9001) == 9003 + + +def test_app_deploy_local_auto_port_overrides_temp_env(monkeypatch, repo_fixture, app_factory): + app_factory( + "demo", + env="W9_ID=demo\nW9_VERSION='1.0'\nW9_HTTP_PORT_SET=9001\n", + compose="services:\n demo:\n image: demo:1\n ports:\n - \"${W9_HTTP_PORT_SET}:80\"\n", + ) + captured = {} + + def fake_run(command, *, progress=None, verbose=False): + if "--env-file" in command: + path = Path(command[command.index("--env-file") + 1]) + captured["text"] = path.read_text(encoding="utf-8") + return types.SimpleNamespace(returncode=0, stdout="", stderr="") + + monkeypatch.setattr(app_deploy, "_run", fake_run) + monkeypatch.setattr(app_deploy, "_occupied_ports_local", lambda prefixes=None: {9001}) + + payload = app_deploy.deploy("demo", target="local") + + assert payload["port_overrides"] == {"W9_HTTP_PORT_SET": "9002"} + assert payload["base_url"] == "http://localhost:9002" + assert "W9_HTTP_PORT_SET=9002" in captured["text"] diff --git a/cli/tests/test_app_tests.py b/cli/tests/test_app_tests.py index ac7e2e23d..0e455d9f3 100644 --- a/cli/tests/test_app_tests.py +++ b/cli/tests/test_app_tests.py @@ -182,7 +182,8 @@ def test_run_app_tests_stops_after_required_failure(repo_fixture, app_factory, m lambda *args, **kwargs: (_ for _ in ()).throw(requests.ConnectionError("connection refused")), ) - payload = app_tests.run_app_tests("demo") + monkeypatch.setattr(app_tests.time, "sleep", lambda seconds: None) + payload = app_tests.run_app_tests("demo", wait_timeout=1, wait_interval=1) assert payload["ok"] is False assert [item["id"] for item in payload["results"]] == ["compose-config", "container-up"] @@ -206,7 +207,8 @@ def fake_run(command): lambda *args, **kwargs: (_ for _ in ()).throw(requests.ConnectionError("connection refused")), ) - payload = app_tests.run_app_tests("demo") + monkeypatch.setattr(app_tests.time, "sleep", lambda seconds: None) + payload = app_tests.run_app_tests("demo", wait_timeout=1, wait_interval=1) assert payload["ok"] is False assert [item["id"] for item in payload["results"]] == ["compose-config", "container-up", "web-access"] @@ -235,7 +237,7 @@ def fake_get(*args, **kwargs): monkeypatch.setattr(app_tests.requests, "get", fake_get) monkeypatch.setattr(app_tests.time, "sleep", lambda seconds: None) - payload = app_tests.run_app_tests("demo", wait_timeout=10, wait_interval=1) + payload = app_tests.run_app_tests("demo", wait_timeout=1, wait_interval=1) assert payload["ok"] is True assert attempts["count"] == 3 @@ -269,7 +271,7 @@ def fake_run_case(app_name, case, env, base_url, remote_ctx): monkeypatch.setattr(app_tests, "run_case", fake_run_case) monkeypatch.setattr(app_tests.time, "sleep", lambda seconds: None) - payload = app_tests.run_app_tests("demo", wait_timeout=10, wait_interval=1) + payload = app_tests.run_app_tests("demo", wait_timeout=1, wait_interval=1) assert payload["ok"] is False assert attempts["compose-config"] == 2 @@ -428,7 +430,8 @@ def test_run_app_tests_remote_progress_starts_with_connectivity_check(repo_fixtu lambda *args, **kwargs: {"id": args[1].get("id") or args[1]["type"], "ok": False, "stdout": "", "stderr": ""}, ) - payload = app_tests.run_app_tests("demo", progress=progress.append, verbose=False) + monkeypatch.setattr(app_tests.time, "sleep", lambda seconds: None) + payload = app_tests.run_app_tests("demo", wait_timeout=1, wait_interval=1, progress=progress.append, verbose=False) assert payload["ok"] is False assert progress == [ diff --git a/cli/tests/test_consistency.py b/cli/tests/test_consistency.py index bde313e87..93413bf48 100644 --- a/cli/tests/test_consistency.py +++ b/cli/tests/test_consistency.py @@ -325,3 +325,17 @@ def test_i18n_translation_covers_all_app_translatable_env_keys(): missing[env_path.parent.name] = keys assert missing == {}, f"apps with translatable env keys missing from i18n: {missing}" + + +def test_variables_schema_accepts_explicit_no_credentials(): + schema = json.loads((REPO_ROOT / "metadata" / "variables.schema.json").read_text(encoding="utf-8")) + sample = { + "name": "demo", + "trademark": "Demo", + "release": True, + "edition": [{"dist": "community", "version": ["1.0"]}], + "requirements": {"cpu": "1", "memory": "1", "disk": "1"}, + "credentials": {"none": True}, + } + + jsonschema.Draft202012Validator(schema).validate(sample) diff --git a/cli/tests/test_http.py b/cli/tests/test_http.py index fe028d644..58abf2399 100644 --- a/cli/tests/test_http.py +++ b/cli/tests/test_http.py @@ -2,9 +2,18 @@ from pathlib import Path +import pytest + from libs import http +@pytest.fixture(autouse=True) +def _reset_remote_only(): + http._REMOTE_ONLY = False + yield + http._REMOTE_ONLY = False + + def test_default_timeout_uses_env_and_falls_back_on_invalid(monkeypatch): monkeypatch.setenv("LIBS_HTTP_TIMEOUT", "20") assert http.default_timeout() == (5.0, 20.0) @@ -47,3 +56,50 @@ def test_normalize_proxy_env_sets_env_and_clears_wildcard_no_proxy(monkeypatch): assert http.os.environ["all_proxy"] == "http://proxy:8080" assert http.os.environ["NO_PROXY"] == "" assert http.os.environ["no_proxy"] == "" + + +class _ProbeResponse: + status_code = 204 + + def close(self): + pass + + +def test_probe_url_returns_quickly_after_two_retries(monkeypatch): + import requests + + calls = {"count": 0} + + def fake_get(*args, **kwargs): + calls["count"] += 1 + raise requests.Timeout("blocked") + + monkeypatch.setattr(http.requests, "get", fake_get) + + result = http.probe_url("https://hub.docker.com/v2/repositories/library/drupal/tags") + + assert result.ok is False + assert result.attempts == 3 + assert calls["count"] == 3 + assert "blocked" in (result.error or "") + + +def test_probe_url_accepts_any_http_status(monkeypatch): + monkeypatch.setattr(http.requests, "get", lambda *args, **kwargs: _ProbeResponse()) + + result = http.probe_url("https://example.com") + + assert result.ok is True + assert result.attempts == 1 + assert result.status == 204 + + +def test_get_json_with_fallback_uses_remote_after_probe_failure(monkeypatch): + monkeypatch.setattr(http, "probe_url", lambda url, **kwargs: http.Reachability(False, url, 3, 5, error="timeout")) + monkeypatch.setattr(http, "remote_get_json", lambda url, params, headers: ({"ok": True}, {}, None)) + + data, headers, error = http.get_json_with_fallback("https://hub.docker.com/v2/repositories/library/drupal/tags") + + assert data == {"ok": True} + assert headers == {} + assert error is None diff --git a/cli/tests/test_readme.py b/cli/tests/test_readme.py index 7167385ce..0e28b6910 100644 --- a/cli/tests/test_readme.py +++ b/cli/tests/test_readme.py @@ -129,3 +129,25 @@ def test_compose_volumes_accepts_hyphenated_src_filenames(): assert data_dirs == [] assert config_overrides == [{"source": "./src/websoft9-url.php", "target": "/usr/local/share/websoft9-url.php"}] + + +def test_readme_renders_no_preset_credentials_note(repo_fixture, app_factory, monkeypatch): + app_factory("demo", variables={ + "name": "demo", + "trademark": "Demo App", + "release": True, + "upstream": {"image": "https://hub.docker.com/_/demo/tags"}, + "edition": [{"dist": "community", "version": ["1.0"]}], + "credentials": {"none": True}, + }) + template_root = repo_fixture / "metadata" / "templates" + template_root.mkdir(parents=True, exist_ok=True) + (template_root / "readme.jinja2").write_text( + "{% if credentials and credentials.none %}NO_PRESET{% endif %}\n", + encoding="utf-8", + ) + monkeypatch.setattr(readme, "TEMPLATE_ROOT", template_root) + + readme.render_readme("demo") + + assert (repo_fixture / "apps" / "demo" / "README.md").read_text(encoding="utf-8") == "NO_PRESET\n" diff --git a/cli/tests/test_validate.py b/cli/tests/test_validate.py index c8155ae63..b0d582055 100644 --- a/cli/tests/test_validate.py +++ b/cli/tests/test_validate.py @@ -328,3 +328,54 @@ def test_check_app_returns_gate_specific_payload(repo_fixture, app_factory): assert structure["gate"] == "structure" assert policy["gate"] == "policy" assert all_result["ok"] is True + + +def test_database_result_flags_eol_bundled_database(repo_fixture, app_factory): + (repo_fixture / "metadata" / "db-lifecycle.json").write_text( + json.dumps({ + "version": 1, + "engines": { + "mysql": { + "tracks": [ + {"version": "8.4", "track": "lts", "eol": "2032-04-30"}, + {"version": "8.0", "track": "lts", "eol": "2026-04-30"}, + ] + } + }, + }), + encoding="utf-8", + ) + app_path = app_factory( + "demo", + env="W9_DB_VERSION=8.0\n", + compose="services:\n db:\n image: mysql:${W9_DB_VERSION}\n", + ) + + result = validate._database_result(app_path) + + assert result["ok"] is False + assert result["status"] == "eol" + assert result["databases"][0]["engine"] == "mysql" + assert result["databases"][0]["current"] == "8.0" + + +def test_database_gate_accepts_alive_lts(repo_fixture, app_factory): + (repo_fixture / "metadata" / "db-lifecycle.json").write_text( + json.dumps({ + "version": 1, + "engines": { + "mysql": {"tracks": [{"version": "8.4", "track": "lts", "eol": "2032-04-30"}]} + }, + }), + encoding="utf-8", + ) + app_factory( + "demo", + env="W9_DB_VERSION=8.4\n", + compose="services:\n db:\n image: mysql:${W9_DB_VERSION}\n", + ) + + payload = validate.check_app("demo", gate="database") + + assert payload["ok"] is True + assert payload["result"]["status"] == "ok" diff --git a/cli/tests/test_versioning.py b/cli/tests/test_versioning.py index a6e18861e..a1cec5584 100644 --- a/cli/tests/test_versioning.py +++ b/cli/tests/test_versioning.py @@ -80,3 +80,27 @@ def test_find_latest_version_uses_patch_candidates_when_no_minor_candidate_exist "version": "2.4.1", "last_updated": "2026-01-04", } + + +def test_normalize_tag_strips_image_variants_but_preserves_prereleases(): + from packaging import version as packaging_version + + assert normalize_tag("11.4-apache") == "11.4" + assert normalize_tag("11.4.11-php8.3-apache") == "11.4.11" + assert normalize_tag("7.1-fpm") == "7.1" + assert normalize_tag("6-apache") == "6" + assert normalize_tag("11-alpine") == "11" + assert normalize_tag("12.0-rc") == "12.0-rc" + assert normalize_tag("12.0-rc-php8.5-fpm-trixie") == "12.0-rc" + assert normalize_tag("11.5.0-beta1-apache") == "11.5.0-beta1" + assert normalize_tag("1.2rc1") == "1.2rc1" + assert packaging_version.parse(normalize_tag("11.4-apache")) == packaging_version.parse("11.4") + + +def test_get_current_versions_accepts_image_variant_tags(): + valid, all_versions = get_current_versions( + [{"dist": "community", "version": ["11.4-apache", "latest"]}] + ) + + assert all_versions == ["11.4-apache", "latest"] + assert valid == [version.parse("11.4"), "latest"] diff --git a/docs/ai-sdlc/03-update-pipeline.md b/docs/ai-sdlc/03-update-pipeline.md index cbc25644f..e9479d210 100644 --- a/docs/ai-sdlc/03-update-pipeline.md +++ b/docs/ai-sdlc/03-update-pipeline.md @@ -8,13 +8,14 @@ Steps: 2. Compare current version and target version. 3. Classify the candidate as `auto-update`, `review-first`, `defer`, or `skip`. 4. Create or update one issue per app. -5. AI researches upstream release notes and docs. -6. AI edits `.env`, `docker-compose.yml`, `variables.json`, `README.md`, and `src/` when needed for the target version and for any app-local conformance fixes required by current repository rules. +5. AI researches upstream release notes and docs. Network probes use a 2s per-attempt budget with at most 2 retries; on local failure, fetch through the remote host's egress instead of extending timeouts. +6. AI edits `.env`, `docker-compose.yml`, `variables.json`, `README.md`, and `src/` when needed for the target version and for any app-local conformance fixes required by current repository rules. When `libs app-check --gate database` reports a bundled DB track as EOL, update it to a vendor-supported alive LTS track in the same update. 7. AI registers any new translatable env key in `i18n/translation.json`. 8. AI runs automated validation. -9. AI publishes the test report. -10. Owner runs final E2E. -11. Owner decides merge, release, defer, or reject. +9. AI syncs the changed app to the test server's websoft9 store with `libs appstore-sync` when the container is reachable; skip within 10s when it is absent. +10. AI publishes the test report. +11. Owner runs final E2E. +12. Owner decides merge, release, defer, or reject. Archive path: - if owner decides to retire an app, move it to `archive/apps/` diff --git a/docs/appstore-release-spec.md b/docs/appstore-release-spec.md index 36877f48d..09e30ec9a 100644 --- a/docs/appstore-release-spec.md +++ b/docs/appstore-release-spec.md @@ -43,6 +43,7 @@ - `credentials` 支持按阶段分组声明（`initial` 初始化凭证 + `login` 登录凭证），也兼容直接在顶层声明单阶段槽位（`username` / `password` / `token`，默认等价于 `login`） - 复杂登录（一次性初始化 + 固定终态账号）：在 `credentials.initial` 中声明首次初始化凭证（如从 `container-log` 提取一次性临时密码或从 `container-file` 读取解锁密码），在 `credentials.login` 中声明终态固定凭证（如 `container-env` 指向 `W9_LOGIN_PASSWORD`），同时保留 `.env` 的 `W9_LOGIN_USER` / `W9_LOGIN_PASSWORD` 供当前前端渲染，并配置 `help.login` 说明初始化与正式登录的关系 - `credentials` 仅描述“凭据从哪里取”，不允许在仓库中写任意宿主级 shell +- 镜像不预置管理员账号、由安装向导创建时，声明 `credentials.none: true`，且不要填写 `W9_LOGIN_USER` / `W9_LOGIN_PASSWORD` 当前约定支持 3 个固定槽位：`username`、`password`、`token`。每个槽位都声明“值从哪里来”的 source。既可直接挂在 `credentials.` 下（单阶段简写），也可挂在 `credentials.initial.` 或 `credentials.login.` 下（分阶段声明）。 diff --git a/docs/runbook.md b/docs/runbook.md index f77cdc429..ef8c2d82d 100644 --- a/docs/runbook.md +++ b/docs/runbook.md @@ -3,7 +3,7 @@ Walk the cli + skill system by hand before CI. Use one real app, e.g. `wordpress`. 1. `make install` -2. `libs scan --app --json` and `libs app-drift --app --json`; read `metadata/db-lifecycle.json`; write the assessment report (update-assessment) +2. `libs app-info --app --json`, `libs scan --app --json`, and `libs app-drift --app --json`; only open app files when these outputs are incomplete; write the assessment report (update-assessment) 3. `libs app-new --name demo-app --trademark "Demo App" --dry-run --json`; optionally prefill `--upstream-releases`, `--upstream-compose`, and `--upstream-env`; check refused duplicates (app-new) 4. `libs app-archive --app --dry-run --json` and `libs app-restore --app --dry-run --json` (archive-app / restore-app) 5. `libs app-check --app ` and `libs app-gen-readme --app ` (deploy-validation / test-report) diff --git a/docs/upstream-spec.md b/docs/upstream-spec.md index 0dece324b..aa44777dc 100644 --- a/docs/upstream-spec.md +++ b/docs/upstream-spec.md @@ -234,6 +234,7 @@ Decision rule: - LTS/stabled tracks rank above innovation/short-term - untested majors above the vendor's documented/tested upper bound are not eligible (AI judgment from prose docs) - the chosen version is recorded back into `externalDB.recommended` with a reason +- implementation rule: when the current bundled track is EOL and the vendor supports a newer alive LTS, update `W9_DB_VERSION` in the same app update; run `libs app-check --app --gate database` and record the change in `CHANGELOG.md` Division of labor: diff --git a/metadata/templates/new-app/.env.tmpl b/metadata/templates/new-app/.env.tmpl index ef4ca4699..c14f24afa 100644 --- a/metadata/templates/new-app/.env.tmpl +++ b/metadata/templates/new-app/.env.tmpl @@ -13,9 +13,9 @@ W9_VERSION={{ version }} W9_ID={{ name }} -# Web/internal ports: uncomment the ones the package actually uses. -# W9_HTTP_PORT=80 -# W9_HTTP_PORT_SET=9001 +# Web/internal ports: keep only the ones the package actually uses. +W9_HTTP_PORT=80 +W9_HTTP_PORT_SET=9001 # W9_HTTPS_PORT=443 # W9_HTTPS_PORT_SET=9002 diff --git a/metadata/templates/new-app/docker-compose.yml.tmpl b/metadata/templates/new-app/docker-compose.yml.tmpl index 764f721b1..7b311c575 100644 --- a/metadata/templates/new-app/docker-compose.yml.tmpl +++ b/metadata/templates/new-app/docker-compose.yml.tmpl @@ -5,7 +5,9 @@ services: container_name: ${W9_ID} restart: unless-stopped env_file: .env - # TODO: add ports, volumes, healthcheck, and dependency services after upstream research + ports: + - "${W9_HTTP_PORT_SET}:80" # Web Console + # TODO: add volumes, healthcheck, and dependency services after upstream research networks: default: diff --git a/metadata/templates/readme.jinja2 b/metadata/templates/readme.jinja2 index 4ad661ceb..b67e99513 100644 --- a/metadata/templates/readme.jinja2 +++ b/metadata/templates/readme.jinja2 @@ -6,6 +6,9 @@ 1. In the [Websoft9](https://www.websoft9.com) console, open **My Apps** and select **{{ trademark }}**. 2. In the **Access** tab, get the login URL and credentials. +{% if credentials and credentials.none %} + No preset administrator credentials are shipped; create the admin account in the setup wizard. +{% endif %} 3. Open the login URL in a browser and sign in to confirm the app works. diff --git a/metadata/variables.schema.json b/metadata/variables.schema.json index 3b8265d27..c147bf28e 100644 --- a/metadata/variables.schema.json +++ b/metadata/variables.schema.json @@ -121,6 +121,10 @@ } } }, + "externalDB": { + "type": "object", + "description": "User-facing verified database requirement cache, keyed by app version and engine. Do not use it as a computation source." + }, "requirements": { "type": "object", "additionalProperties": false, @@ -229,6 +233,10 @@ "type": "object", "additionalProperties": false, "properties": { + "none": { + "type": "boolean", + "description": "Set true when the image ships no preset admin credentials and the account is created interactively during setup." + }, "initial": { "$ref": "#/$defs/credentialSlots", "description": "One-time bootstrap or setup credentials used only during initial setup." diff --git a/skills/app-update/SKILL.md b/skills/app-update/SKILL.md index 8bf58f77a..cc630a1bb 100644 --- a/skills/app-update/SKILL.md +++ b/skills/app-update/SKILL.md @@ -25,7 +25,7 @@ Supporting files in this skill: ## Steps -1. Read repository facts from `apps//`, `metadata/maintenance.yaml`, and the app notes when relevant. +1. Read repository facts with `.venv/bin/libs app-info --app --json` first; it returns version, DB lifecycle, ports, images, credentials, tests, and maintenance metadata in one call. Open `apps//` or notes only for details it does not cover. 2. If the caller did not provide a target version, detect the best candidate stable target version first by checking the current package version, the upstream image tags, and the upstream release notes or changelog. Prefer the newest stable version that matches the app's maintenance policy and image-tag policy. If one candidate is clearly correct, proceed with implementation and report the chosen target version. A major version jump alone is not a reason to stop. Stop and obtain owner confirmation only when the candidate is ambiguous, risky for the package itself, `review-first`, or not clearly better than alternatives. 3. Read `docs/w9-env-spec.md` before touching `.env` or `docker-compose.yml`; use it as the canonical `W9_*` reference, then mirror `metadata/templates/new-app/.env.tmpl` for layout. 4. Read the approved assessment result, if one exists. @@ -37,7 +37,7 @@ Supporting files in this skill: 10. When `.env` is touched, keep the "image environment variables" section intact and mirror the template layout in `metadata/templates/new-app/.env.tmpl`: keep the section banner, the Docs URL, the "Used by docker-compose.yml" group, and the commented "Not used by default" group. Refresh the single Docs URL if the upstream changed, keep only the variables required by the current package shape plus any user-facing essentials, keep the used vars aligned with `docker-compose.yml`, and keep commented unused vars at no more than 5. Follow the decision rules in `docs/w9-env-spec.md` for `W9_URL`, `W9_URL_REPLACE`, login pairs, `_SET` ports, and dependency helpers. Use a domain-style `W9_URL` placeholder (for example `appname.example.com` or `example.youdomain.com`); do not use `internet_ip:${W9_HTTP_PORT_SET}`. Whenever `.env` is touched at all, convert every environment-variable reference in the whole file to the braced form `${VAR}`; do not leave bare `$VAR` in the file even on lines that were already present. 11. When `docker-compose.yml` is touched, ensure every published port line carries an inline `# purpose` comment and that no `# image:` / `# docs:` source comments remain — image and documentation sources live only in `variables.json` `upstream`. Convert every environment-variable reference in the whole file to the braced form `${VAR}` (for example `${W9_REPO}`, `${W9_HTTP_PORT_SET}`), not just the lines being changed. 12. When a credential or config env var only takes effect on first container startup (the image's entrypoint uses a marker file, e.g. `webconsole.security.enabled`), record that fact in `variables.json` as `env.first_startup_only` (a list of such env names). The README generator then auto-renders the warning; keep the "how to rotate" solution in the hand-written README Change Password section or Notes instead of in metadata. -13. When an app does not control a built-in admin username, password, or token in `.env` but the value can be resolved after startup, declare declarative metadata in `variables.json.credentials.` (or stage-grouped `credentials.initial.` / `credentials.login.` when initial bootstrap credentials differ from steady-state login credentials) where `` is `username`, `password`, or `token`. Supported sources are `inline`, `container-env`, `container-file`, `container-log`, and `container-cli`. Prefer this over adding legacy `W9_LOGIN_GET_PASSWORD` or `W9_LOGIN_GET_TOKEN` command strings. +13. When an app does not control a built-in admin username, password, or token in `.env` but the value can be resolved after startup, declare declarative metadata in `variables.json.credentials.` (or stage-grouped `credentials.initial.` / `credentials.login.` when initial bootstrap credentials differ from steady-state login credentials) where `` is `username`, `password`, or `token`. Supported sources are `inline`, `container-env`, `container-file`, `container-log`, and `container-cli`. When the image ships no preset admin and the account is created interactively during setup, declare `credentials.none=true` and do not invent `W9_LOGIN_*` values. Prefer this over adding legacy `W9_LOGIN_GET_PASSWORD` or `W9_LOGIN_GET_TOKEN` command strings. 14. Healthchecks should default to the main app container only. Add healthchecks to sidecar or dependency containers only when the official upstream compose explicitly defines them or the task explicitly requires them. 15. If the target app has app-local drift against the current repository rules (for example template, metadata, env policy, or generated README expectations), fix the minimum blocking or directly relevant items as part of the same update. 16. Keep `apps//CHANGELOG.md` as the single source of app change history. Use a pure-date heading `## YYYY-MM-DD` as the first-level heading for each change batch; list all changes for that date below it. Do not duplicate changelog content into `README.md`. @@ -45,8 +45,13 @@ Supporting files in this skill: 18. For dependency images such as PostgreSQL, MySQL, MariaDB, Redis, or pgvector, prefer `x.x` tags even when upstream examples show `x.x.x`, unless exact patch pinning is demonstrably required. Hard-coded dependency `x.x.x` tags in `docker-compose.yml` are policy drift and should be normalized before handoff. 19. Verify braced references: scan the touched `.env` and `docker-compose.yml` for any remaining bare `$VAR` reference (for example `grep -nE '\$W9_[A-Z_]+'`); fix every hit to `${VAR}` before handoff. A file that was touched must contain no bare `$VAR` anywhere. 20. Ensure `apps//tests/cases.yml` exists and reflects the app's real functional path. Follow `docs/app-tests.md`: keep the built-in adaptive checks and add the minimum app-specific cases the defaults cannot cover, such as `http-basic` for an authenticated console or API, `web-access` for a dedicated health endpoint, or `script` only when built-ins are insufficient. Do not add a case that duplicates a default check. -21. Run the `deploy-validation` skill for the changed app. -22. Produce a short test report. +21. Before validation, run fast preflights and act on the result instead of retrying long timeouts: + - registry/docs reachability: probe each target URL with a 2s per-attempt budget and at most 2 retries; if local egress fails, use the remote host's egress for version and documentation lookups; + - database lifecycle: run `.venv/bin/libs app-check --app --gate database`. If a bundled DB track is EOL, update it to a supported LTS track the vendor supports, or record why the change is deferred; + - target port availability: `libs app-deploy` checks published ports and auto-selects a free 9000-9999 port. Use the returned `port_overrides` and `base_url` for follow-up tests. +22. Run the `deploy-validation` skill for the changed app; pass the `base_url` from `app-deploy` to `app-tests` when a port override happened. +23. After validation passes and the app package has substantive changes, sync it to the test server's websoft9 store: `.venv/bin/libs appstore-sync --app `. Preflight the `websoft9` container first with a <= 10s check; when it is absent or unreachable, skip the sync and record it as skipped instead of waiting. Sync failures are separate from validation failures. +24. Produce a short test report. ## Output diff --git a/skills/app-update/checklist.md b/skills/app-update/checklist.md index 19f7c1605..a91dedf30 100644 --- a/skills/app-update/checklist.md +++ b/skills/app-update/checklist.md @@ -10,9 +10,11 @@ - [ ] Scan edited files for remaining bare `$VAR` references and fix all hits before handoff - [ ] Fix minimum app-local conformance drift required by current gates or generation rules - [ ] Author or refresh `apps//tests/cases.yml` per `docs/app-tests.md` (built-in checks plus the minimum app-specific cases) +- [ ] Preflight registry/docs reachability and target port availability with short timeouts; act before pulling images - [ ] Keep changes app-local - [ ] Update `apps//CHANGELOG.md` with a pure-date heading `## YYYY-MM-DD` for this change batch - [ ] Register new translatable env keys in `i18n/translation.json` if needed - [ ] When an interactive app exposes an initial username, password, or token after deployment, prefer declarative `variables.json.credentials.` (or stage-grouped `credentials.initial.` / `credentials.login.`) metadata (`inline`, `container-env`, `container-file`, `container-log`, `container-cli`) over legacy `W9_LOGIN_GET_PASSWORD` / `W9_LOGIN_GET_TOKEN` - [ ] Run structure, policy, deploy, and reachability checks when applicable +- [ ] Run `.venv/bin/libs appstore-sync --app ` after substantive changes when `websoft9` is reachable (preflight <= 10s; skip when absent) - [ ] Produce a short test report diff --git a/skills/batch-app-update/report-template.md b/skills/batch-app-update/report-template.md index b514d4dd5..39bc53282 100644 --- a/skills/batch-app-update/report-template.md +++ b/skills/batch-app-update/report-template.md @@ -7,6 +7,14 @@ - concurrency used: - overall decision: ready-for-e2e | partially-blocked | blocked +## Automated Checks + +- structure: +- policy: +- deploy: +- reachability: +- logs: + ## Per-App Results - app: diff --git a/skills/deploy-validation/SKILL.md b/skills/deploy-validation/SKILL.md index 9de6f22f1..be096a859 100644 --- a/skills/deploy-validation/SKILL.md +++ b/skills/deploy-validation/SKILL.md @@ -27,11 +27,12 @@ Supporting files in this skill: ## Steps 1. Run the gates locally: `make --no-print-directory libs ARGS="app-check --app --json"`. On failure, stop and report the first blocking error. -2. Run `make --no-print-directory libs ARGS="app-deploy --app [--target ] [--ssh-host --ssh-user --ssh-secret-path --deploy-root ] --json"` to perform the compose deployment primitive. It handles local vs remote resolution, sync, network creation, `config`, `up -d`, and `ps` evidence. -3. Run `make --no-print-directory libs ARGS="app-tests --app [--base-url ] [--ssh-host --ssh-user --ssh-secret-path --deploy-root ] --json"` to perform functional checks. When `tests/cases.yml` is absent, the command still runs the default required checks; report the absence as an app-local test gap when the app's core path needs an app-specific check. -4. Check container logs for blocking errors. -5. Cleanup in all outcomes with `make --no-print-directory libs ARGS="app-deploy --app [--target ] [--ssh-host --ssh-user --ssh-secret-path --deploy-root ] --down --json"`. For remote, the server itself stays running; deletion stays manual. -6. Return validation evidence: gates, deploy, functional checks, logs, cleanup, and the server identity when remote. +2. Preflight quickly: probe registry/docs URLs with a 2s per-attempt budget and at most 2 retries; if local egress fails, fetch through the remote host. `libs app-deploy` checks published ports and auto-selects a free 9000-9999 port on conflict, returning `port_overrides` and `base_url`. +3. Run `make --no-print-directory libs ARGS="app-deploy --app [--target ] [--ssh-host --ssh-user --ssh-secret-path --deploy-root ] --json"` to perform the compose deployment primitive. It handles local vs remote resolution, sync, network creation, `config`, `up -d`, and `ps` evidence. +4. Run `make --no-print-directory libs ARGS="app-tests --app [--base-url ] [--ssh-host --ssh-user --ssh-secret-path --deploy-root ] --json"` to perform functional checks. Pass the `base_url` returned by `app-deploy` when it auto-selected an alternate port. When `tests/cases.yml` is absent, the command still runs the default required checks; report the absence as an app-local test gap when the app's core path needs an app-specific check. +5. Check container logs for blocking errors. +6. Cleanup in all outcomes with `make --no-print-directory libs ARGS="app-deploy --app [--target ] [--ssh-host --ssh-user --ssh-secret-path --deploy-root ] --down --json"`. For remote, the server itself stays running; deletion stays manual. +7. Return validation evidence: gates, deploy, functional checks, logs, cleanup, and the server identity when remote. ## Output diff --git a/skills/deploy-validation/checklist.md b/skills/deploy-validation/checklist.md index 0ee9afca3..6f4b33fa5 100644 --- a/skills/deploy-validation/checklist.md +++ b/skills/deploy-validation/checklist.md @@ -1,6 +1,7 @@ # Deploy Validation Checklist - [ ] Run `.venv/bin/libs app-check --app --json` locally; stop on the first blocking error +- [ ] Preflight registry/docs reachability and published `_SET` port availability with short timeouts - [ ] Run `.venv/bin/libs app-deploy --app ... --json`; it resolves local/remote, syncs when needed, creates the network, runs `config`, `up -d`, and collects `ps` - [ ] Run `.venv/bin/libs app-tests --app ... --json`; it derives localhost vs remote base URL and runs default/custom checks - [ ] Check logs for blocking errors diff --git a/skills/new-app/SKILL.md b/skills/new-app/SKILL.md index 0018f38ff..b6a466c3f 100644 --- a/skills/new-app/SKILL.md +++ b/skills/new-app/SKILL.md @@ -36,15 +36,17 @@ If any required input is missing, stop and ask the user for it before researchin 9. Register any new translatable env key in `i18n/translation.json`. 10. Healthchecks should default to the main app container only. Add healthchecks to sidecar or dependency containers only when the official upstream compose explicitly defines them or the task explicitly requires them. 11. If a credential or config env var only takes effect on first container startup (the image entrypoint uses a marker file, e.g. `webconsole.security.enabled`), record it in `variables.json` as `env.first_startup_only` (list of env names) so the README auto-renders the warning. -12. If the app creates its initial username, password, or token interactively and the consumer can resolve it after deployment, declare `variables.json.credentials.` metadata (or stage-grouped `credentials.initial.` / `credentials.login.` when initial bootstrap credentials differ from steady-state login credentials) where `` is `username`, `password`, or `token`. Supported sources are `inline`, `container-env`, `container-file`, `container-log`, and `container-cli`. Prefer this declarative metadata over legacy `W9_LOGIN_GET_PASSWORD` / `W9_LOGIN_GET_TOKEN` command strings. +12. If the app creates its initial username, password, or token interactively and the consumer can resolve it after deployment, declare `variables.json.credentials.` metadata (or stage-grouped `credentials.initial.` / `credentials.login.` when initial bootstrap credentials differ from steady-state login credentials) where `` is `username`, `password`, or `token`. Supported sources are `inline`, `container-env`, `container-file`, `container-log`, and `container-cli`. When the image ships no preset admin and the account is created interactively, declare `credentials.none=true` instead of inventing `W9_LOGIN_*`. Prefer this declarative metadata over legacy `W9_LOGIN_GET_PASSWORD` / `W9_LOGIN_GET_TOKEN` command strings. 13. Keep `apps//CHANGELOG.md` as the single source of app change history. Use a pure-date heading `## YYYY-MM-DD` as the first-level heading for the initial change batch (the template already injects today's date); list the initial package changes below it. Do not duplicate changelog content into `README.md`. 14. Run `.venv/bin/libs app-gen-readme --app --json` after metadata or README marker content changes so generated sections stay current. 15. For dependency images such as PostgreSQL, MySQL, MariaDB, Redis, or pgvector, prefer `x.x` tags even when upstream examples show `x.x.x`, unless exact patch pinning is demonstrably required. Hard-coded dependency `x.x.x` tags in `docker-compose.yml` are policy drift and should be normalized before handoff. 16. Author `apps//tests/cases.yml` per `docs/app-tests.md`: keep the built-in adaptive checks and add the minimum app-specific cases the defaults cannot cover, such as `http-basic` for an authenticated console or API, `web-access` for a dedicated health endpoint, or `script` only when built-ins are insufficient. Do not add a case that duplicates a default check. -17. Run the `deploy-validation` skill to prove the app deploys. -18. Produce a short test report. +17. Before validation, run fast preflights: probe registry/docs URLs with a 2s per-attempt budget and at most 2 retries, using the remote host's egress when local access fails; run `.venv/bin/libs app-check --app --gate database`; `libs app-deploy` then auto-selects a free 9000-9999 port if a published port is occupied. +18. Run the `deploy-validation` skill to prove the app deploys. 19. Assign a maintenance cadence and update policy: write the app into the matching buckets of `metadata/maintenance.yaml` (apps not listed inherit the monthly/patch-minor defaults), and state the assignment in the report. The owner reviews it at merge. 20. Write the repo catalog fields from the upstream research: copy `metadata/templates/catalog.json` to `metadata/catalog/.json` and fill trademark, summary, overview, description, websiteurl, screenshots, and `catalogBindings`. Choose `catalogBindings` from `metadata/catalog-taxonomy.json` when it exists; parent/child keys must be valid. Keep `summary` to at most 8 words (prefer 5 or fewer) and `overview` to at most 30 words (prefer 20 or fewer); the `catalog-seed` skill is the canonical reference for these limits. This repo catalog file is the fallback editorial source and the input to `.venv/bin/libs catalog-push`. The owner reviews the catalog data before the first Contentful write; AI never writes Contentful directly. The owner applies with `.venv/bin/libs catalog-push --app --apply` after review. If the task is only catalog-file authoring for an existing app, use the `catalog-seed` skill instead of `new-app`. +21. After validation passes and the catalog file exists, sync the new app and its catalog data to the test server's websoft9 store: `.venv/bin/libs appstore-sync --app `. Preflight the `websoft9` container with a <= 10s check; when it is absent or unreachable, skip the sync and record it as skipped. +22. Produce a short test report. ## Output diff --git a/skills/new-app/checklist.md b/skills/new-app/checklist.md index 5833081c8..b4c32eca7 100644 --- a/skills/new-app/checklist.md +++ b/skills/new-app/checklist.md @@ -13,7 +13,9 @@ - [ ] Fill `.env` "image environment variables" section: single Docs URL, used vars, up to 5 unused vars commented out - [ ] Write `CHANGELOG.md` with the pure-date heading `## YYYY-MM-DD` for the initial change batch - [ ] Author `apps//tests/cases.yml` per `docs/app-tests.md` (built-in checks plus the minimum app-specific cases) +- [ ] Preflight registry/docs reachability and target port availability with short timeouts - [ ] Run `.venv/bin/libs app-check --app ` and deploy/reachability validation +- [ ] Run `.venv/bin/libs appstore-sync --app ` after validation when `websoft9` is reachable (preflight <= 10s; skip when absent) - [ ] Produce a short test report - [ ] Assign cadence/update policy by writing the app into `metadata/maintenance.yaml` buckets, and state it in the report - [ ] Write repo catalog fields: copy `metadata/templates/catalog.json` to `metadata/catalog/.json`; fill `catalogBindings` from `metadata/catalog-taxonomy.json` when applicable; owner reviews before `.venv/bin/libs catalog-push --app --apply` diff --git a/skills/update-assessment/SKILL.md b/skills/update-assessment/SKILL.md index e52424e91..0b890cebd 100644 --- a/skills/update-assessment/SKILL.md +++ b/skills/update-assessment/SKILL.md @@ -23,22 +23,23 @@ Supporting files in this skill: ## Steps -1. Run `.venv/bin/libs scan --app --json` and use its output as the primary version fact source. -2. Run `.venv/bin/libs app-drift --app --json` and use its output as the primary dependency and drift fact source. -3. Read repository facts only when scan or drift outputs are missing required facts. -4. Classify the candidate as `patch`, `minor`, `major`, or `security`. -5. Read upstream release notes, changelog, or upgrade guide. -6. Check whether the candidate fits the app's update policy and cadence. -7. Assess breaking risk for compose, env keys, volumes, init flow, login flow, and data path. -8. Perform a read-only repository conformance screening for the current app package against current quality gates and generation rules. Record only issues that materially affect update cost, safety, or readiness; do not expand into a full implementation review. -9. Assess the database dependency when `.venv/bin/libs app-drift` lists a DB engine image: +1. Run `.venv/bin/libs app-info --app --json`; it returns version, DB lifecycle, ports, images, credentials, and tests in one call. +2. Run `.venv/bin/libs scan --app --json` and use its output as the primary version fact source. +3. Run `.venv/bin/libs app-drift --app --json` and use its output as the primary dependency and drift fact source. +4. Read repository files only when the command outputs above are missing required facts. +5. Classify the candidate as `patch`, `minor`, `major`, or `security`. +6. Read upstream release notes, changelog, or upgrade guide. +7. Check whether the candidate fits the app's update policy and cadence. +8. Assess breaking risk for compose, env keys, volumes, init flow, login flow, and data path. +9. Perform a read-only repository conformance screening for the current app package against current quality gates and generation rules. Record only issues that materially affect update cost, safety, or readiness; do not expand into a full implementation review. +10. Assess the database dependency when `.venv/bin/libs app-drift` lists a DB engine image: - Read `W9_DB_VERSION` from `apps//.env` as the authoritative current DB version. - Read `metadata/db-lifecycle.json`; if the engine is missing or the snapshot is stale (older than 45 days), run `.venv/bin/libs db-refresh` first. - Read the vendor-tested minimum from official release notes or docs, not from `externalDB`. - Compute candidates: alive tracks with version >= vendor minimum; LTS/stable preferred over innovation/short-term. - Judge the vendor-tested upper bound from release notes or docs; untested majors are not eligible. - If the current `W9_DB_VERSION` is EOL'd or a better LTS candidate exists, report a DB finding with recommendation and reason. It does not block the main version decision. -10. Decide one result: `auto-update`, `review-first`, `defer`, or `skip`. +11. Decide one result: `auto-update`, `review-first`, `defer`, or `skip`. ## Output From 0e92286542dab2e8732d2a0462ea8f4c604143c8 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 22 Oct 2026 15:57:29 +0000 Subject: [PATCH 2/4] fix ci --- .codex/README.md | 0 .codex/prompts/libs-archive-app.prompt.md | 14 ++ .../prompts/libs-batch-update-app.prompt.md | 14 ++ .codex/prompts/libs-catalog-seed.prompt.md | 14 ++ .../prompts/libs-deploy-validation.prompt.md | 14 ++ .codex/prompts/libs-install-app.prompt.md | 14 ++ .codex/prompts/libs-new-app.prompt.md | 14 ++ .../prompts/libs-release-readiness.prompt.md | 14 ++ .codex/prompts/libs-restore-app.prompt.md | 14 ++ .codex/prompts/libs-test-report.prompt.md | 14 ++ .codex/prompts/libs-update-app.prompt.md | 14 ++ .../prompts/libs-update-assessment.prompt.md | 14 ++ .githooks/README.md | 14 ++ .githooks/pre-commit | 8 + .githooks/pre-push | 15 ++ .github/copilot-instructions.md | 41 +--- .github/prompts/libs-archive-app.prompt.md | 14 ++ .../prompts/libs-batch-update-app.prompt.md | 14 ++ .github/prompts/libs-catalog-seed.prompt.md | 14 ++ .../prompts/libs-deploy-validation.prompt.md | 14 ++ .github/prompts/libs-install-app.prompt.md | 14 ++ .github/prompts/libs-new-app.prompt.md | 14 ++ .../prompts/libs-release-readiness.prompt.md | 14 ++ .github/prompts/libs-restore-app.prompt.md | 14 ++ .github/prompts/libs-test-report.prompt.md | 14 ++ .github/prompts/libs-update-app.prompt.md | 14 ++ .../prompts/libs-update-assessment.prompt.md | 14 ++ .github/workflows/pr-checks.yml | 3 + .opencode/command/libs-archive-app.md | 12 +- .opencode/command/libs-batch-update-app.md | 38 +--- .opencode/command/libs-catalog-seed.md | 14 +- .opencode/command/libs-deploy-validation.md | 16 +- .opencode/command/libs-install-app.md | 15 ++ .opencode/command/libs-new-app.md | 14 +- .opencode/command/libs-release-readiness.md | 12 +- .opencode/command/libs-restore-app.md | 12 +- .opencode/command/libs-test-report.md | 12 +- .opencode/command/libs-update-app.md | 14 +- .opencode/command/libs-update-assessment.md | 14 +- .../console-2026-10-15T01-28-23-284Z.log | 81 -------- .../console-2026-10-15T01-33-52-934Z.log | 65 ------- .../console-2026-10-15T01-39-16-123Z.log | 67 ------- .../page-2026-10-15T01-28-25-042Z.yml | 2 - .../page-2026-10-15T01-33-53-818Z.yml | 2 - .../page-2026-10-15T01-34-35-146Z.yml | 2 - .../page-2026-10-15T01-39-17-126Z.yml | 2 - .../page-2026-10-15T01-39-52-432Z.yml | 23 --- .../page-2026-10-15T01-40-00-713Z.yml | 23 --- .../page-2026-10-15T01-40-21-889Z.yml | 23 --- .../page-2026-10-15T01-40-34-187Z.yml | 23 --- .../page-2026-10-15T01-40-44-592Z.yml | 23 --- AGENTS.md | 1 + Makefile | 12 +- README.md | 35 +++- apps/directus/.env | 4 +- apps/directus/docker-compose.yml | 6 +- apps/dolibarr/.env | 4 +- apps/dolibarr/docker-compose.yml | 4 +- apps/ghost/.env | 4 +- apps/ghost/docker-compose.yml | 4 +- apps/grafana/.env | 22 ++- apps/grafana/CHANGELOG.md | 6 + apps/grafana/docker-compose-enterprise.yml | 6 +- apps/matomo/docker-compose.yml | 8 +- apps/mautic/.env | 4 +- apps/mautic/docker-compose.yml | 4 +- apps/metabase/.env | 4 +- apps/metabase/docker-compose.yml | 4 +- apps/odoo/.env | 2 +- apps/odoo/docker-compose.yml | 4 +- apps/pgvector/.env | 6 +- apps/pgvector/docker-compose.yml | 2 +- apps/postgresql/.env | 6 +- apps/postgresql/docker-compose.yml | 2 +- apps/prestashop/.env | 4 +- apps/prestashop/docker-compose.yml | 4 +- apps/redmine/.env | 4 +- apps/redmine/docker-compose.yml | 4 +- apps/timescaledb/.env | 6 +- apps/timescaledb/docker-compose.yml | 2 +- apps/typo3/.env | 4 +- apps/typo3/docker-compose.yml | 4 +- apps/woocommerce/.env | 4 +- apps/woocommerce/docker-compose.yml | 4 +- apps/wordpress/.env | 4 +- apps/wordpress/docker-compose.yml | 4 +- apps/wordpresspro/.env | 4 +- apps/wordpresspro/docker-compose.yml | 4 +- .../__pycache__/fetch_catalog.cpython-312.pyc | Bin 7625 -> 7625 bytes .../library_publish.cpython-312.pyc | Bin 36386 -> 36386 bytes ci/scripts/build_ai_commands.py | 182 ++++++++++++++++++ cli/libs/__pycache__/__init__.cpython-312.pyc | Bin 184 -> 184 bytes cli/libs/__pycache__/app.cpython-312.pyc | Bin 13277 -> 17688 bytes .../__pycache__/app_build.cpython-312.pyc | Bin 30871 -> 30871 bytes .../__pycache__/app_deploy.cpython-312.pyc | Bin 15971 -> 26952 bytes .../__pycache__/app_tests.cpython-312.pyc | Bin 22444 -> 22712 bytes .../__pycache__/appstore_sync.cpython-312.pyc | Bin 9220 -> 9220 bytes cli/libs/__pycache__/catalog.cpython-312.pyc | Bin 15087 -> 15087 bytes .../__pycache__/contentful.cpython-312.pyc | Bin 10012 -> 10267 bytes .../__pycache__/credentials.cpython-312.pyc | Bin 2596 -> 2596 bytes .../__pycache__/dblifecycle.cpython-312.pyc | Bin 5266 -> 5266 bytes cli/libs/__pycache__/drift.cpython-312.pyc | Bin 5759 -> 5759 bytes cli/libs/__pycache__/http.cpython-312.pyc | Bin 3344 -> 9534 bytes .../__pycache__/imagestats.cpython-312.pyc | Bin 12922 -> 12922 bytes cli/libs/__pycache__/main.cpython-312.pyc | Bin 48888 -> 49411 bytes .../__pycache__/maintenance.cpython-312.pyc | Bin 6548 -> 6548 bytes cli/libs/__pycache__/metadata.cpython-312.pyc | Bin 4718 -> 4718 bytes cli/libs/__pycache__/newapp.cpython-312.pyc | Bin 8269 -> 8269 bytes cli/libs/__pycache__/output.cpython-312.pyc | Bin 822 -> 822 bytes cli/libs/__pycache__/readme.cpython-312.pyc | Bin 9745 -> 9745 bytes cli/libs/__pycache__/remote.cpython-312.pyc | Bin 8455 -> 8673 bytes cli/libs/__pycache__/repo.cpython-312.pyc | Bin 1758 -> 1758 bytes cli/libs/__pycache__/sources.cpython-312.pyc | Bin 16573 -> 16609 bytes cli/libs/__pycache__/validate.cpython-312.pyc | Bin 17708 -> 22740 bytes .../__pycache__/versioning.cpython-312.pyc | Bin 2752 -> 6348 bytes cli/libs/__pycache__/versions.cpython-312.pyc | Bin 6807 -> 6807 bytes .../conftest.cpython-312-pytest-9.1.1.pyc | Bin 3763 -> 3763 bytes .../test_app.cpython-312-pytest-9.1.1.pyc | Bin 21264 -> 25333 bytes ...est_app_build.cpython-312-pytest-9.1.1.pyc | Bin 58819 -> 58981 bytes ...st_app_deploy.cpython-312-pytest-9.1.1.pyc | Bin 22391 -> 28582 bytes ...est_app_tests.cpython-312-pytest-9.1.1.pyc | Bin 57353 -> 58207 bytes ...appstore_sync.cpython-312-pytest-9.1.1.pyc | Bin 36255 -> 36255 bytes .../test_catalog.cpython-312-pytest-9.1.1.pyc | Bin 22944 -> 22944 bytes ...cli_contracts.cpython-312-pytest-9.1.1.pyc | Bin 22161 -> 22161 bytes ...st_cli_errors.cpython-312-pytest-9.1.1.pyc | Bin 5971 -> 5971 bytes ...t_consistency.cpython-312-pytest-9.1.1.pyc | Bin 42901 -> 43434 bytes ...st_contentful.cpython-312-pytest-9.1.1.pyc | Bin 51597 -> 56530 bytes ...t_credentials.cpython-312-pytest-9.1.1.pyc | Bin 15705 -> 15705 bytes ...t_dblifecycle.cpython-312-pytest-9.1.1.pyc | Bin 10682 -> 10682 bytes .../test_drift.cpython-312-pytest-9.1.1.pyc | Bin 11065 -> 11065 bytes .../test_http.cpython-312-pytest-9.1.1.pyc | Bin 8791 -> 17451 bytes ...st_imagestats.cpython-312-pytest-9.1.1.pyc | Bin 34143 -> 34143 bytes .../test_main.cpython-312-pytest-9.1.1.pyc | Bin 11245 -> 11245 bytes ...t_maintenance.cpython-312-pytest-9.1.1.pyc | Bin 4107 -> 4107 bytes ...test_metadata.cpython-312-pytest-9.1.1.pyc | Bin 10549 -> 10549 bytes .../test_newapp.cpython-312-pytest-9.1.1.pyc | Bin 12226 -> 12226 bytes .../test_output.cpython-312-pytest-9.1.1.pyc | Bin 2542 -> 2542 bytes .../test_readme.cpython-312-pytest-9.1.1.pyc | Bin 11005 -> 12814 bytes .../test_repo.cpython-312-pytest-9.1.1.pyc | Bin 7792 -> 7792 bytes .../test_sources.cpython-312-pytest-9.1.1.pyc | Bin 17586 -> 17586 bytes ...sources_fetch.cpython-312-pytest-9.1.1.pyc | Bin 10882 -> 10882 bytes ...test_validate.cpython-312-pytest-9.1.1.pyc | Bin 26094 -> 29682 bytes ...st_versioning.cpython-312-pytest-9.1.1.pyc | Bin 11679 -> 20336 bytes ...test_versions.cpython-312-pytest-9.1.1.pyc | Bin 17060 -> 17060 bytes make.ps1 | 10 + skills/README.md | 15 +- skills/commands.manifest.json | 81 ++++++++ skills/install-app/SKILL.md | 61 ++++++ skills/install-app/checklist.md | 13 ++ skills/install-app/report-template.md | 43 +++++ .../__pycache__/_helpers.cpython-312.pyc | Bin 912 -> 937 bytes .../conftest.cpython-312-pytest-9.1.1.pyc | Bin 2267 -> 2267 bytes ...fetch_catalog.cpython-312-pytest-9.1.1.pyc | Bin 19828 -> 19828 bytes ...brary_publish.cpython-312-pytest-9.1.1.pyc | Bin 43182 -> 43182 bytes tests/build/test_build_ai_commands.py | 80 ++++++++ .../test_assets.cpython-312-pytest-9.1.1.pyc | Bin 16698 -> 16698 bytes ...cli_contracts.cpython-312-pytest-9.1.1.pyc | Bin 12900 -> 12900 bytes ...est_workflows.cpython-312-pytest-9.1.1.pyc | Bin 18882 -> 18882 bytes 158 files changed, 1035 insertions(+), 558 deletions(-) create mode 100644 .codex/README.md create mode 100644 .codex/prompts/libs-archive-app.prompt.md create mode 100644 .codex/prompts/libs-batch-update-app.prompt.md create mode 100644 .codex/prompts/libs-catalog-seed.prompt.md create mode 100644 .codex/prompts/libs-deploy-validation.prompt.md create mode 100644 .codex/prompts/libs-install-app.prompt.md create mode 100644 .codex/prompts/libs-new-app.prompt.md create mode 100644 .codex/prompts/libs-release-readiness.prompt.md create mode 100644 .codex/prompts/libs-restore-app.prompt.md create mode 100644 .codex/prompts/libs-test-report.prompt.md create mode 100644 .codex/prompts/libs-update-app.prompt.md create mode 100644 .codex/prompts/libs-update-assessment.prompt.md create mode 100644 .githooks/README.md create mode 100755 .githooks/pre-commit create mode 100755 .githooks/pre-push create mode 100644 .github/prompts/libs-archive-app.prompt.md create mode 100644 .github/prompts/libs-batch-update-app.prompt.md create mode 100644 .github/prompts/libs-catalog-seed.prompt.md create mode 100644 .github/prompts/libs-deploy-validation.prompt.md create mode 100644 .github/prompts/libs-install-app.prompt.md create mode 100644 .github/prompts/libs-new-app.prompt.md create mode 100644 .github/prompts/libs-release-readiness.prompt.md create mode 100644 .github/prompts/libs-restore-app.prompt.md create mode 100644 .github/prompts/libs-test-report.prompt.md create mode 100644 .github/prompts/libs-update-app.prompt.md create mode 100644 .github/prompts/libs-update-assessment.prompt.md create mode 100644 .opencode/command/libs-install-app.md delete mode 100644 .playwright-mcp/console-2026-10-15T01-28-23-284Z.log delete mode 100644 .playwright-mcp/console-2026-10-15T01-33-52-934Z.log delete mode 100644 .playwright-mcp/console-2026-10-15T01-39-16-123Z.log delete mode 100644 .playwright-mcp/page-2026-10-15T01-28-25-042Z.yml delete mode 100644 .playwright-mcp/page-2026-10-15T01-33-53-818Z.yml delete mode 100644 .playwright-mcp/page-2026-10-15T01-34-35-146Z.yml delete mode 100644 .playwright-mcp/page-2026-10-15T01-39-17-126Z.yml delete mode 100644 .playwright-mcp/page-2026-10-15T01-39-52-432Z.yml delete mode 100644 .playwright-mcp/page-2026-10-15T01-40-00-713Z.yml delete mode 100644 .playwright-mcp/page-2026-10-15T01-40-21-889Z.yml delete mode 100644 .playwright-mcp/page-2026-10-15T01-40-34-187Z.yml delete mode 100644 .playwright-mcp/page-2026-10-15T01-40-44-592Z.yml create mode 100644 ci/scripts/build_ai_commands.py create mode 100644 skills/commands.manifest.json create mode 100644 skills/install-app/SKILL.md create mode 100644 skills/install-app/checklist.md create mode 100644 skills/install-app/report-template.md create mode 100644 tests/build/test_build_ai_commands.py diff --git a/.codex/README.md b/.codex/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/.codex/prompts/libs-archive-app.prompt.md b/.codex/prompts/libs-archive-app.prompt.md new file mode 100644 index 000000000..4e9049415 --- /dev/null +++ b/.codex/prompts/libs-archive-app.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-archive-app +description: "Route to archive-app skill." +argument-hint: " " +agent: agent +--- + + + +Use [archive-app](../../skills/archive-app/SKILL.md). + +Usage: `/libs-archive-app ` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.codex/prompts/libs-batch-update-app.prompt.md b/.codex/prompts/libs-batch-update-app.prompt.md new file mode 100644 index 000000000..7f430b61b --- /dev/null +++ b/.codex/prompts/libs-batch-update-app.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-batch-update-app +description: "Route to batch-app-update skill." +argument-hint: " [options]" +agent: agent +--- + + + +Use [batch-app-update](../../skills/batch-app-update/SKILL.md). + +Usage: `/libs-batch-update-app ` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.codex/prompts/libs-catalog-seed.prompt.md b/.codex/prompts/libs-catalog-seed.prompt.md new file mode 100644 index 000000000..a109a46af --- /dev/null +++ b/.codex/prompts/libs-catalog-seed.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-catalog-seed +description: "Route to catalog-seed skill." +argument-hint: "" +agent: agent +--- + + + +Use [catalog-seed](../../skills/catalog-seed/SKILL.md). + +Usage: `/libs-catalog-seed ` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.codex/prompts/libs-deploy-validation.prompt.md b/.codex/prompts/libs-deploy-validation.prompt.md new file mode 100644 index 000000000..086ea5675 --- /dev/null +++ b/.codex/prompts/libs-deploy-validation.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-deploy-validation +description: "Route to deploy-validation skill." +argument-hint: " [--ssh-host ip --ssh-user name --ssh-secret-path path --deploy-root dir] [local]" +agent: agent +--- + + + +Use [deploy-validation](../../skills/deploy-validation/SKILL.md). + +Usage: `/libs-deploy-validation [--ssh-host ip --ssh-user name] [--ssh-secret-path path] [--deploy-root dir] [local]` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.codex/prompts/libs-install-app.prompt.md b/.codex/prompts/libs-install-app.prompt.md new file mode 100644 index 000000000..c20f7948a --- /dev/null +++ b/.codex/prompts/libs-install-app.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-install-app +description: "Route to install-app skill." +argument-hint: " [local|remote] [plan-only]" +agent: agent +--- + + + +Use [install-app](../../skills/install-app/SKILL.md). + +Usage: `/libs-install-app [local|remote] [plan-only]` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.codex/prompts/libs-new-app.prompt.md b/.codex/prompts/libs-new-app.prompt.md new file mode 100644 index 000000000..0805cd697 --- /dev/null +++ b/.codex/prompts/libs-new-app.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-new-app +description: "Route to new-app skill." +argument-hint: " " +agent: agent +--- + + + +Use [new-app](../../skills/new-app/SKILL.md). + +Usage: `/libs-new-app ` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.codex/prompts/libs-release-readiness.prompt.md b/.codex/prompts/libs-release-readiness.prompt.md new file mode 100644 index 000000000..d0f953d74 --- /dev/null +++ b/.codex/prompts/libs-release-readiness.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-release-readiness +description: "Route to release-readiness-check skill." +argument-hint: "" +agent: agent +--- + + + +Use [release-readiness-check](../../skills/release-readiness-check/SKILL.md). + +Usage: `/libs-release-readiness ` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.codex/prompts/libs-restore-app.prompt.md b/.codex/prompts/libs-restore-app.prompt.md new file mode 100644 index 000000000..830c963d6 --- /dev/null +++ b/.codex/prompts/libs-restore-app.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-restore-app +description: "Route to restore-app skill." +argument-hint: " [--cadence monthly] [--update-policy patch-minor]" +agent: agent +--- + + + +Use [restore-app](../../skills/restore-app/SKILL.md). + +Usage: `/libs-restore-app [--cadence monthly] [--update-policy patch-minor]` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.codex/prompts/libs-test-report.prompt.md b/.codex/prompts/libs-test-report.prompt.md new file mode 100644 index 000000000..6c0c9998f --- /dev/null +++ b/.codex/prompts/libs-test-report.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-test-report +description: "Route to test-report-generation skill." +argument-hint: " " +agent: agent +--- + + + +Use [test-report-generation](../../skills/test-report-generation/SKILL.md). + +Usage: `/libs-test-report ` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.codex/prompts/libs-update-app.prompt.md b/.codex/prompts/libs-update-app.prompt.md new file mode 100644 index 000000000..4ab1366d9 --- /dev/null +++ b/.codex/prompts/libs-update-app.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-update-app +description: "Route to app-update skill." +argument-hint: " [target version]" +agent: agent +--- + + + +Use [app-update](../../skills/app-update/SKILL.md). + +Usage: `/libs-update-app [target version]` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.codex/prompts/libs-update-assessment.prompt.md b/.codex/prompts/libs-update-assessment.prompt.md new file mode 100644 index 000000000..9cc398595 --- /dev/null +++ b/.codex/prompts/libs-update-assessment.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-update-assessment +description: "Route to update-assessment skill." +argument-hint: "" +agent: agent +--- + + + +Use [update-assessment](../../skills/update-assessment/SKILL.md). + +Usage: `/libs-update-assessment ` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.githooks/README.md b/.githooks/README.md new file mode 100644 index 000000000..9834e9683 --- /dev/null +++ b/.githooks/README.md @@ -0,0 +1,14 @@ +# Local Git Hooks + +This repository provides local hooks to catch AI command adapter drift before push. + +Enable them once: + +```bash +make install-git-hooks +``` + +Installed hooks: + +- `pre-commit`: runs `make build-ai-commands ARGS="--check"` +- `pre-push`: runs the same check and `tests/build/test_build_ai_commands.py` when `.venv` exists diff --git a/.githooks/pre-commit b/.githooks/pre-commit new file mode 100755 index 000000000..9bc83e127 --- /dev/null +++ b/.githooks/pre-commit @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +set -euo pipefail + +repo_root="$(git rev-parse --show-toplevel)" +cd "$repo_root" + +echo "[pre-commit] checking generated AI command adapters" +make --no-print-directory build-ai-commands ARGS="--check" diff --git a/.githooks/pre-push b/.githooks/pre-push new file mode 100755 index 000000000..90c7a974a --- /dev/null +++ b/.githooks/pre-push @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -euo pipefail + +repo_root="$(git rev-parse --show-toplevel)" +cd "$repo_root" + +echo "[pre-push] checking generated AI command adapters" +make --no-print-directory build-ai-commands ARGS="--check" + +if [ -x .venv/bin/python ]; then + echo "[pre-push] running generator contract tests" + .venv/bin/python -m pytest tests/build/test_build_ai_commands.py -q +else + echo "[pre-push] skip tests: .venv/bin/python not found" +fi diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index df1f3d16e..f4bcf5f00 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -1,40 +1 @@ -# Copilot Instructions - -Read `AGENTS.md` first. - -Authority order: -1. `AGENTS.md` -2. `docs/vision.md` -3. `docs/architecture.md` -4. `docs/ai-sdlc/README.md` -5. `docs/upstream-spec.md` -6. `docs/code_owner.md` - -Repository model: -- `apps/` is one deployable unit -- keep changes app-local unless the task is explicitly cross-cutting -- prefer official images or trusted upstream images - -Required checks when changing an app: -- `docker-compose.yml` stays runnable -- `src/` files exist for every mounted local config file -- env variables follow repository rules -- translatable env keys are `W9_*_SET` and `W9_LOGIN*`; new ones must be registered in `i18n/translation.json` -- translation values stay human-authored; empty `["", ""]` entries are waiting for humans -- produce a short test report using `docs/ai-sdlc/06-test-report-format.md` - -Maintenance model: -- issue is the work unit -- owner decides demand and final E2E only -- AI does research, implementation, automated validation, and reporting -- maintenance cadence and update policy live in `metadata/maintenance.yaml` -- archived app metadata lives in `metadata/archive.yaml` - -For app updates: -- read upstream release notes first -- classify the candidate using `docs/ai-sdlc/02-maintenance-policy.md` -- follow `docs/ai-sdlc/03-update-pipeline.md` - -For new apps: -- start from the template -- follow `docs/ai-sdlc/04-new-app-pipeline.md` +Use [AGENTS.md](../AGENTS.md) as the single source of truth for all repository instructions. diff --git a/.github/prompts/libs-archive-app.prompt.md b/.github/prompts/libs-archive-app.prompt.md new file mode 100644 index 000000000..4e9049415 --- /dev/null +++ b/.github/prompts/libs-archive-app.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-archive-app +description: "Route to archive-app skill." +argument-hint: " " +agent: agent +--- + + + +Use [archive-app](../../skills/archive-app/SKILL.md). + +Usage: `/libs-archive-app ` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.github/prompts/libs-batch-update-app.prompt.md b/.github/prompts/libs-batch-update-app.prompt.md new file mode 100644 index 000000000..7f430b61b --- /dev/null +++ b/.github/prompts/libs-batch-update-app.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-batch-update-app +description: "Route to batch-app-update skill." +argument-hint: " [options]" +agent: agent +--- + + + +Use [batch-app-update](../../skills/batch-app-update/SKILL.md). + +Usage: `/libs-batch-update-app ` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.github/prompts/libs-catalog-seed.prompt.md b/.github/prompts/libs-catalog-seed.prompt.md new file mode 100644 index 000000000..a109a46af --- /dev/null +++ b/.github/prompts/libs-catalog-seed.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-catalog-seed +description: "Route to catalog-seed skill." +argument-hint: "" +agent: agent +--- + + + +Use [catalog-seed](../../skills/catalog-seed/SKILL.md). + +Usage: `/libs-catalog-seed ` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.github/prompts/libs-deploy-validation.prompt.md b/.github/prompts/libs-deploy-validation.prompt.md new file mode 100644 index 000000000..086ea5675 --- /dev/null +++ b/.github/prompts/libs-deploy-validation.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-deploy-validation +description: "Route to deploy-validation skill." +argument-hint: " [--ssh-host ip --ssh-user name --ssh-secret-path path --deploy-root dir] [local]" +agent: agent +--- + + + +Use [deploy-validation](../../skills/deploy-validation/SKILL.md). + +Usage: `/libs-deploy-validation [--ssh-host ip --ssh-user name] [--ssh-secret-path path] [--deploy-root dir] [local]` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.github/prompts/libs-install-app.prompt.md b/.github/prompts/libs-install-app.prompt.md new file mode 100644 index 000000000..c20f7948a --- /dev/null +++ b/.github/prompts/libs-install-app.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-install-app +description: "Route to install-app skill." +argument-hint: " [local|remote] [plan-only]" +agent: agent +--- + + + +Use [install-app](../../skills/install-app/SKILL.md). + +Usage: `/libs-install-app [local|remote] [plan-only]` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.github/prompts/libs-new-app.prompt.md b/.github/prompts/libs-new-app.prompt.md new file mode 100644 index 000000000..0805cd697 --- /dev/null +++ b/.github/prompts/libs-new-app.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-new-app +description: "Route to new-app skill." +argument-hint: " " +agent: agent +--- + + + +Use [new-app](../../skills/new-app/SKILL.md). + +Usage: `/libs-new-app ` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.github/prompts/libs-release-readiness.prompt.md b/.github/prompts/libs-release-readiness.prompt.md new file mode 100644 index 000000000..d0f953d74 --- /dev/null +++ b/.github/prompts/libs-release-readiness.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-release-readiness +description: "Route to release-readiness-check skill." +argument-hint: "" +agent: agent +--- + + + +Use [release-readiness-check](../../skills/release-readiness-check/SKILL.md). + +Usage: `/libs-release-readiness ` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.github/prompts/libs-restore-app.prompt.md b/.github/prompts/libs-restore-app.prompt.md new file mode 100644 index 000000000..830c963d6 --- /dev/null +++ b/.github/prompts/libs-restore-app.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-restore-app +description: "Route to restore-app skill." +argument-hint: " [--cadence monthly] [--update-policy patch-minor]" +agent: agent +--- + + + +Use [restore-app](../../skills/restore-app/SKILL.md). + +Usage: `/libs-restore-app [--cadence monthly] [--update-policy patch-minor]` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.github/prompts/libs-test-report.prompt.md b/.github/prompts/libs-test-report.prompt.md new file mode 100644 index 000000000..6c0c9998f --- /dev/null +++ b/.github/prompts/libs-test-report.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-test-report +description: "Route to test-report-generation skill." +argument-hint: " " +agent: agent +--- + + + +Use [test-report-generation](../../skills/test-report-generation/SKILL.md). + +Usage: `/libs-test-report ` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.github/prompts/libs-update-app.prompt.md b/.github/prompts/libs-update-app.prompt.md new file mode 100644 index 000000000..4ab1366d9 --- /dev/null +++ b/.github/prompts/libs-update-app.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-update-app +description: "Route to app-update skill." +argument-hint: " [target version]" +agent: agent +--- + + + +Use [app-update](../../skills/app-update/SKILL.md). + +Usage: `/libs-update-app [target version]` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.github/prompts/libs-update-assessment.prompt.md b/.github/prompts/libs-update-assessment.prompt.md new file mode 100644 index 000000000..9cc398595 --- /dev/null +++ b/.github/prompts/libs-update-assessment.prompt.md @@ -0,0 +1,14 @@ +--- +name: libs-update-assessment +description: "Route to update-assessment skill." +argument-hint: "" +agent: agent +--- + + + +Use [update-assessment](../../skills/update-assessment/SKILL.md). + +Usage: `/libs-update-assessment ` + +If input is empty or `help`, return usage and ask for required arguments. diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 710fd02c3..ab02d2248 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -65,3 +65,6 @@ jobs: echo "Validating catalog for $app" python -m libs catalog-push --app "$app" --json done + + - name: Verify AI command adapters are up to date + run: make build-ai-commands ARGS="--check" diff --git a/.opencode/command/libs-archive-app.md b/.opencode/command/libs-archive-app.md index f75c759be..7ad65bdfc 100644 --- a/.opencode/command/libs-archive-app.md +++ b/.opencode/command/libs-archive-app.md @@ -1,15 +1,15 @@ --- -description: Archive one app or a small batch of apps with metadata handoff +description: Archive one app or a small batch of apps with metadata handoff. agent: build -argument-hint: [app name] [archive reason] +argument-hint: --- -Use the `archive-app` skill to run the archive workflow. + -Usage: /libs-archive-app +Use the `archive-app` skill. -If the task input is `help` or empty, echo the usage line, then ask the user for the app name or app list and the archive reason. +Usage: /libs-archive-app -If the task input is present, treat it as the workflow input. +If input is empty or `help`, return usage and ask for required arguments. $ARGUMENTS diff --git a/.opencode/command/libs-batch-update-app.md b/.opencode/command/libs-batch-update-app.md index 2a18db3b5..5289f58f5 100644 --- a/.opencode/command/libs-batch-update-app.md +++ b/.opencode/command/libs-batch-update-app.md @@ -1,41 +1,15 @@ --- -description: Implement approved updates for a batch of apps selected by app names or initials +description: Implement approved updates for a batch of apps selected by app names or initials. agent: build -argument-hint: [app list | initials] [options optional] +argument-hint: [options] --- -Use the `batch-app-update` skill to run the batch app update workflow. + -The slash command stays action-first (`libs-batch-update-app`) even though the shared skill label is `batch-app-update`. +Use the `batch-app-update` skill. -Usage: `/libs-batch-update-app ` +Usage: /libs-batch-update-app -Supported selector forms: - -- explicit app list, for example `n8n,nocodb,netdata` -- initials, for example `n,m` to target all apps whose names start with `n` or `m` -- mixed input when clear, for example `n8n,n,m` - -Supported options: - -- `--mode auto|app-list|initials` -- `--concurrency 1|2|3` -- `--continue` -- `--stop-on-first-failure` -- `--report` - -Default behavior: - -- selector mode defaults to `auto` -- concurrency defaults to `2` -- failure policy defaults to `continue` -- apps that appear to require reverse-engineering from an official `install.sh` without a clear official Compose spec, especially when the runtime likely exceeds 5 containers, should be skipped quickly and recorded in the batch summary for later manual follow-up -- after each app passes automated validation, run `libs appstore-sync --app ` so the updated package is synced into the appstore environment for the later manual E2E pass - -If the task input is `help` or empty, echo the usage line, then ask the user for the selector. - -If the task input is present, treat it as the workflow input. - -If the task input contains `--report`, `formal`, or `formal-report`, produce the output using `report-template.md` from the skill. +If input is empty or `help`, return usage and ask for required arguments. $ARGUMENTS diff --git a/.opencode/command/libs-catalog-seed.md b/.opencode/command/libs-catalog-seed.md index b30a4f953..86d996462 100644 --- a/.opencode/command/libs-catalog-seed.md +++ b/.opencode/command/libs-catalog-seed.md @@ -1,17 +1,15 @@ --- -description: Create or update one app's repo catalog commercial data file and preview its Contentful push +description: Create or update one app catalog file and preview Contentful push. agent: build -argument-hint: [app name] +argument-hint: --- -Use the `catalog-seed` skill to create or update the repo catalog commercial data for one app. + -Usage: /libs-catalog-seed - -If the task input is `help` or empty, echo the usage line, then ask the user for the app name. +Use the `catalog-seed` skill. -If the task input is present, treat it as the workflow input. +Usage: /libs-catalog-seed -The skill writes `metadata/catalog/.json` (trademark, summary, overview, description, websiteurl, screenshots, catalogBindings), validates against `metadata/catalog.schema.json` and `metadata/catalog-taxonomy.json`, and previews with `libs catalog-push --app --json`. It never applies writes to Contentful. +If input is empty or `help`, return usage and ask for required arguments. $ARGUMENTS diff --git a/.opencode/command/libs-deploy-validation.md b/.opencode/command/libs-deploy-validation.md index 578efe492..fbc06ca17 100644 --- a/.opencode/command/libs-deploy-validation.md +++ b/.opencode/command/libs-deploy-validation.md @@ -1,19 +1,15 @@ --- -description: Prove one app deploys, locally or on a prepared remote server +description: Validate one app deployment locally or on a prepared remote server. agent: build -argument-hint: [app name] [--ssh-host ip --ssh-user name --ssh-secret-path path --deploy-root dir] +argument-hint: [--ssh-host ip --ssh-user name --ssh-secret-path path --deploy-root dir] [local] --- -Use the `deploy-validation` skill to run the validation workflow. + -Usage: /libs-deploy-validation [--ssh-host ip --ssh-user name] [--ssh-secret-path path] [--deploy-root dir] [local] - -If the task input is `help` or empty, echo the usage line, then ask the user for the app name. +Use the `deploy-validation` skill. -The default target comes from `.secrets/remote.env` (`TARGET=...`); when the profile file is absent, fall back to local. The task input may carry `--ssh-host --ssh-user --ssh-secret-path --deploy-root `; treat the presence of `--ssh-host` as remote. If the input says `local`, force target local. - -If the resolved target is remote and `--ssh-host` is missing, ask the user for it before starting. `--ssh-user` is optional and defaults from `.secrets/remote.env` or `root`. +Usage: /libs-deploy-validation [--ssh-host ip --ssh-user name] [--ssh-secret-path path] [--deploy-root dir] [local] -The remote SSH secret-path convention is `.secrets/ssh/default.pem` under the repository root (git-ignored, chmod 600). `--ssh-secret-path` overrides it with a relative path under `.secrets/ssh/` or an absolute path. The file may contain either a private key or a password: first detect which it is, then build the SSH auth fragment accordingly. Always add `-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ConnectTimeout=15`: the dedicated ephemeral test server may be reimaged, so a stale `~/.ssh/known_hosts` entry must never block automation. The default deploy root is `/opt/websoft9-test/apps`. +If input is empty or `help`, return usage and ask for required arguments. $ARGUMENTS diff --git a/.opencode/command/libs-install-app.md b/.opencode/command/libs-install-app.md new file mode 100644 index 000000000..41b20c12f --- /dev/null +++ b/.opencode/command/libs-install-app.md @@ -0,0 +1,15 @@ +--- +description: Install one app package with target selection, port pre-check, and health validation. +agent: build +argument-hint: [local|remote] [plan-only] +--- + + + +Use the `install-app` skill. + +Usage: /libs-install-app [local|remote] [plan-only] + +If input is empty or `help`, return usage and ask for required arguments. + +$ARGUMENTS diff --git a/.opencode/command/libs-new-app.md b/.opencode/command/libs-new-app.md index 68302061b..d4017c837 100644 --- a/.opencode/command/libs-new-app.md +++ b/.opencode/command/libs-new-app.md @@ -1,17 +1,15 @@ --- -description: Create one new app package and produce a short report +description: Create one new app package and produce a short report. agent: build -argument-hint: [app name] [trademark] [official reference URL] +argument-hint: --- -Use the `new-app` skill to run the new app workflow. + -Usage: /libs-new-app - -If the task input is `help` or empty, echo the usage line, then ask the user for the app name, trademark, and official upstream references. +Use the `new-app` skill. -If the task input is missing any of these (no trademark, or no official reference URL), ask the user to fill them before starting research. +Usage: /libs-new-app -If the task input is present, treat it as the workflow input. +If input is empty or `help`, return usage and ask for required arguments. $ARGUMENTS diff --git a/.opencode/command/libs-release-readiness.md b/.opencode/command/libs-release-readiness.md index c45bd0ad5..d5bb67d8b 100644 --- a/.opencode/command/libs-release-readiness.md +++ b/.opencode/command/libs-release-readiness.md @@ -1,15 +1,15 @@ --- -description: Check whether an app task is ready for owner E2E or release +description: Check whether an app task is ready for owner E2E or release. agent: build -argument-hint: [app name | task scope] +argument-hint: --- -Use the `release-readiness-check` skill to run the release readiness workflow. + -Usage: /libs-release-readiness +Use the `release-readiness-check` skill. -If the task input is `help` or empty, echo the usage line, then ask the user for the app name or task scope. +Usage: /libs-release-readiness -If the task input is present, treat it as the workflow input. +If input is empty or `help`, return usage and ask for required arguments. $ARGUMENTS diff --git a/.opencode/command/libs-restore-app.md b/.opencode/command/libs-restore-app.md index 9ddd917e4..fba77d3a6 100644 --- a/.opencode/command/libs-restore-app.md +++ b/.opencode/command/libs-restore-app.md @@ -1,15 +1,15 @@ --- -description: Restore one archived app back to active maintenance +description: Restore one archived app back to active maintenance. agent: build -argument-hint: [app name] [--cadence monthly --update-policy patch-minor] +argument-hint: [--cadence monthly] [--update-policy patch-minor] --- -Use the `restore-app` skill to run the restore workflow. + -Usage: /libs-restore-app [--cadence monthly] [--update-policy patch-minor] +Use the `restore-app` skill. -If the task input is `help` or empty, echo the usage line, then ask the user for the app name, and optionally the cadence and update policy. +Usage: /libs-restore-app [--cadence monthly] [--update-policy patch-minor] -If the task input is present, treat it as the workflow input. +If input is empty or `help`, return usage and ask for required arguments. $ARGUMENTS diff --git a/.opencode/command/libs-test-report.md b/.opencode/command/libs-test-report.md index 9c901414a..fec53f1aa 100644 --- a/.opencode/command/libs-test-report.md +++ b/.opencode/command/libs-test-report.md @@ -1,15 +1,15 @@ --- -description: Generate a repository-format test report from validation evidence +description: Generate a repository-format test report from validation evidence. agent: build -argument-hint: [app name] [evidence source] +argument-hint: --- -Use the `test-report-generation` skill to run the test report workflow. + -Usage: /libs-test-report +Use the `test-report-generation` skill. -If the task input is `help` or empty, echo the usage line, then ask the user for the app name and the validation evidence source. +Usage: /libs-test-report -If the task input is present, treat it as the workflow input. +If input is empty or `help`, return usage and ask for required arguments. $ARGUMENTS diff --git a/.opencode/command/libs-update-app.md b/.opencode/command/libs-update-app.md index 5c4cde9f2..f522fee49 100644 --- a/.opencode/command/libs-update-app.md +++ b/.opencode/command/libs-update-app.md @@ -1,19 +1,15 @@ --- -description: Implement an approved update for one app and produce a short report +description: Implement an approved update for one app and produce a short report. agent: build -argument-hint: [app name] [target version optional] +argument-hint: [target version] --- -Use the `app-update` skill to run the app update workflow. + -The slash command stays action-first (`libs-update-app`) even though the shared skill label is `app-update`. +Use the `app-update` skill. Usage: /libs-update-app [target version] -If the task input is `help` or empty, echo the usage line, then ask the user for the app name. The target version is optional: when omitted, detect the best candidate stable version and continue automatically when the choice is clear. A major version jump by itself is not a reason to stop for confirmation, because this workflow updates repository packaging rather than performing a live-instance migration. Ask for confirmation only when the candidate is ambiguous, risky for the package itself, or review-first. - -If the task input is present, treat it as the workflow input. - -If the task input contains `--report`, `formal`, or `formal-report`, produce the output using `report-template.md` from the skill. +If input is empty or `help`, return usage and ask for required arguments. $ARGUMENTS diff --git a/.opencode/command/libs-update-assessment.md b/.opencode/command/libs-update-assessment.md index b20bd0c33..d4aadfa01 100644 --- a/.opencode/command/libs-update-assessment.md +++ b/.opencode/command/libs-update-assessment.md @@ -1,17 +1,15 @@ --- -description: Assess whether one app is worth updating before implementation +description: Assess whether one app is worth updating before implementation. agent: build -argument-hint: [app name] +argument-hint: --- -Use the `update-assessment` skill to run the update assessment workflow. + -Usage: /libs-update-assessment - -If the task input is `help` or empty, echo the usage line, then ask the user which app to assess. +Use the `update-assessment` skill. -If the task input is present, treat it as the workflow input. +Usage: /libs-update-assessment -If the task input contains `--report`, `formal`, or `formal-report`, produce the output using `report-template.md` from the skill. +If input is empty or `help`, return usage and ask for required arguments. $ARGUMENTS diff --git a/.playwright-mcp/console-2026-10-15T01-28-23-284Z.log b/.playwright-mcp/console-2026-10-15T01-28-23-284Z.log deleted file mode 100644 index d092036ba..000000000 --- a/.playwright-mcp/console-2026-10-15T01-28-23-284Z.log +++ /dev/null @@ -1,81 +0,0 @@ -[ 221ms] [WARNING] Ignored an import map value of "@jfrog/mfe-frontend-manifest-esm": Bare specifier: ?v=1.652.49 @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2862ms] [WARNING] single-spa minified message #41: See https://single-spa.js.org/error/?code=41 @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1860 -[ 3457ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/releasebundles/js/manifest.esm.js?v=7.161.15:0 -[ 3462ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/rbv1received/js/manifest.esm.js?v=7.161.15:0 -[ 3523ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/distribution/webapp-vue3/js/manifest.esm.js:0 -[ 3533ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/mc/webapp/vue3/manifest.js:0 -[ 3551ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/catalog/webapp-vue3/js/manifest.esm.js:0 -[ 3554ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xray/webapp-vue3/js/manifest.esm.js:0 -[ 3657ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/runtime/webapp-vue3/js/manifest.esm.js:0 -[ 3714ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/retention-vue3/js/manifest.esm.js:0 -[ 3721ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/worker/webapp/vue3/manifest.js:0 -[ 3775ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/apptrust/webapp-vue3/manifest.js:0 -[ 3780ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/evaluation/webapp/manifest.js:0 -[ 3782ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/evidence/webapp/manifest.esm.js:0 -[ 3798ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/compliance/webapp/manifest.js:0 -[ 3931ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/unifiedpolicy/webapp-vue3/js/manifest.esm.js:0 -[ 3933ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/onemodel/webapp/manifest.js:0 -[ 3934ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/wingman/webapp/js/manifest.esm.js:0 -[ 3934ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/pfed/webapp/manifest.esm.js:0 -[ 3935ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/bridge-server/webapp/manifest.js:0 -[ 3935ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/bridge-client/webapp/manifest.js:0 -[ 3935ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/grid/webapp/manifest.esm.js:0 -[ 3936ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/fastci/webapp/js/manifest.esm.js:0 -[ 3951ms] [LOG] Feature Toggler: using server config: {"commonSessionExpiryWarning":false,"commonShouldEnableUserDataEnrichment":false,"commonFeatureAdoptionCollectionOnprem":true,"commonShouldEnableChiliPiper":false,"commonShouldEnableTemplates":true,"commonDataPopulation":false,"wingmanMfe":false} @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:389 -[ 4132ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4132ms] [WARNING] - Request: { FROM_MFE: true, Payload: INTEGRATIONS/WEBHOOKS, Query: INTEGRATIONS } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4133ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4133ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4172ms] [ERROR] Error: attribute d: Expected number, "M-nan -nanL9.2817…". @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:7 -[ 4278ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/distribution/webapp/js/manifest.umd.js:0 -[ 4278ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/distribution/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 4278ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/catalog/webapp/js/manifest.umd.js:0 -[ 4278ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/catalog/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 4279ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/insight/webapp/js/manifest.umd.js:0 -[ 4279ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/insight/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 4296ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xray/webapp/js/manifest.umd.js:0 -[ 4296ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xray/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 4297ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/retention/js/manifest.umd.js:0 -[ 4297ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/retention/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 4297ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/runtime/webapp/js/manifest.umd.js:0 -[ 4297ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/runtime/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 4329ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4330ms] [WARNING] - Request: { FROM_MFE: true, Payload: INTEGRATIONS/WEBHOOKS, Query: INTEGRATIONS } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4331ms] [WARNING] - Request: { FROM_MFE: true, Payload: INTEGRATIONS/WEBHOOKS, Query: INTEGRATIONS } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4332ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4333ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4333ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4364ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4364ms] [WARNING] - Request: { FROM_MFE: true, Payload: INTEGRATIONS/WEBHOOKS, Query: INTEGRATIONS } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4365ms] [WARNING] - Request: { FROM_MFE: true, Payload: INTEGRATIONS/WEBHOOKS, Query: INTEGRATIONS } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4365ms] [WARNING] - Request: { FROM_MFE: true, Payload: INTEGRATIONS/WEBHOOKS, Query: INTEGRATIONS } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4369ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4370ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4370ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4370ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4380ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/pipe/webapp/js/manifest.umd.js:0 -[ 4380ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/pipe/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 4381ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/unifiedpolicy/webapp/js/manifest.umd.js:0 -[ 4382ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/unifiedpolicy/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 4382ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xsc/webapp/js/manifest.umd.js:0 -[ 4382ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xsc/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 4383ms] [ERROR] Failed to load resource: the server responded with a status of 403 (Forbidden) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ml/frontend-mfe-server/static/manifest.js:0 -[ 4383ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ml/frontend-mfe-server/static/manifest.js' because its MIME type ('text/html') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 4405ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4405ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4405ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4405ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4406ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4420ms] [LOG] Feature Toggler: using server config: {"accessProjectsMigrations":false,"commonSessionExpiryWarning":false,"commonShouldEnableUserDataEnrichment":false,"commonFeatureAdoptionCollectionOnprem":true,"commonShouldEnableChiliPiper":false,"commonShouldEnableTemplates":true,"commonDataPopulation":false,"wingmanMfe":false} @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:389 -[ 4426ms] [LOG] Feature Toggler: using local storage mock: {} @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:389 -[ 7862ms] [WARNING] single-spa minified message #1: See https://single-spa.js.org/error/?code=1 @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1860 -[ 93421ms] [ERROR] Failed to load resource: the server responded with a status of 504 (Gateway Time-out) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/auth/current:0 -[ 93929ms] [ERROR] error in fetching user info. msg: Cannot destructure property 'data' of '(intermediate value)' as it is undefined. @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:388 -[ 183987ms] [ERROR] Failed to load resource: the server responded with a status of 504 (Gateway Time-out) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/auth/current:0 -[ 184837ms] [ERROR] Failed to load resource: the server responded with a status of 401 (Unauthorized) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/system/adoptionMetric:0 -[ 184839ms] [WARNING] error in setting feature adoption metric: Request failed with status code 401 @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:388 -[ 184922ms] [ERROR] Appcues or its reset method is not available in customizedWindow @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 186149ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/oauth2/loginRequestPlatform:0 -[ 186156ms] [ERROR] AxiosError: Request failed with status code 404 - at aRe (http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1947:11009) - at XMLHttpRequest._ (http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1947:17635) @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1975 diff --git a/.playwright-mcp/console-2026-10-15T01-33-52-934Z.log b/.playwright-mcp/console-2026-10-15T01-33-52-934Z.log deleted file mode 100644 index c95c64b86..000000000 --- a/.playwright-mcp/console-2026-10-15T01-33-52-934Z.log +++ /dev/null @@ -1,65 +0,0 @@ -[ 237ms] [WARNING] Ignored an import map value of "@jfrog/mfe-frontend-manifest-esm": Bare specifier: ?v=1.652.49 @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 1345ms] [WARNING] single-spa minified message #41: See https://single-spa.js.org/error/?code=41 @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1860 -[ 2106ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/releasebundles/js/manifest.esm.js?v=7.161.15:0 -[ 2107ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/rbv1received/js/manifest.esm.js?v=7.161.15:0 -[ 2107ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/mc/webapp/vue3/manifest.js:0 -[ 2108ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/distribution/webapp-vue3/js/manifest.esm.js:0 -[ 2108ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/catalog/webapp-vue3/js/manifest.esm.js:0 -[ 2108ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xray/webapp-vue3/js/manifest.esm.js:0 -[ 2108ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/retention-vue3/js/manifest.esm.js:0 -[ 2109ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/runtime/webapp-vue3/js/manifest.esm.js:0 -[ 2204ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2204ms] [WARNING] - Request: { FROM_MFE: true, Payload: INTEGRATIONS/WEBHOOKS, Query: INTEGRATIONS } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2206ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2206ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2260ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2261ms] [WARNING] - Request: { FROM_MFE: true, Payload: INTEGRATIONS/WEBHOOKS, Query: INTEGRATIONS } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2261ms] [WARNING] - Request: { FROM_MFE: true, Payload: INTEGRATIONS/WEBHOOKS, Query: INTEGRATIONS } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2269ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2270ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2271ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2283ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/worker/webapp/vue3/manifest.js:0 -[ 2284ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/evidence/webapp/manifest.esm.js:0 -[ 2284ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/apptrust/webapp-vue3/manifest.js:0 -[ 2284ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/evaluation/webapp/manifest.js:0 -[ 2291ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/wingman/webapp/js/manifest.esm.js:0 -[ 2292ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/compliance/webapp/manifest.js:0 -[ 2292ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/unifiedpolicy/webapp-vue3/js/manifest.esm.js:0 -[ 2292ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/onemodel/webapp/manifest.js:0 -[ 2293ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/pfed/webapp/manifest.esm.js:0 -[ 2326ms] [LOG] Feature Toggler: using server config: {"accessProjectsMigrations":false,"commonSessionExpiryWarning":false,"commonShouldEnableUserDataEnrichment":false,"commonFeatureAdoptionCollectionOnprem":true,"commonShouldEnableChiliPiper":false,"commonShouldEnableTemplates":true,"commonDataPopulation":false,"wingmanMfe":false} @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:389 -[ 2327ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/grid/webapp/manifest.esm.js:0 -[ 2328ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/bridge-client/webapp/manifest.js:0 -[ 2328ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/bridge-server/webapp/manifest.js:0 -[ 2328ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/fastci/webapp/js/manifest.esm.js:0 -[ 2336ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/catalog/webapp/js/manifest.umd.js:0 -[ 2337ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/catalog/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2337ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xray/webapp/js/manifest.umd.js:0 -[ 2337ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xray/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2337ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/retention/js/manifest.umd.js:0 -[ 2337ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/retention/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2338ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/insight/webapp/js/manifest.umd.js:0 -[ 2338ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/insight/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2370ms] [ERROR] Error: attribute d: Expected number, "M-nan -nanL9.2817…". @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:7 -[ 2455ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/runtime/webapp/js/manifest.umd.js:0 -[ 2455ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/runtime/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2456ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/pipe/webapp/js/manifest.umd.js:0 -[ 2456ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/pipe/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2456ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xsc/webapp/js/manifest.umd.js:0 -[ 2456ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xsc/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2456ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/unifiedpolicy/webapp/js/manifest.umd.js:0 -[ 2460ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/unifiedpolicy/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2460ms] [ERROR] Failed to load resource: the server responded with a status of 403 (Forbidden) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ml/frontend-mfe-server/static/manifest.js:0 -[ 2462ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ml/frontend-mfe-server/static/manifest.js' because its MIME type ('text/html') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2594ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/distribution/webapp/js/manifest.umd.js:0 -[ 2594ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/distribution/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2622ms] [LOG] Feature Toggler: using server config: {"accessProjectsMigrations":false,"commonSessionExpiryWarning":false,"commonShouldEnableUserDataEnrichment":false,"commonFeatureAdoptionCollectionOnprem":true,"commonShouldEnableChiliPiper":false,"commonShouldEnableTemplates":true,"commonDataPopulation":false,"wingmanMfe":false} @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:389 -[ 2630ms] [LOG] Feature Toggler: using local storage mock: {} @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:389 -[ 6345ms] [WARNING] single-spa minified message #1: See https://single-spa.js.org/error/?code=1 @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1860 -[ 69896ms] [ERROR] Failed to load resource: the server responded with a status of 401 (Unauthorized) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/system/adoptionMetric:0 -[ 69900ms] [WARNING] error in setting feature adoption metric: Request failed with status code 401 @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:388 -[ 70034ms] [ERROR] Appcues or its reset method is not available in customizedWindow @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 71147ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/oauth2/loginRequestPlatform:0 -[ 71148ms] [ERROR] AxiosError: Request failed with status code 404 - at aRe (http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1947:11009) - at XMLHttpRequest._ (http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1947:17635) @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1975 diff --git a/.playwright-mcp/console-2026-10-15T01-39-16-123Z.log b/.playwright-mcp/console-2026-10-15T01-39-16-123Z.log deleted file mode 100644 index 2a1bc2175..000000000 --- a/.playwright-mcp/console-2026-10-15T01-39-16-123Z.log +++ /dev/null @@ -1,67 +0,0 @@ -[ 649ms] [WARNING] Ignored an import map value of "@jfrog/mfe-frontend-manifest-esm": Bare specifier: ?v=1.652.49 @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 1451ms] [WARNING] single-spa minified message #41: See https://single-spa.js.org/error/?code=41 @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1860 -[ 2133ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2133ms] [WARNING] - Request: { FROM_MFE: true, Payload: INTEGRATIONS/WEBHOOKS, Query: INTEGRATIONS } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2135ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2135ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2145ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2145ms] [WARNING] - Request: { FROM_MFE: true, Payload: INTEGRATIONS/WEBHOOKS, Query: INTEGRATIONS } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2146ms] [WARNING] - Request: { FROM_MFE: true, Payload: INTEGRATIONS/WEBHOOKS, Query: INTEGRATIONS } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2148ms] [WARNING] 1 following requests unresolved @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2148ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2148ms] [WARNING] - Request: { FROM_MFE: true, Payload: PLATFORM_MANAGEMENT/ADMIN_WEBHOOKS, Query: PLATFORM_MANAGEMENT } @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 2217ms] [ERROR] Error: attribute d: Expected number, "M-nan -nanL9.2817…". @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:7 -[ 2304ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/distribution/webapp-vue3/js/manifest.esm.js:0 -[ 2305ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/mc/webapp/vue3/manifest.js:0 -[ 2305ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/releasebundles/js/manifest.esm.js?v=7.161.15:0 -[ 2306ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/catalog/webapp-vue3/js/manifest.esm.js:0 -[ 2306ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/rbv1received/js/manifest.esm.js?v=7.161.15:0 -[ 2315ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xray/webapp-vue3/js/manifest.esm.js:0 -[ 2343ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/retention-vue3/js/manifest.esm.js:0 -[ 2368ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/runtime/webapp-vue3/js/manifest.esm.js:0 -[ 2443ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/apptrust/webapp-vue3/manifest.js:0 -[ 2457ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/worker/webapp/vue3/manifest.js:0 -[ 2459ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/evidence/webapp/manifest.esm.js:0 -[ 2464ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/evaluation/webapp/manifest.js:0 -[ 2469ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/compliance/webapp/manifest.js:0 -[ 2470ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/unifiedpolicy/webapp-vue3/js/manifest.esm.js:0 -[ 2563ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/onemodel/webapp/manifest.js:0 -[ 2589ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/pfed/webapp/manifest.esm.js:0 -[ 2592ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/wingman/webapp/js/manifest.esm.js:0 -[ 2595ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/grid/webapp/manifest.esm.js:0 -[ 2597ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/bridge-client/webapp/manifest.js:0 -[ 2726ms] [LOG] Feature Toggler: using server config: {"accessProjectsMigrations":false,"commonSessionExpiryWarning":false,"commonShouldEnableUserDataEnrichment":false,"commonFeatureAdoptionCollectionOnprem":true,"commonShouldEnableChiliPiper":false,"commonShouldEnableTemplates":true,"commonDataPopulation":false,"wingmanMfe":false} @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:389 -[ 2729ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/insight/webapp/js/manifest.umd.js:0 -[ 2729ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/insight/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2761ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/catalog/webapp/js/manifest.umd.js:0 -[ 2761ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/catalog/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2789ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xray/webapp/js/manifest.umd.js:0 -[ 2789ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xray/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2792ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/bridge-server/webapp/manifest.js:0 -[ 2811ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/retention/js/manifest.umd.js:0 -[ 2811ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/webapp/retention/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2872ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/runtime/webapp/js/manifest.umd.js:0 -[ 2872ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/runtime/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2931ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/pipe/webapp/js/manifest.umd.js:0 -[ 2931ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/pipe/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2955ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/distribution/webapp/js/manifest.umd.js:0 -[ 2956ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/distribution/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2956ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/fastci/webapp/js/manifest.esm.js:0 -[ 2961ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/unifiedpolicy/webapp/js/manifest.umd.js:0 -[ 2961ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/unifiedpolicy/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 2966ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xsc/webapp/js/manifest.umd.js:0 -[ 2967ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/xsc/webapp/js/manifest.umd.js' because its MIME type ('text/plain') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 3304ms] [ERROR] Failed to load resource: the server responded with a status of 401 (Unauthorized) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/system/adoptionMetric:0 -[ 3307ms] [WARNING] error in setting feature adoption metric: Request failed with status code 401 @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:388 -[ 3310ms] [ERROR] Failed to load resource: the server responded with a status of 403 (Forbidden) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ml/frontend-mfe-server/static/manifest.js:0 -[ 3310ms] [ERROR] Refused to execute script from 'http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ml/frontend-mfe-server/static/manifest.js' because its MIME type ('text/html') is not executable, and strict MIME type checking is enabled. @ http://jfrogartifactory.libs.websoft9.cn/ui/:0 -[ 3320ms] [LOG] Feature Toggler: using server config: {"accessProjectsMigrations":false,"commonSessionExpiryWarning":false,"commonShouldEnableUserDataEnrichment":false,"commonFeatureAdoptionCollectionOnprem":true,"commonShouldEnableChiliPiper":false,"commonShouldEnableTemplates":true,"commonDataPopulation":false,"wingmanMfe":false} @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:389 -[ 3328ms] [LOG] Feature Toggler: using local storage mock: {} @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:389 -[ 3467ms] [ERROR] Appcues or its reset method is not available in customizedWindow @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:2003 -[ 4547ms] [ERROR] Failed to load resource: the server responded with a status of 404 (Not Found) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/ui/oauth2/loginRequestPlatform:0 -[ 4865ms] [ERROR] AxiosError: Request failed with status code 404 - at aRe (http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1947:11009) - at XMLHttpRequest._ (http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1947:17635) @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1975 -[ 6451ms] [WARNING] single-spa minified message #1: See https://single-spa.js.org/error/?code=1 @ http://jfrogartifactory.libs.websoft9.cn/ui/client-mfe/assets/legacy/app-frontend-DLE0vcG8.js:1860 -[ 34405ms] [ERROR] Failed to load resource: the server responded with a status of 403 (Forbidden) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/access/auth/login?_spring_security_remember_me=false:0 -[ 77021ms] [ERROR] Failed to load resource: the server responded with a status of 403 (Forbidden) @ http://jfrogartifactory.libs.websoft9.cn/ui/api/v1/access/auth/login?_spring_security_remember_me=false:0 diff --git a/.playwright-mcp/page-2026-10-15T01-28-25-042Z.yml b/.playwright-mcp/page-2026-10-15T01-28-25-042Z.yml deleted file mode 100644 index 59cdbc7f6..000000000 --- a/.playwright-mcp/page-2026-10-15T01-28-25-042Z.yml +++ /dev/null @@ -1,2 +0,0 @@ -- generic [active] [ref=e1]: - - status \ No newline at end of file diff --git a/.playwright-mcp/page-2026-10-15T01-33-53-818Z.yml b/.playwright-mcp/page-2026-10-15T01-33-53-818Z.yml deleted file mode 100644 index 14a35cca8..000000000 --- a/.playwright-mcp/page-2026-10-15T01-33-53-818Z.yml +++ /dev/null @@ -1,2 +0,0 @@ -- generic [active] [ref=f1e1]: - - status \ No newline at end of file diff --git a/.playwright-mcp/page-2026-10-15T01-34-35-146Z.yml b/.playwright-mcp/page-2026-10-15T01-34-35-146Z.yml deleted file mode 100644 index 14a35cca8..000000000 --- a/.playwright-mcp/page-2026-10-15T01-34-35-146Z.yml +++ /dev/null @@ -1,2 +0,0 @@ -- generic [active] [ref=f1e1]: - - status \ No newline at end of file diff --git a/.playwright-mcp/page-2026-10-15T01-39-17-126Z.yml b/.playwright-mcp/page-2026-10-15T01-39-17-126Z.yml deleted file mode 100644 index f41521f4f..000000000 --- a/.playwright-mcp/page-2026-10-15T01-39-17-126Z.yml +++ /dev/null @@ -1,2 +0,0 @@ -- generic [active] [ref=f2e1]: - - status \ No newline at end of file diff --git a/.playwright-mcp/page-2026-10-15T01-39-52-432Z.yml b/.playwright-mcp/page-2026-10-15T01-39-52-432Z.yml deleted file mode 100644 index b80331616..000000000 --- a/.playwright-mcp/page-2026-10-15T01-39-52-432Z.yml +++ /dev/null @@ -1,23 +0,0 @@ -- generic [active] [ref=f2e1]: - - status - - generic [ref=f2e11]: - - img "logo" [ref=f2e13] - - generic [ref=f2e19]: - - generic [ref=f2e20]: Welcome to JFrog - - generic [ref=f2e22]: - - alert [ref=f2e48]: - - generic [ref=f2e49]: "{" - - generic [ref=f2e51]: This request is blocked due to recurrent request failures, please try again in 4 second(s) - - generic [ref=f2e23]: - - generic [ref=f2e24]: - - generic [ref=f2e25]: "* Username" - - textbox "* Username" [ref=f2e29]: admin - - generic [ref=f2e30]: - - generic [ref=f2e31]: "* Password" - - textbox "* Password" [ref=f2e35]: - - /placeholder: "" - - generic [ref=f2e37] [cursor=pointer]: - - generic [ref=f2e38]: - - checkbox "Remember me" - - generic [ref=f2e40]: Remember me - - button "Login" [ref=f2e43] [cursor=pointer] \ No newline at end of file diff --git a/.playwright-mcp/page-2026-10-15T01-40-00-713Z.yml b/.playwright-mcp/page-2026-10-15T01-40-00-713Z.yml deleted file mode 100644 index b80331616..000000000 --- a/.playwright-mcp/page-2026-10-15T01-40-00-713Z.yml +++ /dev/null @@ -1,23 +0,0 @@ -- generic [active] [ref=f2e1]: - - status - - generic [ref=f2e11]: - - img "logo" [ref=f2e13] - - generic [ref=f2e19]: - - generic [ref=f2e20]: Welcome to JFrog - - generic [ref=f2e22]: - - alert [ref=f2e48]: - - generic [ref=f2e49]: "{" - - generic [ref=f2e51]: This request is blocked due to recurrent request failures, please try again in 4 second(s) - - generic [ref=f2e23]: - - generic [ref=f2e24]: - - generic [ref=f2e25]: "* Username" - - textbox "* Username" [ref=f2e29]: admin - - generic [ref=f2e30]: - - generic [ref=f2e31]: "* Password" - - textbox "* Password" [ref=f2e35]: - - /placeholder: "" - - generic [ref=f2e37] [cursor=pointer]: - - generic [ref=f2e38]: - - checkbox "Remember me" - - generic [ref=f2e40]: Remember me - - button "Login" [ref=f2e43] [cursor=pointer] \ No newline at end of file diff --git a/.playwright-mcp/page-2026-10-15T01-40-21-889Z.yml b/.playwright-mcp/page-2026-10-15T01-40-21-889Z.yml deleted file mode 100644 index b80331616..000000000 --- a/.playwright-mcp/page-2026-10-15T01-40-21-889Z.yml +++ /dev/null @@ -1,23 +0,0 @@ -- generic [active] [ref=f2e1]: - - status - - generic [ref=f2e11]: - - img "logo" [ref=f2e13] - - generic [ref=f2e19]: - - generic [ref=f2e20]: Welcome to JFrog - - generic [ref=f2e22]: - - alert [ref=f2e48]: - - generic [ref=f2e49]: "{" - - generic [ref=f2e51]: This request is blocked due to recurrent request failures, please try again in 4 second(s) - - generic [ref=f2e23]: - - generic [ref=f2e24]: - - generic [ref=f2e25]: "* Username" - - textbox "* Username" [ref=f2e29]: admin - - generic [ref=f2e30]: - - generic [ref=f2e31]: "* Password" - - textbox "* Password" [ref=f2e35]: - - /placeholder: "" - - generic [ref=f2e37] [cursor=pointer]: - - generic [ref=f2e38]: - - checkbox "Remember me" - - generic [ref=f2e40]: Remember me - - button "Login" [ref=f2e43] [cursor=pointer] \ No newline at end of file diff --git a/.playwright-mcp/page-2026-10-15T01-40-34-187Z.yml b/.playwright-mcp/page-2026-10-15T01-40-34-187Z.yml deleted file mode 100644 index 539966ecf..000000000 --- a/.playwright-mcp/page-2026-10-15T01-40-34-187Z.yml +++ /dev/null @@ -1,23 +0,0 @@ -- generic [active] [ref=f2e1]: - - status - - generic [ref=f2e11]: - - img "logo" [ref=f2e13] - - generic [ref=f2e19]: - - generic [ref=f2e20]: Welcome to JFrog - - generic [ref=f2e22]: - - alert [ref=f2e53]: - - generic [ref=f2e54]: "{" - - generic [ref=f2e56]: This request is blocked due to recurrent request failures, please try again in 9 second(s) - - generic [ref=f2e23]: - - generic [ref=f2e24]: - - generic [ref=f2e25]: "* Username" - - textbox "* Username" [ref=f2e29]: admin - - generic [ref=f2e30]: - - generic [ref=f2e31]: "* Password" - - textbox "* Password" [ref=f2e35]: - - /placeholder: "" - - generic [ref=f2e37] [cursor=pointer]: - - generic [ref=f2e38]: - - checkbox "Remember me" - - generic [ref=f2e40]: Remember me - - button "Login" [ref=f2e43] [cursor=pointer] \ No newline at end of file diff --git a/.playwright-mcp/page-2026-10-15T01-40-44-592Z.yml b/.playwright-mcp/page-2026-10-15T01-40-44-592Z.yml deleted file mode 100644 index 539966ecf..000000000 --- a/.playwright-mcp/page-2026-10-15T01-40-44-592Z.yml +++ /dev/null @@ -1,23 +0,0 @@ -- generic [active] [ref=f2e1]: - - status - - generic [ref=f2e11]: - - img "logo" [ref=f2e13] - - generic [ref=f2e19]: - - generic [ref=f2e20]: Welcome to JFrog - - generic [ref=f2e22]: - - alert [ref=f2e53]: - - generic [ref=f2e54]: "{" - - generic [ref=f2e56]: This request is blocked due to recurrent request failures, please try again in 9 second(s) - - generic [ref=f2e23]: - - generic [ref=f2e24]: - - generic [ref=f2e25]: "* Username" - - textbox "* Username" [ref=f2e29]: admin - - generic [ref=f2e30]: - - generic [ref=f2e31]: "* Password" - - textbox "* Password" [ref=f2e35]: - - /placeholder: "" - - generic [ref=f2e37] [cursor=pointer]: - - generic [ref=f2e38]: - - checkbox "Remember me" - - generic [ref=f2e40]: Remember me - - button "Login" [ref=f2e43] [cursor=pointer] \ No newline at end of file diff --git a/AGENTS.md b/AGENTS.md index fb2668fe6..7ac7c49f3 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -32,6 +32,7 @@ Read in this order: - Quick network checks use a 2s per-attempt budget with at most 2 retries. If a target URL is unreachable locally, switch to the remote host's egress instead of extending local timeouts. - After a successful app update or new app with substantive changes, run `libs appstore-sync --app ` to push it to the test server's websoft9 store. Preflight the `websoft9` container with a <= 10s check and skip the sync when it is absent. - When `.secrets/remote.env` exists, prefer remote-first for all runtime, deployment, debugging, and validation work; do not default to local container execution unless the user explicitly asks for local reproduction. +- When changing `skills/commands.manifest.json`, command adapter templates, or skill-command mappings, run `make build-ai-commands` and include generated updates under `.opencode/command/`, `.github/prompts/`, and `.codex/prompts/` in the same change. ## i18n diff --git a/Makefile b/Makefile index 44ea18fc8..1e9f0c4ac 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: help opencode opencode-clear install libs cli remote connector github-token dns-bind dns-delete websoft9-upgrade create-aliyun-ecs test test-cli test-build test-skills +.PHONY: help opencode opencode-clear install libs cli remote connector github-token install-git-hooks dns-bind dns-delete websoft9-upgrade create-aliyun-ecs build-ai-commands test test-cli test-build test-skills ifeq ($(OS),Windows_NT) PYTHON ?= py @@ -28,12 +28,14 @@ help: @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'test-cli' 'run cli unit and contract tests' @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'test-build' 'run build pipeline smoke tests' @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'test-skills' 'run skills asset and workflow tests' + @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'build-ai-commands' 'generate opencode/copilot/codex command adapters from manifest' @printf '\n \033[1;35m▸ Config & Setup\033[0m\n' @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'help' 'show this help' @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'install' 'create .venv and install the libs CLI' @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'remote' 'interactively write .secrets/remote.env for remote-aware commands' @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'connector' 'interactively write .secrets/.env for API tokens, DNS and cloud credentials' @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'github-token' 'configure the GitHub MCP token for opencode' + @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'install-git-hooks' 'set core.hooksPath=.githooks and enable local quality hooks' @printf '\n' opencode: @@ -117,6 +119,14 @@ remote: github-token: @$(PYTHON) ci/scripts/configure_github_mcp.py $(ARGS) +install-git-hooks: + @git config core.hooksPath .githooks + @chmod +x .githooks/pre-commit .githooks/pre-push + @echo "configured git hooks path: .githooks" + +build-ai-commands: + @$(PYTHON) ci/scripts/build_ai_commands.py $(ARGS) + connector: @mkdir -p .secrets @bash -lc 'set -e; \ diff --git a/README.md b/README.md index d53c3801c..1a6aad951 100644 --- a/README.md +++ b/README.md @@ -16,19 +16,20 @@ Core design goals: - machine-readable metadata for the Websoft9 platform and AI agents - repeatable, auditable maintenance -## AI-driven maintenance -This repository is maintained by AI agents under owner review. The owner decides demand and the final end-to-end result; AI handles upstream research, implementation, routine validation, and reporting. +## Quick start -Entry points for contributors and agents: +### AI agent deployment -- `AGENTS.md` - repository rules and fastest entry point -- `docs/ai-sdlc/` - AI delivery pipeline, quality gates, and report format -- `skills/` - shared agent workflows for new apps, updates, deployment validation, and archive/restore -- `metadata/maintenance.yaml` and `metadata/archive.yaml` - maintenance and lifecycle state -- `cli/` - the `libs` automation interface +Use the following prompt with your AI agent: -## Quick start +```text +git colone https://github.com/Websoft9/docker-library.git, then deploy one app for me using the `install-app` skill. +Start by listing `apps/`, ask me which app to deploy if I did not specify one, +and return the final access URL plus a short validation summary. +``` + +### Manual deployment 1. Install Docker. @@ -54,10 +55,25 @@ Entry points for contributors and agents: The Websoft9 console is the easiest way to run these packages with a web UI, domains, HTTPS, backups, and lifecycle management. +## AI-driven maintenance + +This repository is maintained by AI agents under owner review. The owner decides demand and the final end-to-end result; AI handles upstream research, implementation, routine validation, and reporting. + +Entry points for contributors and agents: + +- `AGENTS.md` - repository rules and fastest entry point +- `docs/ai-sdlc/` - AI delivery pipeline, quality gates, and report format +- `skills/` - shared agent workflows for new apps, updates, deployment validation, and archive/restore +- `metadata/maintenance.yaml` and `metadata/archive.yaml` - maintenance and lifecycle state +- `cli/` - the `libs` automation interface + ## AI agent commands (opencode) +Command adapters are generated from `skills/commands.manifest.json` by `make build-ai-commands`. + | Command | Purpose | |---|---| +| `/libs-install-app [local\|remote]` | Install one app package with target selection, port pre-check, and health validation | | `/libs-new-app ` | Create a new app package | | `/libs-update-assessment ` | Check upstream versions and decide whether an update is worth doing | | `/libs-update-app [version]` | Implement an approved update and produce a report | @@ -82,6 +98,7 @@ All images come from the official project or an authoritative third party (for e - [Maintenance metadata](metadata/maintenance.yaml) - [Archive metadata](metadata/archive.yaml) - [Shared skills](skills/README.md) +- [AI command manifest](skills/commands.manifest.json) - [CLI](cli/README.md) - [Websoft9 Administrator Guide](https://support.websoft9.com/docs/apps) diff --git a/apps/directus/.env b/apps/directus/.env index 0760e56d3..24e5b3346 100644 --- a/apps/directus/.env +++ b/apps/directus/.env @@ -36,8 +36,8 @@ SECRET=6116487b-cda1-${W9_POWER_PASSWORD} DB_CLIENT=pg DB_HOST=${W9_ID}-postgresql DB_PORT=5432 -DB_DATABASE=${W9_ID} -DB_USER=${W9_ID} +DB_DATABASE=directus +DB_USER=directus DB_PASSWORD=${W9_POWER_PASSWORD} ADMIN_EMAIL=${W9_LOGIN_USER} ADMIN_PASSWORD=${W9_LOGIN_PASSWORD} diff --git a/apps/directus/docker-compose.yml b/apps/directus/docker-compose.yml index aabebd622..0858b2594 100644 --- a/apps/directus/docker-compose.yml +++ b/apps/directus/docker-compose.yml @@ -30,11 +30,11 @@ services: volumes: - postgres:/var/lib/postgresql/data environment: - POSTGRES_DB: ${W9_ID} - POSTGRES_USER: ${W9_ID} + POSTGRES_DB: directus + POSTGRES_USER: directus POSTGRES_PASSWORD: ${W9_POWER_PASSWORD} healthcheck: - test: ["CMD", "pg_isready", "--host=localhost", "--username=${W9_ID}"] + test: ["CMD", "pg_isready", "--host=localhost", "--username=directus"] interval: 10s timeout: 5s retries: 5 diff --git a/apps/dolibarr/.env b/apps/dolibarr/.env index 128d8cb6a..f338731a0 100644 --- a/apps/dolibarr/.env +++ b/apps/dolibarr/.env @@ -41,9 +41,9 @@ W9_NETWORK=websoft9 # Used by docker-compose.yml: DOLI_URL_ROOT=http://${W9_URL} DOLI_DB_HOST=${W9_ID}-mariadb -DOLI_DB_USER=${W9_ID} +DOLI_DB_USER=dolibarr DOLI_DB_PASSWORD=${W9_POWER_PASSWORD} -DOLI_DB_NAME=${W9_ID} +DOLI_DB_NAME=dolibarr DOLI_ADMIN_LOGIN=${W9_LOGIN_USER} DOLI_ADMIN_PASSWORD=${W9_POWER_PASSWORD} PHP_INI_DATE_TIMEZONE=Europe/Paris diff --git a/apps/dolibarr/docker-compose.yml b/apps/dolibarr/docker-compose.yml index e7f08f283..586c32935 100644 --- a/apps/dolibarr/docker-compose.yml +++ b/apps/dolibarr/docker-compose.yml @@ -17,8 +17,8 @@ services: container_name: ${W9_ID}-mariadb restart: unless-stopped environment: - MARIADB_DATABASE: ${W9_ID} - MARIADB_USER: ${W9_ID} + MARIADB_DATABASE: dolibarr + MARIADB_USER: dolibarr MARIADB_PASSWORD: ${W9_POWER_PASSWORD} MARIADB_ROOT_PASSWORD: ${W9_POWER_PASSWORD} volumes: diff --git a/apps/ghost/.env b/apps/ghost/.env index c331a2f36..cbd5d3fc9 100644 --- a/apps/ghost/.env +++ b/apps/ghost/.env @@ -33,9 +33,9 @@ W9_NETWORK=websoft9 NODE_ENV=production database__client=mysql database__connection__host=${W9_ID}-mysql -database__connection__user=${W9_ID} +database__connection__user=ghost database__connection__password="${W9_POWER_PASSWORD}" -database__connection__database=${W9_ID} +database__connection__database=ghost url=http://${W9_URL} # Not used by default; enable only when needed: diff --git a/apps/ghost/docker-compose.yml b/apps/ghost/docker-compose.yml index ee7b33616..3704d759d 100644 --- a/apps/ghost/docker-compose.yml +++ b/apps/ghost/docker-compose.yml @@ -21,8 +21,8 @@ services: volumes: - mysql:/var/lib/mysql environment: - MYSQL_DATABASE: ${W9_ID} - MYSQL_USER: ${W9_ID} + MYSQL_DATABASE: ghost + MYSQL_USER: ghost MYSQL_PASSWORD: ${W9_POWER_PASSWORD} MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWORD} diff --git a/apps/grafana/.env b/apps/grafana/.env index df5531377..021c1369b 100644 --- a/apps/grafana/.env +++ b/apps/grafana/.env @@ -1,5 +1,6 @@ # latest is not stable, sometime is 9.x,sometime is 8.x W9_REPO=grafana/grafana +W9_DIST='community' W9_VERSION='13.2' W9_POWER_PASSWORD='5PidNEsE5!D314t0' @@ -13,16 +14,27 @@ W9_URL='appname.example.com' W9_NETWORK=websoft9 #### --------------------------------------------------------------------------------------- #### -# You can use any environment from grafana.ini. format: GF__ -# refer to: https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#variable-expansion +# ============================================================ +# Grafana image environment variables +# Docs: https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#variable-expansion +# Follow docs/w9-env-spec.md when deciding which vars belong here. +# Enable the vars actually used in docker-compose.yml below; list up +# to 5 unused vars commented out. Full reference lives in the Docs URL. +# ============================================================ + +# Used by docker-compose.yml: +# You can use any environment from grafana.ini. format: GF__ # Grafana 13.x deprecated GF_INSTALL_PLUGINS (silently ignored unless GF_INSTALL_PLUGINS_FORCE=true). -# Use GF_PLUGINS_PREINSTALL instead. -GF_PLUGINS_PREINSTALL=grafana-clock-panel,grafana-simple-json-datasource +# Use GF_PLUGINS_PREINSTALL instead. Grafana 13 refuses Angular plugins, so keep only supported plugins. +GF_PLUGINS_PREINSTALL=grafana-clock-panel GF_LOG_MODE=console file GF_SECURITY_ADMIN_USER=${W9_LOGIN_USER} GF_SECURITY_ADMIN_PASSWORD=${W9_POWER_PASSWORD} # for html display at Text Panel GF_PANELS_DISABLE_SANITIZE_HTML=true -W9_DIST='community' + +# Not used by default; enable only when needed: +# GF_DATABASE_URL= +# GF_SERVER_ROOT_URL= diff --git a/apps/grafana/CHANGELOG.md b/apps/grafana/CHANGELOG.md index 4bfca062b..4418587f0 100644 --- a/apps/grafana/CHANGELOG.md +++ b/apps/grafana/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG +## 2026-10-22 + +- Kept `W9_VERSION=13.2`; the upstream stable `13.2` tag currently resolves to Grafana `13.2.4`. +- Removed `grafana-simple-json-datasource` from `GF_PLUGINS_PREINSTALL` because Grafana 13 refuses Angular plugins; only `grafana-clock-panel` is preinstalled now. +- Aligned the `.env` image environment section with the current template banner and Docs URL. + ## 2026-10-13 - Upgraded Grafana to `13.2`. diff --git a/apps/grafana/docker-compose-enterprise.yml b/apps/grafana/docker-compose-enterprise.yml index 02c8b0216..654574dc8 100644 --- a/apps/grafana/docker-compose-enterprise.yml +++ b/apps/grafana/docker-compose-enterprise.yml @@ -23,7 +23,7 @@ services: # You can use any environment from grafana.ini. format: GF_[group]_item - GF_SECURITY_ADMIN_USER=${W9_LOGIN_USER} - GF_SECURITY_ADMIN_PASSWORD=${W9_POWER_PASSWORD} - - GF_DATABASE_URL=mysql://$W9_ID:$W9_POWER_PASSWORD@${W9_ID}-mysql:3306/$W9_ID + - GF_DATABASE_URL=mysql://$W9_ID:$W9_POWER_PASSWORD@${W9_ID}-mysql:3306/grafana mysql: image: mysql:5.7 @@ -33,8 +33,8 @@ services: volumes: - mysql:/var/lib/mysql environment: - MYSQL_DATABASE: $W9_ID - MYSQL_USER: $W9_ID + MYSQL_DATABASE: grafana + MYSQL_USER: grafana MYSQL_PASSWORD: $W9_POWER_PASSWORD MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD env_file: .env diff --git a/apps/matomo/docker-compose.yml b/apps/matomo/docker-compose.yml index 9db217c5b..2e88e5c99 100644 --- a/apps/matomo/docker-compose.yml +++ b/apps/matomo/docker-compose.yml @@ -13,9 +13,9 @@ services: env_file: .env environment: - MATOMO_DATABASE_HOST=${W9_ID}-mysql - - MATOMO_DATABASE_USERNAME=${W9_ID} + - MATOMO_DATABASE_USERNAME=matomo - MATOMO_DATABASE_PASSWORD=${W9_POWER_PASSWORD} - - MATOMO_DATABASE_DBNAME=${W9_ID} + - MATOMO_DATABASE_DBNAME=matomo volumes: - 'matomo:/var/www/html' restart: unless-stopped @@ -28,8 +28,8 @@ services: command: --default-authentication-plugin=mysql_native_password environment: MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWORD} - MYSQL_DATABASE: ${W9_ID} - MYSQL_USER: ${W9_ID} + MYSQL_DATABASE: matomo + MYSQL_USER: matomo MYSQL_PASSWORD: ${W9_POWER_PASSWORD} volumes: - mysql:/var/lib/mysql diff --git a/apps/mautic/.env b/apps/mautic/.env index 4b12566e1..bde902f22 100644 --- a/apps/mautic/.env +++ b/apps/mautic/.env @@ -20,8 +20,8 @@ DOCKER_MAUTIC_LOAD_TEST_DATA=false MAUTIC_DB_HOST="${W9_ID}-mysql" MAUTIC_DB_PORT=3306 -MAUTIC_DB_DATABASE="${W9_ID}" -MAUTIC_DB_USER=root +MAUTIC_DB_DATABASE="mautic" +MAUTIC_DB_USER=mautic MAUTIC_DB_PASSWORD="${W9_POWER_PASSWORD}" MAUTIC_MESSENGER_DSN_EMAIL="doctrine://default" diff --git a/apps/mautic/docker-compose.yml b/apps/mautic/docker-compose.yml index 03f8d8694..6a34ac21b 100644 --- a/apps/mautic/docker-compose.yml +++ b/apps/mautic/docker-compose.yml @@ -18,8 +18,8 @@ services: restart: unless-stopped command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: - MYSQL_DATABASE: ${W9_ID} - MYSQL_USER: ${W9_ID} + MYSQL_DATABASE: mautic + MYSQL_USER: mautic MYSQL_PASSWORD: ${W9_POWER_PASSWORD} MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWORD} volumes: diff --git a/apps/metabase/.env b/apps/metabase/.env index 76def0ded..b14374897 100644 --- a/apps/metabase/.env +++ b/apps/metabase/.env @@ -32,9 +32,9 @@ W9_NETWORK=websoft9 # Used by docker-compose.yml: MB_DB_TYPE=postgres -MB_DB_DBNAME=${W9_ID} +MB_DB_DBNAME=metabase MB_DB_PORT=5432 -MB_DB_USER=postgres +MB_DB_USER=metabase MB_DB_PASS=${W9_POWER_PASSWORD} MB_DB_HOST=${W9_ID}-postgresql JAVA_TIMEZONE=America/Los_Angeles diff --git a/apps/metabase/docker-compose.yml b/apps/metabase/docker-compose.yml index 64a3fbf77..59f696f86 100644 --- a/apps/metabase/docker-compose.yml +++ b/apps/metabase/docker-compose.yml @@ -20,9 +20,9 @@ services: volumes: - postgres:/var/lib/postgresql/data environment: - - POSTGRES_USER=postgres + - POSTGRES_USER=metabase - POSTGRES_PASSWORD=${W9_POWER_PASSWORD} - - POSTGRES_DB=${W9_ID} + - POSTGRES_DB=metabase volumes: postgres: diff --git a/apps/odoo/.env b/apps/odoo/.env index 9722e0946..52fe07104 100644 --- a/apps/odoo/.env +++ b/apps/odoo/.env @@ -30,7 +30,7 @@ W9_NETWORK=websoft9 # Used by docker-compose.yml: HOST=${W9_ID}-postgresql PORT=5432 -USER=${W9_ID} +USER=odoo PASSWORD=${W9_POWER_PASSWORD} # Not used by default; enable only when needed: diff --git a/apps/odoo/docker-compose.yml b/apps/odoo/docker-compose.yml index ba041878f..32c736d6a 100644 --- a/apps/odoo/docker-compose.yml +++ b/apps/odoo/docker-compose.yml @@ -20,8 +20,8 @@ services: volumes: - postgres:/var/lib/postgresql/data environment: - POSTGRES_DB: postgres - POSTGRES_USER: ${W9_ID} + POSTGRES_DB: odoo + POSTGRES_USER: odoo POSTGRES_PASSWORD: ${W9_POWER_PASSWORD} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_HOST_AUTH_METHOD: trust diff --git a/apps/pgvector/.env b/apps/pgvector/.env index f1fb1fa91..029d8531a 100644 --- a/apps/pgvector/.env +++ b/apps/pgvector/.env @@ -11,7 +11,7 @@ W9_POWER_PASSWORD="d5E8n2733TgO8w" W9_ID=pgvector W9_DB_PORT=5432 W9_DB_PORT_SET=5432 -W9_LOGIN_USER=postgres +W9_LOGIN_USER=pgvector W9_LOGIN_PASSWORD=${W9_POWER_PASSWORD} W9_NETWORK=websoft9 @@ -26,8 +26,8 @@ W9_NETWORK=websoft9 # ============================================================ # Used by docker-compose.yml: -POSTGRES_DB=${W9_ID} -POSTGRES_USER=${W9_LOGIN_USER} +POSTGRES_DB=pgvector +POSTGRES_USER=pgvector POSTGRES_PASSWORD=${W9_POWER_PASSWORD} # This image is based on PostgreSQL 18, which keeps data under diff --git a/apps/pgvector/docker-compose.yml b/apps/pgvector/docker-compose.yml index c29e836c4..ff07a5f43 100644 --- a/apps/pgvector/docker-compose.yml +++ b/apps/pgvector/docker-compose.yml @@ -11,7 +11,7 @@ services: - ./src/init-vector.sql:/docker-entrypoint-initdb.d/init-vector.sql:ro env_file: .env healthcheck: - test: ["CMD-SHELL", "pg_isready -U ${W9_LOGIN_USER} -d ${W9_ID}"] + test: ["CMD-SHELL", "pg_isready -U ${W9_LOGIN_USER} -d pgvector"] interval: 10s timeout: 5s retries: 5 diff --git a/apps/postgresql/.env b/apps/postgresql/.env index 78618b510..e0f82d2a2 100644 --- a/apps/postgresql/.env +++ b/apps/postgresql/.env @@ -11,7 +11,7 @@ W9_POWER_PASSWORD="pc!jBdZ4ZBZ7VaY7" W9_ID=postgres W9_DB_PORT=5432 W9_DB_PORT_SET=5432 -W9_LOGIN_USER=postgres +W9_LOGIN_USER=postgresql W9_LOGIN_PASSWORD=${W9_POWER_PASSWORD} W9_NETWORK=websoft9 @@ -26,8 +26,8 @@ W9_NETWORK=websoft9 # ============================================================ # Used by docker-compose.yml: -POSTGRES_DB=${W9_ID} -POSTGRES_USER=${W9_LOGIN_USER} +POSTGRES_DB=postgresql +POSTGRES_USER=postgresql POSTGRES_PASSWORD=${W9_POWER_PASSWORD} DATABASE_BACKUP=false diff --git a/apps/postgresql/docker-compose.yml b/apps/postgresql/docker-compose.yml index d6fa58d85..97ac0b91a 100644 --- a/apps/postgresql/docker-compose.yml +++ b/apps/postgresql/docker-compose.yml @@ -26,7 +26,7 @@ services: until PGPASSWORD=${W9_POWER_PASSWORD} pg_isready -h ${W9_ID} -p 5432; do echo "Waiting for PostgreSQL to become available..." && sleep 1; done; - PGPASSWORD=${W9_POWER_PASSWORD} pg_dump --host=${W9_ID} --port=5432 --username=${W9_LOGIN_USER} --dbname=${W9_ID} -f "/backup/dump_$(date +'%Y%m%d%H%M%S').sql" && + PGPASSWORD=${W9_POWER_PASSWORD} pg_dump --host=${W9_ID} --port=5432 --username=${W9_LOGIN_USER} --dbname=postgresql -f "/backup/dump_$(date +'%Y%m%d%H%M%S').sql" && find /backup -type f -mtime +30 -delete && echo "Dump taken successfully." && exit 0; diff --git a/apps/prestashop/.env b/apps/prestashop/.env index 6f684eac2..73dce87e1 100644 --- a/apps/prestashop/.env +++ b/apps/prestashop/.env @@ -40,10 +40,10 @@ PS_FOLDER_ADMIN=psadmin PS_DEMO_MODE=0 PS_DEV_MODE=0 DB_SERVER=${W9_ID}-mysql -DB_USER=root +DB_USER=prestashop DB_PASSWD=${W9_POWER_PASSWORD} DB_PREFIX=ps_ -DB_NAME=${W9_ID} +DB_NAME=prestashop ADMIN_MAIL=${W9_LOGIN_USER} ADMIN_PASSWD=${W9_POWER_PASSWORD} diff --git a/apps/prestashop/docker-compose.yml b/apps/prestashop/docker-compose.yml index 37d64d39b..2fff33595 100644 --- a/apps/prestashop/docker-compose.yml +++ b/apps/prestashop/docker-compose.yml @@ -20,8 +20,8 @@ services: volumes: - mysql_data:/var/lib/mysql environment: - MYSQL_DATABASE: ${W9_ID} - MYSQL_USER: ${W9_ID} + MYSQL_DATABASE: prestashop + MYSQL_USER: prestashop MYSQL_PASSWORD: ${W9_POWER_PASSWORD} MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWORD} diff --git a/apps/redmine/.env b/apps/redmine/.env index c5fbc62f1..f222730e5 100644 --- a/apps/redmine/.env +++ b/apps/redmine/.env @@ -34,8 +34,8 @@ W9_NETWORK=websoft9 # Used by docker-compose.yml: REDMINE_DB_MYSQL=${W9_ID}-mysql -REDMINE_DB_USERNAME=${W9_ID} -REDMINE_DB_DATABASE=${W9_ID} +REDMINE_DB_USERNAME=redmine +REDMINE_DB_DATABASE=redmine REDMINE_DB_PASSWORD=${W9_POWER_PASSWORD} REDMINE_PLUGINS_MIGRATE=1 SECRET_KEY_BASE=${W9_POWER_PASSWORD} diff --git a/apps/redmine/docker-compose.yml b/apps/redmine/docker-compose.yml index 9ba8faccc..608556865 100644 --- a/apps/redmine/docker-compose.yml +++ b/apps/redmine/docker-compose.yml @@ -30,8 +30,8 @@ services: - mysql:/var/lib/mysql environment: MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWORD} - MYSQL_DATABASE: ${W9_ID} - MYSQL_USER: ${W9_ID} + MYSQL_DATABASE: redmine + MYSQL_USER: redmine MYSQL_PASSWORD: ${W9_POWER_PASSWORD} volumes: diff --git a/apps/timescaledb/.env b/apps/timescaledb/.env index e09063f89..ce80190ab 100644 --- a/apps/timescaledb/.env +++ b/apps/timescaledb/.env @@ -16,7 +16,7 @@ W9_ID=timescaledb W9_DB_PORT=5432 W9_DB_PORT_SET=5432 W9_DB_EXPOSE=postgresql -W9_LOGIN_USER=postgres +W9_LOGIN_USER=timescaledb W9_LOGIN_PASSWORD=${W9_POWER_PASSWORD} W9_NETWORK=websoft9 @@ -35,8 +35,8 @@ W9_NETWORK=websoft9 # ============================================================ # Used by docker-compose.yml: -POSTGRES_DB=${W9_ID} -POSTGRES_USER=${W9_LOGIN_USER} +POSTGRES_DB=timescaledb +POSTGRES_USER=timescaledb POSTGRES_PASSWORD=${W9_POWER_PASSWORD} PGDATA=/home/postgres/pgdata/data diff --git a/apps/timescaledb/docker-compose.yml b/apps/timescaledb/docker-compose.yml index 66f7ed237..f4d73611d 100644 --- a/apps/timescaledb/docker-compose.yml +++ b/apps/timescaledb/docker-compose.yml @@ -9,7 +9,7 @@ services: - timescaledb:/home/postgres/pgdata env_file: .env healthcheck: - test: ["CMD-SHELL", "pg_isready -U ${W9_LOGIN_USER} -d ${W9_ID}"] + test: ["CMD-SHELL", "pg_isready -U ${W9_LOGIN_USER} -d timescaledb"] interval: 10s timeout: 5s retries: 6 diff --git a/apps/typo3/.env b/apps/typo3/.env index fe14acd23..f44e082d4 100644 --- a/apps/typo3/.env +++ b/apps/typo3/.env @@ -40,8 +40,8 @@ W9_NETWORK=websoft9 TYPO3_DB_DRIVER=mysqli TYPO3_DB_HOST=${W9_ID}-mysql TYPO3_DB_PORT=3306 -TYPO3_DB_DBNAME=${W9_ID} -TYPO3_DB_USERNAME=${W9_ID} +TYPO3_DB_DBNAME=typo3 +TYPO3_DB_USERNAME=typo3 TYPO3_DB_PASSWORD=${W9_POWER_PASSWORD} TYPO3_SETUP_ADMIN_USERNAME=${W9_LOGIN_USER} TYPO3_SETUP_ADMIN_PASSWORD=${W9_LOGIN_PASSWORD} diff --git a/apps/typo3/docker-compose.yml b/apps/typo3/docker-compose.yml index 518111f57..0db71a36d 100644 --- a/apps/typo3/docker-compose.yml +++ b/apps/typo3/docker-compose.yml @@ -31,8 +31,8 @@ services: volumes: - mysql_data:/var/lib/mysql environment: - MYSQL_DATABASE: ${W9_ID} - MYSQL_USER: ${W9_ID} + MYSQL_DATABASE: typo3 + MYSQL_USER: typo3 MYSQL_PASSWORD: ${W9_POWER_PASSWORD} MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWORD} diff --git a/apps/woocommerce/.env b/apps/woocommerce/.env index 653c1ede1..05b8124ea 100644 --- a/apps/woocommerce/.env +++ b/apps/woocommerce/.env @@ -39,9 +39,9 @@ W9_NETWORK=websoft9 # Used by docker-compose.yml: WORDPRESS_CONFIG_EXTRA=" define('WP_ALLOW_MULTISITE', true ); \n" WORDPRESS_DB_HOST=${W9_ID}-mysql -WORDPRESS_DB_USER=${W9_ID} +WORDPRESS_DB_USER=woocommerce WORDPRESS_DB_PASSWORD=${W9_POWER_PASSWORD} -WORDPRESS_DB_NAME=${W9_ID} +WORDPRESS_DB_NAME=woocommerce WOOCOMMERCE_VERSION=11.1.0 # Not used by default; enable only when needed: diff --git a/apps/woocommerce/docker-compose.yml b/apps/woocommerce/docker-compose.yml index 75a53cdd1..2afd12dc6 100644 --- a/apps/woocommerce/docker-compose.yml +++ b/apps/woocommerce/docker-compose.yml @@ -29,8 +29,8 @@ services: volumes: - mysql_data:/var/lib/mysql environment: - MYSQL_DATABASE: ${W9_ID} - MYSQL_USER: ${W9_ID} + MYSQL_DATABASE: woocommerce + MYSQL_USER: woocommerce MYSQL_PASSWORD: ${W9_POWER_PASSWORD} MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWORD} diff --git a/apps/wordpress/.env b/apps/wordpress/.env index bc7e3d0af..44c91b8fe 100644 --- a/apps/wordpress/.env +++ b/apps/wordpress/.env @@ -31,9 +31,9 @@ W9_NETWORK=websoft9 # Used by docker-compose.yml: WORDPRESS_CONFIG_EXTRA=" define('WP_ALLOW_MULTISITE', true ); \n" WORDPRESS_DB_HOST=${W9_ID}-mysql -WORDPRESS_DB_USER=${W9_ID} +WORDPRESS_DB_USER=wordpress WORDPRESS_DB_PASSWORD=${W9_POWER_PASSWORD} -WORDPRESS_DB_NAME=${W9_ID} +WORDPRESS_DB_NAME=wordpress # Not used by default; enable only when needed: # WORDPRESS_DEBUG=1 diff --git a/apps/wordpress/docker-compose.yml b/apps/wordpress/docker-compose.yml index 377d9d6ed..1931f3fd3 100644 --- a/apps/wordpress/docker-compose.yml +++ b/apps/wordpress/docker-compose.yml @@ -29,8 +29,8 @@ services: volumes: - mysql_data:/var/lib/mysql environment: - MYSQL_DATABASE: ${W9_ID} - MYSQL_USER: ${W9_ID} + MYSQL_DATABASE: wordpress + MYSQL_USER: wordpress MYSQL_PASSWORD: ${W9_POWER_PASSWORD} MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWORD} diff --git a/apps/wordpresspro/.env b/apps/wordpresspro/.env index 75fdd71eb..8ea30e5d7 100644 --- a/apps/wordpresspro/.env +++ b/apps/wordpresspro/.env @@ -31,9 +31,9 @@ W9_NETWORK=websoft9 # Used by docker-compose.yml: WORDPRESS_CONFIG_EXTRA=" define('WP_ALLOW_MULTISITE', true ); \n" WORDPRESS_DB_HOST=${W9_ID}-mysql -WORDPRESS_DB_USER=${W9_ID} +WORDPRESS_DB_USER=wordpresspro WORDPRESS_DB_PASSWORD=${W9_POWER_PASSWORD} -WORDPRESS_DB_NAME=${W9_ID} +WORDPRESS_DB_NAME=wordpresspro WP_REDIS_HOST=${W9_ID}-redis WP_REDIS_PORT=6379 WP_REDIS_DATABASE=0 diff --git a/apps/wordpresspro/docker-compose.yml b/apps/wordpresspro/docker-compose.yml index 001736ed8..2155a9a2e 100644 --- a/apps/wordpresspro/docker-compose.yml +++ b/apps/wordpresspro/docker-compose.yml @@ -28,8 +28,8 @@ services: volumes: - mysql_data:/var/lib/mysql environment: - MYSQL_DATABASE: ${W9_ID} - MYSQL_USER: ${W9_ID} + MYSQL_DATABASE: wordpresspro + MYSQL_USER: wordpresspro MYSQL_PASSWORD: ${W9_POWER_PASSWORD} MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWORD} diff --git a/build/__pycache__/fetch_catalog.cpython-312.pyc b/build/__pycache__/fetch_catalog.cpython-312.pyc index b6b5d7ea6c94d9da8a86660974623475cfdc0bc6..579ce58edb8f1b85969112ef9e9eef8ec6dc9e99 100644 GIT binary patch delta 20 acmX?UebSoyG%qg~0}$|Z-`vQ(PZj_`^9Bk4 delta 20 acmX?UebSoyG%qg~0}%YbwqYapK3M=rjRzk9 diff --git a/build/__pycache__/library_publish.cpython-312.pyc b/build/__pycache__/library_publish.cpython-312.pyc index c58adb45a47c3bc8bf647ea9b87cd0d504605925..9f9dbf4553787e7c00667ed63ea7900fd3a8b962 100644 GIT binary patch delta 22 ccmZ29hiTCqChpU`yj%=Gz|(zmBe!@T0891;OaK4? delta 22 ccmZ29hiTCqChpU`yj%=GpjdZfBe!@T08BOpQvd(} diff --git a/ci/scripts/build_ai_commands.py b/ci/scripts/build_ai_commands.py new file mode 100644 index 000000000..9ad5b6595 --- /dev/null +++ b/ci/scripts/build_ai_commands.py @@ -0,0 +1,182 @@ +#!/usr/bin/env python3 +from __future__ import annotations + +import argparse +import json +import re +import sys +from pathlib import Path +from typing import Iterable, NamedTuple + + +COMMAND_ID_RE = re.compile(r"^libs-[a-z0-9-]+$") +REPO_ROOT = Path(__file__).resolve().parents[2] +MANIFEST_PATH = REPO_ROOT / "skills" / "commands.manifest.json" + + +class CommandSpec(NamedTuple): + command_id: str + description: str + skill: str + argument_hint: str + usage: str + + +def load_specs(path: Path) -> list[CommandSpec]: + payload = json.loads(path.read_text(encoding="utf-8")) + items = payload.get("commands") + if not isinstance(items, list) or not items: + raise ValueError("commands manifest must contain a non-empty 'commands' array") + + specs: list[CommandSpec] = [] + seen_ids: set[str] = set() + for idx, item in enumerate(items): + if not isinstance(item, dict): + raise ValueError(f"commands[{idx}] must be an object") + command_id = _require_string(item, "id", idx) + description = _require_string(item, "description", idx) + skill = _require_string(item, "skill", idx) + argument_hint = _require_string(item, "argument_hint", idx) + usage = _require_string(item, "usage", idx) + + if not COMMAND_ID_RE.match(command_id): + raise ValueError(f"commands[{idx}].id must match {COMMAND_ID_RE.pattern}") + if command_id in seen_ids: + raise ValueError(f"duplicate command id: {command_id}") + seen_ids.add(command_id) + + specs.append( + CommandSpec( + command_id=command_id, + description=description, + skill=skill, + argument_hint=argument_hint, + usage=usage, + ) + ) + return specs + + +def _require_string(item: dict, key: str, idx: int) -> str: + value = item.get(key) + if not isinstance(value, str) or not value.strip(): + raise ValueError(f"commands[{idx}].{key} must be a non-empty string") + return value.strip() + + +def render_opencode(spec: CommandSpec) -> str: + return ( + "---\n" + f"description: {spec.description}\n" + "agent: build\n" + f"argument-hint: {spec.argument_hint}\n" + "---\n\n" + "\n\n" + f"Use the `{spec.skill}` skill.\n\n" + f"Usage: {spec.usage}\n\n" + "If input is empty or `help`, return usage and ask for required arguments.\n\n" + "$ARGUMENTS\n" + ) + + +def render_prompt(spec: CommandSpec, skill_link: str) -> str: + return ( + "---\n" + f"name: {spec.command_id}\n" + f'description: "Route to {spec.skill} skill."\n' + f"argument-hint: \"{spec.argument_hint}\"\n" + "agent: agent\n" + "---\n\n" + "\n\n" + f"Use [{spec.skill}]({skill_link}).\n\n" + f"Usage: `{spec.usage}`\n\n" + "If input is empty or `help`, return usage and ask for required arguments.\n" + ) + + +def expected_outputs(repo_root: Path, specs: Iterable[CommandSpec]) -> dict[Path, str]: + outputs: dict[Path, str] = {} + for spec in specs: + outputs[repo_root / ".opencode" / "command" / f"{spec.command_id}.md"] = render_opencode(spec) + outputs[repo_root / ".github" / "prompts" / f"{spec.command_id}.prompt.md"] = render_prompt( + spec, "../../skills/" + spec.skill + "/SKILL.md" + ) + outputs[repo_root / ".codex" / "prompts" / f"{spec.command_id}.prompt.md"] = render_prompt( + spec, "../../skills/" + spec.skill + "/SKILL.md" + ) + return outputs + + +def find_stale_outputs(repo_root: Path, expected: dict[Path, str]) -> list[Path]: + candidates: list[Path] = [] + candidates.extend((repo_root / ".opencode" / "command").glob("libs-*.md")) + candidates.extend((repo_root / ".github" / "prompts").glob("libs-*.prompt.md")) + candidates.extend((repo_root / ".codex" / "prompts").glob("libs-*.prompt.md")) + stale = [path for path in candidates if path not in expected] + return sorted(stale, key=lambda path: str(path)) + + +def find_outdated_outputs(expected: dict[Path, str]) -> list[Path]: + outdated: list[Path] = [] + for path, content in sorted(expected.items(), key=lambda item: str(item[0])): + if not path.exists() or path.read_text(encoding="utf-8") != content: + outdated.append(path) + return outdated + + +def write_outputs(outputs: dict[Path, str]) -> list[Path]: + changed: list[Path] = [] + for path, content in sorted(outputs.items(), key=lambda item: str(item[0])): + path.parent.mkdir(parents=True, exist_ok=True) + current = path.read_text(encoding="utf-8") if path.exists() else None + if current != content: + path.write_text(content, encoding="utf-8") + changed.append(path) + return changed + + +def remove_stale_outputs(paths: Iterable[Path]) -> list[Path]: + removed: list[Path] = [] + for path in paths: + if path.exists(): + path.unlink() + removed.append(path) + return removed + + +def main(argv: list[str] | None = None) -> int: + parser = argparse.ArgumentParser(description="Generate AI command adapters from manifest") + parser.add_argument("--check", action="store_true", help="exit non-zero if outputs are not up-to-date") + parser.add_argument("--clean", action="store_true", help="remove stale generated adapter files") + args = parser.parse_args(argv) + + specs = load_specs(MANIFEST_PATH) + outputs = expected_outputs(REPO_ROOT, specs) + stale = find_stale_outputs(REPO_ROOT, outputs) + + if args.check: + outdated = find_outdated_outputs(outputs) + if outdated or stale: + for path in outdated: + print(f"outdated: {path.relative_to(REPO_ROOT)}") + for path in stale: + print(f"stale: {path.relative_to(REPO_ROOT)}") + return 1 + print(f"verified {len(outputs)} adapter files from {len(specs)} command specs") + return 0 + + changed = write_outputs(outputs) + removed = remove_stale_outputs(stale) if args.clean else [] + + print(f"built {len(outputs)} adapter files from {len(specs)} command specs") + if changed: + print(f"updated {len(changed)} files") + if removed: + print(f"removed {len(removed)} stale files") + elif stale and not args.clean: + print(f"found {len(stale)} stale files (run with --clean to remove)") + return 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/cli/libs/__pycache__/__init__.cpython-312.pyc b/cli/libs/__pycache__/__init__.cpython-312.pyc index ee7d75e8d0f11b61001dcbc0c137669d3ab3e803..fce0f4529cb34277fe1b685b11e814dbc643a855 100644 GIT binary patch delta 19 ZcmdnNxPy`VG%qg~0}$|Z-<-(37633{1ttIh delta 19 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 delta 22 ccmbRKk#YJ*M()$Ryj%=GV0LlKM(&;p09ob-hyVZp diff --git a/cli/libs/__pycache__/app_deploy.cpython-312.pyc b/cli/libs/__pycache__/app_deploy.cpython-312.pyc index 0746658a5c7a4f9fee698034557fee711d0e1663..0f249a9e9ff225be0f2d9342ef72da76df95133b 100644 GIT binary patch literal 26952 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 s5FBO_wNM80asi22DT{sCMxtamWLq+;bsWqJ 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 Mm$-P_2`kR}FJdy&9RL6T delta 5095 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 diff --git a/cli/libs/__pycache__/appstore_sync.cpython-312.pyc b/cli/libs/__pycache__/appstore_sync.cpython-312.pyc index 324b3cb1a619bc4b541f9ed4c023c36665d175d7..8b92881de7424c32c1cfd797bf636d3caf6c3fab 100644 GIT binary patch delta 20 acmZqiXz}1a&CAQh00cbUH#c(sR0aS!1qIsx delta 20 acmZqiXz}1a&CAQh00dV`7H;JJsSE%-+Xhqs diff --git a/cli/libs/__pycache__/catalog.cpython-312.pyc b/cli/libs/__pycache__/catalog.cpython-312.pyc index 0aed4bcfe3ab64ec38d4ab8d3a156344c930fd7c..10184c2b87e509a9289d1c03030430ae9487d564 100644 GIT binary patch delta 20 acmaD~`o5I=G%qg~0}$|Z-`vRk#0mgUCRdZ8IAU$qIs-PCpq>Of-Jv@fdW9{`CTx=NLh;FmR^b#Frg{s0DS5~9*1&bcqP zL$@dS+|NDV@44q(Z|7f{3;rPx@JaC1@4SEZiJq-s7a82@|LKVo^H^dRj7R?oUi*Xv8`tZqpnA0GqmHJ(+v_(yVBb6MmP zVKIV?n2Wk!-?gFgxxBWvS>oi8it& zqfJ12oj9>spTlWua-4n6+wwtu+paCwvqLg?*^o`h)cGtI`06BnKA@%u;+Q)?_v{iu z>Tl%Hh-bM?MUr^8l76zCh8~u}aa}~R+_Ym`I}Xu^i1@Umhx4|d85h<{%s6jU%$lv# ziq%!aR#(?fmrF%kD^*N`RSISPsk-3SSU+Fz^v1scdD@4(Q1Z>s^yBZ`bWitG>r*~u+U>bQE)NWI{AL+g} zx;6T8&rW3EUS#mr#OCb%VDw&a=6d30`bPTYr*COHiJ{*tyqlQWoZ&=!>nr!8sSo4H z>q9q3Z;Za0xHY|#8s3S2^f;}3Z?+$T zo$j&~$_i&pINWt_pE3r#0sfBnFa7<1*g+sQyqZiV!(y=7-g32AD3>l9lug0@Q2nm& z6d^}=pTA!@3XDhVbN)D)eGH(kup_Xr$B}#kh#j3ApC6w+IuI&-G zUt59nn<=qL)U6;{;q`Dj30Mw!-_Q(GR5>dHlsFV`ocv!rtzAd`{Qfat2QWo!Ibv8=jl@yD31Tn1sa{vbB) zA{%_9s}E?Qt6#Ya>~;QJ*DuK@d?4|)xak3g_$aZOlgqafQ9c*Z=H75M#$>~5wl!3( z=D=?FEbS~lArF16mS&1SlZ>_bnzk|ii)1HB z@ZToWB+cJT=14F9G}#$wYs9KV%q-8QQVD;9Lj!<Z|43l zqfjFwBGHb|dNJ{q#Ak&XRRXPWBf@^kjPpOIdXGi&3`?#P_9!fNJM?>@TwR_hRcNWQ zT+>zC4ejgG%DSd|ZVPmTQ$HJV*ydz^-*qAT?%i=((3 z2|hXu9|MLr%y8&oUf%A0WEi`Mbs)iEW`js@a2WO}!`2gH&#?d55)i$Eg%Rg@Z#pyn z48rdsf&T@GjUs90&3*)17_Y*5xmuuNxNOb1RH~V9Xts{JlYBF+`(6O}efZTr;Pv#r z*zX>{edhNoJ0nlMH*)ITkyAS(OMi+L>i5%ckd8Yc|FkaM)!U{IyYCK?>BIFGdT){| zKR{pjlrT{eF}%;>_Qyajdn;A*i)X5975bPX7bSZRL@;w=j71eh0fecEredDkb`OgT zA=*OJI<+&VI2Mc}5f8}o{7&|uat-!(>K|qIkt^3xltLoV4MZ;j(aAhyAS#Dj(Hzbd zv{YoLs6xJ%E3)|vSJXfR5toEWm#;Xb5$xj_N3hjB+#+xv_{wlI-=?Lad6J1pFA3{C zYR#DN&WT%Y#<%5swPLUYT4;M@moVHFp|%e2az`sh#>xmA5o#L^UHLpX#^OHk)lAk< z5bgDIR0uh@Ar8_yX{)f}azqRN4Ah-Ug1beDp}Eti0*RQIl^*KzpX-PJ zwJ#s~4n`3FeBy8B7$3`xpT>va;V~4$H-!SxaQJ8DOxy)Tt+5k5iIc&wlU|cpC*l~8 f2inN_DqSlZW9$|Fx7-QOCt8T8A0Oc32R`^8lvrEB delta 2455 zcmah~Z){Ul6o2ovuYX_vZ2hjLFNzogsfmf7-~%QqiAMZjs-k|`7hVoY!}sT1+~>aX4%OtfPY;j=!TWIGe=oh0ZevlzHQjhlGg(b}xw#C+t3=5*O@# z(oEd22S}7Oz}`e+q!IQYX(1liL!_0o5%0V_6ejH?PJF;ctb$b_?aVDk9Ua6Eh+0EJ z3h5*PfSPBdL{}*-4jWVvV_I1X>;^#)@AxG_I4=|h_MPlwOFpYIEfyqE$OyAy1r#Ng zl%s4iWM#)>wQ^F8W5Ojc#MLjHmPVy9VN@F4CSn~e zC@n~*HW|TiR?;CBzSy^(fJ!XHT6KSECF%z>Z2zO-CHB=C?3SseTOp1IeG})Rc|XJ< z@>q@w30JbLQ0=*?4AmyIoL*p0n}-Z$+Rm<+qe>S9S~eH-JWY+UWpix6P_`aR(M&3x z)e5v3q_hP{0aJ>_V$_HF-t<%^OGYMAqen71ZRBu9%aQ`^29b)o%K|%O39!?aPuKqJ z4_(-_)cbbtN5RVjH^V(Q{hR*^D2nM%L6J@W{%tY_Z3Pq9TvNC7n=GRuyAt%WSFPt< zYXMA1Wtq^_VI5*!V{4Zm18faDVEe_?4jhfM9(zRI3hcVlLHi+5+|IsGI^|seY$z=& zez9>IunC!NhmAggq@OvRq1XgFwp4XiC?{@^oh8s5V2lvq5KvoCLu(wyeb2 z1?PHkcj<=nb5Y#K=G~hDC@Py$lapGGl+9zBp3-$n*RmhnaZ|-9yXV$r4b*m*rW}7v6#_aG_ef&22iS{7x&?)(RyGz=$22+) zEaZ@8XT08OIX?C#&{wrGl=*qT571RXc@P%TgHf!cIo!2!nnc~ zTpowzKE%l`$3pB{NOeeyrdg$EDD+tcy@A~hgU7LHbRUa`gR-4E^dNgb9FK=^%GmUoqC)YPjj^E`8nniP&&$gEHU}uDk35s^NM>98gOqV@u-Pi)e`zqC9OrKd;~s zeVnl7^7^BP^HVvpqax>JISC?|0<1UXIrDV6X$~sj& z;WyZ4tzGg0oUfLCZ*3Ll&Y~!cgmVnJH-W&!@**Km??-vnR-rtARVYuJ`)#b=0DkM} zUSV$KV#u}*4}ee9%$d5BoKqbWh`%|B>)d`5xBW(U;zU;KQbi4-M}z z{KKe>6rZ8`T=6!<)~DD!7X=zX9{*$STDDB&$y8R`O5bC@bv$FfV{wY6JFRS6=TH9u DbH4@v diff --git a/cli/libs/__pycache__/credentials.cpython-312.pyc b/cli/libs/__pycache__/credentials.cpython-312.pyc index 9f74485ab1e837ff47240de0852d519d6f8b4c35..9df580f8cc1196c3d3daf58ad2735c05b75fa5ed 100644 GIT binary patch delta 20 acmZ1?vP6XYG%qg~0}$|Z-`vP8$prv3oCLZ6 delta 20 acmZ1?vP6XYG%qg~0}!0=IlGZtk_!Miy9IIp diff --git a/cli/libs/__pycache__/dblifecycle.cpython-312.pyc b/cli/libs/__pycache__/dblifecycle.cpython-312.pyc index 6cf5966bd3a7e122d71fbcd963ec03b10954e2e1..c5a4290e314f37ab13684a62f706df2f6242a8cc 100644 GIT binary patch delta 20 acmbQFIZ2cIG%qg~0}$|Z-`vREE&>2G$^|$8 delta 20 acmbQFIZ2cIG%qg~0}yO!+Ov_nT?7C*n+3W6 diff --git a/cli/libs/__pycache__/drift.cpython-312.pyc b/cli/libs/__pycache__/drift.cpython-312.pyc index 53d50e3891d17d6e17f90ac510084d99d222b8fd..8610f274992fe3ba0002e532e0004c19a0f3b41d 100644 GIT binary patch delta 20 acmeyb^IwPiG%qg~0}$|Z-`vPuA_f3PKn4c@ delta 20 acmeyb^IwPiG%qg~0}zyMYTL+NA_f3RY6e6A diff --git a/cli/libs/__pycache__/http.cpython-312.pyc b/cli/libs/__pycache__/http.cpython-312.pyc index 9d36aa1e872ee8dfdd041a0246de44f640083e03..1e0c9788ae46c53adbcea7c3a2e4975732104b2a 100644 GIT binary patch literal 9534 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 V48Xp)QCUIQ#%D6s=)Gt4{{vIU27Lek delta 4805 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 Qm}LwaU+Sl){PnE){}?EPTmS$7 diff --git a/cli/libs/__pycache__/maintenance.cpython-312.pyc b/cli/libs/__pycache__/maintenance.cpython-312.pyc index 0b35acb4aaab7a5be586d948137a7ce3f2e39e5c..710b4cddb2f6a3a979e36c22fe2323b46c90199c 100644 GIT binary patch delta 20 acmbPYJjIy%G%qg~0}$|Z-`vREDG2~KhXq#v delta 20 acmbPYJjIy%G%qg~0}y0obZ+GClmq}bw*^7~ diff --git a/cli/libs/__pycache__/metadata.cpython-312.pyc b/cli/libs/__pycache__/metadata.cpython-312.pyc index 010b4bbb68a21bb95c959196c241b6addb335109..ed69063976428988fb1587458748950332dbdb1a 100644 GIT binary patch delta 20 acmaE-@=k^OG%qg~0}$|Z-`vQZECc{TbOpcw delta 20 acmaE-@=k^OG%qg~0}zyMYTL-2ECc{Vo(25? diff --git a/cli/libs/__pycache__/newapp.cpython-312.pyc b/cli/libs/__pycache__/newapp.cpython-312.pyc index 04e29c5d27d52e4cb286bab4dfd2791629b2d8d7..3fcae570c13a5cf5b90b5c306740faea81111a73 100644 GIT binary patch delta 20 acmX@>aMpqQG%qg~0}$|Z-`vRUqyPXxN(G|; delta 20 acmX@>aMpqQG%qg~0}yPqp0<(ONdW*to&~i4 diff --git a/cli/libs/__pycache__/output.cpython-312.pyc b/cli/libs/__pycache__/output.cpython-312.pyc index 79f69796d24a31e382121f1dfc8aeb8563451fdc..27710bea30ec53c8b1cf833280a407bb0a450b53 100644 GIT binary patch delta 20 acmdnSwvCPZG%qg~0}$|Z-`vQp%?toFZ3N8# delta 20 acmdnSwvCPZG%qg~0}wo0-L{cin;8H)gavc} diff --git a/cli/libs/__pycache__/readme.cpython-312.pyc b/cli/libs/__pycache__/readme.cpython-312.pyc index 260b5209732c247767166df436fc79b64503d2ba..44f40251b52f9542579e91fac1a94e5d21d87008 100644 GIT binary patch delta 20 acmbQ}Gtr0pG%qg~0}$|Z-`vQ}rUn2xpal&8 delta 20 acmbQ}Gtr0pG%qg~0}zDWoxhQrO$`7%a0PDw diff --git a/cli/libs/__pycache__/remote.cpython-312.pyc b/cli/libs/__pycache__/remote.cpython-312.pyc index 093a49662213798b4d5469f2007fb986c09f552f..e15c8d8fbb1799c0261e6380f13fc81800e8123b 100644 GIT binary patch delta 1577 zcma)6T}&KR6rQ_#cXrriyLFNMVSh15nSxR^65D8Epf*;Fl62vrO)?y@qjyiLVqBu%I|+7uO^L<~T0`dUR>OJ|tcA&4s1y!Sp4UmyLxU-vn5 z!nACMRxE?_A+Yj12#1c1T88BVn8U@9>S&fVQ9uJX;1wV1hWM;yJhN(UM*22_eQWu( zGwbc^r`P-Hr(UU_9NY*F*6CpFOyneK(J3DT1}~zJiI`YuNs)=#$1T4SV%FYoHApK* ztA)ZwVWOxAZ|rF@EBa#Jy*LdD-OI1Q=6HFf%x6*Iar{MddU~|X_%(R9JRtUp4uV%< z&sr7z@n@pg*51+p$n$(oET*z_p5CY8i+FCT3VPY5?mJMoqgq8?nz7}e4vxr=*?8A|VFK@*1o5A5a9j={7d_$_T;R>e3CLRA+ z<&ssJGx%kEQ}|o3=|Q)1-;g6>%EW3&& zUDN|^)iR5`trGnc4XJ$j@3?m{pmqpH_8>i}Jl=gh>~;nhSNxXAx-+@^?MlhSC%aSGOe>EpP+nqq6aH(QfxKSu@_^uRQKygKUn&moP z9X^3Ve%G^zCqT%E_&pc>3pfXIZvX%Q delta 1227 zcma)5O=wd=5PtLe@)DcI*4XC9T)c`$6NOgDpPpRQCVgShCKIzKnkS4?LD3;vNQX!VNQZ?jf~41oP7xv<5nUooIx04ZHKZ*O zCrf0)bt*<^gNPDp6&r;`zP2&l-c;TKuYEQj_Gjn>>NE|ioWcWbNE7f3j%&7l#5R{? zXQSo9Uh>F8jj@D6#Z}$8Y&JER?@eb?xk7%==I!VuMoly@cdD_yi9t#GUhi%&ziDol zDX;k>x(V{Je^LHudYyc3RE!HbCtooNP71My=oMq2-$^+J!8RJ`W1GiuE}UaKo~LDs zrc;tXR}DoM{E2yQVn)pL&2FCUojo|$wR^5JIqyx*8OicB|1QvRK)zcYg>?Dr>aPGJ z<@YTqXmMx<%(E!47-4Zm9u01RqP!k_yEaP(yADT5RqC*i#UdN@ihD4Z$@FIhj>(ab z1tobWv=t0FA8m#m@g{seV1~EO7Usj=;PB}+a;te9+ zqv=>AO4>(nVCw2q^^5Dyz^TF-~@BTSsfB9zk6(m#vS9o_$y5b%voOja2 z6kg($hDgfx;;76TIR~nk|4L3V z<8q)a2&1ythCO@(m}a3~F+Wr+vEZK9E@_g{6bto5RWENrC{|koWxs%zPpb diff --git a/cli/libs/__pycache__/repo.cpython-312.pyc b/cli/libs/__pycache__/repo.cpython-312.pyc index 76019a7723513e7a57baf5d2b975d5cb43dd9e52..7a3c6e372569b18565cbfa6e175cbeb31a5bec96 100644 GIT binary patch delta 20 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 delta 4636 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 delta 1016 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 delta 76 zcmex*lySl`M!wU$yj%=GaNqh&mWIScJ_*LIiR#@fl}wsk8~0cQGHFUoK9#s-a&wY6 c*EygvMj$SBp1dT@CSBH+xjH8t@hR*~Q##-!sC$T9dCB>Wt<;3j-6Y+ml6jVes zL?+slF1cDVA*m7=k2x*GkTR|p(8G<6Eny8YrOfN1qR*d!Sdu8W?nUK-l07cx6~Yrl zHzY8zCNzpE?^bc%osd7JNGBf`f8_ zWK-;5dE|tlJ`=LQaI;fXj1V5SG4gaUOS(KZjg1tq`3#bs ze4JKR5PLtqEek?IM@oo8)kRU3>DT|08Mk_zu*<(?|7n2;3490NTAh1Pk8o2uE%YFF zX;a30G!SZNJ$&JiFBCY@6!g1MMoYudcrbRLK~qhZD&G#+G~ig(_r?p;s+!cS+b2jO#8JpjZCCx*p7d! zBy#=6J`(BPv3pO=-r73vONln+qcqGc^dW~6ATOMi_wYj1keuBJy$deX0s{*{F^J&r zV>=Wq*2rEKr>DTTSms;XBBQ+$RW8Ik!c^gfhB%z%JDg+Smg$<2#<=>Q30^Fgc{;cl z<o{7V6+Ce{?hqzZL^U?L0q99w{ywX<>v-|hm?1WcEX!w7rF^wmp|Hy(B7ZbRY+b5AuEz;A@lzO@F4$* delta 727 zcmX|8>uZux7(d6?_x0ARuc>q3WiWShU8r<9`cg(NXGzQ%Yh75f*PyX!9bdK@x*fpoZoq#-}B?SoqCCTQ{;?AQPd-P zhQBONlwz-ppWnBrn7@0p^yLu3n`J1tPGcR^hT1_C4MvOkJ*kGYP7)#L2oxNsAmO)avFKBY{_b_TR z$KBq2XYdTV#f_pF?6tzDpaZHNBaE*Eu?R0#PHJ@|L|Y~Uu(i?+@eT_Fiv5NV9pfjx znJok_tpQjsesH%^*&}<9M+IIV>fs8eQ>KuId*|V)GmgQmwl1xf6fG7YyjI5sI9Tq) zVThL(@gV#yci|XxR_>_IVz?Q1z}t$A65lETK0(WKumc zdp3Ap^$C4cM~0zZZKsWCYtF6_mhu7xuR#76ClicSSo%DJ5s1{<_sNV*GFV{bD6?V= zE>rNDh@G)&23O!gZO}f(VpmyAOW5YfHAY0BP-&%uOB?SCOIRRgs{aQ>zr~gS diff --git a/cli/tests/__pycache__/test_app_deploy.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_app_deploy.cpython-312-pytest-9.1.1.pyc index fb0c2083fa3cbde56224dd1d15c0c392a3055c11..5e267969bf9deebcf976dd42be5209ff8bde1138 100644 GIT binary patch delta 4571 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 KW+&-Xn)o-MnC`p) delta 423 zcmZ2>pYi)TM!wU$yj%=GaB}ACtd(*T`6L)SCaQO`R5EGuY&^49gRyFImu5cW^2xt6 z|1hqZoTwnfRJ3fesJ0U0(#;mywv3D`Cl`juO`f7-z_@wyQJrIKjN2#o7~3%J+I-S@ z9v|b9$r(ah_?%JZ1V}m^NMO3p zWAcO$)5(3o&TQvFiq1^F9_$XZLq5cZ4Q$7DV9IZN2E$~9d>O6>KsF-~7duXN%eUqE?7%3>n95jW2owSU^gn`) diff --git a/cli/tests/__pycache__/test_app_tests.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_app_tests.cpython-312-pytest-9.1.1.pyc index ad8181fd4b5df14112e89afe184eabafe5343291..47f27fcdf62ddf28fda23866c2c8a43cd0edcfd6 100644 GIT binary patch delta 4682 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 diff --git a/cli/tests/__pycache__/test_cli_errors.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_cli_errors.cpython-312-pytest-9.1.1.pyc index 67fe45aff6956145179dc0a429fadb1a7f3bd148..c948e2226f54a0961528bce5dc263db9bd19369b 100644 GIT binary patch delta 20 acmcbtcUh17G%qg~0}$|Z-`vRUAr1gPsRf7t delta 20 acmcbtcUh17G%qg~0}xbOPus}tAr1gPg9T&& diff --git a/cli/tests/__pycache__/test_consistency.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_consistency.cpython-312-pytest-9.1.1.pyc index 506bc3aa696b857c5bc0860ca31818a482c90d90..0836b5a9a7fd53949c2cdeadcd8c846babbc96fd 100644 GIT binary patch delta 788 zcmaKqO=uHQ5XX1Yn8vL6Xs}I@ewZ2?5<>-{(uysy+K@(KKxv^(q1I$AE89(dyGGlC zV5!AZv5fujCZ-nb$+8D2is0Epq+T>V2wp@yX;8FZ`eqTm`PlvOfAjt`vpc(UMa#+? zi|dus=@9q|7T;ZY-#Y861fkXIu z@iufDefOvK!am%17_Fy?PT0anTO>8lI>~Adwu;hsv8~YV`#0DcW3u&OD;x|~y)S=U1aCMjVH>zBqLVazObfiJ@&f0v!B z3PFJKI!2?Ddn#qfy092cfg4}OPB^S;j=$*_Zo2+F-6YE`jDC% z$}lM_sk%I@Xe`NlCitys=t(6j-_|xfu-?6idRNdAYR2_PpJHWRjL~1myo3Oun?Px1 rKARv*3n9X>X+Jrd%U)BYPS(#Y{1UWz++LpXd=0x{0LlRoI!ya-Mw!bG delta 639 zcmZ2=nQ7{ICce|Wyj%=G@PzGh);r^gd=iXY8`ZfPSt^+{#Wve8#``j9vQ6@koV?91 zjPcWEUjL13jDIHY4^?FRG5KL=6eH(mo3IBgY+ryT6n&kn6s^Sl8^rtrBK}VHk2Z4u z2VzPA2~E*kTsfIZ#d;}4nQ0|OJd8l`{~$>j5WxWAdVpA-Ai@hs++t2oEh%CJN%%5M zKCsxF8>|OxHv43*m_|my%{?*EqEOp6zb%}|#Q1%4eMt+WJYIu~_$DirIS9#vOkNDK zZ3&Rj6fI((TvF!D_6sB;H+gSa8>8}Om-5|mjKZ6yc{4I9O!k?c%gqPU#0^rSHu=c( z1Sty;e+r1N3Sw!3Sj#|!;$*uSVxpQLK`juW1`<>U5!#b8XXG#{O};jxmCwC)+Ky6h{Q6SP|G}UXUEmO_i!BVnion742q<`qyQC;FuQ(^MBr`v+2y8At$bcr02C%=qfw3wv*jA8_<1OREnrAYt) diff --git a/cli/tests/__pycache__/test_contentful.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_contentful.cpython-312-pytest-9.1.1.pyc index 9c60557ad8533e1be86b9136c4d8fde476c84bfd..5270dd28632f70e60dfa207667dbb765f1052e8b 100644 GIT binary patch delta 8896 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 delta 6552 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 diff --git a/cli/tests/__pycache__/test_credentials.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_credentials.cpython-312-pytest-9.1.1.pyc index d44f36c2341c3eab9a2a9c36905eab41845f0071..bed01366e7167394a674fd98f114dfea10da38bf 100644 GIT binary patch delta 20 acmcavb+d~5G%qg~0}$|Z-`vRUXA1yJZw6QZ delta 20 acmcavb+d~5G%qg~0}#CFIlGbD&lUhtSqCiu diff --git a/cli/tests/__pycache__/test_dblifecycle.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_dblifecycle.cpython-312-pytest-9.1.1.pyc index 3bf4f7804a1a1c4de60eab5b7cb5aab5fa1d80f0..2505516820c339ca9e632ad6c72a5a5ce97d270d 100644 GIT binary patch delta 20 acmdlLyepXdG%qg~0}$|Z-`vQ(UK0R92L>4c delta 20 acmdlLyepXdG%qg~0}zzF+pv*)y(R!gWCptc diff --git a/cli/tests/__pycache__/test_drift.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_drift.cpython-312-pytest-9.1.1.pyc index 237c6dcb8f649cc5555b4b47ae7367ac96834445..2e3e8418e8652a9c854cab913b6694cf64a488e5 100644 GIT binary patch delta 20 acmdlPwlj?TG%qg~0}$|Z-`vQprwsr>O$D9+ delta 20 acmdlPwlj?TG%qg~0}yQ7-@cJsPa6P5ZU!X) diff --git a/cli/tests/__pycache__/test_http.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_http.cpython-312-pytest-9.1.1.pyc index 021fcf481ca4e6973fb6481d44ca00eb4e8d9c52..381ab7107ac29c68d695d2f13203d5fba235d6ff 100644 GIT binary patch literal 17451 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 u_TO)ci97DM$Hbm5+huX@|8x?u{x<@EFB_V~yU z8;Pg_ACs?dUcM0!gwGTVhWO90-i7V_yeZYyjqpmC2~~MZSQ)N{s(~$OCBo+*pQBZU zXSI%Ks@vak_`aO-4Do}+LS8SBWO$#IFshX0XPmko?K=_^v$eJxP5D%6(?MtEVHT2$6o3R%fn@&vj#xpJgOB)9MsW$EZ{cvWHE_ z6#XHd1C1~4;vc=p5?ILUr+10%i%rK5+KsCgt_$a%d z8Tcw&U^)DeU6PminrW|MtcwTp+;ZIh@g?#xU$w0Dw%Z2VvS5g+DQoRo-K{ko7(;Dw z?kwT?LAu_0Z4GFbFLCF9%q`IC0=iwGzXa6lsQ}ama$J5Z3meU9yKWzY^E_nybMp9d caWwr^NPZ8Ue<+^&G%qg~0}$|Z-`vQ(T^|5M{RU3} delta 20 acmX>Ue<+^&G%qg~0}yPqp0<&DyFLI$Q3hcE diff --git a/cli/tests/__pycache__/test_output.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_output.cpython-312-pytest-9.1.1.pyc index 8b5899afbe888cb32fb88a4d3d38e33660d79a04..9c3bfc50110162d8840c71b93c4a09b57435f02a 100644 GIT binary patch delta 20 acmaDS{7#trG%qg~0}$|Z-`vRkm=gd&2L=@Y delta 20 acmaDS{7#trG%qg~0}yQ7-@cLiF(&{;ClGM_{q(H@wb;A`i`iT9To3e$h^IZ!EE?5td zU4Gm83u($O+m;C#&en-;gX1Vyh!cpDh;Bp|;us)eV@;^PjOao1B9e$#5T^lo@%Y7=SYnz@#nXrLyxHR? zQGVXLk572KLJ9)HAWD#b<&E&~JpYi9?AMh!JsIbhYdYpJ)w-S?f`LsSE+B9Z>(9Q2 z$I92X^h|p=y$@G=4KazB0w^{>sQ5r{&wG!Obaut-Cs6vgzVG!U!Bc^L@;?6|aC81W zh|U|CoKP6U6s7tjg4XoB7=uZf$*D0}DeL>wYc??zlVN)wFV6%%tvVJ3jpz1ulDVui zSP9i}SDi20S$o&u*Q&D7csd@VN%lx-JhFdu;Nkm!Y8~rl_7RqF74f8E%*A3t(5OH5 zA0gLy)d76PuDY0^3acn2C~FPB(r_$vrIhs=YM%m>M{@ny&_QnSVC1g={=&x$fZ`*9 z0ycTDX;`{*AV>{KLWNuAO>skC2q8LENA0r^M;&~RD_rF)n=w!q&P*7%L_8)pl{PE* zyRIhU;g`wb7NVn-8KbIGjTn?MQIavMCe^H27Fw0DsutC%SvJ+iL*dHij6kJ~sMo22 zDsEP6kU|X^JFU(*RJ-c9&;W^?s&kPj5_h|6eKo2xL8uq!68a51nD9_vTH*_#0KZ@B z;IZo9vfsw9R)?4UcH-kJ?go%r-lw-|W2>Z%Hleth<_(zy{)IbevzL3rj-o~P+_KI> zk25anrvcTKB%0;sW+_74{5h$n$@l@um_W=R77#0l4MYGDLF^#TjAKR@*~|N+dXq6V zos#*NQXndhF`3G#bTU4vuqxOOt3h}XK12X8+x1~xD47VA#fIW3T5h*s#!y|RuRnI? zY|pu#0bWs2KQEL_foUhU5mPoHnh{43Z3qPrk)C*IX{Y=Y2K6EO5oZvuBhDhuAqEhG zh&K>JI^A13_9m!`1SsAMrBOSD`IfY-q~V~)>68pZiporhrKV#SnXJg^SlN!jo0i!k zq{2g`e1_Mel$z1+&B)uDUa?#r&-4 zntIQeSZON+-NkB3>e@(2-4?q``qofMg@qsL(f^k(c*+SYXdknPCojZ!WuuRr;4O{M zzoXq$Z$qo{#>wQUQuvS!gUv<}_F;`xTp|ww9x_g}`2PSH9oGo} delta 905 zcmb8tKWGzC90&0JlC)kL62wdOB(27#YOk@BVq0xf6aOG74sp>mQ1EEH#9kZI@-7E8 zg9W9vU6l595C@$z%Hg1+2o6qyE&)eD5GN-E!QVHbY70tzaG!hs-}fGO-~4ek^d=Z= zZ{d>t@MKm|*Fzf3tRJ_0w>)~_>7&9P(l-=Iy4+OysVZM8@2Ssy=-(ikbmM`&-ry-- zT5AzGeu=D{2n~?oE`}1mazFRzAu)u3VK4%G0Bghh2MI}l=luKmN2vC5pm4D0cOB|M%S_; z2N;Ouuk12Ftxep<*?0byqHQZhlw*914bzH@^nBwK9Y+ms2U0XQ`11nRdQ;J*U%TE# zZJDvR?e(cQL94Py{}Rjbn7*&xZWu+U;)sG_2rqZlmAqq>DpuJRNjWrla;ou3QyB4; zti0X)btkzk3@`^4KozWjRd5a95RqlRE8{okO{Y{yiU-^ze(X{CdT=E0^;m!$YRvoz DD4@8K diff --git a/cli/tests/__pycache__/test_repo.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_repo.cpython-312-pytest-9.1.1.pyc index ca14de6550142e376a22ac91d9fe76684edb722d..32a907acf11d139caea050d45af4892f146ee0ec 100644 GIT binary patch delta 20 acmexh^TCGuG%qg~0}$|Z-`vQZDhB{YFa`nu delta 20 acmexh^TCGuG%qg~0}wFpZ{NtBDhB{Xj|JNR diff --git a/cli/tests/__pycache__/test_sources.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_sources.cpython-312-pytest-9.1.1.pyc index c9610bc8afb218e9e0077041fc8be67d1e582e5e..bd177aa8d65c578a3626bf43d7bde1cc114cc9af 100644 GIT binary patch delta 22 ccmdng$+)SLk^3|+FBbz4@O0nY$i3VJ08CN_iU0rr delta 22 ccmdng$+)SLk^3|+FBbz4REJI6$i3VJ08F(8d;kCd diff --git a/cli/tests/__pycache__/test_sources_fetch.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_sources_fetch.cpython-312-pytest-9.1.1.pyc index 971daf6f1b98f3d1adaa684edd116aff8e99b3c5..ca0b3a399225b08496cb1b7429aca18d9fce06cd 100644 GIT binary patch delta 20 acmZn)Z3^W+&CAQh00cbUH#c&ZYXJZ`kOg)C delta 20 ZcmZn)Z3^W+&CAQh00cf_9UHmJwE#B#1n>X= diff --git a/cli/tests/__pycache__/test_validate.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_validate.cpython-312-pytest-9.1.1.pyc index 3065b82df5652df9344dd107d6d6dd6f4b1268d6..2e0588cab81ad37b85579aaa48de0379309a7162 100644 GIT binary patch delta 3093 zcmbW3Yfu~47035#A9^ej;*AhbBV!BmGN#1f;FuVSO%uBqlQ;>rEOZwt5Fp=`f+3=! zleUSIPD6TU8rssto=IC6bxTjq> zhp}kVj%2N?S##3#y0dTa}g0 zt=UNHru2)bJJINw6A_FnrZ>E8s3)Q^$zcoz@2m9FPC&?3_dJ=F7@C=|IaE2jh$zag{qyfMn zU=%P;-)Jduh9TU(#NS&Eph&{g`o84;j3ubKy|HQt#(x#!ST~z`^iKsqhG#r^ElOQ$D;AVRVnn^T2`U~ly&sY@n&jKc3HtF~g-xoTcB2!R# zj;=qmqbLU9R{(c+6^FEg`j7UZ=M(Q7y<)C^zzP@!_!%}(J=???I^WZcj?)`Gdp{5N zXG5x2l}I$a$dg%6h5#=zu&3)&4+KP-sE;F~>_95%S5H*4NtaGkmA}3@i4-a1@TbY#zcN0PY_78<1WAbkM#1-RR9ktluIP zEFw)9V%yTB@HpGxBwIZcA`A5U16cYIs28ai7(tg4X9I^3{b7B+^CM>0*SHvm(Ui<_ z*hCvF5B2a^z#^8g8C$S*p2s#8$q)^hf+&b^#=PkgV$-n~wl6s@nT!~5CN73>CU)Yi zrR+<*QJpqL%rvW@geIFE)*KfrP764fUd^aA=f$K!g!AdT!)Gs;H%&?GGczv4E_%k^ zXDv!=-Sqd?dULU^E%{_^UMXmCna=X`IN^UBSCJlPd*HYe@k!3R}#xTXsX@U zz#j9bb*(Pacx5~^#e@x0Ow-t$)|d>9Ss5D&jww|tX=FplJ^(v4ZYul97GKAsz9%|Q z^d3Eatc?w~Z8Xx~*1BE#H)!=dcb{O|Mryz$rzADvk3?1SOPFcv`O>Vgs{y~Ns041V zCK>B$=0KDXWh~;gkv14{5by{9+P>!WZH}XRvs&Wy5k-w`m3%}|qoIgzFytR%4Qf2( z8;FkKkb<`q^Ic+5_BwAablenexwhM!%_^_wbJ?zS7bmu(JDgpV zZWeP+_nO7AmQk_h?7CwXoYKsZI~klKf7M=o3=R`kq>uYukO?P0*)ckH4`-dcz^TZ9BHA|?fq(J*M(=0#@O&KKQfgO81@}ko_94<=aoTCAq}@jTOhe z7E%W4at6&D_D_b!{g_lj$phF4r~>R_P%RAQ=@(%K$7!DX?F>IOK7SyfgxUWMe<=8@ z;$xkS{DDb_!NXYl zuIsG8awA!R#0al}n$A`i9Lk>EpOTB`PNn3kq)@luVMxkV3!ao*w<^GOJzX%e6+JWJ zYoMnWPZycIZh8fujzgE!givrmHU1rYSx(vkoq!{NZa@#97eD|JzzpDdz(v5DfXjgQ z0C3ui9I1vFZqkP3;n8s%4Jil7hb(2cfK$;ReMxyL@776VMV?!QMX339YYwW{2mJ?l Cj3tr) delta 1167 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 delta 1087 zcmbu8O-vI(6vvrB23_2x}C*s+br`7yIH4 zM$n9I-IvOxLc>V~Y0Lq&@?uZa5?9z2Ro9Y$W#?+FT3qY z2x0g|*1sHPFFYM&ioNyxBvG~!3TU4@K3a&KJ@?K>&hn_bLrja4Bk9aYW`dsKj)tk( z;dyTJHrss{&smYpqDn=jVWloC_`n%Df{0O8_Q?~7_^WC7{6GNc26{LeHaZ7;oC*FQ z39GYK>JHp_nW$Cr$(7qB*}&%!daFeaSG@)EEBTmhCi6r7@F&Aw*QtE@d4 zU=P9~+0OhG`8pCCt!%)$3@ifw z(#o9CiYFE$TWmV^>CdT&#UGp2vpi?rDyGJGO;oCzxlR9bd}dFsk!|f(a*ha5o;1.env for API tokens, DNS and cloud credentials" Write-HelpEntry "github-token" "configure the GitHub MCP token for opencode" + Write-HelpEntry "install-git-hooks" "set core.hooksPath=.githooks and enable local quality hooks" Write-Host "" } "install" { @@ -172,6 +174,14 @@ switch ($Target) { $python = Get-PythonCommand & $python ci/scripts/configure_github_mcp.py @Args } + "install-git-hooks" { + git config core.hooksPath .githooks + Write-Host "configured git hooks path: .githooks" + } + "build-ai-commands" { + $python = Get-PythonCommand + & $python ci/scripts/build_ai_commands.py @Args + } "connector" { New-Item -ItemType Directory -Force ".secrets" | Out-Null $currentChoice = "1" diff --git a/skills/README.md b/skills/README.md index febdbf769..217d042df 100644 --- a/skills/README.md +++ b/skills/README.md @@ -1,4 +1,4 @@ -# Shared Skills +# AI Shared Skills `skills/` is the canonical source for project skills shared across agents. @@ -22,7 +22,19 @@ Naming guidance: Current adapters: - opencode: `.opencode/opencode.json` via `skills.paths` +Command adapter maintenance: +- command index: `skills/commands.manifest.json` +- generator: `ci/scripts/build_ai_commands.py` +- build command: `make build-ai-commands` (use `ARGS="--check"` in validation, `ARGS="--clean"` to remove stale generated files) +- local guardrail: `make install-git-hooks` (enables `.githooks/pre-commit` and `.githooks/pre-push`) +- generated outputs: + - `.opencode/command/*.md` + - `.github/prompts/*.prompt.md` + - `.codex/prompts/*.prompt.md` +- do not hand-edit generated adapter files; update `skills/commands.manifest.json` and rebuild + Shared skills: +- `commands.manifest.json` (shared command index for generated adapters) - `catalog-seed` - `update-assessment` - `app-update` @@ -33,3 +45,4 @@ Shared skills: - `deploy-validation` - `test-report-generation` - `release-readiness-check` +- `install-app` diff --git a/skills/commands.manifest.json b/skills/commands.manifest.json new file mode 100644 index 000000000..64bdcacbf --- /dev/null +++ b/skills/commands.manifest.json @@ -0,0 +1,81 @@ +{ + "commands": [ + { + "id": "libs-install-app", + "description": "Install one app package with target selection, port pre-check, and health validation.", + "skill": "install-app", + "argument_hint": " [local|remote] [plan-only]", + "usage": "/libs-install-app [local|remote] [plan-only]" + }, + { + "id": "libs-new-app", + "description": "Create one new app package and produce a short report.", + "skill": "new-app", + "argument_hint": " ", + "usage": "/libs-new-app " + }, + { + "id": "libs-update-assessment", + "description": "Assess whether one app is worth updating before implementation.", + "skill": "update-assessment", + "argument_hint": "", + "usage": "/libs-update-assessment " + }, + { + "id": "libs-update-app", + "description": "Implement an approved update for one app and produce a short report.", + "skill": "app-update", + "argument_hint": " [target version]", + "usage": "/libs-update-app [target version]" + }, + { + "id": "libs-batch-update-app", + "description": "Implement approved updates for a batch of apps selected by app names or initials.", + "skill": "batch-app-update", + "argument_hint": " [options]", + "usage": "/libs-batch-update-app " + }, + { + "id": "libs-deploy-validation", + "description": "Validate one app deployment locally or on a prepared remote server.", + "skill": "deploy-validation", + "argument_hint": " [--ssh-host ip --ssh-user name --ssh-secret-path path --deploy-root dir] [local]", + "usage": "/libs-deploy-validation [--ssh-host ip --ssh-user name] [--ssh-secret-path path] [--deploy-root dir] [local]" + }, + { + "id": "libs-release-readiness", + "description": "Check whether an app task is ready for owner E2E or release.", + "skill": "release-readiness-check", + "argument_hint": "", + "usage": "/libs-release-readiness " + }, + { + "id": "libs-test-report", + "description": "Generate a repository-format test report from validation evidence.", + "skill": "test-report-generation", + "argument_hint": " ", + "usage": "/libs-test-report " + }, + { + "id": "libs-catalog-seed", + "description": "Create or update one app catalog file and preview Contentful push.", + "skill": "catalog-seed", + "argument_hint": "", + "usage": "/libs-catalog-seed " + }, + { + "id": "libs-archive-app", + "description": "Archive one app or a small batch of apps with metadata handoff.", + "skill": "archive-app", + "argument_hint": " ", + "usage": "/libs-archive-app " + }, + { + "id": "libs-restore-app", + "description": "Restore one archived app back to active maintenance.", + "skill": "restore-app", + "argument_hint": " [--cadence monthly] [--update-policy patch-minor]", + "usage": "/libs-restore-app [--cadence monthly] [--update-policy patch-minor]" + } + ] +} diff --git a/skills/install-app/SKILL.md b/skills/install-app/SKILL.md new file mode 100644 index 000000000..c8cb86944 --- /dev/null +++ b/skills/install-app/SKILL.md @@ -0,0 +1,61 @@ +--- +name: install-app +description: Use when the user wants to install one app package with a repeatable runbook, choose local vs remote host, pre-check and allocate server ports (prefer 9000-9999), verify Docker Compose deployment health, and return access URL plus backup reminders. Trigger phrases: install app, deploy app, install , 安装应用, 部署应用. +--- + +# Install App + +Install one application using a structured, verifiable workflow contract. + +This skill is a generic execution wrapper for app-specific install instructions. +Use it with per-app facts from `apps//` and official upstream docs. + +Supporting files in this skill: + +- `checklist.md` +- `report-template.md` + +## Inputs + +- app name (required) +- install contract/prompt (required): concrete command sequence and success criteria +- install target (required before execution): `local` or `remote` +- execution mode (optional): `plan_only` | `execute_with_confirmation` | `execute_directly` (default: `execute_with_confirmation`) +- language (optional, default `en`) +- workspace folder chosen by user (optional at planning, required before execution when commands write files) + +## Steps + +1. Parse the install contract into explicit phases: prerequisites, install, conflict handling, validation, and user handoff. +2. Ask whether to install on `local` or `remote` host before execution. If the user does not specify, ask explicitly instead of assuming. +3. Run prerequisite checks exactly as required by the contract (for example, `docker compose version`). If a mandatory dependency is missing, stop and report the exact blocker. +4. Resolve required server ports before installation: probe occupancy first, then choose available ports with this priority order: + - contract-required fixed port (if mandatory and free) + - nearest available port in `9000-9999` + - contract fallback strategy (for example `--port `) +5. In `execute_with_confirmation` mode, present the exact command plan (including selected target and ports) and wait for user confirmation before executing. +6. Execute install commands in the user-selected folder. Keep commands deterministic and non-interactive when possible. +7. Run all required health checks and capture evidence (for example, `docker compose -p ps` and HTTP health endpoint checks). +8. Produce a concise outcome report using `report-template.md`. +9. Provide handoff details: final access URL, credentials retrieval path (if applicable), and backup reminders (such as backing up generated `.env`). + +## Output + +- install result (`passed` / `failed` / `blocked`) +- install target (`local` / `remote`) +- execution folder +- commands run +- port allocation result (required port, occupancy check, and final port) +- health check evidence +- access URL and next actions + +## Rules + +- Never invent prerequisites, flags, ports, or health endpoints that are not in the contract or repository facts. +- Always ask for install target (`local` or `remote`) before execution when it is not explicitly given. +- For server-facing ports, prefer available ports in the `9000-9999` range whenever the contract allows custom ports. +- Always check port occupancy before install commands that bind ports. +- If critical input is missing (for example, target folder or required secret), stop and ask the user before execution. +- Do not silently ignore a failed check; surface the first blocking error and its command output. +- Keep changes scoped to the target app/work folder. +- Match output language to user preference. diff --git a/skills/install-app/checklist.md b/skills/install-app/checklist.md new file mode 100644 index 000000000..da87cfb85 --- /dev/null +++ b/skills/install-app/checklist.md @@ -0,0 +1,13 @@ +# Install App Checklist + +- [ ] Confirm app name and install contract +- [ ] Confirm install target (`local` or `remote`) +- [ ] Confirm execution mode (`plan_only` / `execute_with_confirmation` / `execute_directly`) +- [ ] Confirm target folder before running write/install commands +- [ ] Run prerequisite checks (for example Docker + Compose v2) +- [ ] Identify required server ports and check occupancy before install +- [ ] Prefer available ports in `9000-9999` when custom ports are supported +- [ ] Execute install commands from the contract +- [ ] Handle remaining port conflicts per contract rule +- [ ] Run required service and endpoint health checks +- [ ] Return final URL, evidence, and backup reminders diff --git a/skills/install-app/report-template.md b/skills/install-app/report-template.md new file mode 100644 index 000000000..8cb94943d --- /dev/null +++ b/skills/install-app/report-template.md @@ -0,0 +1,43 @@ +## Summary + +- app: +- target (local/remote): +- mode: +- result: +- execution folder: + +## Automated Checks + +- structure: +- policy: +- deploy: +- reachability: +- logs: + +## Prerequisites + +- checks run: +- blockers: + +## Execution + +- commands executed: +- retries/adjustments: + +## Port Handling + +- requested port(s): +- occupancy check: +- preferred range policy: +- final port: + +## Health Evidence + +- compose status: +- endpoint checks: + +## Handoff + +- access URL: +- credentials notes: +- backup reminders: diff --git a/tests/build/__pycache__/_helpers.cpython-312.pyc b/tests/build/__pycache__/_helpers.cpython-312.pyc index d221b558534967386afc779fd3c73dbee365cdc3..a5c2d6c9bf94d69431bef3bce858df63eb242f9b 100644 GIT binary patch delta 52 zcmbQhzLK5$G%qg~0}$|Z-`vQp$RuT;pORRTsGpKrrk|3ZoSj;vo0FMTlvq@$zgd?l GnGpbVa1T%b delta 27 hcmZ3`!vl~+~BLHPy2K@j4 diff --git a/tests/build/__pycache__/conftest.cpython-312-pytest-9.1.1.pyc b/tests/build/__pycache__/conftest.cpython-312-pytest-9.1.1.pyc index 0ac740a3784531225478a244144536236eed8b6e..7159672900ef79f3254027b1b0f718fbba6ad958 100644 GIT binary patch delta 20 acmcaDcw3PBG%qg~0}$|Z-`vQ3fdc?N#s${^ delta 20 acmcaDcw3PBG%qg~0}%LUb#COozySa~MFpt< diff --git a/tests/build/__pycache__/test_fetch_catalog.cpython-312-pytest-9.1.1.pyc b/tests/build/__pycache__/test_fetch_catalog.cpython-312-pytest-9.1.1.pyc index 1950fc614d14adab4abbcf57991b931e4da144ec..7b02dd8bd5413bc4dfc79def20fbb338c8d87747 100644 GIT binary patch delta 22 ccmew|i}A}WM()$Ryj%=Gz|(zmBX_1R09gnI`v3p{ delta 22 ccmew|i}A}WM()$Ryj%=G@c-I|jog{O0AQjB5C8xG diff --git a/tests/build/__pycache__/test_library_publish.cpython-312-pytest-9.1.1.pyc b/tests/build/__pycache__/test_library_publish.cpython-312-pytest-9.1.1.pyc index 6d740e89cc7a28c4d12154c8a23ce1e44d595f79..d9ae37dd608cf15172099498f4196c50771ab983 100644 GIT binary patch delta 22 ccmZ2?k!jsUChpU`yj%=Gz|(zmBlqGJ09PjmbN~PV delta 22 dcmZ2?k!jsUChpU`yj%=G@c-I|jogb@003UW2#Ejy diff --git a/tests/build/test_build_ai_commands.py b/tests/build/test_build_ai_commands.py new file mode 100644 index 000000000..34eca18a2 --- /dev/null +++ b/tests/build/test_build_ai_commands.py @@ -0,0 +1,80 @@ +from __future__ import annotations + +import json +from pathlib import Path + +from _helpers import REPO_ROOT, load_build_module + + +builder = load_build_module("build_ai_commands", REPO_ROOT / "ci" / "scripts" / "build_ai_commands.py") + + +def test_manifest_commands_are_unique_and_skills_exist(): + specs = builder.load_specs(builder.MANIFEST_PATH) + command_ids = {spec.command_id for spec in specs} + assert len(command_ids) == len(specs) + + for spec in specs: + skill_path = REPO_ROOT / "skills" / spec.skill / "SKILL.md" + assert skill_path.exists(), f"missing skill for {spec.command_id}: {skill_path}" + + +def test_generated_outputs_match_repository_files(): + specs = builder.load_specs(builder.MANIFEST_PATH) + expected = builder.expected_outputs(REPO_ROOT, specs) + + for path, content in expected.items(): + assert path.exists(), f"missing generated file: {path}" + assert path.read_text(encoding="utf-8") == content, f"outdated generated file: {path}" + + for root in ( + REPO_ROOT / ".opencode" / "command", + REPO_ROOT / ".github" / "prompts", + REPO_ROOT / ".codex" / "prompts", + ): + expected_paths = {path for path in expected if path.parent == root} + actual_paths = set(root.glob("*.md")) | set(root.glob("*.prompt.md")) + assert actual_paths == expected_paths, f"unexpected generated files under {root}" + + +def test_find_stale_outputs_and_clean(tmp_path): + specs = builder.load_specs(builder.MANIFEST_PATH) + expected = builder.expected_outputs(tmp_path, specs[:1]) + builder.write_outputs(expected) + + stale_path = tmp_path / ".github" / "prompts" / "libs-stale.prompt.md" + stale_path.parent.mkdir(parents=True, exist_ok=True) + stale_path.write_text("stale", encoding="utf-8") + + stale = builder.find_stale_outputs(tmp_path, expected) + assert stale == [stale_path] + + removed = builder.remove_stale_outputs(stale) + assert removed == [stale_path] + assert not stale_path.exists() + + +def test_main_check_detects_drift_without_writing(tmp_path, monkeypatch): + manifest = tmp_path / "skills" / "commands.manifest.json" + manifest.parent.mkdir(parents=True, exist_ok=True) + payload = { + "commands": [ + { + "id": "libs-demo", + "description": "Demo command.", + "skill": "install-app", + "argument_hint": "", + "usage": "/libs-demo ", + } + ] + } + manifest.write_text(json.dumps(payload), encoding="utf-8") + + monkeypatch.setattr(builder, "REPO_ROOT", tmp_path) + monkeypatch.setattr(builder, "MANIFEST_PATH", manifest) + + rc = builder.main(["--check"]) + assert rc == 1 + + opencode_target = tmp_path / ".opencode" / "command" / "libs-demo.md" + assert not opencode_target.exists() diff --git a/tests/skills/__pycache__/test_assets.cpython-312-pytest-9.1.1.pyc b/tests/skills/__pycache__/test_assets.cpython-312-pytest-9.1.1.pyc index e774784b25dfbee4bec84e6a6bf20befa299d973..c24e4fa43d427b8629c7006b3275c08b257107b6 100644 GIT binary patch delta 22 ccmdnh#JH=8k^3|+FBbz4@O0nY$gS@P085qz5dZ)H delta 22 ccmdnh#JH=8k^3|+FBbz4n162H$gS@P08N<&QUCw| diff --git a/tests/skills/__pycache__/test_skill_cli_contracts.cpython-312-pytest-9.1.1.pyc b/tests/skills/__pycache__/test_skill_cli_contracts.cpython-312-pytest-9.1.1.pyc index 0f3708e16a4a92734f66d8fdd9638c1968b460a1..c5718553cb1b7b8cbe191ea4dc538e24b8087fd0 100644 GIT binary patch delta 20 acmaEo@+5`(G%qg~0}$|Z-`vO@X#@aD1O`F? delta 20 acmaEo@+5`(G%qg~0}xbOPus{HX#@aC-Uc23 diff --git a/tests/skills/__pycache__/test_workflows.cpython-312-pytest-9.1.1.pyc b/tests/skills/__pycache__/test_workflows.cpython-312-pytest-9.1.1.pyc index b90f30c5c2250479910f39c1d414e0cb5a77b2b1..329f3f429795311fa1f1067cf02e89ef09c46193 100644 GIT binary patch delta 22 ccmX>!neotMM()$Ryj%=Gz|(zmBlmVs08otv(*OVf delta 22 ccmX>!neotMM()$Ryj%=GP;EVJBlmVs08nQJuK)l5 From 146ab66f0ce67aea3141714d9409011d5a42691c Mon Sep 17 00:00:00 2001 From: root Date: Fri, 23 Oct 2026 08:29:16 +0000 Subject: [PATCH 3/4] optimize ci workflow --- .github/workflows/appstore-publish.yml | 27 +-- .github/workflows/i18n.yml | 82 ------- .github/workflows/pr-checks.yml | 11 +- AGENTS.md | 4 +- CHANGELOG.md | 2 + Makefile | 10 +- apps/grafana/CHANGELOG.md | 5 + apps/grafana/tests/cases.yml | 3 + apps/grafana/tests/check-plugin-validation.sh | 22 ++ apps/metabase/.env | 2 +- apps/metabase/CHANGELOG.md | 5 + apps/metabase/README.md | 3 +- apps/metabase/variables.json | 2 +- .../__pycache__/fetch_catalog.cpython-312.pyc | Bin 7625 -> 0 bytes .../library_publish.cpython-312.pyc | Bin 36386 -> 0 bytes build/sync_contentful.py | 91 ------- {build => ci/scripts}/fetch_catalog.py | 0 {build => ci/scripts}/library_publish.py | 2 +- cli/README.md | 2 +- .../__pycache__/app_deploy.cpython-312.pyc | Bin 26952 -> 27772 bytes cli/libs/__pycache__/http.cpython-312.pyc | Bin 9534 -> 13665 bytes cli/libs/__pycache__/main.cpython-312.pyc | Bin 49411 -> 49785 bytes cli/libs/__pycache__/sources.cpython-312.pyc | Bin 16609 -> 16754 bytes .../__pycache__/versioning.cpython-312.pyc | Bin 6348 -> 7415 bytes cli/libs/__pycache__/versions.cpython-312.pyc | Bin 6807 -> 8003 bytes cli/libs/app_deploy.py | 28 ++- cli/libs/http.py | 166 +++++++++++-- cli/libs/main.py | 4 + cli/libs/sources.py | 37 +-- cli/libs/versioning.py | 22 ++ cli/libs/versions.py | 18 +- ...st_app_deploy.cpython-312-pytest-9.1.1.pyc | Bin 28582 -> 31172 bytes .../test_http.cpython-312-pytest-9.1.1.pyc | Bin 17451 -> 26572 bytes ...sources_fetch.cpython-312-pytest-9.1.1.pyc | Bin 10882 -> 14854 bytes ...st_versioning.cpython-312-pytest-9.1.1.pyc | Bin 20336 -> 24224 bytes ...test_versions.cpython-312-pytest-9.1.1.pyc | Bin 17060 -> 18539 bytes cli/tests/test_app_deploy.py | 19 +- cli/tests/test_http.py | 69 +++++- cli/tests/test_sources_fetch.py | 52 ++++ cli/tests/test_versioning.py | 13 +- cli/tests/test_versions.py | 19 ++ docs/appstore-release-spec.md | 2 +- docs/architecture.md | 3 +- docs/devops-spec.md | 2 +- docs/test.md | 2 +- i18n/README.md | 36 ++- i18n/create.py | 26 +- i18n/manage.py | 226 ++++++++++++++++++ i18n/pr.py | 75 ------ i18n/translation.json | 16 +- ...fetch_catalog.cpython-312-pytest-9.1.1.pyc | Bin 19828 -> 19845 bytes ...brary_publish.cpython-312-pytest-9.1.1.pyc | Bin 43182 -> 43199 bytes tests/build/test_fetch_catalog.py | 2 +- tests/build/test_i18n_manage.py | 103 ++++++++ tests/build/test_library_publish.py | 2 +- 55 files changed, 844 insertions(+), 371 deletions(-) delete mode 100644 .github/workflows/i18n.yml create mode 100755 apps/grafana/tests/check-plugin-validation.sh delete mode 100644 build/__pycache__/fetch_catalog.cpython-312.pyc delete mode 100644 build/__pycache__/library_publish.cpython-312.pyc delete mode 100644 build/sync_contentful.py rename {build => ci/scripts}/fetch_catalog.py (100%) rename {build => ci/scripts}/library_publish.py (99%) create mode 100755 i18n/manage.py delete mode 100644 i18n/pr.py create mode 100644 tests/build/test_i18n_manage.py diff --git a/.github/workflows/appstore-publish.yml b/.github/workflows/appstore-publish.yml index d60a62fb3..2febd7c11 100644 --- a/.github/workflows/appstore-publish.yml +++ b/.github/workflows/appstore-publish.yml @@ -73,7 +73,7 @@ jobs: env: CONTENTFUL_GRAPHQL_TOKEN: ${{ secrets.CONTENTFUL_GRAPHQLTOKEN }} run: | - python build/fetch_catalog.py \ + python ci/scripts/fetch_catalog.py \ --channel "${{ steps.resolve_channel.outputs.channel }}" \ --output-dir dist/catalog-source @@ -140,7 +140,7 @@ jobs: elif [[ -n "${{ steps.release_base.outputs.from_ref }}" ]]; then args+=(--from-ref "${{ steps.release_base.outputs.from_ref }}") fi - python build/library_publish.py "${args[@]}" + python ci/scripts/library_publish.py "${args[@]}" - name: Generate changelog if: steps.resolve_channel.outputs.channel == 'release' @@ -152,7 +152,7 @@ jobs: OUTPUT: dist/CHANGELOG_RELEASE.md - name: Upload workflow artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: appstore-publish-${{ steps.resolve_channel.outputs.channel }} path: dist/appstore-publish @@ -236,22 +236,21 @@ jobs: id: purge_urls run: | if [[ "${{ steps.resolve_channel.outputs.channel }}" == "dev" ]]; then - echo "urls=[\"https://artifact.websoft9.com/dev/websoft9/plugin/library/library-dev.zip\",\"https://artifact.websoft9.com/dev/websoft9/plugin/media/media-dev.zip\"]" >> "$GITHUB_OUTPUT" + echo "urls=https://artifact.websoft9.com/dev/websoft9/plugin/library/library-dev.zip https://artifact.websoft9.com/dev/websoft9/plugin/media/media-dev.zip" >> "$GITHUB_OUTPUT" else - echo "urls=[\"https://artifact.websoft9.com/release/websoft9/plugin/library/library-latest.zip\",\"https://artifact.websoft9.com/release/websoft9/plugin/media/media-latest.zip\"]" >> "$GITHUB_OUTPUT" + echo "urls=https://artifact.websoft9.com/release/websoft9/plugin/library/library-latest.zip https://artifact.websoft9.com/release/websoft9/plugin/media/media-latest.zip" >> "$GITHUB_OUTPUT" fi - name: Purge legacy Cloudflare Cache - uses: jakejarvis/cloudflare-purge-action@master - env: - CLOUDFLARE_ZONE: ${{ secrets.CLOUDFLARE_ZONE_ID }} - CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} + uses: NathanVaughn/actions-cloudflare-purge@v4.0.0 with: - PURGE_URLS: ${{ steps.purge_urls.outputs.urls }} + cf_zone: ${{ secrets.CLOUDFLARE_ZONE_ID }} + cf_auth: ${{ secrets.CLOUDFLARE_API_TOKEN }} + files: ${{ steps.purge_urls.outputs.urls }} - name: Create GitHub Release (release channel only) if: steps.resolve_channel.outputs.channel == 'release' - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v3 with: files: | dist/appstore-publish/legacy/release/library/library.json @@ -278,13 +277,13 @@ jobs: uses: actions/checkout@v7 - name: Setup Pages - uses: actions/configure-pages@v4 + uses: actions/configure-pages@v6 - name: Upload artifact - uses: actions/upload-pages-artifact@v3 + uses: actions/upload-pages-artifact@v5 with: path: '.' - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 \ No newline at end of file + uses: actions/deploy-pages@v5 \ No newline at end of file diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml deleted file mode 100644 index a5fd9ad08..000000000 --- a/.github/workflows/i18n.yml +++ /dev/null @@ -1,82 +0,0 @@ -name: i18n - -on: - workflow_dispatch: - push: - branches: [ main ] - paths: - - "apps/*/.env" - -permissions: - contents: write - pull-requests: write - -jobs: - create: - runs-on: ubuntu-latest - if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' - steps: - - uses: actions/checkout@v7 - name: Check out code - with: - ref: main - fetch-depth: 0 - - - name: Check automation token - env: - TOKEN: ${{ secrets.OPENCODE_GITHUB_TOKEN }} - run: | - if [ -z "$TOKEN" ]; then - echo "::error::Set OPENCODE_GITHUB_TOKEN so i18n PRs trigger the required PR checks." - exit 1 - fi - - - name: Update translation.json - run: | - echo "start to update translation.json" - cd i18n - pip3 install python-dotenv - python3 create.py - - - name: Create translation PR - uses: peter-evans/create-pull-request@v5 - with: - # A PAT is required so the generated PR triggers the required PR checks. - token: ${{ secrets.OPENCODE_GITHUB_TOKEN }} - branch: update-i18n - base: main - delete-branch: true - commit-message: "chore: update i18n translation keys" - title: "chore: update i18n translation keys" - body: "Automated update from the i18n workflow." - - pr: - runs-on: ubuntu-latest - if: github.event_name == 'workflow_dispatch' - strategy: - matrix: - repository: ['Websoft9/plugin-appstore', 'Websoft9/plugin-myapps'] - steps: - - name: Checkout - uses: actions/checkout@v7 - with: - repository: ${{ matrix.repository }} - ref: main - - - name: Update languages files - run: | - cd public - wget https://raw.githubusercontent.com/Websoft9/docker-library/main/i18n/translation.json - wget https://raw.githubusercontent.com/Websoft9/docker-library/main/i18n/pr.py - python3 pr.py translation.json po.en_US.js po.zh_CN.js - rm -rf pr.py translation.json - - - name: Create Pull Request - uses: peter-evans/create-pull-request@v5 - with: - token: ${{ secrets.ZJ_ADMIN_TOKEN }} - branch: update-${{ matrix.repository }}-version-${{ github.run_number }} - delete-branch: true - commit-message: "${{ matrix.repository }} combine translation.json" - title: "${{ matrix.repository }} combine translation.json" - body: "${{ matrix.repository }} combine translation.json" \ No newline at end of file diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index ab02d2248..3405b6968 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -18,14 +18,13 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 20 steps: - - name: Validate PR title + - name: Check PR title format env: TITLE: ${{ github.event.pull_request.title }} PATTERN: '^(feat|fix|docs|ci|chore|refactor|perf|test|build|revert)(\([^)]+\))?!?:[[:space:]]+.+' run: | if ! [[ "$TITLE" =~ $PATTERN ]]; then - echo "::error::PR title must look like 'type: summary', e.g. 'fix: handle empty config'" - exit 1 + echo "::warning::PR title should look like 'type: summary', e.g. 'fix: handle empty config'" fi - name: Checkout repository @@ -52,6 +51,12 @@ jobs: - name: Run build tests run: python -m pytest tests/build -q + - name: Validate i18n keys for changed apps + env: + BASE_SHA: ${{ github.event.pull_request.base.sha }} + HEAD_SHA: ${{ github.event.pull_request.head.sha }} + run: make i18n-check ARGS="--base $BASE_SHA --head $HEAD_SHA --github-annotations --warn-only" + - name: Validate changed catalog files env: BASE_SHA: ${{ github.event.pull_request.base.sha }} diff --git a/AGENTS.md b/AGENTS.md index 7ac7c49f3..b3a41b57c 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -39,7 +39,7 @@ Read in this order: - Translatable env keys are `W9_*_SET` and `W9_LOGIN*`. - When a task adds or changes such keys, ensure `i18n/translation.json` gets the key. - New keys may stay `["", ""]`; translations are filled by humans, not AI. -- Do not edit downstream repos; the `i18n.yml` workflow syncs them by PR. +- Do not edit downstream repos. i18n checks cover only this repo's `translation.json`; downstream sync workflows were removed. ## Delivery Model @@ -54,7 +54,7 @@ Read in this order: - App metadata: `metadata/maintenance.yaml`, `metadata/archive.yaml` - Shared skills: `skills/` - Template: `metadata/templates/` -- Scripts: `ci/scripts/`, `build/` +- Scripts: `ci/scripts/` - Process docs: `docs/ai-sdlc/` - CI: `.github/workflows/` diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c26ad96e..454b9a101 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,12 +9,14 @@ Project-level changes only: architecture, delivery model, tooling, CI, and relea ### Changed - Moved the opencode session cleanup script from `build/` to `ci/scripts/` and updated `make opencode-clear` to use it. +- Moved `fetch_catalog.py` and `library_publish.py` from `build/` to `ci/scripts/`; the `build/` directory is now removed. ### Removed - Removed the legacy `template/` directory; scaffolds and generated docs now use `metadata/templates/`. - Removed unused `build/update_readme.py`, `build/update_variables.py`, `build/test_apps.py`, and `build/get_apps_latest_version.py`. - Removed obsolete workflows: `build_files`, `pull_quest_test`, `pre_merge`, `release`, `release-dev`, `sync_php_files`, and `get_apps_latest_version`. - Removed `add_apps.json` and its template-scaffold workflow. +- Removed the unused `build/sync_contentful.py`; Contentful sync now uses `libs catalog-push`. ## 2026-09 diff --git a/Makefile b/Makefile index 1e9f0c4ac..348a18ce0 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: help opencode opencode-clear install libs cli remote connector github-token install-git-hooks dns-bind dns-delete websoft9-upgrade create-aliyun-ecs build-ai-commands test test-cli test-build test-skills +.PHONY: help opencode opencode-clear install libs cli remote connector github-token install-git-hooks dns-bind dns-delete websoft9-upgrade create-aliyun-ecs build-ai-commands i18n-check i18n-update test test-cli test-build test-skills ifeq ($(OS),Windows_NT) PYTHON ?= py @@ -29,6 +29,8 @@ help: @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'test-build' 'run build pipeline smoke tests' @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'test-skills' 'run skills asset and workflow tests' @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'build-ai-commands' 'generate opencode/copilot/codex command adapters from manifest' + @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'i18n-check' 'check translation.json for missing keys (ARGS: --strict, --app )' + @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'i18n-update' 'add missing translation keys as ["", ""]' @printf '\n \033[1;35m▸ Config & Setup\033[0m\n' @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'help' 'show this help' @printf ' \033[2mmake \033[0m\033[1;32m%-18s\033[0m %s\n' 'install' 'create .venv and install the libs CLI' @@ -239,6 +241,12 @@ connector: chmod 600 "$$file"; \ echo "wrote $$file"' +i18n-check: + $(PYTHON) i18n/manage.py --check $(ARGS) + +i18n-update: + $(PYTHON) i18n/manage.py --update $(ARGS) + test-cli: $(VENV_BIN)/python -m pytest cli/tests -q diff --git a/apps/grafana/CHANGELOG.md b/apps/grafana/CHANGELOG.md index 4418587f0..52f249791 100644 --- a/apps/grafana/CHANGELOG.md +++ b/apps/grafana/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## 2026-10-23 + +- Added a startup log regression check for unsupported Grafana plugins. +- Version scans now identify patch releases already covered by the current floating minor tag. + ## 2026-10-22 - Kept `W9_VERSION=13.2`; the upstream stable `13.2` tag currently resolves to Grafana `13.2.4`. diff --git a/apps/grafana/tests/cases.yml b/apps/grafana/tests/cases.yml index 49c6f9d57..7cfc1eeba 100644 --- a/apps/grafana/tests/cases.yml +++ b/apps/grafana/tests/cases.yml @@ -3,3 +3,6 @@ optional: type: web-access path: /api/health expect_status: 200 + - id: grafana-plugin-validation + type: script + script: check-plugin-validation.sh diff --git a/apps/grafana/tests/check-plugin-validation.sh b/apps/grafana/tests/check-plugin-validation.sh new file mode 100755 index 000000000..7c87cf6cd --- /dev/null +++ b/apps/grafana/tests/check-plugin-validation.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +set -euo pipefail + +container="${W9_ID:-grafana}" +stale_plugin="/var/lib/grafana/plugins/grafana-simple-json-datasource" + +if docker exec "$container" test -d "$stale_plugin"; then + echo "Unsupported stale plugin remains in the Grafana plugins volume: $stale_plugin" >&2 + echo "Remove that directory once before validating an existing instance." >&2 + exit 1 +fi + +started_at="$(docker inspect -f '{{.State.StartedAt}}' "$container")" +logs="$(docker logs --since "$started_at" "$container" 2>&1 || true)" + +if grep -Eiq 'Plugin validation failed|angular plugins are not supported|Refusing to initialize plugin' <<<"$logs"; then + echo "Grafana reported an unsupported plugin during this container startup." >&2 + grep -Ei 'Plugin validation failed|angular plugins are not supported|Refusing to initialize plugin' <<<"$logs" >&2 + exit 1 +fi + +echo "No unsupported plugin validation errors during the current startup." diff --git a/apps/metabase/.env b/apps/metabase/.env index b14374897..1b87f8352 100644 --- a/apps/metabase/.env +++ b/apps/metabase/.env @@ -1,6 +1,6 @@ W9_REPO=metabase/metabase W9_DIST=community -W9_VERSION=v0.64.x +W9_VERSION=v0.64.1.x # Optional password seed: enable only when the package actually controls a DB or built-in login. # See docs/w9-env-spec.md for when W9_POWER_PASSWORD is appropriate. diff --git a/apps/metabase/CHANGELOG.md b/apps/metabase/CHANGELOG.md index 4f55e6cfc..76806e913 100644 --- a/apps/metabase/CHANGELOG.md +++ b/apps/metabase/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## 2026-10-23 + +- Updated Metabase to the official `v0.64.1.x` Docker image tag from the invalid `v0.64.x` placeholder. +- Updated version metadata so upstream scans can parse and compare the current Metabase image correctly. + ## 2026-10-08 - Updated Metabase from `v0.57.5.3` to `v0.64.x`. diff --git a/apps/metabase/README.md b/apps/metabase/README.md index 48bfef10a..2e51f48f5 100644 --- a/apps/metabase/README.md +++ b/apps/metabase/README.md @@ -6,6 +6,7 @@ 1. In the [Websoft9](https://www.websoft9.com) console, open **My Apps** and select **Metabase**. 2. In the **Access** tab, get the login URL and credentials. + 3. Open the login URL in a browser and sign in to confirm the app works. @@ -33,7 +34,7 @@ Apps run as containers; rebuild after any configuration change. ### Version Support -Supported versions: v0.64.x, latest. +Supported versions: v0.64.1.x, latest. The `latest` tag is not guaranteed to remain valid; pin a specific version for production. diff --git a/apps/metabase/variables.json b/apps/metabase/variables.json index fc8245a1d..c558e9b3a 100644 --- a/apps/metabase/variables.json +++ b/apps/metabase/variables.json @@ -14,7 +14,7 @@ { "dist": "community", "version": [ - "v0.64.x", + "v0.64.1.x", "latest" ] } diff --git a/build/__pycache__/fetch_catalog.cpython-312.pyc b/build/__pycache__/fetch_catalog.cpython-312.pyc deleted file mode 100644 index 579ce58edb8f1b85969112ef9e9eef8ec6dc9e99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7625 zcmbVRTTmNUn(l73t}O|KC3CgYAtXj)K*qO?iQ|NDO+vsn;EnMl8llsm21%`)ZW$v> zH6%4vfw8NAt*L@+JQW^hw#eF5%f9U9F`M0onVN?Y2*;X^w<=YW+S~43O?tpKg_K9DC&=-VtlM#p!dIo!WxArL`SI@Jwel? z%tV<9M$1hTCM{eCm?1YsEivnawLoi|upxHBj?Bn{taq3R2eKhMazKeg+=LT3 zCtS#fTt8zc+~_cJLtceyQ5EFXs18*_?m_j)19=TdP0cg&jKAqyQuWg+7mCLvC8UT_TporxdoiR$QZGjoB_VeO z0@FB@h`bl=2upEAh$~Y`Qj7%()xh=6fSd@01vxM^g<;H;I31arQyC$yGO384NtuOs z`}k{R}q4rm+Q*(0{>sINnPNc)qnIDuqK)p^G0?uo$0y*3aK`@O(I=gkUYLBI@Fs zPhL%&7`u9E_O-$3fwNb7XXL?&;l!KGZM-qGz(XI(^HDKAE1-TX#actrs5B>_A#D!1 zi@(;a9ZB;$25oVw9w{0X!sI4eqhd@{y7-ePN<=&_Dnd-w*2WjUSz#VlYJ3Sv7Rl(c zCPh@DLRtNLe0bsOIz&x(mI{`I)>EK~}(gG21%Uz4P$5Q^(JQ0OQ>gaT*^H{Zt3MFb2Wx*19& zMiq$^6`T~>_;Q|Q6J*+W2_pe_@$$SJ6j88yva=3-7U=WR4Th-)%n1RY(}Y+BZsk` zd)xtDT#3dg85VPt@;ir9t^I-$ju_T}e`9oHm`7k5_$g5Cd{4j1uh?A($vS)FBxRI!=&jngV;Na z2G{~k#*{YA6hWuWr6mS@0IH@Ld#T+h8T}bH&CXPSAF>)y#Vv}<7^M_B&A5%WQl4g! zwH~U(xxD8vM9Sdv0S)~e>DM7$4HhaY!hM063(Uw;JY{`N2w?&9;IKIhkZvEFPY9~3 zJE=q@ET%MKz^qwwnN<7r5Ees|Q9=Ip2Ji)dTO$Hk7c8qR;iy^_F(v?%Rf~YJgysHk zi3ESjs7|mLNh}0Ia#$2qix@`$Pn9JI^V@Wh5M%||fc{cccNyZxFAu5JI3&tKa7w~K z8JyOnjGqCvstHi6I!5PZ@R0g$h>B`P$yh@6n^m(WIk*w1a1$W~p_3Ef>k6th5t@%m zAtV#+L=+;AYYBxNC*whFo46C|Q}8eU3=+U_Rqb+SDf7^F`0J*Q{4+0XBsZqBM>@VU zn>>y^2X(kHU*8NBw`0#ndAxt}an+WE!M!@l?0Uc+*=CRIvd`q*hnHhZv0Ku@K;G*9 z@aFqBS6&J5L@vLn;&(*A)U3w+UHsCr~ zNVr_(78P?Addl&grj#NbqSLfU8@R|YX{Mq|E-LLCv<%`RQX0l9DsKZ@MM{F^N|fvq zl;*U#BBl8t!vt~5?ChhW6S5Nm?_t3~d@X~nS z<*WEO9FpIHJ0QcSNb&+nPD29oXg<5@2p8ROnH;W$i~=-#2UJ}Ukc&k@#xDU`3jXCV zBmfi6yE1;~tTdys=k>`BN7nUxpAIovgJ6!9=WR`7x5(PvjX9U|Cahz8o0#D9zo}Uwy2p{5;GSMv%T!9k^V&BG3iBY(oX z7?wbZy-cWWQxLgLhQhNlIb4DQT|Lwg?KvMT%pN53;U1v)0RH8-Az7fl=Bk&^EuCAr zlH;0oxaJK80AS@lyz%~x700f%F<<3fbUv)&A5^t$SG8Hl2WJ~Om1 znCDI}3R&*-%9Zt*&DQLZQ`_9>EPGnNb-3l?M;slf)B6}CeT|xilSXugMNGz=X4B?b zXvGPzT`X8H(;ZXBQgYkMwL`k-gk`L0Yem_7Qi^S9TSdypq!`v?u52ftGTw3!qtld8 z2YU)uE(I2mSkA)k=-Y|3sh3)|hnZ>6i|;%Kz4o-d;>v6yWw?G7`|ZX|tIX}^SqfZW zd&%mi9WVl%|o>*m1^n;GDpRfZZK3MyKs*mq7`; zuhv#+ABDBjWWDw|qr??U(B^jy6W~$b5)A?hmnc+~B~dH5lllV=co?eZiP)J~Wr$<( z-;lwGj50w0t1===wV|Z$n+RpTwGl#-NV!8q{Pj>YDZo=oifQ9@33n8<{l&{8z2iM& zW!fGbkQ?CPBGn>G7$Qg29F~$G^5nS;d=*IqUu9^dr+cVxR1;&ryUaQa0Fkyz+)qlc zlZ1E?y4mO=rB@+Q?V1vSAYN8&Mp1PYw?aB_HxSCicO$B#^yx~aU|0$#RWvMDfczF2 zcMgttfy&o4EcE3$C#Vyr3rY_6itp!bUmtGDd+YKIE#FyLpJUPfCkItszwY~$YjZwV zb#9T(`|8);UVS@zv@_>Bx#N3rYjV+%uWnd#ue#Uga@EIns@pa@7tMK_YuUNvT$xyV zclF(kft;^x$9Hmz*|nX@+ng(=C2o=3^HE&Yitkn%_%s)K=r5~#w)$3lYxS%3>t{Ba zbDrlPc>LQQ|7Od5Pas>}v+z1354{arSHEnGZPtC!`kVRR|Ma&%%?77)Ba!TEG&d6c z`@x;YSk4VFE~Nj#)03kzqkL^p1mB*4gMrM5X#n1=G@_|E&NSQ{o3)>oU?0x6S9j-si_W$s`i}Li+Kd6ndAHH``&H-9J3P<<_ z)!O?b_KQ>2-hl0km%Nbvdo>H`e|Qh|o@NiYRK<{C6UIH=m?Gw$$qY&Dod*-fpSqs7_EPb0C;kDH{IfsT-!N)Ew=%4XgBA z%A8cD+Fyha4sZyz3~XjUZib~`(2Ue0+5r}il@dZ+_nTSbCadN-3_cV1@N5F!e(?#Q zR4ov?B5?1?o&c;mN*x+ukU04GC(!XL_?L-{05t8c<@%-il~WtFi}g9Xe~)6!jhj~< z+MLVwCHu;;^|M>%&qDWYujXxT4Q6AzwuV2Of#}bK@;j0|l1Vu9i{srk)4$ow-5zTg zs>QE(EB^wrQ10m7Es$t04MZP3_Q{-5bWBSw5GYT=QTxDMs_<0F7Y(x?4{lTH{-{!(~K#@DkRv}KG;Qt z-KUEf&6pJu-~6AnX{Hz?SQO&B>C`j=hvH)jS$=6s!5yW|B}5*evL2wal&Ee`u++TG zZy!#*9usAmxN@bZ6MlgF$Z%R!jlI)k@96B;DJYvF$hN?hQpw6iQ2sZ zZ;wG~7Q_0$c`L*P!IZf}i$`sSYSk>3-=)7%XmJ3s1ei#y>d@a_g7Ef2-f3hhdR zv01HNc+A0<2|2M`n%j?wiq?d|Z&g|He1fM)3y})lAUfcI6f2rzsa6@wB1Qrt2eryr zR-r*Am@F6vUFO(WNQ~n+H2)*~%fEw!L>RtX=fMhaRm)vJ?;?7$9_8FZ)+T)8@vWdW zX;sR3UU=Z?*!FZlC;?Ff>wds`w^{G{*k*5*_3pBr`T8TDG=0>xS-(?%a@G48yYR+0 zN1y*B_EGF(>3fPbkI>t;hDFPY<6%Q!i~U!}KRZ6_&o%TcR+ZI1eOg7{HZt`Yio zfb3Och-RR1kxXZ!SS*pSOjag*@-0H5ZErMRF^EJHJJB#&Mio-|F0NvqbcvV;_Z z5wZ%^B*qngt?CE{r;-o^3Be#Hx)xWHggk2CLnL_<5`uCiLf+g6O7St0_(`Hc@fA{f zktA=CM0z^Z>no(gcmp mD%!QzLb1-p)Q+h>&pH=+J{)|1aB1w;mHVuB&qNj8LjD(&$QSVd diff --git a/build/__pycache__/library_publish.cpython-312.pyc b/build/__pycache__/library_publish.cpython-312.pyc deleted file mode 100644 index 9f9dbf4553787e7c00667ed63ea7900fd3a8b962..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36386 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 0: - print(f"Failed products: {failed_products}") \ No newline at end of file diff --git a/build/fetch_catalog.py b/ci/scripts/fetch_catalog.py similarity index 100% rename from build/fetch_catalog.py rename to ci/scripts/fetch_catalog.py diff --git a/build/library_publish.py b/ci/scripts/library_publish.py similarity index 99% rename from build/library_publish.py rename to ci/scripts/library_publish.py index 0c1f9b6a9..d2b1f30e8 100644 --- a/build/library_publish.py +++ b/ci/scripts/library_publish.py @@ -14,7 +14,7 @@ from zipfile import ZIP_DEFLATED, ZipFile -ROOT = Path(__file__).resolve().parent.parent +ROOT = Path(__file__).resolve().parents[2] APPS_DIR = ROOT / "apps" PACKAGE_ROOT_NAME = "library" CHANNEL_PACKAGE_NAMES = { diff --git a/cli/README.md b/cli/README.md index cee849810..0d3d5df8c 100644 --- a/cli/README.md +++ b/cli/README.md @@ -118,4 +118,4 @@ Credentials: - resolution order: command flag > explicit `--env-file` > environment variable > default provider file - CI keeps passing secrets as environment variables from GitHub Actions secrets; it does not use `.secrets/` -Run from the repository root or a subdirectory inside it. The CLI now refuses to run outside the repository so it cannot read or write the wrong `apps/` or `metadata/` tree by accident. CLI does not depend on `build/`. +Run from the repository root or a subdirectory inside it. The CLI now refuses to run outside the repository so it cannot read or write the wrong `apps/` or `metadata/` tree by accident. CLI does not depend on the publishing scripts under `ci/scripts/`. diff --git a/cli/libs/__pycache__/app_deploy.cpython-312.pyc b/cli/libs/__pycache__/app_deploy.cpython-312.pyc index 0f249a9e9ff225be0f2d9342ef72da76df95133b..5c62e1de0db72023b03172cc1a9ebaa8e5faa4bc 100644 GIT binary patch delta 9863 zcmcIK32+Yk;02Ia-h_Ba6h%qYNm-Y5k`igjqC|rfK1hP10Qm2Ml;DLS zt8SX6iLXDMxUuZSPRGsoXr3e^% z07Ox)GoCKVw{QP{|6Tw6|Nga|mXQY1ODZ4C z8EGVINfo@C$U0ID?`E=|)WExi^br@lTge9EhIbp;NNVBjC7VbcyjPIT!~^ekvV}-)sAe6XnHxVVYq_U`vK$Oe z&Tq>3Ky*8Rf)*i}l?LSKj3Vd2hXl`J1-si?YjMG+hsCVFvlRm7HB%RRAa`v?x}9uI z(MuAo0aUa5Xf))bfzx3nKpUZ?o&9s}O3^)EX4_>F3)x8iF0qk4onKd636<1|pd5jV zy_xTA@E|H7s0X0gNgy&4KI^05utIgAtj1nn%|#XZ<)$Dx1pNSpJUFZ>O*rvj2OCJ#IXCsA&q5j3fm~$OUu#WqcU^pb3-~(-7n;dS- zX81VDMjfpQH(-7dfbk$5_*MJ_mHwun3Pe2B2I@jL4GF|NBzSWUQVj1{X*42r5~;H@ z5}lcmcrPqkcp2RY^<9P z=Y$)LT^C!gHufd$o@CChm*)UbHyd?Uv!@&{iM?#7=-_5td&$NgL2%QD0KV)C6 zyabFlRCVX<>czHc?sOM&u|&dDk+r-?^yExXo(d4|8*dIB!CEu$qGz!g8W}USHqbV9 z$z8Ug8Ox>-U}SkqbiMAxf;|XOL(08=7_lJ)!w5RqXYRJd5kNI_Fr?@sDa=1-0wGEO z^OkaHTCQQper$*#pykl;oU9e3y22M4KON8&wFH3IS*Moe}pxxda%|1AAc-VJ%=Pvlu zET_j6{}eYzvrN)(G~zYUC@TIKfb5{4_hTu7*V+F_YoT-2)SJYkk3a$RFP~W+MG9=E zyO05<Ab*rjbN#k?%At>{jHB;9r z%^IPBiQpM}42n`?>l{oZ?=-Fyf65A)c6VWgX49zxGB;r?HTnv;<9tEc7oH2zr-1M+ z_CQlD*z)bB0#hk>Pyro;a(Ws;nEj}wuJ|0HXbf)wLHl8gXWQ4{TPqHn@y|p_z-LIK zPa@eFth1%+2$ivnYn2BbnCh3u*uK`9dfs_XUu2xZ^b_{`qmf{Mq$r+)W^d1brS&~g z>|vAMEgLX9P%naV1XvGVeHL-9O&$sRPX(wiBGbQw!gO*0@4V}ESuR1@zp>wW6)T@+ zb69_IIs3+nx3)GS2hNvUj(oWUuZ7;6Aaq&P$lC&dPd32(>2|ke9=?CW{=R*?K8Z0; z$A4B$Ls_gi6qY7vARu8lO2LpsA7`DN9pVZ$(%J3e_80jgLH{WqQgPGi524{_?Agw* z0kiI|52j-9&Bp_1gz>D07gFhcbuVCEn?5`8_<9)%w7f86Vj3g?Su?}D-4yXYQxP-q&K6!zO3E&e1 zISPF90MGUe(v?=L* zgAP+`E{SVSLBXPUPb_D1*NP?@#Fl>r0NCS9uN8uJM|K__+B0wv=MA$QJxLF<18bX( z{5g_VAgPtdAq`*w*Cg!~Ef?}3EKx$YtYAtY_+bWusKuX=t1J#Uy zI{(bN7sTeZ$T^(}Vg)n7lX9oNXz8SnqY5VaEhhJQ?L6NgBf6LUMPGLdPoHVUG^-qr zQh$I(kb(~$(*&W%*k^q;wcJxTt2Ggv3D6IKcEfz{h8lATdM9RH*&xMoq?Q(m7P7I; zO$qc9#S}q#xV(kf&k*ndR*D!OWh)S?M8IcF9L(N=B|}Zi$Ay+Y`)4`Sfvxxo(gq8S z)8io`r$et-pnPZ+0F4pT_%;?E+|Q}CB08IX2!#9C`Yrzfk>0g+u%sEjW2R9_UohoR z2YYyHlMy)Mp-?y)0+)RZRDO1OYnKhD5$JOt`)sR6>|%BO6{3Un_P?IMq)UAW{vE+5 z2)Yn_3P8(~PX!}G*s8q7r*oPO zj`QUz|DuafH^u&R+ZH#U{?JRtgI#0BRpwYR`}MZ!M1fi$+Z8C$A60lB*D~;&7u7rk zQx<<_MOvqz>ii*4_k=)9N}f@Yp)}e*Av~F5;O9lfZcwVCYI+`5B=E!w9cnHtaLpl+ zuJfHGn+^JwL;SVTpRh{XY3MEmWt^ziylL*hJoE)!&OzXtWds1>>1NlLB!(BLao}g(5?&D5zB=FIET+uNt|9 zP4RMUlvaZwSX*Iu1$WPrrWjP+EFfN^)=amt_p8dBWv5_7(Ctclx_!-b2fKHFnYfZY zJy6RY*^y(enO>DCNti@|lp8*TsLOpsln>vmB`A+FtJOT>r6=t!f#j+c z)UNcVODYU*U@|!Vh1#rkH^l_Wj|s42fY7MRB1wnF^1e`T2IG&KX9$|^VwVpE1RA)8{UQ4FuU7op}(4c4|Q86#br9C4$cd5Rcj_} za9&%Zdy?1;(Z)MNrlyCU>QM7k=k!MG`u-il!=8sFzd0!QO`|XspMZHW?ukpPC#$Js zuw$mLm*oh4b6kph)JnB3?E_#{Kw2;4s}&EFsTI?kaf+yId% z5A3OJtyk-_lM-2B(1YtTw08h)8SC%ObHp36ig#dfQ9Ad;8`Z|?-K=D9Yi+yQ2wBOr zEVDZ~vyay2CE`tL6LeUIDgd!L-keGVwJ-;}AQ4n&B?8DY%05GPwO(yd8`UzSD~;I~ z(m`gpm1gHBhqY+H^2hu`?l-Q=!6qd@-*;Br1 zl})OXmMM6S!k<)|X3R~gcDOr$M-&oZXVWdhvvbWMofIY-ZZTPzVqw+Gvqj&+Cp+0J z;iC-k_Bb@uX0po2IX5%^GMR?GaiI7VW|vJjtM!Gl%O9n)%Xwva#dW<`^OaE#>6yL@ zBg$KBL>pfZrB)Y9Z2Ge4W{n{OvS$&UTw6=Ldzb~ z3fU>c3@L+cJLEbJ`DIS|XNP8)3H!%qXbYB4vxg3K!Qs=74td}%;hzreOXz3q4io^l z8dC7|_+&tiIiq;T0aAjpk}0Nl1CN*uPUQKKd#o&VG_I>RF%ElbLhnNwC*PrAOD;Uc z7WRd>U*y}oSh);)VWkLZV1o!p_~Uqwz#cz5)bb(_dGj?hl^Nn-KJ~ zf}uL`MbjoT@v7y5GmTH)Yb`}g}2g9H2bY~QnUh#x2883lziDmsQ_ zIN@k{{_&8$x1}era2CNs2r%JN+<4Mg5nMv>0RlYc;ahgfPY?U>^LB?23BE_Bc+AD` zKPaAW^Ro=i8Vx~*pQ4z~GCO;%EOr0jlLLMV*9H92V>i-pFU%v>jo?EBn8hew_E6k# zdt3M>U-u#R{FWuI=l+A$A{ag%Rl@q&U_Z9UPT|KO^cRTz7QrU=(Or^wo;i-Jn&F2} z>#-F5t>wr{AVPnQ-#O@i3`~Aj0>@Iak5^)sq)$>(M`#k3)dSEPXd!8@Z(yID$x>j9uT`Wv) z9=JYu<34GJaE~SyxVtmkMBzF&SXHnUL1eB zO#068i@UEjZ+yq)xi0lw-1kb=HEHkViR6*7?1NSE*ae!B(`xgXZuj#M}UMEa` z6O1P}VHfXaZPy3Jf%4iw=w}1Ul>z12!0eTVS)jVZv=@noO~;YA?gTq_tmBIlKXL3A zCeI3X|Hx{q(_ZdasG0x%$opdA6<2cb=+$jUuXJusjw;t}(YNhYk01Zu?yI#u@08U& zu6$?sdmFE>KX^Ho96gnsnMuFFwiT@W1XqkGzR5R>2<6lL5nzSh34eXLk`v!Y@wzx>S(58&^X zSB$Nwc`x4z_IZ2&+fP~ zIDQuGgK&>2sS+pQ3b;{$6dh;GXEH(nDUk^<$w7jC-ZLE%c8_5Tr#O$aO$OgsKJP@NA2sf; zGKQjfXdF!oy}2<>)gMdO!`)Cqpy)qcYwT2DfXC0er=A6Du{a$#hOubkBHURh$KmD? z6+t@MoaWPleDd`JWUii+=2(vyw@hzy zO7IYAKqX554=3^U!crc{w+$uTc1+gm24?Dig>B9ufTRO`&QX|dvPT4ORGJm~Jd1JR znds&jk$Z)&EjZSNd^iR(R|?CB=Eic~_JjP{l^CXWAUwFsTazV?4>Zo@i%QG56>~D> zQ&MRf>qlL<_8DD@u&iz~(r~r-Xy2&i`+O5oB}xN6A2lP%`v~4bPyzt{Lm+xGLc{RC z5i)(3B}tojC;Kf~pFr-KV~~a?Vc8)cr9rq*qCdrEHxOJya1z0z2%bjpT?BuF;QI&) zQ5C)r;%gDUH0i?%zAD*<7@i{NtE(}@CJ@XbcnIbW{r+3OrhW=PpF?m7!90Q=B6tb%7 delta 9037 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 MEFZhEnGfZ^0ltl(^#A|> diff --git a/cli/libs/__pycache__/http.cpython-312.pyc b/cli/libs/__pycache__/http.cpython-312.pyc index 1e0c9788ae46c53adbcea7c3a2e4975732104b2a..35caa85582ad5efe0bf9a16e3810bf9324f66d15 100644 GIT binary patch literal 13665 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 I0I|vcAM+JAPXGV_ delta 3762 zcmZ`+eQ*=U72ngHPT!Vo*^+G;OO^~+7~5czk~j&F*fN2DA($k_U=*P}6Ujm%duK32 zs+G6Q_?9j^bh`MJ89C)w9|iNOlotuGjuYYY1-+G8`4fb{^@&n z76ztW&Aom5-rKjk@9q9}^_SFdwzvGz<+2kf_TtUdGqr?#hK*7&8w_{nBuB`FbFIHB z)Kl9jVbDWYP&?FBw1GOHuBHL%gxX7k)CIK<doP6Ok;m z;)BY|;1i39Y$eoliqNXdCPQ-BsK}t7R#Pway=$@&~^RHLx%CbaY=o zD@R`zDRV5zvKfs(EGhabA|{O=kxtwnEi`pfNs$uD(g2+xTBpA4-Xvf|)INvz>KE>d zT)Rdh0z;+lpRGe~JrHnfHbQlO8h%|-YwiO5!|JVy37G6i<+0~A%Tf|G%ZpN+N=%0J zV?H%2lU^E?WJNZ73M_*DA4Bpul1)Hl0Z0&v9$MW{C%x(hPb=4W^^oUP&W8OoKABO} ze^wR3+pzD`NbZj*dlF?xcBm88U4A|J*gOm$mMx#-eu|jb<5zE2zsx&6$DH=@|P3C+yn znZpv>j4m<2upgDUGAhRsSt@DfL^>-=?ZyInQEiKkC8VQDGMiyhY@6k@Bpr>|jp^yp z+oP_pYvH!3Lv_9gMngti!AKg#*s3<5Om}+*hZ*5D~00cY+6j1qEW>oHM6v$R3cbl)z8OncpGrnTGj(k|TLB z$1z_{e1}kTPCQ1KiHaGHf`#IM;q;Q@N+1ON_`G+@8(ivYgsep5^`}4p0=Vdq@fS zO7?j>EVmkcm<8Z`uv&k?oU>Es2d>LY=$v=t94Xx24;0FcY=rE#V`#tvG39{*i!6r- zJ5mS?4-_K+v@8{PKta@?&t8c!wh;xlv|dsnoFosf)Tuy__LDGCf=fD*YASKdbrWHg zd8eK>cg|^~En(URbIm)y>+D~uk8{V#7{8Ak=OX2OOg}B0CNk+rR*}?=jd@cudewzZz)dKF7cU%(@fVOa?J)2~SRXjDds0l9G5aI2=!=C92kigZ79= z6Vk~;G8wIvc05=HA}FtFK4Ga~EYS z%Ob9OU=S?N|^ zSh=~NIiDVn&ifkP%1?#nye%`{mRWD>7lbpfJ7Yi1pMG}U>Y8w#ah|1<@}xA?F(pks zU#xE}R=0g>ZC~WU?6zQgZO1D+&U$YMHS@0WiGec%5dJIC8`WL2uCDRkd6#G6;F*Jy zJyWZG+Wy1#*-+<|{U5F>4(>mFaMpF800tJTX1_OPM$eAx$08u#nxGO^K@vM z7Tq01YsXg$4)>fRFyjc|YI-=`adE|?*P_=p7X95tclW2(?r#gYh92%488i92#>Oa5 zKH)vlX8seeB^u^GS-~M6HUo`t`n8e(WYY_xy9l3-bU%aE1)>-lpz>LzWC!4N_xuYv zAtl^30!H2B6$|VHoIM0hz2r!a%keqW2i)Z)Qym(uCH-2rqAP}vb#gnoW8_u$raYM3K zP%O}7LeYJ*A+*IyQ9n}=n{j*t`m;hmzc>y3`Ep2N3ADr8QN7Yu>$U-N_prjNa-psM zg||R94WC>DGEV*-BF>tH^4iI;T6Wqz?p6b1_^~2|H_;;SQ z&U^fGp4Bs+)zh8VJ#7nBH5ay@+dlcy`JD@a&{XHNc+K*A-;KaCs&C!e!k1REa>JGG zYu*oivrXG(gvRlnqP=c1dec!p@AIE_&O6-2ipHsjijL-@(EQbxE>g7uPKB!tw3B;( z(m6Hy4}X`t|uR@w{=(YA9cC9UHr!u4)~8|NHql_L+OZ$fb0+qEvy&8g-AKo<#(U+-6wgZ7QF7rz-Ha*xV)r7umMk<+{$39`~ zBd|x1$Nu;9=KK2kB34XK-BQ9ZN8dOwmBCyPUBSa^+xp%F_wV|>fPMp-Jr)}tg}6zv7(eG{z+?6s>tjcs4gw>cMisBb%ci)Pe_q^!1NQ`WqQHj7Roc7Evs IPXDX&Um?g}Bme*a diff --git a/cli/libs/__pycache__/main.cpython-312.pyc b/cli/libs/__pycache__/main.cpython-312.pyc index 62d403f7bf80af58cecdb0b8057d659a233b80a9..5d317d91bba420b0c257fbf9118de4664ef16751 100644 GIT binary patch delta 6211 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 JIElr%{2w&}-~#{v diff --git a/cli/libs/__pycache__/sources.cpython-312.pyc b/cli/libs/__pycache__/sources.cpython-312.pyc index 17f657d6e146815961535a2abc85a879c0a5d504..f6e4f5f6a173c0ae7d4413356f9d50c3166562c7 100644 GIT binary patch delta 967 zcmYk5O>EOh6vyW|c5LU%4o;IMO_b2kB_X8^I5Z6bTD9HsrM4hAtbm?sv`br6D9)j1 z9Z^!|tATCMXgk`S;%Vy?Jju z^Y^Da(EJTtuboaCBIASbVfIw=x$ASEjVDtJLhyA1L;na5KSO~v0AK9sz_KXH1>#;|J46Q;oD?cbsZ8OY$DG2dp_h%E>O z(GYdU5OgR74Pg;<2G9*O>%^}D3jW(B;y?TC(lL^0Gi(~`Crb-%%DQ=7%V{)xoZi#kr-^#B599suW(cn9_lzGj(3Nm#Oi= zx**+kExYb5z7Zn3?#?EXIDe6=hhycQs(Y|#-SLLk_zkb=O)lGuZ1MU#yZnf)J3PCd z&im(9N4Aw{Rf(>hy=^LeH6>NL9Wuqlwy0J`wLDV3SQFDV zVXE>t^E>!2z`so^a*aYuDzAj267=`ESh!!LTBtKTx(nr6RTw33s>^ zfr6oSUW|NLV6f<+Y!tpk%%>m-wn6^Ezb9#S$ zk@zH=R7i?AEwOPJr=nDnlh`{Dr-2%!##ETEHQ*1WfPXzIF+ieuiH|a7lAaVW?Q(&D z-CmPJB>~Y{S&u5neH>5{cbb}RVfK6jl^`dW_Sa%YC%_;sdRv@aj3Hv|ybSp%8;a}k zL~Qg{tV>o{85angO5}ZxhIV=1DI-L%!3U?u;Yr6jr=AP1iH0qemEm-+1qm+lYE)x1>>ezJ(HYDE?mmCm8^l17+kg%#mJVeY0ci4 z)fVinKO5PK8vQI&=BdhR0<|tRP&QDyekgOKUb$vZ`SY8@x9*xFdeVB{c)qRj)GAIJoD0bd^*JQ(cy#CK=UOq*t`Q`Xr;NvK;D z>;=J|IhDCm6q<^BckXceeK7aH&bETm_CZ`t%H?@y#LVYIw#b3p`wl+?H*&jOG_X~m KE4L%lbMqhCJIW{k diff --git a/cli/libs/__pycache__/versioning.cpython-312.pyc b/cli/libs/__pycache__/versioning.cpython-312.pyc index 5b0ee983a61b2e186a47d28f9aef734c1af53e32..03331d45497a8a66cdf9268e679287acb7f84271 100644 GIT binary patch delta 2225 zcmZ`)U2GIp6y7`gKimClcS~g{9ZHLx(k%!irRAs8QURf@0um@J+v(nEJMI2?XSTM@ zHd~D*V4|hDiIB(xJ_&(DuqL7=D*A%K7^Fm-k;E6{lMj+&j68Yn-EM0L-iLF}ob%mt z&OP^>JKsO|cdPG?*DG3J-LU^Ma=(1mSB2i4eYStA2ixDY^|^2vb^v!{FLnYKu@Ad| zd$1q7ftTR`7J+*w1UWeS@f*Sqi2fL?rN>c#ZYp0J!&WThk-_})HDW7CEBu=6>XLQ} z<6{VFQT#GXgkft{-@Q^-wQoHg_hw@AN4ZjY-39x0>0R)qZ+Sq$H@E=Wyx zbx_C)x-E|q!U@X}OI{eMpu<9Sua!w9e{~*L=ggtK~{=D^l3--`+f{e=M zJ{R6W-c!xvbuu#TgGpsbr(L$1O3@UEYFhQ&fGHl>*VB8rtFz-s7fstvp%A@e)5JB9 z0n1zeiSD*PQ}xJUDG!~moUOdzyi|Uv?-TOr)Qze8!7loW{Yq^O;BHk`c0?_=qD`H3 z)^8#m0*i`4i^vlM9AS=0Ijwf>l_DUTp&`|XCvt?SX(K+S5?#xrbPAkBO4c-dAC zlwD*yJ?cA!BJ_r@5p~lCzHZb;8~ul*UCf0=wwgloX0n}a=mMf!fk@IcxO>mP1s$c| z`NwKmvlEtsjEdn~7;-5rv$awsumK&TX95kbHiom3ZS-cKU1okwaX{6L_z=nDvScrV z^FXZoB)<0SfoM`NY(EUD{c~->p9Kf6j!0L9`qu6PEu4El+sXXt0uTuf%oGRcOlTuA z=og`l>v@I(VUt0Q0+BsM`M-DR4%gPR3Yt!$CRIgONiBmPVuXd4y`-DTz4WDUD{7~2 zhu5L)^jf&FhF?+zyViJ8G1!TgI)Dtoh7)stg@;gWg5_3PtZYzDw73~cb>5OkI+{Q* z<8ps5iKoofqI);vt%=xWFnyc(Vo66TII$`h*; z2iry)V26~qJ`IKK*tVKY`BOX;ZG1PHa7+}OvTO2TXHwC1ZE!+Tq=b^j8ivA1uMKNS zRU)dMRTGAm9+C!=8HEceEuA5fmQsdP$$;^07Dd(o9n#WFN&Wrf&Ex(3%qS^IqAGX- z93@n3Ox2}aRyRPE;;6!S^8^61ijf!w3k$3_ac_DCvMK6Ua?;Y0F|10ul2WCmEObdr z4`xUTQp=>3q(l@z5P&IZN#UNdN@A3yT6Evcb(3N)8#OY~0*hE|F9+0`u)FS=T$9K^ zQ>ZvPFcDokQRPd4a!=4%}ze9Vu7B-=a5vW4f!;f-eQEfZYV}hCn^}H7^(nd+Vaq6DGM+7Bft5=GpVzwi`|zu&97;j z_wAV8_rM#PiJgsI+;y$u@`;aPS7J9?zaE&69+;P3oR1uw_a2&lVZrG=x9Xm=3LHFe ziiI;RGwo;F=be!YuikS?myUgS`h(NgpTGX{-TIcBEnl^N)_!}-?T))UdhXTtEcl}f zo@&A$23zsnW9Kv-L^X0GP1pwvcs;PkVp7wMlUPd_F*rDX1$a#c!8qyCRpTTyK}>cP zieowiYSP1O9=_4YWs_=*7mT|lY@cc8YIt+`X!AX+q$`NW9u`r`OFfyi3b++3W;l%z z=Bb#f&lKZ@_+So_SL1PFWd<)0(_QQs=y`sxrZbUAWnmbIpF!9Uv-nG4e+>S-^CySD zAN;Ned+K RqQ%;E$nj`D3ZS*z)4$>G1=s)p delta 1211 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 delta 3060 zcmZ`*U5pgR5$>M-o!y=Nnc1KF|36@3;0S~`vV8<&ayD3Cl0ZZ@Myp|aICed|d+C|G zaMo<@A`vMlrvT{(ti-mgJVc7%g%Bxzc3v#yArL2#GXmj=NRi(bU*sr$N>%U89XPm8 z*IoN{*H_(D)z$Nd1K0Mi{87^q1X}8+e{cM-K*$695wv7apz9+FA=d~ajM}70E0m(F z*h)o#F=U6D;Yzp}s)RQ1NF@Sz*p4=1l~^-giAy|UtIb3uA?2u@Y^ExyX1`X^n(0bf zf-yVO%vQ3LD8z~gGnJoXai+2aOU^5GdLwlmc7d&;voWS!3|9;`&eAaE*#yhLSYVSZ z3u93wTYqdyWa(gXn&mG>DkV#Ad|6yg4MfpKW3RXwH;f!B+$aX*TX;cXCDsQsp`O{T z8AE6NPtq_3*x(a!gAF|i&*^NKjci#s7sag_+t}#E$n~C4QW;oQ%G<>o$`0|q;uWc% zpSRpR8yn-2!{CBb}1mTdGz{*+=)BhIOsff+_XN~098yz)59kGwS3S;osP z5&o1ry}7eoV2fp6+X3k@%yM7M`SjzQzjZO0WMle8f}RdiBw+0n0xzx@n^@5+@)@@r z=z_hx^sM1NwTTsj)fcFvKtU{c#Yf^+2xh&o7lM+pk#;h{N}ayesEc<a z4(P))FJ9Gm(x$kie~lg#@9Bre$|a74jYqMQbm#{^YF(&1uES%(HilMGIJp<`5D;z{ zL=4l%SL;suT$@Avla<4dLfx`j%n#XC%MUfp3mh*f$C||Pu`Ks}CEkf>0!gpTNp@u5P;)_oJ>UX7gi%vpA97ENImQ(>>33qRKvTAwNZ56mR7R=!|$b zU(Oyu_z-r_L+A91hxwsrdIe8)YG4oe9ex((u+%xffGV>}{+%W1v3HUmXggQuKGZU+ zbN@6ZJ}{=%$xF9tg(?-F7H7qL>E^S4PECKb^ODMx9`pBM|Ozc^zElaz6t>Y=gz~MfdTPjrc-S=?Uqlg{4@X#>cRUVThFIq^eLYQd<_>&LAOe} zI#Ko2=kIF8clzH=zQ25%HUFZuR_E@9vsa35l>QnX=lHsmLt$=+J%ghMC*T)9fgL6W z$0PDObbk13yKTcxzl4ZfAh-ParQ-5n-^xCz!0I(u>dNKisC>eX&++{*`!POF$II!S zYqm(vBfE4`10{L(P`%~KjO0zkzJr}yhx>XxVZ#;q9@;t+(5-wSA46Tqg3LY1LP=Wd zo%49RWt9j0M74Tu(Ou+LwaRg`{1|pvZ=_TFh zz3471x-!guN+P{C-r2f|Jo)qC!Zy6!e&i&+{C)^-Mz0`X6y#LnwTd8|+3<=tfC4-;GHzPO?TF)cDFSPyb~jC; z+4YP>7Zh<~#1wZ%j8j^IPDo-HB`=H{v?%phQA!|x5~UPL>s{1C%ETubkk&&)$vjj* Hk|+Kj6-t>V diff --git a/cli/libs/app_deploy.py b/cli/libs/app_deploy.py index 57036bb79..88cf03961 100644 --- a/cli/libs/app_deploy.py +++ b/cli/libs/app_deploy.py @@ -25,6 +25,7 @@ SS_PORT_RE = re.compile(r":(\d+)\s+\S+\s*$") FREE_PORT_LOW = 9000 FREE_PORT_HIGH = 9999 +PULL_POLICIES = {"always", "missing", "never"} def _run(command: list[str], *, progress: ProgressWriter | None = None, verbose: bool = False) -> subprocess.CompletedProcess: @@ -87,6 +88,10 @@ def _remote_compose_script(target: str, action: str) -> str: return f"docker compose -f {target}/docker-compose.yml --env-file {target}/.env {action}" +def _compose_up_action(pull_policy: str) -> str: + return "up -d --pull never" if pull_policy == "never" else "up -d" + + def _compose_services(target: Path) -> dict: compose_path = target / "docker-compose.yml" if not compose_path.exists(): @@ -388,12 +393,15 @@ def deploy( version: str | None = None, down: bool = False, auto_port: bool = True, + pull_policy: str = "always", progress: ProgressWriter | None = None, verbose: bool = False, ) -> dict: source = app_dir(app_name) if not source: raise FileNotFoundError(app_name) + if pull_policy not in PULL_POLICIES: + raise ValueError(f"invalid pull policy: {pull_policy}; expected one of {sorted(PULL_POLICIES)}") mode = _target_mode(target, ssh_host) action = "down -v" if down else "up -d" @@ -425,9 +433,9 @@ def deploy( raise RuntimeError(config.stderr.strip() or config.stdout.strip() or "compose config failed") if not down: - _announce(progress, step + 1, total, "pulling images") - if pull_services: - pull = _run(_local_compose_args(target_path, env_file) + ["pull", *pull_services], progress=progress, verbose=verbose) + _announce(progress, step + 1, total, "pulling images" if pull_policy != "never" else "using existing images") + if pull_services and pull_policy != "never": + pull = _run(_local_compose_args(target_path, env_file) + ["pull", "--policy", pull_policy, *pull_services], progress=progress, verbose=verbose) if pull.returncode != 0: raise RuntimeError(pull.stderr.strip() or pull.stdout.strip() or "compose pull failed") if needs_build: @@ -439,11 +447,11 @@ def deploy( progress=progress, ) _announce(progress, step + 3, total, "starting application") - result = _run(_local_compose_args(target_path, env_file) + ["up", "-d"], progress=progress, verbose=verbose) + result = _run(_local_compose_args(target_path, env_file) + _compose_up_action(pull_policy).split(), progress=progress, verbose=verbose) ps_step = step + 4 else: _announce(progress, step + 2, total, "starting application") - result = _run(_local_compose_args(target_path, env_file) + ["up", "-d"], progress=progress, verbose=verbose) + result = _run(_local_compose_args(target_path, env_file) + _compose_up_action(pull_policy).split(), progress=progress, verbose=verbose) ps_step = step + 3 else: _announce(progress, step + 1, total, "stopping application") @@ -461,6 +469,7 @@ def deploy( "deploy_root": str(repo_path("apps")), "app_target": str(target_path), "action": action, + "pull_policy": pull_policy, "port_overrides": {key: str(value) for key, value in overrides.items()}, "base_url": base_url, "ps": ps.stdout.strip(), @@ -505,9 +514,9 @@ def deploy( raise RuntimeError(config.stderr.strip() or config.stdout.strip() or "remote compose config failed") if not down: - _announce(progress, step + 1, total, "pulling images") - if pull_services: - pull = _run_remote(host, user, secret_path, _remote_compose_script(app_target, f"pull {' '.join(pull_services)}"), progress=progress, verbose=verbose) + _announce(progress, step + 1, total, "pulling images" if pull_policy != "never" else "using existing images") + if pull_services and pull_policy != "never": + pull = _run_remote(host, user, secret_path, _remote_compose_script(app_target, f"pull --policy {pull_policy} {' '.join(pull_services)}"), progress=progress, verbose=verbose) if pull.returncode != 0: raise RuntimeError(pull.stderr.strip() or pull.stdout.strip() or "remote compose pull failed") if needs_build: @@ -522,7 +531,7 @@ def deploy( progress=progress, ) _announce(progress, step + 3, total, "starting application") - result = _run_remote(host, user, secret_path, _remote_compose_script(app_target, "up -d"), progress=progress, verbose=verbose) + result = _run_remote(host, user, secret_path, _remote_compose_script(app_target, _compose_up_action(pull_policy)), progress=progress, verbose=verbose) ps_step = step + 4 else: _announce(progress, step + 2, total, "starting application") @@ -547,6 +556,7 @@ def deploy( "app_target": app_target, "version": version, "action": action, + "pull_policy": pull_policy, "port_overrides": {key: str(value) for key, value in overrides.items()}, "base_url": base_url, "ps": ps.stdout.strip(), diff --git a/cli/libs/http.py b/cli/libs/http.py index 7c6765034..98a4ae446 100644 --- a/cli/libs/http.py +++ b/cli/libs/http.py @@ -14,6 +14,68 @@ PROXY_KEYS = ("https_proxy", "HTTPS_PROXY", "http_proxy", "HTTP_PROXY", "all_proxy", "ALL_PROXY") REPO_CONFIG_PATH = Path(__file__).resolve().parent.parent / "proxy.conf" _REMOTE_ONLY = False +_LOCAL_UNAVAILABLE = False +_REMOTE_UNAVAILABLE = False +_NETWORK_DEADLINE: float | None = None +_NETWORK_LAST_ERROR = "" +_NETWORK_STATS = { + "local_probe_attempts": 0, + "local_requests": 0, + "remote_attempts": 0, + "remote_retries": 0, + "local_unavailable": False, + "remote_unavailable": False, +} + + +def reset_network_state(deadline_seconds: float | None = None) -> None: + """Reset per-command network state and optionally set a hard deadline.""" + global _LOCAL_UNAVAILABLE, _REMOTE_ONLY, _REMOTE_UNAVAILABLE, _NETWORK_DEADLINE, _NETWORK_STATS, _NETWORK_LAST_ERROR + _REMOTE_ONLY = False + _LOCAL_UNAVAILABLE = False + _REMOTE_UNAVAILABLE = False + _NETWORK_DEADLINE = time.monotonic() + deadline_seconds if deadline_seconds is not None else None + _NETWORK_LAST_ERROR = "" + _NETWORK_STATS = { + "local_probe_attempts": 0, + "local_requests": 0, + "remote_attempts": 0, + "remote_retries": 0, + "local_unavailable": False, + "remote_unavailable": False, + } + + +def network_snapshot() -> dict: + remaining = None if _NETWORK_DEADLINE is None else max(0, int(_NETWORK_DEADLINE - time.monotonic())) + if _REMOTE_ONLY: + path = "remote" + elif _REMOTE_UNAVAILABLE: + path = "unavailable" + elif _LOCAL_UNAVAILABLE: + path = "local-failed" + else: + path = "local" + return {**_NETWORK_STATS, "path": path, "deadline_remaining_seconds": remaining} + + +def _remaining_budget() -> float | None: + if _NETWORK_DEADLINE is None: + return None + return max(0.0, _NETWORK_DEADLINE - time.monotonic()) + + +def _bounded_timeout(timeout: tuple[float, float] | None) -> tuple[float, float] | None: + remaining = _remaining_budget() + if remaining is None: + return timeout + if remaining <= 0: + return (0.1, 0.1) + base = timeout or default_timeout() + # Version discovery uses a separate bounded remote fallback. Keep one + # stalled local request from consuming the entire command budget. + base = (min(base[0], 2.0), min(base[1], 2.0)) + return (min(base[0], remaining), min(base[1], remaining)) def default_timeout() -> tuple[float, float]: @@ -141,28 +203,61 @@ def remote_get_json(url: str, params: dict | None, headers: dict | None) -> tupl # Import lazily so http.py stays usable without a remote profile. from libs import remote + global _REMOTE_UNAVAILABLE, _NETWORK_STATS, _NETWORK_LAST_ERROR + if _REMOTE_UNAVAILABLE: + return None, None, _NETWORK_LAST_ERROR or "remote egress unavailable after retry budget was exhausted" + + remaining = _remaining_budget() + if remaining is not None and remaining <= 0: + _REMOTE_UNAVAILABLE = True + _NETWORK_STATS["remote_unavailable"] = True + return None, None, "network scan deadline exceeded" + host = remote.ssh_host() if not host: + _REMOTE_UNAVAILABLE = True + _NETWORK_STATS["remote_unavailable"] = True return None, None, "local network unreachable and no remote SSH host configured" secret_path = remote.resolve_secret_path() if not secret_path.exists(): + _REMOTE_UNAVAILABLE = True + _NETWORK_STATS["remote_unavailable"] = True return None, None, f"local network unreachable and SSH secret not found: {secret_path}" target = url if params: target = f"{target}{'&' if '?' in target else '?'}{urlencode(params)}" - parts = ["curl", "-fsSL", "--connect-timeout", "5", "--max-time", "20"] - for key, value in (headers or {}).items(): - parts.extend(["-H", f"{key}: {value}"]) - parts.append(target) - script = " ".join(shlex.quote(part) for part in parts) - result = remote.run_ssh(host, remote.ssh_user(), secret_path, script, connect_timeout=5) - if result.returncode != 0: - return None, None, (result.stderr or result.stdout or "remote fetch failed").strip() - try: - return json.loads(result.stdout), {}, None - except json.JSONDecodeError as error: - return None, None, f"remote response was not JSON: {error}" + # Keep the remote fallback bounded as well; a blocked local path should not + # turn version discovery into a long retry cycle on the remote host. + attempts = 2 + last_error = "remote fetch failed" + for attempt in range(attempts): + remaining = _remaining_budget() + if remaining is not None and remaining <= 0: + break + curl_timeout = min(4.0, remaining) if remaining is not None else 4.0 + parts = ["curl", "-fsSL", "--connect-timeout", "2", "--max-time", str(max(1, int(curl_timeout)))] + for key, value in (headers or {}).items(): + parts.extend(["-H", f"{key}: {value}"]) + parts.append(target) + script = " ".join(shlex.quote(part) for part in parts) + _NETWORK_STATS["remote_attempts"] += 1 + connect_timeout = min(3, max(1, int(remaining))) if remaining is not None else 3 + result = remote.run_ssh(host, remote.ssh_user(), secret_path, script, connect_timeout=connect_timeout) + if result.returncode == 0: + try: + return json.loads(result.stdout), {}, None + except json.JSONDecodeError as error: + last_error = f"remote response was not JSON: {error}" + else: + last_error = (result.stderr or result.stdout or "remote fetch failed").strip() + if attempt == 0: + _NETWORK_STATS["remote_retries"] += 1 + + _REMOTE_UNAVAILABLE = True + _NETWORK_STATS["remote_unavailable"] = True + _NETWORK_LAST_ERROR = last_error + return None, None, last_error def get_json_with_fallback( @@ -180,22 +275,53 @@ def get_json_with_fallback( After one successful remote fallback, later calls in the same process skip the local probe and go straight to the remote path. """ - global _REMOTE_ONLY - - if not _REMOTE_ONLY: - probe = probe_url(url) + global _LOCAL_UNAVAILABLE, _REMOTE_ONLY, _REMOTE_UNAVAILABLE, _NETWORK_STATS, _NETWORK_LAST_ERROR + + remaining = _remaining_budget() + if remaining is not None and remaining <= 0: + _LOCAL_UNAVAILABLE = True + _REMOTE_UNAVAILABLE = True + _NETWORK_STATS["local_unavailable"] = True + _NETWORK_STATS["remote_unavailable"] = True + return None, None, "network scan deadline exceeded" + + if not _REMOTE_ONLY and not _LOCAL_UNAVAILABLE and not _REMOTE_UNAVAILABLE: + probe_timeout = min(2.0, remaining) if remaining is not None else 2.0 + probe_retries = 0 if _NETWORK_DEADLINE is not None else 2 + probe = probe_url(url, timeout=max(0.1, probe_timeout), retries=probe_retries) + _NETWORK_STATS["local_probe_attempts"] += probe.attempts if probe.ok: try: - response = get(url, params, timeout=timeout, headers=headers) + _NETWORK_STATS["local_requests"] += 1 + response = get(url, params, timeout=_bounded_timeout(timeout), headers=headers) if response.status_code == 429: - time.sleep(1) - response = get(url, params, timeout=timeout, headers=headers) + remaining = _remaining_budget() + if remaining is not None: + time.sleep(min(1, remaining)) + else: + time.sleep(1) + response = get(url, params, timeout=_bounded_timeout(timeout), headers=headers) response.raise_for_status() return response.json(), dict(response.headers), None except Exception as error: - return None, None, str(error) + _LOCAL_UNAVAILABLE = True + _NETWORK_STATS["local_unavailable"] = True + local_error = str(error) + else: + _LOCAL_UNAVAILABLE = True + _NETWORK_STATS["local_unavailable"] = True + local_error = probe.error or "local network probe failed" + else: + local_error = "local network path unavailable" + + if _REMOTE_UNAVAILABLE: + return None, None, _NETWORK_LAST_ERROR or "remote egress unavailable after retry budget was exhausted" data, response_headers, error = remote_get_json(url, params, headers) if not error: _REMOTE_ONLY = True + else: + _REMOTE_UNAVAILABLE = True + _NETWORK_STATS["remote_unavailable"] = True + _NETWORK_LAST_ERROR = error return data, response_headers, error diff --git a/cli/libs/main.py b/cli/libs/main.py index 42792f01a..7de2f902f 100644 --- a/cli/libs/main.py +++ b/cli/libs/main.py @@ -168,6 +168,7 @@ def scan_command( page_size: int = typer.Option(100, help="Number of tags per Docker Hub page"), major_ahead: int = typer.Option(3, help="How many future majors to probe"), app_name: str | None = typer.Option(None, "--app", help="Scan only this app"), + network_timeout: float = typer.Option(15.0, "--network-timeout", min=1.0, max=120.0, help="Total seconds for upstream network checks"), as_json: bool = typer.Option(False, "--json", help="Machine-readable output"), ) -> None: """Scan upstream versions for selected apps.""" @@ -178,6 +179,7 @@ def scan_command( page_size=page_size, major_ahead=major_ahead, app_filter=app_name, + network_timeout=network_timeout, ) print_output(payload, as_json) @@ -599,6 +601,7 @@ def app_deploy_command( version: str | None = typer.Option(None, "--version", help="Deploy a specific image tag by overriding W9_VERSION; repo .env is not modified"), down: bool = typer.Option(False, "--down", help="Tear the app down with docker compose down -v instead of up -d"), auto_port: bool = typer.Option(True, "--auto-port/--no-auto-port", help="Automatically use a free 9000-9999 host port when a published port is occupied"), + pull_policy: str = typer.Option("always", "--pull-policy", help="always | missing | never"), progress: bool = typer.Option(False, "--progress", help="Show step progress on stderr"), verbose: bool = typer.Option(False, "--verbose", help="Show step progress and raw subprocess output on stderr"), as_json: bool = typer.Option(False, "--json", help="Machine-readable output"), @@ -616,6 +619,7 @@ def app_deploy_command( version=version, down=down, auto_port=auto_port, + pull_policy=pull_policy, progress=progress_writer, verbose=verbose, ) diff --git a/cli/libs/sources.py b/cli/libs/sources.py index 15b8f91d0..c5b1c6298 100644 --- a/cli/libs/sources.py +++ b/cli/libs/sources.py @@ -283,25 +283,28 @@ def version_key(name): def _dockerhub_verify(api_url: str, candidate: str, page_size: int) -> dict | None: candidate_ver = version.parse(normalize_tag(candidate)) - params = {"page_size": page_size, "name": candidate.lstrip("v")} - data, error = _get_json(api_url, params) - if error or not data: - return None + queries = [candidate] + stripped = candidate.lstrip("v") + if stripped != candidate: + queries.append(stripped) - best = None - for tag in (data or {}).get("results") or []: - tag_name = tag["name"] - try: - if version.parse(normalize_tag(tag_name)) == candidate_ver: - best = { - "version": candidate, - "last_updated": tag["last_updated"], - } - break - except version.InvalidVersion: + for query in queries: + params = {"page_size": page_size, "name": query} + data, error = _get_json(api_url, params) + if error or not data: continue - return best + for tag in (data or {}).get("results") or []: + tag_name = tag["name"] + try: + if version.parse(normalize_tag(tag_name)) == candidate_ver: + return { + "version": tag_name, + "last_updated": tag["last_updated"], + } + except version.InvalidVersion: + continue + return None def fetch_verified_candidates( @@ -331,7 +334,7 @@ def fallback() -> tuple[dict | None, str | None]: candidates = _stable_candidates(index_tags, current_version) minors = sorted( - {version.parse(name).release[:2] for name in candidates}, + {version.parse(normalize_tag(name)).release[:2] for name in candidates}, reverse=True, ) wanted = [".".join(str(p) for p in minor) for minor in minors] + candidates diff --git a/cli/libs/versioning.py b/cli/libs/versioning.py index 65801ff87..41b4ef9fa 100644 --- a/cli/libs/versioning.py +++ b/cli/libs/versioning.py @@ -21,6 +21,9 @@ def normalize_tag(name: str) -> str: so prerelease filtering still works. """ normalized = re.sub(r"-ls\d+$", "", name) + # Metabase publishes release trains with an ``.x`` patch placeholder, + # such as ``v0.64.1.x``. Treat it as the numeric release for comparison. + normalized = re.sub(r"\.x$", "", normalized, flags=re.IGNORECASE) if normalized.endswith("-cli"): normalized = normalized[:-4] try: @@ -117,3 +120,22 @@ def find_latest_version(tags: list[dict], current_version: str) -> dict | None: "version": best[1], "last_updated": best[2], } + + +def update_status(current_version: str, candidate: dict | None) -> str: + """Classify a candidate while respecting floating minor image tags. + + A current ``x.x`` tag already receives upstream ``x.x.y`` patch updates, + so a patch candidate in the same minor is informational rather than a + package update. + """ + if not candidate: + return "up-to-date" + + current = version.parse(normalize_tag(current_version)) + latest = version.parse(normalize_tag(str(candidate.get("version", "")))) + if latest <= current: + return "up-to-date" + if len(current.release) == 2 and latest.release[:2] == current.release[:2]: + return "covered-by-current-minor-tag" + return "update-available" diff --git a/cli/libs/versions.py b/cli/libs/versions.py index aa793cffd..2bf3ba524 100644 --- a/cli/libs/versions.py +++ b/cli/libs/versions.py @@ -1,14 +1,16 @@ from __future__ import annotations import json +import time from datetime import date, datetime import typer +from libs import http from libs.metadata import active_app_dirs, resolve_app_metadata from libs.output import print_output from libs.sources import detect_source_type, fetch_candidates, fetch_verified_candidates -from libs.versioning import get_current_versions +from libs.versioning import get_current_versions, update_status app = typer.Typer(help="Scan upstream versions", context_settings={"help_option_names": ["-h", "--help"]}) @@ -56,7 +58,10 @@ def scan_apps( page_size: int = 100, major_ahead: int = 3, app_filter: str | None = None, + network_timeout: float = 15.0, ) -> list[dict]: + started = time.monotonic() + http.reset_network_state(network_timeout) target = _parse_target_date(target_date) output = [] @@ -97,12 +102,16 @@ def scan_apps( if not variables.get("release", False) and not app_filter: payload["error"] = "App release=false" payload["latest_version"] = None + payload["network"] = http.network_snapshot() + payload["scan_elapsed_ms"] = int((time.monotonic() - started) * 1000) output.append(payload) continue if not current_versions or ("latest" in current_version_strs and len(current_version_strs) == 1): payload["error"] = "No valid current versions found" payload["latest_version"] = None + payload["network"] = http.network_snapshot() + payload["scan_elapsed_ms"] = int((time.monotonic() - started) * 1000) output.append(payload) continue @@ -129,9 +138,13 @@ def scan_apps( if error: payload["error"] = f"Failed to fetch tags: {error}" payload["latest_version"] = None + payload["version_status"] = "unavailable" else: payload["latest_version"] = latest_version + payload["version_status"] = update_status(str(highest_version), latest_version) + payload["network"] = http.network_snapshot() + payload["scan_elapsed_ms"] = int((time.monotonic() - started) * 1000) output.append(payload) return output @@ -144,8 +157,9 @@ def scan( plan_only: bool = typer.Option(False, help="Only list selected apps without remote version checks"), max_pages: int = typer.Option(1, help="Deprecated; ignored"), page_size: int = typer.Option(100, help="Number of tags per Docker Hub page"), + network_timeout: float = typer.Option(15.0, "--network-timeout", min=1.0, max=120.0, help="Total seconds for upstream network checks"), as_json: bool = typer.Option(False, "--json", help="Machine-readable output"), ) -> None: _ = max_pages - output = scan_apps(selection=selection, target_date=target_date, plan_only=plan_only, page_size=page_size) + output = scan_apps(selection=selection, target_date=target_date, plan_only=plan_only, page_size=page_size, network_timeout=network_timeout) print_output(output, as_json) diff --git a/cli/tests/__pycache__/test_app_deploy.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_app_deploy.cpython-312-pytest-9.1.1.pyc index 5e267969bf9deebcf976dd42be5209ff8bde1138..15f8304f26c64615110db55e278cafadc4eb647c 100644 GIT binary patch delta 1701 zcmbtUeM}o=7=PdEwMvg(p@o8sZQazcCVZ$wG?9^L85oAxjhjT~Yzuc|z)9;J9h9_b zH8Y|ihULvROculZSY{TJnM(}OWFf{xlFfMiKm_Ne{;_Pv?GJDfh>FkKBg6gW)XQ_f z{NCq%KHlefKTco4Uo2t%g3V?{@ZBo;uJ8DcqkJhoeYE0~RV+AyIyXfbPvOTGXBvx3 z!Vy_^S5<{Wa&LFk9h8THQI)*CtFPPzzSq!l5~X?XIYGDYIMbN5Ka}FVE6PRU+tsLb zHO-q2c&GMdd9TiT$7*%no8c%;ao#z0LuToup~!5|Eb9daL!AbGrw`~ssZF%3n(-%>+4I zcbDVdT#nD$@`&$oyTcl{M3JYYO{s@fD_H9C~u=^5}xR7v$q!@cTY??8{g_oZNuq*m9zbyiKg2cd>o&^7>&7D6lFd#4Pg(vz|s`g|5#gFYg@Iz z35Jm()Ad{eP#FNX+o=5l@R6sW_QZcHzP?8qkcPub!?!eYHGpw39D$jk@w$nQ$-R^9 z6EEmaPukgX=Fn8nbk}tEl&n{`WSlK2M_?tl6|a_+<9tO2XXPsj`Q-fGrxQ3=jOqIC zvBmNg#+7k(G?w1lFl%o}@xqGo zJza^F)D#sHK`tflHy1G;o(#yf zAGhf4XJ=U-xhg!8XwLGj$>tw8$N0_^w@qg&Cp!RiZrfx>imRMssm!h`j8P^xGI*NW z8}#o8Ci9Mf-s#T*vVk#GcLXwaN_9Yvk`x!1V*_&u_;WH#%?z5^pjq&6tXrgW-iFC- z1cP~An31x)ptAyfCxr}0X^Io(*bSMblZGO*L9^_30Xz(Snicdroj?!9+R$@VCcH>K zc;0Wm1)aR4<#j$|HZ#!AYubK)lL;?t?{tu3 zhvBJB_MKu_Oz!XRWiTdh_1EH?rB{ j3eBj{B#Mh{4Q;k=0SbcD7fDm7$-?7(cyT)!3zhu^Vw^9E delta 401 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 delta 2200 zcmaJ?Yitx%6rMZ#e)P$1+vTy{K7dZU?NT0XDPmio4+0ceDwPVZvz;kjn0>>f0k(?`&ZO`Dk`^QMp-!;u5QuP2P>7Ch<`W|e zk|Ml8&Jl?8Kdo8eJn4iVt^Pll6|B?CgM?SMm*q6^Ei18cr=x`w^A1Nj$b*i*h==cY zZnlNNvm|%kxrx~E++mSdwfk~EyI!}F5`MBUT8x3vB?uJ=0e-7+xYmr$&E#WhEJM>1 zS;K>}l3&mj=osWxgH=((GpwmH%^M__;nb6vSVq=I=}K@itfsgM{Z}K@AxH@I2n_(t z1rSFR_|*Mf@LxYu71SO%iuRa9La*8g>#Zplqs&=-TJt>|hws%Gi`UjXyE5Pv8HH@M{A zWZMGDT7KLA8*%ef&4JvnWj{C|-W$Oh;^Th?dr2AJTDifF;Xq_3D+Bh2S*R5uNQxKCGP9KKj>C9wfGGi*$*V0w|r^*JhnwN$eq1v6HZMGQrL~^f&Mnw4RT=i(* zWztVE!N6xLQ?(I>T!k3%EZeY_X6mFbwuh$UYE)$zV7l65YCFM!VPdC*n@%rv^LJ|6 zHjcpBJdNU&%|ob+62fNqF{JN|aI@4uwc|c;vLNp$n;8h#o^cS3f6&lNJZHmu$#xzM zH$a#t!#&P5ufCq*7D~DFrWwNajqvfEyXF+obZ)j{= z+K=LHguMt+gfzla{6u4YC7xmKnRMa_&1)nE)Py%pfkon1SOlxM_iKr8DGNVDM)5!sfxu+8d<}D^sI*x!zHWNfk zP&$DS=O4DVRp$E%*Ji$^QF;ksk;By;Gq5)73N?&=+H=8ACoo{Q16k?6?j5Lg%s<&88U#Co@+A`KmGadc9g zWclHOtw50p^dbWC`r-U};Cv#PR>m~-N%}4raJsQLo-$`4gnTbl-@$=&U8uM%6#OXo q=j?)5JXQ8e@Ko@;^%`06i)bOi`xZeA&Y{H59IkWU_c=+x{KDT(l=l1p diff --git a/cli/tests/__pycache__/test_sources_fetch.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_sources_fetch.cpython-312-pytest-9.1.1.pyc index ca0b3a399225b08496cb1b7429aca18d9fce06cd..34ac25e0b7cc82bf132079ed2cadb53cf8ce0b6f 100644 GIT binary patch delta 2050 zcmcIlUrbY17{8~z?d>1>hqhQ0)D}viD& z-#Pa?Uw`L(zw=T5r)m4oHk(C&=PmOuBey*_?3Lt$8}|6@J>K4^}(U~o~O zgzBh%S(hMG7}WI%Au+mbo@xoVwT9cm)65Q&m>J<1!WjTX2jKHD4+i=GGJU+IVgLE~ zz<``eE3xTVDj6S;hbEF#W-%rw<+vip((!~6KAM~uh$od!FydpEX}mLr`7lvVxOMQy zY{7pv@9WRMdp^JaLQY`2aD@>7{zF|2Il_OftM|&&@v&4=Zi=T;O_;M-SCadK9-`IJ z^D1>vTxkqJTXP)O{5H62FaXA)kR_CiHbA8YuyklK1JzTJ8kT`EDgbN7XhuZRGR7ix zY!Z`c?7{RM_EKOedH~6?9(vWGEY7$7HX7zMj`DY##T>yx!Erx9sJv7szGjad;p9d|#ClxX$dHiNkOv zF7Xye4VmOy^{`b~X*^Fr^YESgtBM)tPmpJlWH3J4?Gh@g*F0?nPn+rqsO}Ec?NeQ?YGo}yIx2hYt_F#_+FCY6j8F~alCDyIv!^}4huB!tf- z>X?)GU(Rzi)NluP8=e^*oE9UMmUT1wtS+m^Gc+S+Mc!hqHH(9UnlZ{RTKjo!PdoqJ z>f?{CW;?Ym>oP`|YM^D*#*bA;T~thv8U4KUvK$!Yf4KUI#E-i}fTQk%FVAy2;EWFJ z)TR|E0=fl(Y@P$-E3zoeiz9^l1MXQk`@11_2eu6#qICmCb~?d``awlhka3a_X7tpM z)erxpCdMd35d%qS4!0i;w}hv+Ev?P1?TszXjm<|iWm%V)tV|};3Uk2Bkb!l>59-_bI`bEYRw6@7k^9vJcXz?nlOIpbNvd=A(viHQ_U75VBa}CVifx7(oOuJa zOCFQc@yj5FO(jE9uxl`bA)_pdpy@>&TJ-?y#v(h+hml$Y6eW#|kS-bxS=k}=rWUPpOZHGhU{B9`SiubLiavC|sYe~CI u@Os-e9UYsXlS#RgT?ZF?N$KFd2M&0j`s}2eJgwPFPLa(nQch~Lq<;gHRYPC^ delta 102 zcmZoGX$s{#&CAQh00cbUH?yAdPUMqd44J4N%2LUs$+@v-t}3JEWG%Hq#^T9y)G`@0 zH?yf%Gcx9HZql%1WYXlHEN@xDm_K=*r7Tw&&I1dv1(c+| zRc~2}+!gTJtU64q#xiy@tx8>P2$5SI&ztUbqhn34dTV`a0%G6u_LPJWWZjOoKSRKquB`UWiPsAtMMu#%s<`3Zo8Yr324^B?zkV406W#~Eq>m#ArOhZ-8#|h zfm=CyWGE5~4uyl^5!wchHH(?sQP7Z}vu(!R1agbdEQe_fod;OD?Pd1Q$*yJ}nwZ~O z1AP|tIJ0`XNFVF-1c=N|dk%=tgL`-JkDjjyjDOAHEwXlj&+iAX%s=A8p$HuUy~WQd zDh;EuYnQVc&Cryt<@k6gZm!N@xMj?kj-VPv96-z>FogL~4x%~)cw%uL#mAqxsAUt$ zMK(C?Vtri!@daoZU}w7?kwEcO_gfb0G3-Cd{_P()Zbbem+Q$C)87f@y=1h;HI*FJ@ zoJKqc&>H~ertq1&;skRByzI9<5%B`t8ZCaJwQ7ViFjF$p1#vP1pl>VoJWc+GNl5}Y|P5*mhaakLx{ znm*<1nJsWe)F9eSQ3;GyC+&7X`hVh7vcjnrl}{1&T6d>=g}-jO&c8CiaVx@gLBG%b z)!xl+4|&+si2>&Gy~O@@!uQ5*8+*obin;d5{Ek11tT4Qbz3HFua#zU;fu99_!U|uF zEE$nInjB9Nde;wy<{;sYrpBiToBv)|IGLR@IUzg@y8$WAlXd&Gs_>2bPz}lY0RE52`k>*6%DQY{@r{pP zG|afHQyYvXixf9FZAR<_;8u^BXTQrlT8#GLu&i$ha0-NtREKkJvjzo~B_)+s=F(cu zzL*JS7lK%sWE-{N8J729SUe--2HJ~y4`MIiyNA~S`g3%{`{%YCc&5FyK-Dn#~#zHv5cKft0LrUdPA7K)oQxe zp{GAq*V1TRk5!|ao*M6YA-yR`?-wP16qK1>v?7gwQHoC?LC2@c($rl6uT8^~2bXEr zSjOI_RjJDjVG7g3#_Q12AFXR?q^_TcX5KQ=ixpZ*LJTu2v{a>6gb+9bK zgz?&}I!vp^GWImBN?mRUG0Y14tqTypCLv}`uMV2>dxVjp1pj65LQDIPf8nsU!#Bws zd-w32p875@%N#Dq76g6<(Mte!bMi12zHuLVjKVwyN_Np-p`*UM`_RNSPWutKtmzp< z3c%t=Qf8HAI+@ex^E0sn>KgCn1aP>HTNn)x#nYb2dV809UD%9zKG*22r!#P~M& z;WEfNrw@vGXtcn7IsMQY042Axb2FW!lP%5+Tidb!5_@k(&f~#A_aTCa2?UmMiWQSy zKwurAc)A-qiQ)_>24CYSMmCDyqaBCl7u3bH_6+?!_+X=PI@YlVJR#&h*Yg#}y~=HJ zyT9U+6)w4L70CFu(?a$SZ`-Y8WV=}cyVC~BV<*<__68E&Zn1&#@MLt`;UFscrprp; IHABq*0*!VKLI3~& delta 1337 zcmbu8PiPZ)6vyY6=}g)*oz|pDo6^=au}MbLm`U2&T5GEowEIVDt>|{GZFRCzsW!Zc zLJIyxPs+0K;YkqjAjF%F7ex;qTox9Q9z1MdPYcSjDE`?+=xN`ZuzxNdmK~T6@ArLg z-uu1Zyx+~o;_VHg{n*gpk?48y{HJ44t)#VzbEWwB79p9+MQK_yRbr#*CN`P1#5HCe z(Pw&yezTs~Y8)?xw#sYkiWQ~%yiS6$f+ zJJ>ORmpeK|1n+cgP-7%iGWaGQ!rwdElu25)+WyYpgh*WVh3wXFjeK@JiMqTh8>tLz z;CT7)ya`FRJh>Bv9OPla$}P)-sX_3P3MmG+3TZ}$k!4IVI7Rg|`qW{>6yvqw(i_2_10KLy0F5?!UEd9m)6OC2QvhVgVfG3I35#%rhgcD6WSwc9ba zb~1J`zF>Swu=saXYlb0)zs4t&uSv<+TN68|d&HiN_Fa9^H9JZw3=@_WBV|yJU$Nj6 zon~vC@j2ta7Nu`0BhJ}hOU9K$v>d@F$rWl5dv3e-RcmHaS*ppEmSwWx|2Fz%W%y7mj$(GZ@Cui>nhx9T&J$AkLU9=68!CIU?=vPiru!(T+qnaQ~Z^5OR zcF~4cX0p`|7xC$gemu@8`Q`#&9^gR*9wgxZ33CkIK5(|O1f0s5@zvTb$Cu2Li@B|E zhBQI1#k2ZW7DD_iMP5nLMd^jq@k*Lnk*40OHDdU^hD(P!HLozmhfY=WJIVe8I13)T diff --git a/cli/tests/__pycache__/test_versions.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_versions.cpython-312-pytest-9.1.1.pyc index 3b0e45a41b6f8ba34663ba7ad08dc8b85f2224e8..dddb09b0a8df3ed8a879cc6f6d5b42ae18eaf86f 100644 GIT binary patch delta 910 zcmb7COH30%7~U=02lPQpDKB|d15$8XD58|Kr4S!WOfVW^6cX2IccI0$TW7Z%j*`%8rg98Ec6vqbo%R=8efcJDE=qn+&Ngm;i5yeq?^xZLBI zIU%sTK=Tohq(Lgh(~wPZP~d4EBv?8TOLCA-0U;8l0Z&Ib^erso_Q$yhi1R^2KqAb5 z;5drM+Yn^2rHk*Ta?T;?!m!jhlEq-Zoa&wo8W|oV$kgryBEyqqWF!qCn-oYT7b$=- z@p|a^jQ9VK1)rhVSJ2>JA;@CeMCojC!CGCgR~8(#QavS=4;1QJmPg-2rLNPta!Rrf zd@a^C>waKbt^SJ%(^~UHWsa!)V6e^<3^m(^kzGBZ)$N)vOGVz?kTW+d`8Lg6*;60? zEiy`Kr6htb8;OV}Zb%Adpp9EvtMD=u*N+wP2jWaB5nPxC/ 2. 解析 channel 3. 检查 R2 apps/ 是否为空 → 空则标记首次发布（--all-apps） 4. 从 Contentful 拉取 catalog 源数据 -5. 运行 library_publish.py 构建所有制品（v2 + legacy），并以仓库 variables.json 统一 product distribution 数据结构 +5. 运行 `ci/scripts/library_publish.py` 构建所有制品（v2 + legacy），并以仓库 variables.json 统一 product distribution 数据结构 6. 上传 v2 制品到新 R2 路径（`channel` 只由目录表达，full 固定入口统一为 `latest.zip`） 7. 上传 legacy 制品到旧 R2 路径（兼容旧消费者） 8. 清除 Cloudflare 缓存 diff --git a/docs/architecture.md b/docs/architecture.md index 34c99a571..be61185d9 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -9,8 +9,7 @@ Core layout: - `metadata/archive.yaml`: archived app metadata and external handoff flags - `skills/`: canonical shared skills for multiple agents - `metadata/templates/`: app scaffold, README, and catalog templates -- `ci/scripts/`: local and CI helper scripts -- `build/`: generation and publishing scripts +- `ci/scripts/`: local, CI, and publishing scripts - `docs/`: product, process, and maintainer docs - `.github/workflows/`: CI, release, and maintenance automation diff --git a/docs/devops-spec.md b/docs/devops-spec.md index 8124679e8..628dd4760 100644 --- a/docs/devops-spec.md +++ b/docs/devops-spec.md @@ -315,7 +315,7 @@ Those concerns belong to platform workflows or human process. Recommended order: -1. Normalize existing `build/*.py` inputs and outputs. +1. Normalize existing `ci/scripts/*.py` inputs and outputs. 2. Introduce a thin unified CLI. 3. Update workflows to call the CLI. 4. Add `make` only if maintainers need local shortcuts. diff --git a/docs/test.md b/docs/test.md index 6609cad44..8ac73a586 100644 --- a/docs/test.md +++ b/docs/test.md @@ -4,7 +4,7 @@ This repository uses five test layers: 1. Unit tests: `cli/libs` pure logic. 2. CLI contract tests: command input, JSON output, and exit code. -3. Metadata and template consistency tests: `metadata/`, templates, `build/` pipeline smoke, and repository facts. +3. Metadata and template consistency tests: `metadata/`, templates, publish pipeline smoke, and repository facts. 4. App deploy validation: changed apps only, high cost, not the default local loop. 5. Owner E2E: final human verification. diff --git a/i18n/README.md b/i18n/README.md index 89aee755c..1fb2abb40 100644 --- a/i18n/README.md +++ b/i18n/README.md @@ -1,13 +1,31 @@ # i18n -`translation.json` holds translatable env labels for downstream repos. +`translation.json` holds translatable env labels. Translatable keys are +`W9_*_SET` and `W9_LOGIN*`. Values are `["English label", "中文标签"]`. -Mechanism: -- Translatable keys: `W9_*_SET` and `W9_LOGIN*` -- `create.py` scans `apps/*/.env` and registers missing keys as `["", ""]` -- Values are filled by humans: `["English label", "中文标签"]` -- `.github/workflows/i18n.yml` pushes updates to the plugin repos by PR +## Commands -Rules for AI: -- register new translatable keys -- do not author final translations +```bash +make i18n-check # check all apps; fails only on missing keys +make i18n-check ARGS="--strict" # also fail when a used key has an empty translation +make i18n-check ARGS="--app drupal" +make i18n-check ARGS="--warn-only" # report missing/untranslated keys, exit 0 +make i18n-update # add missing keys as ["", ""] +make i18n-update ARGS="--app drupal" +``` + +The PR check uses the same entrypoint, restricted to keys added by the PR. It +is warning-only and never blocks a PR: + +```bash +make i18n-check ARGS="--base --head --github-annotations --warn-only" +``` + +`i18n/manage.py` is the single implementation. `create.py` is kept as a thin +`--update` wrapper for older local scripts. + +## Rules for AI + +- Register new translatable keys in the same PR that adds them. +- New keys may stay `["", ""]`; do not author final translations. +- Use `--strict` when you want to audit translation completeness. diff --git a/i18n/create.py b/i18n/create.py index dfb96ca48..35f65073e 100644 --- a/i18n/create.py +++ b/i18n/create.py @@ -1,23 +1,5 @@ -import glob -import json -from dotenv import dotenv_values +#!/usr/bin/env python3 +from manage import main -# 读取已有的 translation.json 文件 -with open('translation.json', 'r') as f: - translation = json.load(f) - -# 遍历所有 .env 文件 -for filename in glob.glob('../apps/*/.env'): - # 解析 .env 文件 - env_dict = dotenv_values(filename) - # 遍历所有环境变量 - for key in env_dict.keys(): - # 如果 key 以 'W9_' 开头并以 '_SET' 结尾，或者以 'W9_LOGIN' 开头 - if (key.startswith('W9_') and key.endswith('_SET')) or key.startswith('W9_LOGIN'): - # 如果 key 不在 translation.json 中，将其添加到 translation.json 中 - if key not in translation: - translation[key] = ["", ""] - -# 将修改后的 translation.json 写回到文件中 -with open('translation.json', 'w') as f: - json.dump(translation, f, indent=4, ensure_ascii=False) \ No newline at end of file +if __name__ == "__main__": + raise SystemExit(main(["--update"])) diff --git a/i18n/manage.py b/i18n/manage.py new file mode 100755 index 000000000..1f7dc0aa2 --- /dev/null +++ b/i18n/manage.py @@ -0,0 +1,226 @@ +#!/usr/bin/env python3 +from __future__ import annotations + +import argparse +import json +import re +import subprocess +import sys +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[1] +DEFAULT_TRANSLATION = ROOT / "i18n" / "translation.json" +TRANSLATABLE_KEY_RE = re.compile(r"^(W9_.*_SET|W9_LOGIN.*)$") +ENV_LINE_RE = re.compile(r"^\s*([A-Za-z_][A-Za-z0-9_]*)\s*=") + + +def is_translatable(key: str) -> bool: + return bool(TRANSLATABLE_KEY_RE.match(key)) + + +def parse_env_keys(text: str) -> set[str]: + keys: set[str] = set() + for raw_line in text.splitlines(): + line = raw_line.strip() + if not line or line.startswith("#"): + continue + match = ENV_LINE_RE.match(line) + if match and is_translatable(match.group(1)): + keys.add(match.group(1)) + return keys + + +def added_env_keys(diff_text: str) -> set[str]: + keys: set[str] = set() + for line in diff_text.splitlines(): + if not line.startswith("+") or line.startswith("+++"): + continue + content = line[1:].strip() + if not content or content.startswith("#"): + continue + match = ENV_LINE_RE.match(content) + if match and is_translatable(match.group(1)): + keys.add(match.group(1)) + return keys + + +def missing_keys(keys: set[str], translation: dict) -> list[str]: + return sorted(key for key in keys if key not in translation) + + +def untranslated_keys(keys: set[str], translation: dict) -> list[str]: + """Return keys whose English or Chinese translation is still empty.""" + result = [] + for key in sorted(keys): + values = translation.get(key) + if not isinstance(values, list) or len(values) < 2: + continue + if not str(values[0]).strip() or not str(values[1]).strip(): + result.append(key) + return result + + +def app_from_path(path: Path) -> str: + parts = path.parts + if "apps" in parts: + index = parts.index("apps") + if index + 1 < len(parts): + return parts[index + 1] + return "" + + +def app_env_files(app: str | None = None) -> list[Path]: + files = sorted((ROOT / "apps").glob("*/.env")) + if app: + return [path for path in files if app_from_path(path) == app] + return files + + +def changed_env_files(base: str, head: str, app: str | None = None) -> list[Path]: + result = subprocess.run( + ["git", "diff", "--name-only", base, head, "--", "apps/*/.env"], + cwd=ROOT, + check=True, + capture_output=True, + text=True, + ) + files = [ROOT / line for line in result.stdout.splitlines() if line.strip()] + if app: + files = [path for path in files if app_from_path(path) == app] + return files + + +def file_added_keys(base: str, head: str, path: Path) -> set[str]: + result = subprocess.run( + ["git", "diff", "--unified=0", base, head, "--", str(path.relative_to(ROOT))], + cwd=ROOT, + check=True, + capture_output=True, + text=True, + ) + return added_env_keys(result.stdout) + + +def collect_keys( + *, + base: str | None = None, + head: str | None = None, + app: str | None = None, +) -> dict[str, set[str]]: + if bool(base) != bool(head): + raise ValueError("--base and --head must be provided together") + if base and head: + files = changed_env_files(base, head, app) + return {app_from_path(path): file_added_keys(base, head, path) for path in files} + return {app_from_path(path): parse_env_keys(path.read_text(encoding="utf-8")) for path in app_env_files(app)} + + +def write_translation(path: Path, translation: dict) -> None: + path.write_text(json.dumps(translation, indent=4, ensure_ascii=False), encoding="utf-8") + + +def main(argv: list[str] | None = None) -> int: + parser = argparse.ArgumentParser( + description="Check or update i18n/translation.json for W9_*_SET and W9_LOGIN* env keys." + ) + parser.add_argument("--check", action="store_true", help="Check only; exit 1 when keys are missing") + parser.add_argument("--update", action="store_true", help='Add missing keys as ["", ""]') + parser.add_argument("--base", help="Base commit SHA; only inspect keys added between base and head") + parser.add_argument("--head", help="Head commit SHA; only inspect keys added between base and head") + parser.add_argument("--app", help="Limit to one app") + parser.add_argument("--translation", type=Path, default=DEFAULT_TRANSLATION, help="translation.json path") + parser.add_argument("--strict", action="store_true", help="Fail when a used key has an empty translation") + parser.add_argument("--github-annotations", action="store_true", help="Emit GitHub error/warning annotations") + parser.add_argument("--warn-only", action="store_true", help="Never fail on missing or untranslated keys") + parser.add_argument("--json", action="store_true", help="Machine-readable output") + args = parser.parse_args(argv) + + if not args.check and not args.update: + parser.error("pass --check or --update") + + translation_path = args.translation if args.translation.is_absolute() else ROOT / args.translation + if not translation_path.exists(): + print(f"missing translation file: {translation_path}", file=sys.stderr) + return 1 + translation = json.loads(translation_path.read_text(encoding="utf-8")) + + try: + keys_by_app = collect_keys(base=args.base, head=args.head, app=args.app) + except (ValueError, subprocess.CalledProcessError) as error: + print(str(error), file=sys.stderr) + return 2 + + missing_by_app = {} + untranslated_by_app = {} + for app, keys in sorted(keys_by_app.items()): + missing = missing_keys(keys, translation) + if missing: + missing_by_app[app] = missing + untranslated = untranslated_keys(keys, translation) + if untranslated: + untranslated_by_app[app] = untranslated + + if args.update: + added = [] + for app, keys in sorted(missing_by_app.items()): + for key in keys: + translation[key] = ["", ""] + added.append({"app": app, "key": key}) + if added: + write_translation(translation_path, translation) + if args.json: + print(json.dumps({ + "updated": added, + "untranslated": untranslated_by_app, + "translation": str(translation_path.relative_to(ROOT)), + }, indent=2, ensure_ascii=False)) + else: + for item in added: + print(f"added {item['key']} ({item['app']})") + if not added: + print("no missing i18n keys") + for app, keys in sorted(untranslated_by_app.items()): + print(f"needs translation ({app}): {', '.join(keys)}") + return 0 + + ok = not missing_by_app + strict_ok = ok and not untranslated_by_app + if args.json: + print(json.dumps({ + "missing": missing_by_app, + "untranslated": untranslated_by_app, + "ok": ok, + "strict_ok": strict_ok, + }, indent=2, ensure_ascii=False)) + elif args.github_annotations: + missing_level = "warning" if args.warn_only else "error" + for app, keys in sorted(missing_by_app.items()): + joined = ", ".join(keys) + print(f"::{missing_level} file=apps/{app}/.env,title=Missing i18n keys::{joined}") + for app, keys in sorted(untranslated_by_app.items()): + joined = ", ".join(keys) + print(f"::warning file=apps/{app}/.env,title=Untranslated i18n keys::{joined}") + if missing_by_app: + print("add missing keys to i18n/translation.json (empty values are allowed)", file=sys.stderr) + elif untranslated_by_app and not args.strict: + print("some keys still have empty translations; use --strict to fail on them", file=sys.stderr) + else: + for app, keys in sorted(missing_by_app.items()): + print(f"missing ({app}): {', '.join(keys)}") + for app, keys in sorted(untranslated_by_app.items()): + print(f"needs translation ({app}): {', '.join(keys)}") + if missing_by_app: + print("add missing keys to i18n/translation.json (empty values are allowed)", file=sys.stderr) + elif untranslated_by_app and not args.strict: + print("some keys still have empty translations; use --strict to fail on them", file=sys.stderr) + if ok and not untranslated_by_app: + print("i18n keys OK") + elif ok: + print("i18n keys registered; translations pending") + if args.warn_only: + return 0 + return 0 if (strict_ok if args.strict else ok) else 1 + + +if __name__ == "__main__": + raise SystemExit(main()) diff --git a/i18n/pr.py b/i18n/pr.py deleted file mode 100644 index 2a04daf0e..000000000 --- a/i18n/pr.py +++ /dev/null @@ -1,75 +0,0 @@ -import json -import argparse - -# 设置命令行参数 -parser = argparse.ArgumentParser(description='Update JS translation files from a JSON file.') -parser.add_argument('json_file', help='The path to the translation.json file') -parser.add_argument('en_js_file', help='The path to the po.en_US.js file') -parser.add_argument('zh_js_file', help='The path to the po.zh_CN.js file') - -# 解析命令行参数 -args = parser.parse_args() - -# 读取translation.json文件 -with open(args.json_file, "r") as f: - translation = json.load(f) - -# 读取po.en_US.js文件 -with open(args.en_js_file, "r") as f: - en_lines = f.readlines() - -# 读取po.zh_CN.js文件 -with open(args.zh_js_file, "r") as f: - zh_lines = f.readlines() - -# 定义一个函数，用于在js文件中查找或替换key和value -def update_js(lines, key, value): - # 如果值为空字符串，则不更新 - if value == "": - return False - - # 遍历每一行 - for i, line in enumerate(lines): - # 如果找到了key - if f'"{key}": [' in line: - # 替换value, 确保不在最后一行添加逗号 - lines[i+1] = f" null,\n" - lines[i+2] = f" \"{value}\"\n" - # 检查下一行是否是数组结束，如果不是则添加逗号 - if not lines[i+3].strip().startswith(']'): - lines[i+2] = lines[i+2].rstrip() + ",\n" - # 返回True表示已经更新 - return True - # 如果没有找到key，就在最后一行前插入新的key和value - # 确保在倒数第二行添加逗号 - if not lines[-2].strip().endswith(','): - lines[-2] = lines[-2].rstrip() + ",\n" - lines.insert(-1, f" \"{key}\": [\n") - lines.insert(-1, f" null,\n") - lines.insert(-1, f" \"{value}\"\n") - lines.insert(-1, f" ]\n") - # 返回False表示已经插入 - return False - -# 遍历translation.json的每一个键值对 -for key, values in translation.items(): - # 获取英文和中文的value - en_value = values[0] - zh_value = values[1] - # 如果英文值不为空，则在po.en_US.js文件中更新或插入key和value - if en_value: - update_js(en_lines, key, en_value) - # 如果中文值不为空，则在po.zh_CN.js文件中更新或插入key和value - if zh_value: - update_js(zh_lines, key, zh_value) - -# 写入po.en_US.js文件 -with open(args.en_js_file, "w") as f: - f.writelines(en_lines) - -# 写入po.zh_CN.js文件 -with open(args.zh_js_file, "w") as f: - f.writelines(zh_lines) - -# 打印完成信息 -print("同步完成！") diff --git a/i18n/translation.json b/i18n/translation.json index eb0e803b8..60c136a29 100644 --- a/i18n/translation.json +++ b/i18n/translation.json @@ -8,16 +8,16 @@ "应用 HTTP 端口" ], "W9_GRPC_PORT_SET": [ - "", - "" + "GRPC PORT", + "应用 GRPC 端口" ], "W9_AGENT_PORT_SET": [ "App Agent Port", "应用代理端口" ], "W9_ENROLLMENT_PORT_SET": [ - "", - "" + "Enrollment Port", + "注册端口" ], "W9_SSH_PORT_SET": [ "App SSH Port", @@ -132,12 +132,12 @@ "管理员密码" ], "W9_LOGIN_MYSQL_CONNECTION_STRING": [ - "", - "" + "MySQL Connection String", + "MySQL 连接字符串" ], "W9_LOGIN_MYSQL_CONNECTION_STRING_PASSWORD": [ - "", - "" + "MySQL Connection String Password", + "MySQL 连接字符串密码" ], "W9_LOGIN_WORKSPACE": [ "Login Workspace", diff --git a/tests/build/__pycache__/test_fetch_catalog.cpython-312-pytest-9.1.1.pyc b/tests/build/__pycache__/test_fetch_catalog.cpython-312-pytest-9.1.1.pyc index 7b02dd8bd5413bc4dfc79def20fbb338c8d87747..0fa5bbb3b95b45e092360a8670cbbd15551ba5ae 100644 GIT binary patch delta 1989 zcmZ9MTTE0}6ozNdjTvBsfkDs_7)BW82qOrh7(@Zl)C&bEULe%T3Fm-A4>RLF2NfD) zo1(qhCb-iy*4p%9V$c|ECh?(Z-x_10HZ@IOP9K`|%`|B=>62-bu76MQHpzV1x3l(I z>tAdC{TVxRkp=Ds0)-CxJ+As~dSNlJihaGtk8nQm2*y|Z1K*XV&_E4E-)u}Dr=d!Dt6da zSw*&=c=UAQz-v56V_pW7=iYVu8Hy zOEq{Y%@k&P)ofNzYl@r0C|?DvCfJ?{)i6xcP2)%;@)i#ZQFMJvHTEe&NB(#XjYc@4 zeW+ov7N`Su0&9U7&?x4L`^w~oPAFKc5XWK_VzR%!sSRtp z2}&_<$9NY21AHUU0c-*`i}65bCGIne3FPeZuZNtz7TCmwbAJTZF-k+Aq}o}Aix8pYON_@KN$Ff=^ae_+Q*a{qyy!=t1 zm>zEJ)YDwY)R&r3r}SBF@LKWD>NR1+jKpu8 zUy=7U(h$$iZBk6WSG0%YOcCSZrs7!U&96*m_>5|G@F5&b z0n!ogWXdpf&GggCvN{op;&Hf(9m^%w{0nuOYU*8VN(|L0URg|&;&fdmCUx=YCsU@C zN>3@?r`6N;zk0Z2RD_~YugsnydZV#&sf$v;XR#}5Wl+pUcTrn>AKk!CiNB(M(v9}o z2wm@Wc^!67W)CAu0u^yV8w+-ulfE*nX9 z26>yWZ4r+}>Idkw;(D%{-+9@V-7R_=x}E%N?pn;_u7RYozn^$!t;s~^60?1JdLpAy zB1qAn)?KYdEAit%zLYVNRdWKPlj75+wT&`^g(rB*(v#C>Ce6>$p6xL*s%F}LuB%$o z(ob4wyBNw@DYAXmOg5QSt)u)S*vTglqd8z+G&PS=D$h2@*@fJV=4z;SKM`fjFCML* z9(Wr@d>rA)_-&VIaoeluhMqpo7qEN=kdC=$)Kq#oEdt9grbS$7sbQCMw_9$M#xG*q z4}1<>0=^*37bFr^<_#))nfrC(Qcrs;vN!J|AysOMgj7#)$^*97$k6Min|QdEWn6Q< z_efsF0ipHwcF2Az%<_yjJ7J|LYmlG(ls8m<`)-`+|@ zN>A)FwT@zMRD9bPs*p;(hxz-!2S7;Jec!b~Cyta*=RN!Mnb7-a%XZT{+A7(`KNh!l zsBB5Z`(vfD@V=PP%% YJm?(x`B3UXXX=;IY0)vz<%WU(06W&jO8@`> delta 2053 zcmZXUT}%{L6vy}O&W;Q0Aj^lMi?}SX?!c}hpg{2p1TBcDDD|6VWCmCqcBgk{RnSD+ zLfQtK6mK7lAE~Wv)9uGgH^#K}r7umBrj52QI(=!A)}(3L^r3wrHSIZf71VCBzuZ0d z+_U$b|2cR1GWqKgk-nCsTnBu-Gxx?$&q~Y4mDyGMyFYZI&EYuYRToV;4oRv9n6Ksl z7pu9z0yPilQ@y}KRRR{N`M_dzF|b4}04|wu%D&leyG8f0R9sgxRpfwc=~9R~=hhO@ z{=KvS*3^e6%rGH`kP3Fyy_GCyKe<~-6Z4DLNLl8V_>Qo-2%OSR+ifK+MW>75mrQI? zF$^uC$^ylpv=p%nV7rGDT{leu)`39a99_=d%=@^d4EHhDtosUB?W36IuPPeL5dlO8 zB8aF)gxIvVy^#N>Kr6vwyNrpow2IyH2Ew-j|x8_?B{~Mvth8MU9<}i zRv|)wxqQVmHEIQ_!^T9DY~r<=(zz6!ZE1Jku8#h#`(k_gJNph&yc?}WtU*K&QN(IQ z9bzpY?Y8r_7!$E<;5yoi8x0O9B;5B?pI=-K2D_f!lKkv%Unv=2`Gr$Y-uO$>uoqAD zBk(HpImCX%0mMPXVSwodfIfi$2=s1oJsD(oi>E;Gqb29vD^YP<(32xc+o>feN@RQD zS9)Fo1>w#G}PCj0W^|DF3*=B#3gxRRScI>I#=aZFls0IP(5sdO!+6`Q) ztYtV!#}#WG-Gz>$2!0W9IIioOYUY52XYeqK2mV%KWLnA|5J;n`yvjv}*^vra9Kw?t zo2f{KxH=x~RNS=Ui4j?x@2L6(W$6JH2nO?c^^W7whpknaFE64N8h9V|vKNBepn1Lu zt|e#KT<|ye)BBYH($=1BHzV2*C5R;e(*=MeC<;tF+4kxg zE-TGtcdNUK_Dk6Pfwq(EdTnKd7cuuFjayo5%uFWe4D8u% zJ*lXs4YDd~%+gL-^K}c#dA7$IH)4ijjneZNC|f~XokC2orpO_v<%LL?T+DnPS%C`P ziv|htuzyyMojnImvWH@Rya2Y#w5Tnrnyw{I(3j9Wh2S?6#+7*DQC%*e`Tun(wKUU; zp<|3{&!^&4GhIw`|luIo;`O{~MdJQQBi^@Pz~h_uiqJ7CKe;Bl_wtf#NB@3t!Beb(3!D&=i^ z4I|)P=-Y@#PxdoB^6O}t1<1Z^OLOUXqm1JgZ5%LCm(9s9ov%9l~ z+{m2n{6-{YtgEMjMA-43hO_(y;w|cljcU4~QIiUI8ehQdb((Os2Qh#cL>P!Oh-t({ z1U3h~f#9>t%ZxKS=h-k0O6l4rdJBFM_?pK6f4T@^D|RlGw%=*qal3c$PV?aR1q$1? JvsJ*e{{e=~-L?P# diff --git a/tests/build/__pycache__/test_library_publish.cpython-312-pytest-9.1.1.pyc b/tests/build/__pycache__/test_library_publish.cpython-312-pytest-9.1.1.pyc index d9ae37dd608cf15172099498f4196c50771ab983..adf28cd991739b2d8a240b6cb6b4274115c0d689 100644 GIT binary patch delta 4391 zcma)9dvH|M8PDBhH)}S#**rIa>}C@Xa$^z_5fVrU3GqQ2v6NQ@kpyvo|6~P+Fm|ubHC+w=Vj6FpXKL=4j*z?NdG#tbYx7uZq${P^}G!$ zSy?*@)x3RKJBm~nVX>M|SfVae-TQKOl&T&Ym8k`UKGjQDt`-tjs6~Ve)MCPgY6)Q_ zNtBX=UoE3ifJQzVRnfPczCpEuW~BYwpDtGVam=5>BEWu#efpPV!ot&xd#lU(};(XMmRLe|8!`PpEc0j zR4!`-*D^p8paam%PnXwAUHn}65@|#Fqw-CX)SbR#!M)iu_cOm*)J;sLU5O?J6}BD% z9=;|}$@^-{s$mf}HgozkLy@mDbB5xPVe$rz41V@2kmg>9o{-ANF%ex0m~FRE&lG`_Ry1F4()cU7d-;Ip}o0Q7oz zL2c{GDyVe!DY_Po3~N(4ma~Fjs0QH7mpmDE$d; zGyGtkkD`3KZmslS`klIVn*+fPXYq}}lJuH}XKd0qzp$*qI}Q~O0rmqtysD|!XQi2@ zMvO>&Sf6zh???t0HIXyQh*i#Gf~`nT#$pPKjB24h8q*H`U^9lo zocnm7IY38T)7&9F#_wXGQT%eH=EW}T7Qn55+jw`&!;+W(yv5Hi9ICNV zzU8$BiatwgdM?3qE>SA2Zf%k#)4N-@Njb2c#}AgJ&#!vcL3+nK8&(BrPUOrL>9T^% z6Imc~E(#u`92*A20j2z%&Mu!0(g27Q@UmT?y?kxgB3DLL@PD)v`>e9Sy2xI8#L!|o zyPhBIs`2&Gv}unFtJ=NnD`4pZwDB`t0dEt?*|cEy@ylIhr6(~d{P_SV#9A-rg(GD) zGP!HrTIu=p__~W;KEAW0`OCCuy7lm&7E`ua!7-&~=7HdLzz)D&0Mre8l7Dw|t@l}w z#{kCxHT?a}erbZcwtUVZvgM1scZ=*jKx?LxREKv{2C#$t$t~S?!oHcBoNHiREzAK6(o z_9Kwj@}KOSvyA-|obwt(3&i<o7J-1Kj*$ zrEO_G$TtC-38o~|+0Wv!5Yzf~i6(-q3u|BCp}r9H*q8g(2HlvLm0)kt@M_i`9tr!1 zeLP%NaTM(EiR>`*G9vdj|8}^u^IFa^T}+F`_h@Pt#hT%erYk(C3=dc{v%cd^YT4%h z;kRDweiq_(Rf`&mRWS1;z?Gis;!moprSs`?D$8gGz5U*t8=inh;l&A1djVFW6D8Z& zbC{R{c=)lQMt>p5YJgQAM434^lX2kXe;uk{FkfxG1c7hy`rW~5t5ra(%u0VXq8lvI zmqfb_#gqgZC>q=3?wYo_Joy7Oi2I@u)Lec$=rSQUW_SW!fvNoB?o!Gadvvw*Zn`u2 z5N`k1Vh=eS5iAe!9;4rhaLLkWKR@X9@iRuaNmv&IgD_F_LQ%kI`d7YsZlqr6Hs_n z=p-;5YGgnocL^Veu#0ML27|Z{Z|C_VxL0l%St5Ou-ZbKHuST+7D(Fu}qsyX-LDG$* zkp%lDL|z2I3G+6@_xR+#cIhbp)xPzP?}O=w-2d=My_ZNin*}j5>!s1mS4RuEMtE(2 zzw+>HbX__3S6<__v}%9Pu3Bi40d)lQMjQZr&DQ3W$PrGIo)Kr7bw!}lG4wRuMKFB} z;zQTMh5b#ECtdu=3)z$buRLa#N`-zKsbPbVn@$Mx@p^|9Ii5ceq*FIc_$v@CGf$5v zSy;oXNw*38q&7U!D*4jKC+?A|KZX{e?=q-Q2*^PaHuwo9vU%fyK&6+)vcpP_BCHhy zN&sFyc%Y`r+AE$k5=jGlv0Pfyvq^(x$kc&0sWSbS1AA>_M`&_1KN{&{3QIK(>G9#w z?E4GcD_8S|U8k@}A>6_1r^6zQI%uOh%Xk1a*A89mK#hEvgNM5rLT%qYrLfB-c zrSrcXTG%@C#+j?pD%dhljb8OMX_;ItRdY7^4K#5+=4=%`wF1J3%&5H?N57SPbq*(7 zNDF4s%*%By6zpw&?$`$ZCh(xy%M#l{AD!5<_RjSAPfoS*)bT=U-j5$&zHpXzo;FXM z?)ORbLqvEyi*@tr6E~MZ@%+rL53p2+Q+M-MPi*vAXE1H5A&xM6)sW(1QQsCXq=F>H zy?ueD_h&_<&D3V^U;!waHe(<0d`buZ_gBlv4EM?H^@1(ibWNuUi^mPiRmh;}gt@{4 zzc|@MqL)u90fES3{7kn6YSn{!OlK?1}y9YT5a8&lnmDdlhgGU@<^sz;;kqzShiK z-0PdPer9zhaNL9q#n!7qbr8^{B-(}DIz5gg7cx6>o7vPx=UyykPAprA4CC&x{&`_f zgUOB((9JxiDJpqeV~inBSq>MMQ!wf5(N?lr2<6G77!Ke zr81|V$NF@N6gC(0y(bpi*!uJ*U;B^E373&gDV}|LiB!w$PA?x5uLW^fDr{pA<(flW zrrk&-G+o%r&~8j;Xi$qL=poD;*f$p-T)qy}27m^55bzja67W3Wb-){d^MH2&9|1hb z1?B@(0;&P)0mw8aLfl2vC1-mqt|p^e2m3s&(qEST1ou6+v?%9n`|WS0&bHrq=C1hJ Q_V{m#61?ZRka&px7s0M6BLDyZ delta 4431 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 Date: Fri, 23 Oct 2026 08:44:33 +0000 Subject: [PATCH 4/4] fix(tests): stub ssh_user in remote http fallback tests Co-authored-by: chendelin1982 <16741975+chendelin1982@users.noreply.github.com> --- cli/libs/__pycache__/__init__.cpython-312.pyc | Bin 184 -> 207 bytes cli/libs/__pycache__/http.cpython-312.pyc | Bin 13665 -> 13688 bytes cli/libs/__pycache__/remote.cpython-312.pyc | Bin 8673 -> 8696 bytes cli/libs/__pycache__/repo.cpython-312.pyc | Bin 1758 -> 1781 bytes .../conftest.cpython-312-pytest-9.1.1.pyc | Bin 3763 -> 3786 bytes .../test_http.cpython-312-pytest-9.1.1.pyc | Bin 26572 -> 27010 bytes cli/tests/test_http.py | 2 ++ 7 files changed, 2 insertions(+) diff --git a/cli/libs/__pycache__/__init__.cpython-312.pyc b/cli/libs/__pycache__/__init__.cpython-312.pyc index fce0f4529cb34277fe1b685b11e814dbc643a855..6c1c4fce2888454c881ed7bfd5751df2b9fd6e27 100644 GIT binary patch delta 56 zcmdnNc%G5_G%qg~0}w>Y-JZxDrRbuck)NBYUsRfxms+G>o?n!$pOT-Pom!-ulbKYM KSX4PN-xC1f$P(57 delta 33 ncmX@lxPy`VG%qg~0}$|Z-<-%D#igsCl30?cpORWOvCR_zl|u=* diff --git a/cli/libs/__pycache__/http.cpython-312.pyc b/cli/libs/__pycache__/http.cpython-312.pyc index 35caa85582ad5efe0bf9a16e3810bf9324f66d15..d8c618fb6707b318fefdbf6bbb275e5c654fbc39 100644 GIT binary patch delta 58 zcmaEu^&^YxG%qg~0}w>YZRE;gQFPGH$j?pHFDlK;OD)nb&o9c>PsvZtPA$^S$xJFr MEUMgG$MVY-QLLkic!%?KO;XkRlle-FE6!7zdXMvTR$Z~IXksTHzzZx ND6yz=^MA%i@&H?i6~+Jn delta 36 qcmez2{Lq>EG%qg~0}w1YcXK26D@HDD{glL#ME#W1vdv;lkK_UA^bCLi diff --git a/cli/libs/__pycache__/repo.cpython-312.pyc b/cli/libs/__pycache__/repo.cpython-312.pyc index 7a3c6e372569b18565cbfa6e175cbeb31a5bec96..0d56e0194a065c325a186afcfe137578f55b1a9a 100644 GIT binary patch delta 59 zcmcb|`<0jbG%qg~0}w>Y-QLLU#-!+=pOK%Ns$W!^mzP?kU!Gr-t)G&goSj;vo0FMT Nlvq@`Ihv`N1pp*c6OsS` delta 36 qcmey$dykjAzmpORRTsGpKrwz-I@nFRp6z6x{z diff --git a/cli/tests/__pycache__/conftest.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/conftest.cpython-312-pytest-9.1.1.pyc index a438ecddd7da202cf9ade4023543cebde45de4d3..07040f5f15a562ed947928a70225e34d78257e1b 100644 GIT binary patch delta 59 zcmdlidrFr3G%qg~0}w>Y-QLLki&4>4KO;XkRlle-FE6!7zdXMvTR$Z~IXksTHzzZx ND6yz=Ge6T39so3Y6Y&55 delta 36 qcmX>lyIGd|G%qg~0}$|Z-`vRki;+uDKP9mwQ9mWMY_l5E5*`4-I11AM diff --git a/cli/tests/__pycache__/test_http.cpython-312-pytest-9.1.1.pyc b/cli/tests/__pycache__/test_http.cpython-312-pytest-9.1.1.pyc index cfbd171d7c581e3ec126395bd8e3cc07ac4d712d..4d52bee041c50c9f476fc17600d2a5da14f780c2 100644 GIT binary patch delta 1006 zcmb7CTS!z<6utY-`#Sgfno;lgwg-+jjuU?M`YDx&ab!{pAEVbfGvj;Uj#AcKun0=C zul-T1861BB z!V{k77&?LlOFdh%ZVPcJu5osS`vXpSXkZ{9I}e5BUMC6rdjqngue(#02W=tR(P6nX<+E#+=;fCX>1*m>(k_K2Rc7)ch%#>zGi_IoPCoCJ#))&0R@OR`8{TOV!6 zRk%@s^&T@RBE{I@^%_aZKbAJa#@LkC#hQ$fNLTw%Bp_p( zRA8E5>t1Q)aCi_$BpZHdtTvveuazG%48Cc&3*&gc@hY5&?QFUM+#)?WMrULN-yf(l zT;?X~=C#}L0;!4l4vs--C6!>UM91A*|t=ClKQ#F{?FhheMuwBZB zS)A-_v0hiR)X&xP=jv__bNwZ-guDDT#(A2sr^*XB?(cw?xZ*#`Ez{IFIwN0ECP|}X l7szfF7Vvd&k6!%>@-o^(`S1>FLx*__RDP;noMdY^k1PSZ|F~a-aeb@_iQZYqi z!%pFK1AId-82Euc<9_Qq1_Ygz1&S1Nut>LxW8yM{CfOYQLY`7gPnUM_ut2xV`-H}S ZRhH>vxd&Egt$ayxLF8wj3-%a~{Q>Dx(9Zw> diff --git a/cli/tests/test_http.py b/cli/tests/test_http.py index 2a66024bf..eb1e2119f 100644 --- a/cli/tests/test_http.py +++ b/cli/tests/test_http.py @@ -136,6 +136,7 @@ def fake_run_ssh(host, user, secret_path, script, connect_timeout=15): return subprocess.CompletedProcess(["ssh"], 0, '{"ok": true}', "") monkeypatch.setattr(remote, "ssh_host", lambda: "remote.example") + monkeypatch.setattr(remote, "ssh_user", lambda: "root") monkeypatch.setattr(remote, "resolve_secret_path", lambda: Path("/tmp/key")) monkeypatch.setattr(Path, "exists", lambda self: True) monkeypatch.setattr(remote, "run_ssh", fake_run_ssh) @@ -158,6 +159,7 @@ def fake_run_ssh(host, user, secret_path, script, connect_timeout=15): return subprocess.CompletedProcess(["ssh"], 1, "", "connection timeout") monkeypatch.setattr(remote, "ssh_host", lambda: "remote.example") + monkeypatch.setattr(remote, "ssh_user", lambda: "root") monkeypatch.setattr(remote, "resolve_secret_path", lambda: Path("/tmp/key")) monkeypatch.setattr(Path, "exists", lambda self: True) monkeypatch.setattr(remote, "run_ssh", fake_run_ssh)