diff --git a/agent/pyproject.toml b/agent/pyproject.toml index 44b3abe..400b606 100644 --- a/agent/pyproject.toml +++ b/agent/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "gti-fiscal-agent" -version = "1.1.4" +version = "1.1.5" requires-python = ">=3.10" dependencies = ["httpx>=0.27,<1"] diff --git a/agent/scripts/run_agent_service.py b/agent/scripts/run_agent_service.py index ff0861b..48dee6d 100644 --- a/agent/scripts/run_agent_service.py +++ b/agent/scripts/run_agent_service.py @@ -103,7 +103,7 @@ class Config: # (A legacy AGENT_JOBS_ENABLED line in an old agent.env is deliberately ignored.) self.agent_jobs_enabled = True self.poll_interval_seconds = float(env.get("POLL_INTERVAL_SECONDS", "5")) - self.agent_version = env.get("AGENT_VERSION", "1.1.4") + self.agent_version = env.get("AGENT_VERSION", "1.1.5") self.schema_fingerprint = env.get("SCHEMA_FINGERPRINT", REFERENCE_SCHEMA_V1) self.state_db = env.get("AGENT_STATE_DB", str(AGENT_ROOT / "agent_state.sqlite")) # Pilot write authorization: both must be explicitly set by the installer for @@ -240,7 +240,7 @@ def execute_job(job, config, executor, state, env): "coverage": coverage, "operational": operational, "fiscal_mode": getattr(config, "fiscal_mode", None), - "release_version": env.get("AGENT_VERSION") or "1.1.4", + "release_version": env.get("AGENT_VERSION") or "1.1.5", "products_total": len(products), "products_changed": len(to_process), "products_processed": summary["processed"], @@ -398,7 +398,7 @@ def run(config, env, *, max_iterations=None, stopper=None): def enforce_startup_preflight(env): """Full read-only preflight at startup (Hub, auth, Firebird, capabilities, company context, guards). Fail closed.""" from gti_fiscal_agent.preflight import run_preflight - report = run_preflight(env, agent_version=env.get("AGENT_VERSION") or "1.1.4") + report = run_preflight(env, agent_version=env.get("AGENT_VERSION") or "1.1.5") logger.info("startup preflight: %s", json.dumps({k: report[k] for k in ("PREFLIGHT", "blockers", "fiscal_mode", "effective_firebird_writes")}, ensure_ascii=False)) print(json.dumps({"PREFLIGHT": report["PREFLIGHT"], "blockers": report["blockers"]}, ensure_ascii=False)) if report["PREFLIGHT"] != "PASS": diff --git a/agent/src/gti_fiscal_agent/preflight.py b/agent/src/gti_fiscal_agent/preflight.py index 9fb64a4..59ba2bd 100644 --- a/agent/src/gti_fiscal_agent/preflight.py +++ b/agent/src/gti_fiscal_agent/preflight.py @@ -9,7 +9,7 @@ import os import sqlite3 from pathlib import Path -AGENT_VERSION_DEFAULT = "1.1.4" +AGENT_VERSION_DEFAULT = "1.1.5" REQUIRED_ENV = ("GTI_HUB_URL", "AGENT_TOKEN", "FIREBIRD_DATABASE_PATH", "FB_USER", "FB_PASSWORD") REQUIRED_CAPABILITIES = ("supports_ncm", "supports_ipi", "supports_cest") FISCAL_MODES = ("DRY_RUN", "AUTO_APPLY") diff --git a/central/app/version.py b/central/app/version.py index 8ce0c21..fe68ca2 100644 --- a/central/app/version.py +++ b/central/app/version.py @@ -4,5 +4,5 @@ kept identical to this) and what an AgentRelease row's `version` column holds once published — never a second, independent version number. Fiscal semantics are versioned separately (ENGINE_VERSION/DECISION_VERSION in classification.py, DECISION_ENGINE_VERSION etc.) and are NOT changed by a release bump.""" -GTI_FISCAL_VERSION = "1.1.4" +GTI_FISCAL_VERSION = "1.1.5" API_COMPAT_MAJOR_MINOR = "1.0" # an Agent 1.0.x/1.1.x talks to any Hub 1.0.x diff --git a/central/pyproject.toml b/central/pyproject.toml index 09e09f1..0e75718 100644 --- a/central/pyproject.toml +++ b/central/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "gti-fiscal-hub" -version = "1.1.4" +version = "1.1.5" requires-python = ">=3.10" dependencies = [ "fastapi>=0.115,<1", diff --git a/central/tests/test_health.py b/central/tests/test_health.py index 3d1ef7a..6613697 100644 --- a/central/tests/test_health.py +++ b/central/tests/test_health.py @@ -17,7 +17,7 @@ def test_health_is_unavailable_when_database_is_down(): def test_version_endpoint_reports_release_and_fiscal_versions(): body = TestClient(create_app(database_probe=lambda: True)).get("/version").json() - assert body["version"] == "1.1.4" and body["api_compat"] == "1.0" and body["engine_version"] and body["decision_version"] + assert body["version"] == "1.1.5" and body["api_compat"] == "1.0" and body["engine_version"] and body["decision_version"] def test_production_refuses_the_dev_token(monkeypatch): diff --git a/deploy/agent-windows/agent.env.template b/deploy/agent-windows/agent.env.template index a4167e5..21271b4 100644 --- a/deploy/agent-windows/agent.env.template +++ b/deploy/agent-windows/agent.env.template @@ -19,4 +19,4 @@ FB_PASSWORD= FISCAL_MODE=DRY_RUN FIREBIRD_WRITES=0 POLL_INTERVAL_SECONDS=5 -AGENT_VERSION=1.1.4 +AGENT_VERSION=1.1.5 diff --git a/deploy/agent-windows/gti-agent.ps1 b/deploy/agent-windows/gti-agent.ps1 index 6ba381b..e55ce19 100644 --- a/deploy/agent-windows/gti-agent.ps1 +++ b/deploy/agent-windows/gti-agent.ps1 @@ -164,7 +164,7 @@ switch ($Command) { "GTI_HUB_URL=$hub", "AGENT_TOKEN=$token", "AGENT_ID=$agentId", "COMPANY_CODE=$code", "COMPANY_CNPJ=$cnpj", "COMPANY_CRT_SOURCE=$crtSource", "FIREBIRD_DATABASE_PATH=$db", "FB_USER=$fbUser", "FB_PASSWORD=$fbPass", - 'FISCAL_MODE=DRY_RUN', 'FIREBIRD_WRITES=0', 'POLL_INTERVAL_SECONDS=5', 'AGENT_VERSION=1.1.4' + 'FISCAL_MODE=DRY_RUN', 'FIREBIRD_WRITES=0', 'POLL_INTERVAL_SECONDS=5', 'AGENT_VERSION=1.1.5' ) Set-Content -Path $EnvFile -Value $lines -Encoding UTF8 } diff --git a/deploy/agent-windows/pilot-construcao.env.example b/deploy/agent-windows/pilot-construcao.env.example index fa80e1f..08a7775 100644 --- a/deploy/agent-windows/pilot-construcao.env.example +++ b/deploy/agent-windows/pilot-construcao.env.example @@ -19,4 +19,4 @@ FB_PASSWORD= FISCAL_MODE=DRY_RUN FIREBIRD_WRITES=0 POLL_INTERVAL_SECONDS=5 -AGENT_VERSION=1.1.4 +AGENT_VERSION=1.1.5 diff --git a/deploy/agent-windows/profiles/mmmodas.env.example b/deploy/agent-windows/profiles/mmmodas.env.example index 193fbb2..3a9f946 100644 --- a/deploy/agent-windows/profiles/mmmodas.env.example +++ b/deploy/agent-windows/profiles/mmmodas.env.example @@ -19,4 +19,4 @@ FB_PASSWORD= FISCAL_MODE=DRY_RUN FIREBIRD_WRITES=0 POLL_INTERVAL_SECONDS=5 -AGENT_VERSION=1.1.4 +AGENT_VERSION=1.1.5 diff --git a/deploy/agent-windows/profiles/rincao.env.example b/deploy/agent-windows/profiles/rincao.env.example index bc5e58d..ccc2502 100644 --- a/deploy/agent-windows/profiles/rincao.env.example +++ b/deploy/agent-windows/profiles/rincao.env.example @@ -19,4 +19,4 @@ FB_PASSWORD= FISCAL_MODE=DRY_RUN FIREBIRD_WRITES=0 POLL_INTERVAL_SECONDS=5 -AGENT_VERSION=1.1.4 +AGENT_VERSION=1.1.5 diff --git a/deploy/agent-windows/profiles/uniao.env.example b/deploy/agent-windows/profiles/uniao.env.example index 37365c8..689da6c 100644 --- a/deploy/agent-windows/profiles/uniao.env.example +++ b/deploy/agent-windows/profiles/uniao.env.example @@ -19,4 +19,4 @@ FB_PASSWORD= FISCAL_MODE=DRY_RUN FIREBIRD_WRITES=0 POLL_INTERVAL_SECONDS=5 -AGENT_VERSION=1.1.4 +AGENT_VERSION=1.1.5 diff --git a/deploy/hub/.env.example b/deploy/hub/.env.example index 7852a83..ecf8815 100644 --- a/deploy/hub/.env.example +++ b/deploy/hub/.env.example @@ -1,5 +1,5 @@ # GTI Fiscal Hub — production environment (copy to .env, never commit .env) -GTI_FISCAL_VERSION=1.1.4 +GTI_FISCAL_VERSION=1.1.5 # REQUIRED. URL-safe secret (used inside a connection URL): openssl rand -hex 24 POSTGRES_PASSWORD= diff --git a/deploy/hub/docker-compose.prod.yml b/deploy/hub/docker-compose.prod.yml index 671c9d0..2e3b74b 100644 --- a/deploy/hub/docker-compose.prod.yml +++ b/deploy/hub/docker-compose.prod.yml @@ -36,7 +36,7 @@ services: build: context: ../.. dockerfile: central/Dockerfile - image: gti-fiscal-hub:${GTI_FISCAL_VERSION:-1.1.4} + image: gti-fiscal-hub:${GTI_FISCAL_VERSION:-1.1.5} restart: unless-stopped depends_on: postgres: diff --git a/installer/install_common.py b/installer/install_common.py index 1d69fd1..ad09286 100644 --- a/installer/install_common.py +++ b/installer/install_common.py @@ -213,6 +213,16 @@ def stop_service() -> None: _sc(["stop", SERVICE_NAME]) +def ensure_service_stopped(timeout: float = 45.0) -> None: + """Stop the service and make sure its host process is really gone (an upgrade must be able + to overwrite the executable): SCM stop, wait, then kill any leftover host process.""" + stop_service() + if not wait_service_state("STOPPED", timeout=timeout): + subprocess.run(["taskkill", "/F", "/IM", "GTIFiscalAgentService.exe"], capture_output=True, text=True) + wait_service_state("STOPPED", timeout=15) + time.sleep(2) + + def remove_service() -> None: """Stop then delete the service; both best effort (idempotent).""" stop_service() diff --git a/installer/setup_main.py b/installer/setup_main.py index 1758609..1ed99f1 100644 --- a/installer/setup_main.py +++ b/installer/setup_main.py @@ -26,6 +26,7 @@ import os import shutil import sys import threading +import time import tkinter as tk from pathlib import Path from tkinter import filedialog, messagebox, ttk @@ -141,8 +142,7 @@ def upgrade_flow(*, install_dir_path: str | None = None, progress: Callable[[str version = setup_version() progress("Atualizando o Agent (identidade e credenciais preservadas)…") if common.service_installed(): - common.stop_service() - common.wait_service_state("STOPPED", timeout=45) + common.ensure_service_stopped() extract_payload(install) common.upgrade_agent_env(install, version) common.install_service(install) @@ -175,7 +175,14 @@ def extract_payload(install: Path) -> None: if not source.exists(): raise RuntimeError(f"bundled payload missing: {source}") if source.is_dir(): - shutil.copytree(source, dest, dirs_exist_ok=True) + for attempt in range(5): # a just-stopped host can still hold files for a moment + try: + shutil.copytree(source, dest, dirs_exist_ok=True) + break + except PermissionError: + if attempt == 4: + raise + time.sleep(3) else: dest.parent.mkdir(parents=True, exist_ok=True) shutil.copy2(source, dest) diff --git a/release/RELEASE_MANIFEST.json b/release/RELEASE_MANIFEST.json index 6e80fda..1ddf123 100644 --- a/release/RELEASE_MANIFEST.json +++ b/release/RELEASE_MANIFEST.json @@ -1,14 +1,14 @@ { "artifact": "RELEASE_MANIFEST", - "GTI_FISCAL_VERSION": "1.1.4", - "generated_at": "2026-09-24T12:33:17+00:00", + "GTI_FISCAL_VERSION": "1.1.5", + "generated_at": "2026-09-24T12:43:54+00:00", "hub": { - "version": "1.1.4", + "version": "1.1.5", "api_compat": "1.0", "engine_version": "0.3.0", "decision_version": "mission-04c-ipi-ex-split" }, - "agent_version": "1.1.4", + "agent_version": "1.1.5", "fiscal_engine": { "ENGINE_VERSION": "0.3.0", "DECISION_VERSION": "mission-04c-ipi-ex-split", diff --git a/release/VERSION b/release/VERSION index 65087b4..e25d8d9 100644 --- a/release/VERSION +++ b/release/VERSION @@ -1 +1 @@ -1.1.4 +1.1.5 diff --git a/tests/test_release_candidate.py b/tests/test_release_candidate.py index 51155f1..221e29b 100644 --- a/tests/test_release_candidate.py +++ b/tests/test_release_candidate.py @@ -14,11 +14,11 @@ sys.path.insert(0, str(ROOT)) def test_versions_are_coherent_across_hub_agent_and_packages(): from central.app.version import GTI_FISCAL_VERSION v = (ROOT / "release" / "VERSION").read_text(encoding="utf-8").strip() - assert v == GTI_FISCAL_VERSION == "1.1.4" + assert v == GTI_FISCAL_VERSION == "1.1.5" pep = v.replace("-rc", "rc") for pp in ("central/pyproject.toml", "agent/pyproject.toml"): assert f'version = "{pep}"' in (ROOT / pp).read_text(encoding="utf-8") - assert '"AGENT_VERSION", "1.1.4"' in (ROOT / "agent" / "scripts" / "run_agent_service.py").read_text(encoding="utf-8") + assert '"AGENT_VERSION", "1.1.5"' in (ROOT / "agent" / "scripts" / "run_agent_service.py").read_text(encoding="utf-8") manifest = ROOT / "release" / "RELEASE_MANIFEST.json" if manifest.exists(): m = json.loads(manifest.read_text(encoding="utf-8")) diff --git a/tests/test_zero_touch_installer.py b/tests/test_zero_touch_installer.py index 9e74a82..65feaf9 100644 --- a/tests/test_zero_touch_installer.py +++ b/tests/test_zero_touch_installer.py @@ -36,7 +36,7 @@ def world(tmp_path, monkeypatch): monkeypatch.setattr(common, "service_running", lambda: False) monkeypatch.setattr(common, "service_installed", lambda: True) monkeypatch.setattr(common, "start_service", lambda: calls.append(("start",))) - monkeypatch.setattr(common, "stop_service", lambda: calls.append(("stop",))) + monkeypatch.setattr(common, "ensure_service_stopped", lambda timeout=45.0: calls.append(("stop",))) monkeypatch.setattr(common, "wait_service_state", lambda wanted, timeout=45: True) monkeypatch.setattr(common, "wait_for_heartbeat", lambda token, hub, timeout=120: calls.append(("heartbeat_wait",)) or True) monkeypatch.setattr(common, "audit_event", lambda *a, **k: None)