chore: rolling promotion dev -> main

.claude-plugin/marketplace.json

@@ -10,7 +10,7 @@
   "plugins": [
     {
       "name": "genie",
-      "version": "4.260409.4",
+      "version": "4.260409.8",
       "source": "./plugins/genie",
       "description": "Human-AI partnership for Claude Code. Share a terminal, orchestrate workers, evolve together. Brainstorm ideas, wish them into plans, make with parallel agents, ship as one team. A coding genie that grows with your project."
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/genie",
-  "version": "4.260409.4",
+  "version": "4.260409.8",
   "description": "Collaborative terminal toolkit for human + AI workflows",
   "type": "module",
   "bin": {

plugins/genie/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "genie",
-  "version": "4.260409.4",
+  "version": "4.260409.8",
   "description": "Human-AI partnership for Claude Code. Share a terminal, orchestrate workers, evolve together. Brainstorm ideas, turn them into wishes, execute with /work, validate with /review, and ship as one team.",
   "author": {
     "name": "Namastex Labs"

plugins/genie/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genie-plugin",
-  "version": "4.260409.4",
+  "version": "4.260409.8",
   "private": true,
   "description": "Runtime dependencies for genie bundled CLIs",
   "type": "module",

src/__tests__/_shared-sdk-query-mock.ts

@@ -0,0 +1,58 @@
+/**
+ * Shared mock for `@anthropic-ai/claude-agent-sdk`.
+ *
+ * Bun's `mock.module()` is process-global and first-registration-wins. When
+ * multiple test files register competing mocks for the same module, whichever
+ * loads first locks the global cache, and other files' mocks become dead weight.
+ *
+ * This file provides a SINGLE `queryMock` instance used by both:
+ *   - `src/__tests__/sdk-integration.test.ts`
+ *   - `src/services/executors/__tests__/_sdk-mocks.ts`
+ *
+ * It ONLY mocks `@anthropic-ai/claude-agent-sdk` — no directory, registry, or
+ * other module mocks — so it's safe to import from any test file without
+ * polluting unrelated modules.
+ */
+
+import { mock } from 'bun:test';
+
+/** Default SDK query implementation — yields one assistant reply + success result with session_id. */
+const defaultQueryImpl = () => {
+  const gen = (async function* () {
+    yield { type: 'assistant', message: { content: [{ type: 'text', text: 'reply' }] } };
+    yield { type: 'result', subtype: 'success', session_id: 'sdk-session-aaa' };
+  })();
+  return Object.assign(gen, {
+    interrupt: mock(),
+    setPermissionMode: mock(),
+    setModel: mock(),
+    return: mock(async () => ({ value: undefined, done: true })),
+    throw: mock(async () => ({ value: undefined, done: true })),
+  });
+};
+
+export const queryMock = mock(defaultQueryImpl);
+
+export function resetQueryMock(): void {
+  queryMock.mockReset();
+  queryMock.mockImplementation(defaultQueryImpl);
+}
+
+// ============================================================================
+// Register the SDK mock — this is the single source of truth for the process.
+// ============================================================================
+
+mock.module('@anthropic-ai/claude-agent-sdk', () => ({
+  query: queryMock,
+  createSdkMcpServer: mock((opts: any) => ({
+    type: 'sdk' as const,
+    name: opts.name,
+    instance: {},
+  })),
+  tool: mock((_name: string, _desc: string, _schema: any, handler: any) => ({
+    name: _name,
+    description: _desc,
+    inputSchema: _schema,
+    handler,
+  })),
+}));

src/__tests__/sdk-integration.test.ts

@@ -6,33 +6,15 @@
  * permission gate, frontmatter parsing, and config priority layering.
  */
 
-import { beforeEach, describe, expect, it, mock } from 'bun:test';
+import { beforeEach, describe, expect, it, type mock } from 'bun:test';
 import type { SpawnContext } from '../lib/executor-types.js';
 
 // ============================================================================
-// Mock the SDK module before any provider imports
+// Use the shared SDK mock — eliminates process-global mock.module() race with
+// executor tests. See _shared-sdk-query-mock.ts for details.
 // ============================================================================
 
-const mockQuery = mock(() => {
-  const gen = (async function* () {
-    yield { type: 'assistant', message: { content: [{ type: 'text', text: 'hello' }] } };
-  })();
-  return Object.assign(gen, {
-    interrupt: mock(),
-    setPermissionMode: mock(),
-    setModel: mock(),
-    return: mock(async () => ({ value: undefined, done: true })),
-    throw: mock(async () => ({ value: undefined, done: true })),
-  });
-});
-
-mock.module('@anthropic-ai/claude-agent-sdk', () => ({
-  query: mockQuery,
-}));
-
-// No audit mocking — routeSdkMessage is fire-and-forget (.catch(() => {}))
-// and these tests never iterate the message stream, so audit is never invoked.
-// Removing audit mocks prevents spyOn leaks that corrupt audit.test.ts in the same bun process.
+import { queryMock as mockQuery } from './_shared-sdk-query-mock.js';
 
 // ============================================================================
 // Dynamic imports (must come after mock.module)

src/db/migrations/035_bridge_sessions.sql

@@ -0,0 +1,27 @@
+-- 035_bridge_sessions.sql — Dedicated bridge session tracking
+-- Persists omni bridge sessions so they survive process restarts.
+-- Complements the executors table with bridge-specific fields.
+
+CREATE TABLE IF NOT EXISTS genie_bridge_sessions (
+  id TEXT PRIMARY KEY DEFAULT gen_random_uuid()::text,
+  executor_id TEXT REFERENCES executors(id) ON DELETE SET NULL,
+  instance_id TEXT NOT NULL,
+  chat_id TEXT NOT NULL,
+  agent_name TEXT NOT NULL,
+  tmux_pane_id TEXT,
+  claude_session_id TEXT,
+  status TEXT NOT NULL DEFAULT 'active'
+    CHECK (status IN ('active', 'closed', 'orphaned')),
+  started_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+  last_activity_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+  closed_at TIMESTAMPTZ,
+  metadata JSONB DEFAULT '{}'
+);
+
+CREATE INDEX IF NOT EXISTS idx_bridge_sessions_status
+  ON genie_bridge_sessions(status);
+CREATE INDEX IF NOT EXISTS idx_bridge_sessions_instance_chat
+  ON genie_bridge_sessions(instance_id, chat_id);
+CREATE INDEX IF NOT EXISTS idx_bridge_sessions_active
+  ON genie_bridge_sessions(status, last_activity_at)
+  WHERE status = 'active';

src/genie-commands/doctor.ts

@@ -306,6 +306,57 @@ async function checkWorkerProfiles(): Promise<CheckResult[]> {
   return results;
 }
 
+/**
+ * Check Omni bridge health
+ */
+async function checkBridge(): Promise<CheckResult[]> {
+  const results: CheckResult[] = [];
+
+  try {
+    const { getBridge } = await import('../services/omni-bridge.js');
+    const bridge = getBridge();
+
+    if (!bridge) {
+      results.push({
+        name: 'Bridge running',
+        status: 'warn',
+        message: 'not running in this process',
+        suggestion: 'Bridge starts automatically with: genie serve',
+      });
+      return results;
+    }
+
+    const s = await bridge.status();
+
+    results.push({
+      name: 'NATS connection',
+      status: s.connected ? 'pass' : 'fail',
+      message: s.connected ? `connected (${s.natsUrl})` : `disconnected (${s.natsUrl})`,
+      suggestion: s.connected ? undefined : 'Check NATS server: nats-server or omni start',
+    });
+
+    results.push({
+      name: 'Active sessions',
+      status: 'pass',
+      message: `${s.activeSessions} / ${s.maxConcurrent} (queue: ${s.queueDepth})`,
+    });
+
+    results.push({
+      name: 'PG backing',
+      status: s.pgAvailable ? 'pass' : 'warn',
+      message: s.pgAvailable ? 'connected' : 'degraded (in-memory)',
+    });
+  } catch {
+    results.push({
+      name: 'Bridge module',
+      status: 'warn',
+      message: 'could not load omni-bridge',
+    });
+  }
+
+  return results;
+}
+
 /**
  * Main doctor command
  */
@@ -334,6 +385,7 @@ export async function doctorCommand(options?: { fix?: boolean }): Promise<void>
   runCheckSection('Configuration', await checkConfiguration(), counts);
   runCheckSection('Tmux', await checkTmux(), counts);
   runCheckSection('Worker Profiles', await checkWorkerProfiles(), counts);
+  runCheckSection('Omni Bridge', await checkBridge(), counts);
 
   // Summary
   console.log();

src/lib/runtime-events.ts

@@ -73,7 +73,7 @@ export type RuntimeEventKind =
   | 'tool_result'
   | 'system'
   | 'qa';
-export type RuntimeEventSource = 'provider' | 'mailbox' | 'chat' | 'registry' | 'hook';
+export type RuntimeEventSource = 'provider' | 'mailbox' | 'chat' | 'registry' | 'hook' | 'sdk';
 export type RuntimeEventDirection = 'in' | 'out';
 
 export interface RuntimeEvent {