apply final review fixes

Author: charlesvien

apps/code/scripts/dev-update/run-from-ci-forge.sh

@@ -21,7 +21,7 @@ command -v gh >/dev/null || {
   exit 1
 }
 
-if pgrep -x "PostHog Code" >/dev/null || pgrep -x "PostHog" >/dev/null; then
+if pgrep -x "PostHog Code|PostHog" >/dev/null; then
   echo "PostHog is already running. Quit it first; the test build shares its single-instance lock and data dir." >&2
   exit 1
 fi

apps/code/scripts/dev-update/run-from-ci.sh

@@ -20,7 +20,7 @@ command -v gh >/dev/null || {
   exit 1
 }
 
-if pgrep -x "PostHog" >/dev/null; then
+if pgrep -x "PostHog Code|PostHog" >/dev/null; then
   echo "PostHog is already running. Quit it first; the test build shares its single-instance lock and data dir." >&2
   exit 1
 fi

apps/code/tests/e2e/fixtures/update.ts

@@ -30,8 +30,7 @@ export const FORGE_RUN_APP_BIN = path.join(
   FORGE_RUN_APP,
   "Contents/MacOS/PostHog Code",
 );
-// Squirrel replaces the bundle's contents but keeps the on-disk .app name, so
-// after the swap the "PostHog Code.app" dir contains the renamed binary.
+// Squirrel swaps bundle contents in place, so the old-named .app dir gains the renamed binary.
 export const FORGE_RUN_APP_BIN_UPDATED = path.join(
   FORGE_RUN_APP,
   "Contents/MacOS/PostHog",
@@ -143,35 +142,35 @@ export function shipItEvidence(): { exists: boolean; entries: string[] } {
   }
 }
 
-// The forge leg runs the pre-rename build ("PostHog Code") before the swap and
-// the renamed build ("PostHog") after it, so process checks must match both.
-const APP_PROCESS_NAMES = ["PostHog", "PostHog Code"];
+// The forge leg is "PostHog Code" pre-swap and "PostHog" post-swap, so match either name.
+const APP_PROCESS_PATTERN = [FORGE_RUN_APP_BIN, RUN_APP_BIN]
+  .map((bin) => path.basename(bin))
+  .join("|");
 
 export function isAppRunning(): boolean {
-  return APP_PROCESS_NAMES.some((name) => {
-    try {
-      execFileSync("pgrep", ["-x", name], { stdio: "ignore" });
-      return true;
-    } catch {
-      return false;
-    }
-  });
+  try {
+    execFileSync("pgrep", ["-x", APP_PROCESS_PATTERN], { stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
 }
 
 // Executable paths of the running main app processes (not helpers). Used to prove
 // Squirrel's auto-relaunched process is running from the swapped bundle.
 export function runningAppExecutables(): string[] {
-  const pids = APP_PROCESS_NAMES.flatMap((name) => {
-    try {
-      return execFileSync("pgrep", ["-x", name], { encoding: "utf8" })
-        .trim()
-        .split("\n")
-        .filter(Boolean);
-    } catch {
-      return [];
-    }
-  });
-  return [...new Set(pids)]
+  let pids: string[];
+  try {
+    pids = execFileSync("pgrep", ["-x", APP_PROCESS_PATTERN], {
+      encoding: "utf8",
+    })
+      .trim()
+      .split("\n")
+      .filter(Boolean);
+  } catch {
+    return [];
+  }
+  return pids
     .map((pid) => {
       try {
         return execFileSync("ps", ["-p", pid, "-o", "comm="], {
@@ -185,12 +184,10 @@ export function runningAppExecutables(): string[] {
 }
 
 export function killApp(): void {
-  for (const name of APP_PROCESS_NAMES) {
-    try {
-      execFileSync("pkill", ["-x", name]);
-    } catch {
-      // nothing running, fine
-    }
+  try {
+    execFileSync("pkill", ["-x", APP_PROCESS_PATTERN]);
+  } catch {
+    // nothing running, fine
   }
 }
 

packages/core/src/speech/composeUtterance.ts

@@ -1,4 +1,6 @@
 const TASK_TITLE_MAX = 40;
+const TASK_PREFIX = "PostHog task";
+const TASK_PREFIX_GUARD = new RegExp(`^\\s*${TASK_PREFIX}`, "i");
 
 export interface ComposeInput {
   text: string;
@@ -43,7 +45,7 @@ export function composeUtterance({
   // before any greeting logic so the guard stays order-independent: injecting
   // "Hey <name>," first would push the prefix past the start of the string and
   // defeat this test, producing a double prefix.
-  if (/^\s*posthog task/i.test(body)) return body;
+  if (TASK_PREFIX_GUARD.test(body)) return body;
 
   if (needsUser && addressByName && firstName) {
     // Normalize any leading greeting the agent added, then address by real name.
@@ -57,5 +59,5 @@ export function composeUtterance({
     title.length > TASK_TITLE_MAX
       ? `${title.slice(0, TASK_TITLE_MAX)}…`
       : title;
-  return `PostHog task '${shortTitle}' — ${body}`;
+  return `${TASK_PREFIX} '${shortTitle}' — ${body}`;
 }