feat: Add native Zellij terminal multiplexer support #1226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft

mrdavidlaing wants to merge 22 commits into code-yeongyu:dev from mrdavidlaing:dev

+3,731 −698

bun.lock

Large diffs are not rendered by default.

src/config/schema.test.ts

-Original file line number
+Diff line change
@@ Expand Up @@
         expect(result.data?.browser_automation_engine).toBeUndefined()
       })
     })
+    describe("TerminalConfigSchema", () => {
+      test("accepts provider field with 'auto' value", () => {
+        // #given
+        const input = { provider: "auto" }
+        // #when
+        const result = OhMyOpenCodeConfigSchema.safeParse({ terminal: input })
+        // #then
+        expect(result.success).toBe(true)
+        if (result.success) {
+          expect(result.data.terminal?.provider).toBe("auto")
+        }
+      })
+      test("accepts provider field with 'tmux' value", () => {
+        // #given
+        const input = { provider: "tmux" }
+        // #when
+        const result = OhMyOpenCodeConfigSchema.safeParse({ terminal: input })
+        // #then
+        expect(result.success).toBe(true)
+        if (result.success) {
+          expect(result.data.terminal?.provider).toBe("tmux")
+        }
+      })
+      test("accepts provider field with 'zellij' value", () => {
+        // #given
+        const input = { provider: "zellij" }
+        // #when
+        const result = OhMyOpenCodeConfigSchema.safeParse({ terminal: input })
+        // #then
+        expect(result.success).toBe(true)
+        if (result.success) {
+          expect(result.data.terminal?.provider).toBe("zellij")
+        }
+      })
+      test("defaults provider to 'auto' when not specified", () => {
+        // #given
+        const input = {}
+        // #when
+        const result = OhMyOpenCodeConfigSchema.parse({ terminal: input })
+        // #then
+        expect(result.terminal?.provider).toBe("auto")
+      })
+      test("accepts tmux config nested in terminal", () => {
+        // #given
+        const input = {
+          provider: "tmux",
+          tmux: {
+            enabled: true,
+            layout: "main-horizontal",
+          },
+        }
+        // #when
+        const result = OhMyOpenCodeConfigSchema.safeParse({ terminal: input })
+        // #then
+        expect(result.success).toBe(true)
+        if (result.success) {
+          expect(result.data.terminal?.tmux?.enabled).toBe(true)
+          expect(result.data.terminal?.tmux?.layout).toBe("main-horizontal")
+        }
+      })
+      test("accepts zellij config nested in terminal", () => {
+        // #given
+        const input = {
+          provider: "zellij",
+          zellij: {
+            enabled: true,
+            session_prefix: "my-session",
+          },
+        }
+        // #when
+        const result = OhMyOpenCodeConfigSchema.safeParse({ terminal: input })
+        // #then
+        expect(result.success).toBe(true)
+        if (result.success) {
+          expect(result.data.terminal?.zellij?.enabled).toBe(true)
+          expect(result.data.terminal?.zellij?.session_prefix).toBe("my-session")
+        }
+      })
+      test("rejects invalid provider value", () => {
+        // #given
+        const input = { provider: "invalid" }
+        // #when
+        const result = OhMyOpenCodeConfigSchema.safeParse({ terminal: input })
+        // #then
+        expect(result.success).toBe(false)
+      })
+    })
+    describe("OhMyOpenCodeConfigSchema - backward compatibility with tmux key", () => {
+      test("still accepts top-level tmux config key (backward compat)", () => {
+        // #given
+        const input = {
+          tmux: {
+            enabled: true,
+            layout: "main-vertical",
+          },
+        }
+        // #when
+        const result = OhMyOpenCodeConfigSchema.safeParse(input)
+        // #then
+        expect(result.success).toBe(true)
+        if (result.success) {
+          expect(result.data.tmux?.enabled).toBe(true)
+          expect(result.data.tmux?.layout).toBe("main-vertical")
+        }
+      })
+      test("accepts both tmux and terminal keys together", () => {
+        // #given
+        const input = {
+          tmux: {
+            enabled: true,
+          },
+          terminal: {
+            provider: "zellij",
+            zellij: {
+              enabled: true,
+            },
+          },
+        }
+        // #when
+        const result = OhMyOpenCodeConfigSchema.safeParse(input)
+        // #then
+        expect(result.success).toBe(true)
+        if (result.success) {
+          expect(result.data.tmux?.enabled).toBe(true)
+          expect(result.data.terminal?.provider).toBe("zellij")
+          expect(result.data.terminal?.zellij?.enabled).toBe(true)
+        }
+      })
+      test("accepts config with only tmux key (no terminal key)", () => {
+        // #given
+        const input = {
+          tmux: {
+            enabled: true,
+            session_prefix: "my-prefix",
+          },
+        }
+        // #when
+        const result = OhMyOpenCodeConfigSchema.safeParse(input)
+        // #then
+        expect(result.success).toBe(true)
+        if (result.success) {
+          expect(result.data.tmux?.enabled).toBe(true)
+          expect(result.data.terminal).toBeUndefined()
+        }
+      })
+    })

