getculpa 1.0.2 → 1.0.4

package/lib/start.mjs

@@ -415,10 +415,15 @@ async function runPosixStateMachine({ appDir, liveCompose, platform, spawnSync,
     };
   }
 
-  // No collectord build/staging exists for macOS/Linux yet (task scope) —
-  // degrade honestly rather than fail the whole launch over capture.
+  // V102 T-V102-14 (M4, D-113): the old line here said "no collector build
+  // ships for macOS/Linux yet" — verified FALSE on real hardware (the arm64
+  // collectord ships, was staged executable, install-state recorded
+  // collectorStaged: true). What IS true: the collector is not auto-started
+  // on this platform yet, while the server-side coding-tool log sweep works
+  // (proven live on the Mac: calls landed unattended, ~45 min cadence). Say
+  // exactly that — neither direction of the old overclaim.
   stagesRun.push(STAGES.START_CULPA);
-  log("getculpa: capture is OFF on this platform for now (no collector build ships for macOS/Linux yet) - everything else works normally.");
+  log("getculpa: your local coding-tool usage is captured by the built-in log sweep. The production traffic collector is not started automatically on this platform yet - everything else works normally.");
 
   stagesRun.push(STAGES.OPEN_UI);
   if (pinnedVersion) writeFileSync(path.join(appDir, "last-boot-version.txt"), `${pinnedVersion}\n`);

package/lib/uninstall.mjs

@@ -62,12 +62,36 @@ async function promptPgdataRemoval(createInterface, isTTY) {
   if (!isTTY) return false;
   const rl = createInterface({ input: process.stdin, output: process.stdout });
   const answer = await new Promise((resolve) => {
+    // V102 T-V102-16 (D-113): EOF (Ctrl-D, or a stdin that ends mid-prompt)
+    // fires `close` and NEVER invokes question()'s callback — this promise
+    // used to hang forever at the one prompt guarding DELETION of the cost
+    // database. An unanswered question is a NO, exactly like tty.mjs.
+    // Optional-call: older injected fakes without `once` keep working.
+    rl.once?.("close", () => resolve(""));
     rl.question("Also DELETE all recorded cost data? This cannot be undone. (y/N) ", resolve);
   });
   rl.close();
   return answer.trim().toLowerCase() === "y";
 }
 
