behavior-wrapped 0.4.1 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "behavior-wrapped",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "A private, local-first Wrapped report for Claude Code, Cowork, and Codex behavior.",
   "license": "Apache-2.0",
   "type": "module",

package/server/cli.mjs

@@ -14,6 +14,8 @@ import { deletePublicReport, publishPublicReport, PUBLIC_REPORT_ORIGIN } from ".
 import { createReportId, deleteReport, getOrCreateClientId, listReports, saveReport, storeRoot } from "./store.mjs";
 import { judgeErrorDetails } from "./judge-debug.mjs";
 import { createCliProgress } from "./progress.mjs";
+import { helperHealthMatches, stopVerifiedStaleHelper } from "./local-helper-runtime.mjs";
+import { APP_VERSION, LOCAL_DONATION_PROTOCOL } from "./runtime-version.mjs";
 
 const here = path.dirname(fileURLToPath(import.meta.url));
 const root = path.dirname(here);
@@ -68,21 +70,31 @@ function printJudgeDebug(label, error) {
   console.error(JSON.stringify(judgeErrorDetails(error), null, 2));
 }
 
-async function serverReady(expectedDemo = false) {
+async function helperStatus(expectedDemo = false) {
   try {
     const response = await fetch(`${loopbackUrl}/api/health`);
     const body = await response.json();
-    return response.ok && body.app === "behavior-wrapped" && Boolean(body.demo) === expectedDemo;
-  } catch { return false; }
+    const recognized = response.ok && body.app === "behavior-wrapped" && body.local === true && body.purpose === "research-donation";
+    return { recognized, compatible: recognized && helperHealthMatches(body, { version: APP_VERSION, protocol: LOCAL_DONATION_PROTOCOL, demo: expectedDemo }), pid: Number(body.pid) || null };
+  } catch { return { recognized: false, compatible: false, pid: null }; }
 }
 
 async function ensureServer(demo = false) {
-  if (await serverReady(demo)) return;
+  const current = await helperStatus(demo);
+  if (current.compatible) return;
+  if (current.recognized) {
+    const stopped = await stopVerifiedStaleHelper(port, current.pid);
+    if (!stopped) throw new Error(`An older Behavior Wrapped helper is using port ${port}. Stop it, then run this command again.`);
+    for (let attempt = 0; attempt < 30; attempt++) {
+      await new Promise((resolve) => setTimeout(resolve, 100));
+      if (!(await helperStatus(demo)).recognized) break;
+    }
+  }
   const child = spawn(process.execPath, [path.join(here, "launcher.mjs"), `--port=${port}`, "--no-open", ...(demo ? ["--demo"] : [])], { detached: true, stdio: "ignore", env: { ...process.env, BEHAVIOR_WRAPPED_DAEMON: "1" } });
   child.unref();
   for (let attempt = 0; attempt < 30; attempt++) {
     await new Promise((resolve) => setTimeout(resolve, 100));
-    if (await serverReady(demo)) return;
+    if ((await helperStatus(demo)).compatible) return;
   }
   throw new Error(`Could not start the local donation helper on port ${port}.`);
 }

package/server/launcher.mjs

@@ -9,6 +9,7 @@ import { discoverAllSessionsAsync, readRecordsAsync, defaultDateRange, DEFAULT_W
 import { makeDonationPreview } from "./analysis.mjs";
 import { deleteDonationReceipt, getOrCreateClientId, loadDonationReceipt, loadReport, saveDonationReceipt } from "./store.mjs";
 import { deleteResearchDonation, RESEARCH_DONATION_URL, submitResearchDonation } from "./research-donation.mjs";
+import { APP_VERSION, LOCAL_DONATION_PROTOCOL } from "./runtime-version.mjs";
 
 const here = path.dirname(fileURLToPath(import.meta.url));
 const root = path.dirname(here);
@@ -90,7 +91,7 @@ const server = http.createServer(async (request, response) => {
   try {
     if (!new Set([`127.0.0.1:${port}`, `localhost:${port}`]).has(request.headers.host || "")) return json(response, 403, { error: "Local access only" });
     const url = new URL(request.url || "/", `http://${request.headers.host}`);
-    if (request.method === "GET" && url.pathname === "/api/health") return json(response, 200, { app: "behavior-wrapped", local: true, purpose: "research-donation", demo });
+    if (request.method === "GET" && url.pathname === "/api/health") return json(response, 200, { app: "behavior-wrapped", version: APP_VERSION, local: true, purpose: "research-donation", donationProtocol: LOCAL_DONATION_PROTOCOL, pid: process.pid, demo });
     if (request.method === "GET" && url.pathname === "/api/discover") {
       catalog = await loadCatalog();
       return json(response, 200, publicCatalog());

package/server/local-helper-runtime.mjs

@@ -0,0 +1,37 @@
+import { execFile } from "node:child_process";
+
+function run(file, args) {
+  return new Promise((resolve, reject) => execFile(file, args, { encoding: "utf8" }, (error, stdout) => error ? reject(error) : resolve(stdout)));
+}
+
+export function helperHealthMatches(value, { version, protocol, demo }) {
+  return Boolean(value && value.app === "behavior-wrapped" && value.local === true && value.purpose === "research-donation"
+    && value.version === version && value.donationProtocol === protocol && Boolean(value.demo) === Boolean(demo));
+}
+
+export function isVerifiedLauncherCommand(command, port) {
+  const escapedPort = String(port).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return new RegExp(`/(?:agent-)?behavior-wrapped/server/launcher\\.mjs(?:\\s|$)`, "i").test(command || "")
+    && new RegExp(`(?:^|\\s)--port=${escapedPort}(?:\\s|$)`).test(command || "");
+}
+
+async function listeningPids(port, runCommand) {
+  try {
+    const output = await runCommand("/usr/sbin/lsof", ["-nP", "-t", `-iTCP:${port}`, "-sTCP:LISTEN"]);
+    return String(output).split(/\s+/).filter((value) => /^\d+$/.test(value)).map(Number);
+  } catch { return []; }
+}
+
+export async function stopVerifiedStaleHelper(port, advertisedPid, { runCommand = run, kill = process.kill } = {}) {
+  const candidates = Number.isInteger(advertisedPid) && advertisedPid > 1 ? [advertisedPid] : await listeningPids(port, runCommand);
+  let stopped = false;
+  for (const pid of candidates) {
+    let command;
+    try { command = await runCommand("/bin/ps", ["-p", String(pid), "-o", "command="]); }
+    catch { continue; }
+    if (!isVerifiedLauncherCommand(String(command).trim(), port)) continue;
+    try { kill(pid, "SIGTERM"); stopped = true; }
+    catch (error) { if (error?.code !== "ESRCH") throw error; }
+  }
+  return stopped;
+}

package/server/runtime-version.mjs

@@ -0,0 +1,6 @@
+import fs from "node:fs";
+
+const packageJson = JSON.parse(fs.readFileSync(new URL("../package.json", import.meta.url), "utf8"));
+
+export const APP_VERSION = packageJson.version;
+export const LOCAL_DONATION_PROTOCOL = 2;