@arcote.tech/arc-cli 0.8.3 → 0.8.4

package/dist/index.js

@@ -35708,7 +35708,8 @@ async function bootstrap(inputs) {
     });
     ok("Host bootstrapped");
   }
-  const needUpStack = state.kind !== "ready" || state.marker === null || state.marker.configHash !== inputs.configHash || state.marker.cliVersion !== inputs.cliVersion || !await isRegistryRunning(cfg);
+  const artifactsHash = new Bun.CryptoHasher("sha256").update(generateCaddyfile(cfg)).update(generateCompose({ cfg })).digest("hex");
+  const needUpStack = state.kind !== "ready" || state.marker === null || state.marker.configHash !== inputs.configHash || state.marker.cliVersion !== inputs.cliVersion || state.marker.artifactsHash !== artifactsHash || inputs.forceAnsible === true || !await isRegistryRunning(cfg);
   if (needUpStack) {
     await upStack(inputs);
     ok("Docker stack up");
@@ -35722,6 +35723,7 @@ async function bootstrap(inputs) {
   await writeStateMarker(cfg.target, {
     cliVersion: inputs.cliVersion,
     configHash: inputs.configHash,
+    artifactsHash,
     updatedAt: new Date().toISOString()
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcote.tech/arc-cli",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "CLI tool for Arc framework",
   "module": "index.ts",
   "main": "dist/index.js",
@@ -12,13 +12,13 @@
     "build": "bun build --target=bun ./src/index.ts --outdir=dist --external @arcote.tech/arc --external @arcote.tech/arc-ds --external @arcote.tech/arc-react --external @arcote.tech/platform --external @arcote.tech/arc-map --external '@opentelemetry/*' && chmod +x dist/index.js"
   },
   "dependencies": {
-    "@arcote.tech/arc": "^0.8.3",
-    "@arcote.tech/arc-ds": "^0.8.3",
-    "@arcote.tech/arc-react": "^0.8.3",
-    "@arcote.tech/arc-host": "^0.8.3",
-    "@arcote.tech/arc-adapter-db-sqlite": "^0.8.3",
-    "@arcote.tech/arc-adapter-db-postgres": "^0.8.3",
-    "@arcote.tech/arc-otel": "^0.8.3",
+    "@arcote.tech/arc": "^0.8.4",
+    "@arcote.tech/arc-ds": "^0.8.4",
+    "@arcote.tech/arc-react": "^0.8.4",
+    "@arcote.tech/arc-host": "^0.8.4",
+    "@arcote.tech/arc-adapter-db-sqlite": "^0.8.4",
+    "@arcote.tech/arc-adapter-db-postgres": "^0.8.4",
+    "@arcote.tech/arc-otel": "^0.8.4",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/api-logs": "^0.57.0",
     "@opentelemetry/core": "^1.30.0",
@@ -31,8 +31,8 @@
     "@opentelemetry/sdk-trace-base": "^1.30.0",
     "@opentelemetry/sdk-trace-node": "^1.30.0",
     "@opentelemetry/semantic-conventions": "^1.27.0",
-    "@arcote.tech/platform": "^0.8.3",
-    "@arcote.tech/arc-map": "^0.8.3",
+    "@arcote.tech/platform": "^0.8.4",
+    "@arcote.tech/arc-map": "^0.8.4",
     "@clack/prompts": "^0.9.0",
     "commander": "^11.1.0",
     "chokidar": "^3.5.3",

package/src/deploy/bootstrap.ts

@@ -62,7 +62,11 @@ export interface BootstrapInputs {
   cliVersion: string;
   /** sha256 of deploy.arc.json — used for the remote state marker. */
   configHash: string;
-  /** Force the ansible run even when the host is already bootstrapped. */
+  /**
+   * `--force-bootstrap`: wymusza PEŁNY bootstrap mimo markera „ready" —
+   * zarówno Ansible, jak i upStack (re-render + wgranie Caddyfile/compose).
+   * Escape hatch po ręcznych edycjach hosta albo gdy marker się rozjechał.
+   */
   forceAnsible?: boolean;
 }
 
@@ -137,6 +141,17 @@ export async function bootstrap(inputs: BootstrapInputs): Promise<void> {
     ok("Host bootstrapped");
   }
 
+  // Hash wyrenderowanych artefaktów stacku (Caddyfile + compose). Wykrywa
+  // zmianę GENERATORA w obrębie tej samej wersji CLI — bez tego republish tej
+  // samej wersji z poprawionym Caddyfile (np. dodane `encode`) NIE odświeżał
+  // configu na hoście (obraz aplikacji i tak leci co deploy, ale upStack był
+  // pomijany). Marker bez `artifactsHash` (starszy deploy) → undefined ≠ hash
+  // → jednorazowy upStack, po którym marker dostaje hash.
+  const artifactsHash = new Bun.CryptoHasher("sha256")
+    .update(generateCaddyfile(cfg))
+    .update(generateCompose({ cfg }))
+    .digest("hex");
+
   // Force upStack whenever:
   //   - stack isn't fully ready, OR
   //   - marker is missing (legacy v0.5 deploy with no .arc-state.json), OR
@@ -144,6 +159,9 @@ export async function bootstrap(inputs: BootstrapInputs): Promise<void> {
   //   - the CLI version changed (generators evolve — compose/Caddyfile/
   //     observability configs must be re-rendered + re-uploaded even when
   //     deploy.arc.json itself is unchanged), OR
+  //   - the RENDERED artifacts differ (generator changed within same CLI
+  //     version — e.g. republished patch), OR
+  //   - `--force-bootstrap` (wymusza pełny bootstrap, nie tylko Ansible), OR
   //   - registry container isn't running (e.g. legacy stack predates v0.7)
   // Without this, an old v0.5 stack (no registry container) is classified as
   // "ready" and bootstrap is skipped — then `docker login` on the next step
@@ -153,6 +171,8 @@ export async function bootstrap(inputs: BootstrapInputs): Promise<void> {
     state.marker === null ||
     state.marker.configHash !== inputs.configHash ||
     state.marker.cliVersion !== inputs.cliVersion ||
+    state.marker.artifactsHash !== artifactsHash ||
+    inputs.forceAnsible === true ||
     !(await isRegistryRunning(cfg));
 
   if (needUpStack) {
@@ -180,6 +200,7 @@ export async function bootstrap(inputs: BootstrapInputs): Promise<void> {
   await writeStateMarker(cfg.target, {
     cliVersion: inputs.cliVersion,
     configHash: inputs.configHash,
+    artifactsHash,
     updatedAt: new Date().toISOString(),
   });
 }

package/src/deploy/remote-state.ts

@@ -24,6 +24,15 @@ export type RemoteState =
 export interface RemoteStateMarker {
   cliVersion: string;
   configHash: string;
+  /**
+   * sha256 wyrenderowanych artefaktów stacku (Caddyfile + docker-compose).
+   * Wykrywa zmianę GENERATORA w obrębie tej samej wersji CLI — bez tego
+   * republish tej samej wersji z poprawionym Caddyfile (np. dodane `encode`)
+   * nie odświeżał configu na hoście (needUpStack patrzył tylko na cliVersion
+   * i configHash). Opcjonalny: starsze markery go nie mają → traktowane jako
+   * zmiana (wymusza jednorazowy upStack, po którym marker dostaje hash).
+   */
+  artifactsHash?: string;
   updatedAt: string;
 }