+// V102 T-V102-16 (M11/W2, D-113): macOS uninstall exited 0 leaving ~7.3 MB
+// (launcher, collector, compose, register.mjs) silently behind — the Windows
+// ps1 removes the app dir and is "the more complete of the two" (W2). Remove
+// the dir ONLY when it is provably a Culpa install dir (install-state.json,
+// which every install writes); a mistargeted CULPA_APP_DIR is kept and said.
+// Truthful beats a surprise rm -rf in both directions.
+function removeAppDir(appDir) {
+  if (!existsSync(appDir)) return;
+  if (existsSync(path.join(appDir, "install-state.json"))) {
+    rmSync(appDir, { recursive: true, force: true });
+    console.log(`Removed: ${appDir} (launcher, collector, compose and capture shims).`);
+    return;
+  }
+  console.log(
+    `Kept: ${appDir} - no install-state.json found there, so it is not provably a Culpa install directory. Remove it yourself if you are sure.`,
+  );
+}
+
 export async function uninstall(opts = {}) {
   const appDir = opts.appDir ?? getAppDir();
   const platform = opts.platform ?? process.platform;
@@ -82,13 +106,28 @@ export async function uninstall(opts = {}) {
     if (!ok) console.error("getculpa: uninstall did not complete cleanly - see the output above.");
   } else {
     ok = composeDown(appDir, spawnSync);
-    removeShortcutEquivalents(homedir);
-    const wipe = await promptPgdataRemoval(createInterface, isTTY);
-    if (wipe) {
-      spawnSync("docker", ["volume", "rm", "culpa_pgdata"], { stdio: "inherit" });
-      console.log("Data volume removed.");
+    // Review-4 IMPORTANT + CodeRabbit PR#19 [7] (Major): a FAILED stop skips
+    // EVERY destructive step — the ps1's $stackStopped gate, whose comment
+    // records the prior real incident (CR-PR5 round 3). Not even the pgdata
+    // PROMPT is offered: after a partial teardown the volume can be
+    // unreferenced, so a user confirming deletion here could lose the cost
+    // database while being told the stack is still running. Nothing is
+    // removed; the one honest instruction is to stop the stack and rerun.
+    if (!ok) {
+      console.log(
+        `Files kept: ${appDir} - the stack is still running (\`docker compose down\` failed above). Nothing was removed. Stop the stack, then run this again.`,
+      );
     } else {
-      console.log("Data kept (volume culpa_pgdata). Reinstalling later will find it again.");
+      removeShortcutEquivalents(homedir);
+      const wipe = await promptPgdataRemoval(createInterface, isTTY);
+      if (wipe) {
+        spawnSync("docker", ["volume", "rm", "culpa_pgdata"], { stdio: "inherit" });
+        console.log("Data volume removed.");
+      } else {
+        console.log("Data kept (volume culpa_pgdata). Reinstalling later will find it again.");
+      }
+      // M11/W2: after the data decision, remove the app dir itself (ps1 parity)
+      removeAppDir(appDir);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getculpa",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Culpa CLI: `npm i -g getculpa` provisions the full Culpa install (Windows-installer parity) and leaves it dormant. `getculpa` wakes the stack.",
   "license": "SEE LICENSE IN LICENSE",
   "bin": {

package/scripts/install.js

@@ -119,11 +119,15 @@ async function main() {
   // `getculpa` dead-ends — the Mac tester's exact experience. Best-effort by
   // construction: any failure leaves the payload deferred and the summary
   // below names `getculpa update`, which is where we already were.
-  const { stageInitialPayload, vendoredLauncherPath } = await import("../lib/bootstrap.mjs");
-  const { staged: payloadStaged } = stageInitialPayload({
+  const { readPayloadState, stageInitialPayload, vendoredLauncherPath } = await import("../lib/bootstrap.mjs");
+  stageInitialPayload({
     launcherPath: vendoredLauncherPath(path.join(__dirname, "..")),
     env: process.env,
   });
+  // V102 T-V102-15 (M3): the summary reports what updates/state.json actually
+  // says, never the updater's exit code — "installed" was claimed on a Mac
+  // whose state read current: null while doctor FAILed the same install.
+  const payloadState = readPayloadState({ env: process.env });
 
   // CF20-T6: the completion line names what actually happened — an upgrade
   // is STAGED only; the new version applies at the next `getculpa`, not here.
@@ -139,7 +143,7 @@ async function main() {
     dockerState,
     imagesStaged,
     collectorStaged,
-    payloadStaged,
+    payloadState,
     platform: process.platform,
     isTTY: Boolean(process.stdout.isTTY),
     env: process.env,

package/scripts/prepack.js

@@ -14,6 +14,9 @@ const pkgRoot = path.join(__dirname, "..");
 const repoRoot = path.join(pkgRoot, "..", "..");
 const assetsDir = path.join(pkgRoot, "assets");
 
+// An entry is either the repo-relative path parts (staged under its own
+// basename) or { src: [...parts], as: "name" } when the canonical file's
+// basename is too generic to sit in a customer's install folder.
 const SOURCES = [
   ["installers", "culpa-compose.yml"],
   ["installers", "windows", "install-culpa.ps1"],
@@ -21,6 +24,14 @@ const SOURCES = [
   ["installers", "windows", "uninstall-culpa.ps1"],
   ["installers", "windows", "culpa-collector.ps1"],
   ["collector", "node", "register.mjs"],
+  // ISS-V103-9: the dashboard's Fly relay tab prints
+  // `flyctl deploy --config <this file>` and tells the customer to run it from
+  // their Culpa install folder. It shipped in NEITHER the install folder nor
+  // the npm package — it existed only in the source repo — so the Fly relay
+  // path could not be completed by anyone who installed via npm. Staged under
+  // an explicit name because a bare `fly.toml` in the install folder would
+  // read as the customer's OWN app config.
+  { src: ["deploy", "relay", "fly.toml"], as: "culpa-relay-fly.toml" },
 ];
 
 // CF20-R: clear assets/ before restaging — otherwise a canonical source file
@@ -29,13 +40,14 @@ const SOURCES = [
 // hand-edited, so nothing else would ever remove it).
 fs.rmSync(assetsDir, { recursive: true, force: true });
 fs.mkdirSync(assetsDir, { recursive: true });
-for (const parts of SOURCES) {
+for (const entry of SOURCES) {
+  const parts = Array.isArray(entry) ? entry : entry.src;
   const src = path.join(repoRoot, ...parts);
   if (!fs.existsSync(src)) {
     console.error(`prepack: missing canonical source ${src}`);
     process.exit(1);
   }
-  const dest = path.join(assetsDir, path.basename(src));
-  fs.copyFileSync(src, dest);
-  console.log(`prepack: staged ${path.basename(src)}`);
+  const name = Array.isArray(entry) ? path.basename(src) : entry.as;
+  fs.copyFileSync(src, path.join(assetsDir, name));
+  console.log(`prepack: staged ${name}`);
 }