Merge branch 'cap/fix-wi201-targets-add' into 'main'

fix(cli): apply targets config after add

Closes #201

See merge request postgres-ai/postgresai!279

Author: NikolayS

cli/bin/postgres-ai.ts

@@ -2265,6 +2265,18 @@ function updatePgwatchConfig(configPath: string, updates: Record<string, string>
   fs.writeFileSync(configPath, lines.join("\n") + "\n", { encoding: "utf8", mode: 0o600 });
 }
 
+/**
+ * Regenerate pgwatch sources and recreate collectors so target changes take effect without `mon restart`.
+ */
+async function applyMonitoringTargetsConfig(): Promise<number> {
+  console.log("Applying monitoring target configuration...");
+  const generateCode = await runCompose(["run", "--rm", "sources-generator"]);
+  if (generateCode !== 0) return generateCode;
+
+  console.log("Restarting pgwatch collectors to pick up target changes...");
+  return runCompose(["up", "-d", "--force-recreate", "pgwatch-prometheus", "pgwatch-postgres"]);
+}
+
 /**
  * Run docker compose command
  */
@@ -3341,6 +3353,14 @@ targets
     try {
       addInstanceToFile(file, buildInstance(instanceName, connStr));
       console.log(`Monitoring target '${instanceName}' added`);
+
+      const applyCode = await applyMonitoringTargetsConfig();
+      if (applyCode !== 0) {
+        console.error("Monitoring target was saved, but applying the generated pgwatch sources failed. Run 'postgresai mon restart' to apply manually.");
+        process.exitCode = 1;
+        return;
+      }
+      console.log("✓ Monitoring target configuration applied");
     } catch (err) {
       // Surface InstancesParseError as-is so we don't silently overwrite a
       // corrupted file (which could discard several targets, including the
@@ -3369,6 +3389,14 @@ targets
         return;
       }
       console.log(`Monitoring target '${name}' removed`);
+
+      const applyCode = await applyMonitoringTargetsConfig();
+      if (applyCode !== 0) {
+        console.error("Monitoring target was removed, but applying the generated pgwatch sources failed. Run 'postgresai mon restart' to apply manually.");
+        process.exitCode = 1;
+        return;
+      }
+      console.log("✓ Monitoring target configuration applied");
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       console.error(`Error processing instances.yml: ${message}`);

cli/test/targets-add-config.test.ts

@@ -0,0 +1,28 @@
+import { describe, expect, test } from "bun:test";
+import { readFileSync } from "fs";
+import { resolve } from "path";
+
+const cliSource = readFileSync(resolve(import.meta.dir, "../bin/postgres-ai.ts"), "utf8");
+
+describe("mon targets configuration apply", () => {
+  test("targets add regenerates sources and restarts pgwatch collectors after saving", () => {
+    expect(cliSource).toContain("async function applyMonitoringTargetsConfig()");
+    expect(cliSource).toContain('runCompose(["run", "--rm", "sources-generator"])');
+    expect(cliSource).toContain(
+      'runCompose(["up", "-d", "--force-recreate", "pgwatch-prometheus", "pgwatch-postgres"])'
+    );
+
+    const saveIndex = cliSource.indexOf("addInstanceToFile(file, buildInstance(instanceName, connStr))");
+    const applyIndex = cliSource.indexOf("await applyMonitoringTargetsConfig()", saveIndex);
+    expect(saveIndex).toBeGreaterThan(-1);
+    expect(applyIndex).toBeGreaterThan(saveIndex);
+  });
+
+  test("targets remove regenerates sources and restarts pgwatch collectors after saving", () => {
+    const removeIndex = cliSource.indexOf("removeInstanceFromFile(file, name)");
+    const applyIndex = cliSource.indexOf("await applyMonitoringTargetsConfig()", removeIndex);
+    expect(removeIndex).toBeGreaterThan(-1);
+    expect(applyIndex).toBeGreaterThan(-1);
+    expect(applyIndex).toBeGreaterThan(removeIndex);
+  });
+});