src/config/schema.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -367,6 +367,17 @@ export const TmuxConfigSchema = z.object({ @@
       agent_pane_min_width: z.number().min(20).default(40),
     })
+    export const ZellijConfigSchema = z.object({
+      enabled: z.boolean().default(false),
+      session_prefix: z.string().optional(),
+    })
+    export const TerminalConfigSchema = z.object({
+      provider: z.enum(["auto", "tmux", "zellij"]).default("auto"),
+      tmux: TmuxConfigSchema.optional(),
+      zellij: ZellijConfigSchema.optional(),
+    })
     export const SisyphusTasksConfigSchema = z.object({
       /** Absolute or relative storage path override. When set, bypasses global config dir. */
       storage_path: z.string().optional(),
@@ Expand Down Expand Up / @@ -408,6 +419,7 @@ export const OhMyOpenCodeConfigSchema = z.object({ @@
       browser_automation_engine: BrowserAutomationConfigSchema.optional(),
       websearch: WebsearchConfigSchema.optional(),
       tmux: TmuxConfigSchema.optional(),
+      terminal: TerminalConfigSchema.optional(),
       sisyphus: SisyphusConfigSchema.optional(),
     })
@@ Expand Down Expand Up @@
     export type WebsearchConfig = z.infer<typeof WebsearchConfigSchema>
     export type TmuxConfig = z.infer<typeof TmuxConfigSchema>
     export type TmuxLayout = z.infer<typeof TmuxLayoutSchema>
+    export type ZellijConfig = z.infer<typeof ZellijConfigSchema>
+    export type TerminalConfig = z.infer<typeof TerminalConfigSchema>
     export type SisyphusTasksConfig = z.infer<typeof SisyphusTasksConfigSchema>
     export type SisyphusConfig = z.infer<typeof SisyphusConfigSchema>
@@ Expand Down @@

src/features/AGENTS.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -27,7 +27,7 @@ features/
  
    ├── hook-message-injector/      # Message injection

    ├── task-toast-manager/         # Background task notifications

    ├── skill-mcp-manager/          # MCP client lifecycle (617 lines)

    ├── tmux-subagent/              # Tmux session management

    ├── tmux-subagent/              # Terminal multiplexer session management (tmux/zellij)

    ├── mcp-oauth/                  # MCP OAuth handling

    ├── sisyphus-swarm/             # Swarm coordination

    ├── sisyphus-tasks/             # Task tracking

    @@ -56,9 +56,45 @@ features/
  
    - **Transports**: stdio, http (SSE/Streamable)

    - **Lifecycle**: 5m idle cleanup

    ## TMUX SESSION MANAGER

    **Purpose**: Manages background agent sessions in terminal multiplexer panes.

    ### Architecture

    - **Multiplexer Abstraction**: Uses `Multiplexer` interface (supports tmux and zellij)

    - **Capability-Based Behavior**: Checks `adapter.capabilities.manualLayout` for layout strategy

    - **Dual State Tracking**: Maintains both `TrackedSession` and `PaneHandle` maps

    ### Layout Strategies

    | Capability | Strategy | Multiplexer |

    |------------|----------|-------------|

    | `manualLayout: true` | Decision engine with grid algorithm | tmux |

    | `manualLayout: false` | Simple spawn, auto-layout | zellij |

    ### Usage

    ```typescript

    // Create with detected multiplexer

    const adapter = createMultiplexer(detectedType, config)

    const manager = new TmuxSessionManager(ctx, adapter, tmuxConfig)

    // Manager handles capability branching internally

    manager.onSessionCreated(session)  // Uses appropriate strategy

    ```

    ### Key Features

    - **Auto-detection**: Detects tmux or zellij via environment variables

    - **Graceful degradation**: Plugin works without multiplexer

    - **Backward compatible**: Existing tmux functionality unchanged

    - **Clean separation**: Capability-based branching is explicit

    ## ANTI-PATTERNS

    - **Sequential delegation**: Use `delegate_task` parallel

    - **Trust self-reports**: ALWAYS verify

    - **Main thread blocks**: No heavy I/O in loader init

    - **Direct state mutation**: Use managers for boulder/session state

    - **Hardcoded multiplexer**: Use `terminal-multiplexer` abstraction

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add native Zellij terminal multiplexer support #1226

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

feat: Add native Zellij terminal multiplexer support #1226

Are you sure you want to change the base?

feat: Add native Zellij terminal multiplexer support #1226

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!