fix: Cursor IDE compat (platform source + empty stdin)

plugin/scripts/bun-runner.js

@@ -161,59 +161,45 @@ if (child.stdin) {
       // Lifecycle commands don't need stdin — close pipe and let child run.
       try { child.stdin.end(); } catch {}
     } else {
-      // Issue #2188: empty/missing stdin previously masked by `|| '{}'` fallback,
-      // which silently hid WSL bash failures (e.g. hooks invoked under a broken
-      // shell that never piped a payload). Surface the failure mode instead.
-      const dataDir = process.env.CLAUDE_MEM_DATA_DIR || join(homedir(), '.claude-mem');
-      const payloadType = stdinData === null
-        ? 'null (no data event or stream error)'
-        : stdinData === undefined
-          ? 'undefined'
-          : Buffer.isBuffer(stdinData) && stdinData.length === 0
-            ? 'empty Buffer (zero bytes received)'
-            : `unexpected (${typeof stdinData})`;
-      const payloadByteLength = (stdinData && typeof stdinData.length === 'number')
-        ? stdinData.length
-        : 0;
-      const diagnostic = [
-        `[bun-runner] empty stdin payload received — issue #2188`,
-        `  script: ${args[0]}`,
-        `  payload byte length: ${payloadByteLength}`,
-        `  payload type: ${payloadType}`,
-        `  platform: ${process.platform}`,
-        `  shell: ${process.env.SHELL || 'n/a'}`,
-        `  stdin TTY: ${process.stdin.isTTY === true ? 'true' : process.stdin.isTTY === false ? 'false' : 'undefined'}`,
-        `  timestamp: ${new Date().toISOString()}`,
-        `  CLAUDE_PLUGIN_ROOT: ${RESOLVED_PLUGIN_ROOT}`,
-      ].join('\n');
-
-      // IO discipline (see src/shared/hook-io.ts intent vocabulary):
-      // - this stderr write is a USER_HINT (Claude Code surfaces it inline).
-      // - the CAPTURE_BROKEN marker file below is a DIAGNOSTIC durable signal for
-      //   the next session-start hint.
-      // - exit 0 below is the EXIT_SIGNAL per CLAUDE.md (Windows Terminal tab
-      //   management); the marker file, not the exit code, is the durable failure
-      //   signal. bun-runner runs in its own node process BEFORE hookCommand's
-      //   stderr buffer is installed, so this write is never swallowed.
-
-      // Write to stderr so Claude Code surfaces the diagnostic.
-      console.error(diagnostic);
-
-      // Persist diagnostic to the runner-errors log and drop a CAPTURE_BROKEN marker
-      // file so the next session-start hint can surface the failure. We exit 0 to
-      // honor the project's exit-code strategy (worker/hook errors exit 0 to
-      // prevent Windows Terminal tab pileup) — the marker file is the durable
-      // signal that something is wrong, not the exit code.
-      try {
-        const logsDir = join(dataDir, 'logs');
-        mkdirSync(logsDir, { recursive: true });
-        appendFileSync(join(logsDir, 'runner-errors.log'), diagnostic + '\n\n');
-        mkdirSync(dataDir, { recursive: true });
-        writeFileSync(join(dataDir, 'CAPTURE_BROKEN'), diagnostic + '\n');
-      } catch (writeErr) {
-        console.error(`[bun-runner] failed to persist diagnostic: ${writeErr && writeErr.message ? writeErr.message : writeErr}`);
+      // Non-lifecycle hooks with empty stdin are a no-op. Cursor (and the Claude
+      // Code ↔ Cursor bridge) routinely invoke shell/MCP hooks without a payload;
+      // issue #2188 diagnostics (CAPTURE_BROKEN + runner-errors.log) produced
+      // persistent false positives on macOS. Set CLAUDE_MEM_STRICT_STDIN=1 to
+      // restore the #2188 failure surface for WSL/bash debugging.
+      if (process.env.CLAUDE_MEM_STRICT_STDIN === '1') {
+        const dataDir = process.env.CLAUDE_MEM_DATA_DIR || join(homedir(), '.claude-mem');
+        const payloadType = stdinData === null
+          ? 'null (no data event or stream error)'
+          : stdinData === undefined
+            ? 'undefined'
+            : Buffer.isBuffer(stdinData) && stdinData.length === 0
+              ? 'empty Buffer (zero bytes received)'
+              : `unexpected (${typeof stdinData})`;
+        const payloadByteLength = (stdinData && typeof stdinData.length === 'number')
+          ? stdinData.length
+          : 0;
+        const diagnostic = [
+          `[bun-runner] empty stdin payload received — issue #2188`,
+          `  script: ${args[0]}`,
+          `  payload byte length: ${payloadByteLength}`,
+          `  payload type: ${payloadType}`,
+          `  platform: ${process.platform}`,
+          `  shell: ${process.env.SHELL || 'n/a'}`,
+          `  stdin TTY: ${process.stdin.isTTY === true ? 'true' : process.stdin.isTTY === false ? 'false' : 'undefined'}`,
+          `  timestamp: ${new Date().toISOString()}`,
+          `  CLAUDE_PLUGIN_ROOT: ${RESOLVED_PLUGIN_ROOT}`,
+        ].join('\n');
+        console.error(diagnostic);
+        try {
+          const logsDir = join(dataDir, 'logs');
+          mkdirSync(logsDir, { recursive: true });
+          appendFileSync(join(logsDir, 'runner-errors.log'), diagnostic + '\n\n');
+          mkdirSync(dataDir, { recursive: true });
+          writeFileSync(join(dataDir, 'CAPTURE_BROKEN'), diagnostic + '\n');
+        } catch (writeErr) {
+          console.error(`[bun-runner] failed to persist diagnostic: ${writeErr && writeErr.message ? writeErr.message : writeErr}`);
+        }
       }
-
       try { child.stdin.end(); } catch {}
       try { child.kill(); } catch {}
       process.exit(0);

plugin/scripts/context-generator.cjs

@@ -531,11 +531,14 @@ ${o.stack}`:` ${o.message}`;else if(this.getLevel()===0&&typeof o=="object")try{
         `).run(t,e),d.customTitle&&this.db.prepare(`
           UPDATE sdk_sessions SET custom_title = ?
           WHERE content_session_id = ? AND custom_title IS NULL
-        `).run(d.customTitle,e),d.platformSource){let p=g.platform_source?.trim()?D(g.platform_source):void 0;if(!p)this.db.prepare(`
+        `).run(d.customTitle,e),d.platformSource){let p=g.platform_source?.trim()?D(g.platform_source):void 0;p?p!==d.platformSource&&this.db.prepare(`
+            UPDATE sdk_sessions SET platform_source = ?
+            WHERE content_session_id = ?
+          `).run(d.platformSource,e):this.db.prepare(`
             UPDATE sdk_sessions SET platform_source = ?
             WHERE content_session_id = ?
               AND COALESCE(platform_source, '') = ''
-          `).run(d.platformSource,e);else if(p!==d.platformSource)throw new Error(`Platform source conflict for session ${e}: existing=${p}, received=${d.platformSource}`)}return g.id}return this.db.prepare(`
+          `).run(d.platformSource,e)}return g.id}return this.db.prepare(`
       INSERT INTO sdk_sessions
       (content_session_id, memory_session_id, project, platform_source, user_prompt, custom_title, started_at, started_at_epoch, status)
       VALUES (?, NULL, ?, ?, ?, ?, ?, ?, 'active')

src/cli/adapters/cursor.ts

@@ -39,6 +39,7 @@ export const cursorAdapter: PlatformAdapter = {
     return {
       sessionId,
       cwd,
+      platform: 'cursor',
       prompt: r.prompt ?? r.query ?? r.input ?? r.message,
       toolName: isShellCommand ? 'Bash' : r.tool_name,
       toolInput: isShellCommand ? { command: r.command } : r.tool_input,

src/services/sqlite/SessionStore.ts

@@ -1732,9 +1732,12 @@ export class SessionStore {
               AND COALESCE(platform_source, '') = ''
           `).run(resolved.platformSource, contentSessionId);
         } else if (storedPlatformSource !== resolved.platformSource) {
-          throw new Error(
-            `Platform source conflict for session ${contentSessionId}: existing=${storedPlatformSource}, received=${resolved.platformSource}`
-          );
+          // Cursor and Claude Code can share a content_session_id across IDEs;
+          // last-writer wins instead of dropping observations with HTTP 500.
+          this.db.prepare(`
+            UPDATE sdk_sessions SET platform_source = ?
+            WHERE content_session_id = ?
+          `).run(resolved.platformSource, contentSessionId);
         }
       }
       return existing.id;

