diff --git a/script/publish.ts b/script/publish.ts
index 64a7a787..f082457e 100644
--- a/script/publish.ts
+++ b/script/publish.ts
@@ -232,10 +232,17 @@ async function publishAllPackages(version: string): Promise<void> {
 }
 
 async function buildPackages(): Promise<void> {
+  const skipPlatform = process.env.SKIP_PLATFORM_PACKAGES === "true"
+  
   console.log("\nBuilding packages...")
   await $`bun run clean && bun run build`
-  console.log("Building platform binaries...")
-  await $`bun run build:binaries`
+  
+  if (skipPlatform) {
+    console.log("⏭️  Skipping platform binaries (SKIP_PLATFORM_PACKAGES=true)")
+  } else {
+    console.log("Building platform binaries...")
+    await $`bun run build:binaries`
+  }
 }
 
 async function gitTagAndRelease(newVersion: string, notes: string[]): Promise<void> {
diff --git a/src/features/claude-code-session-state/state.test.ts b/src/features/claude-code-session-state/state.test.ts
index 7b72ebf0..813bc197 100644
--- a/src/features/claude-code-session-state/state.test.ts
+++ b/src/features/claude-code-session-state/state.test.ts
@@ -82,6 +82,11 @@ describe("claude-code-session-state", () => {
   })
 
   describe("mainSessionID", () => {
+    beforeEach(() => {
+      // #given - ensure clean state for mainSessionID tests
+      setMainSession(undefined)
+    })
+
     test("should store and retrieve main session ID", () => {
       // #given
       const mainID = "main-session-123"