src/services/worker/http/shared.ts

@@ -58,7 +58,9 @@ export interface ObservationPayload {
 export async function ingestObservation(payload: ObservationPayload): Promise<IngestResult> {
   const { sessionManager, dbManager, eventBroadcaster, ensureGeneratorRunning } = requireContext();
 
-  const platformSource = normalizePlatformSource(payload.platformSource);
+  const platformSource = payload.platformSource != null && String(payload.platformSource).trim()
+    ? normalizePlatformSource(payload.platformSource)
+    : undefined;
   const cwd = typeof payload.cwd === 'string' ? payload.cwd : '';
   const project = cwd.trim() ? getProjectContext(cwd).primary : '';
 

tests/sqlite/session-store-sessions.test.ts

@@ -104,11 +104,11 @@ describe('SessionStore session lifecycle', () => {
       expect(store.getSessionById(id)?.platform_source).toBe('codex');
     });
 
-    it('throws on an explicit platform_source conflict', () => {
-      store.createSDKSession('content-platform-3', 'project', 'prompt', undefined, 'codex');
-      expect(() =>
-        store.createSDKSession('content-platform-3', 'project', 'prompt', undefined, 'claude')
-      ).toThrow(/Platform source conflict/);
+    it('updates platform_source when an explicit conflicting value arrives', () => {
+      const id = store.createSDKSession('content-platform-3', 'project', 'prompt', undefined, 'codex');
+      store.createSDKSession('content-platform-3', 'project', 'prompt', undefined, 'claude');
+      store.createSDKSession('content-platform-3', 'project', 'prompt', undefined, 'cursor');
+      expect(store.getSessionById(id)?.platform_source).toBe('cursor');
     });
   });