mcp-codex-subagent 2.0.8 → 2.0.10

package/dist/process/runner.js

@@ -0,0 +1,227 @@
+/**
+ * CodexProcessRunner — owns the lifecycle of one codex child process.
+ *
+ * Responsibilities:
+ * - Spawn the codex process
+ * - Line-buffer stdout for JSONL parsing
+ * - Filter stderr noise
+ * - Emit normalized events via callbacks
+ * - Deterministic cleanup: SIGTERM → grace → SIGKILL → remove listeners
+ *
+ * Single-use: one runner per task, created once, not reused.
+ */
+import { spawn } from 'child_process';
+import { parseCodexEvent, isStderrNoise, createStderrEvent, parseEventString, } from './event-parser.js';
+const DEFAULT_KILL_GRACE_MS = 5000;
+export class CodexProcessRunner {
+    child = null;
+    _state = 'spawning';
+    stdoutBuffer = '';
+    killGraceMs;
+    callbacks;
+    exitPromise = null;
+    exitResolve = null;
+    wasKilledByUs = false;
+    constructor(callbacks, killGraceMs) {
+        this.callbacks = callbacks;
+        this.killGraceMs = killGraceMs ?? DEFAULT_KILL_GRACE_MS;
+    }
+    get state() {
+        return this._state;
+    }
+    /**
+     * Spawn the codex process. Returns a ProcessHandle for PID access
+     * and kill control.
+     */
+    spawn(options) {
+        const isWindows = process.platform === 'win32';
+        const child = spawn('codex', options.args, {
+            shell: isWindows,
+            cwd: options.cwd,
+            env: options.env ? { ...process.env, ...options.env } : process.env,
+            stdio: ['pipe', 'pipe', 'pipe'],
+            detached: false,
+        });
+        this.child = child;
+        // Create exit promise for awaiting process termination
+        this.exitPromise = new Promise((resolve) => {
+            this.exitResolve = resolve;
+        });
+        // Wire stdout: line-buffered JSONL parsing
+        child.stdout?.on('data', this.onStdout);
+        // Wire stderr: noise-filtered
+        child.stderr?.on('data', this.onStderr);
+        // Wire close: cleanup + exit notification
+        child.on('close', this.onClose);
+        // Wire error: spawn failure
+        child.on('error', this.onError);
+        // Transition to running once PID is assigned
+        if (child.pid) {
+            this._state = 'running';
+        }
+        else {
+            // PID may be assigned asynchronously; check on next tick
+            child.on('spawn', () => {
+                if (this._state === 'spawning') {
+                    this._state = 'running';
+                }
+            });
+        }
+        const self = this;
+        return {
+            get pid() {
+                return child.pid;
+            },
+            childProcess: child,
+            get state() {
+                return self._state;
+            },
+            kill: () => self.kill(),
+        };
+    }
+    /**
+     * Kill the process deterministically.
+     * SIGTERM → wait grace period → SIGKILL → wait for exit.
+     */
+    async kill() {
+        if (this._state === 'exited' || this._state === 'exiting') {
+            // Already exiting/exited — wait for completion
+            if (this.exitPromise) {
+                await this.exitPromise;
+            }
+            return;
+        }
+        if (!this.child || this.child.exitCode !== null) {
+            this._state = 'exited';
+            return;
+        }
+        this._state = 'exiting';
+        this.wasKilledByUs = true;
+        // Send SIGTERM
+        try {
+            this.child.kill('SIGTERM');
+        }
+        catch {
+            // Process may already be dead
+            this._state = 'exited';
+            return;
+        }
+        // Wait for graceful exit or timeout
+        const graceTimeout = new Promise((resolve) => setTimeout(() => resolve('timeout'), this.killGraceMs));
+        const result = await Promise.race([
+            this.exitPromise.then(() => 'exited'),
+            graceTimeout,
+        ]);
+        if (result === 'timeout' && this.child.exitCode === null) {
+            // Force kill
+            try {
+                this.child.kill('SIGKILL');
+            }
+            catch {
+                // Already dead
+            }
+            // Wait for exit event (best effort)
+            if (this.exitPromise) {
+                await Promise.race([
+                    this.exitPromise,
+                    new Promise((r) => setTimeout(r, 2000)),
+                ]);
+            }
+        }
+        this._state = 'exited';
+    }
+    /**
+     * Wait for the process to exit naturally.
+     */
+    async waitForExit() {
+        if (!this.exitPromise) {
+            return { exitCode: null, signal: null, wasKilled: false };
+        }
+        return this.exitPromise;
+    }
+    // --- Private event handlers (arrow functions to preserve `this`) ---
+    onStdout = (data) => {
+        this.stdoutBuffer += data.toString();
+        const lines = this.stdoutBuffer.split('\n');
+        // Keep incomplete last line in buffer
+        this.stdoutBuffer = lines.pop() || '';
+        for (const line of lines) {
+            const raw = parseCodexEvent(line);
+            if (raw) {
+                const parsed = parseEventString(raw);
+                this.callbacks.onEvent({
+                    raw,
+                    parsed: parsed ?? { type: 'unknown' },
+                });
+            }
+        }
+    };
+    onStderr = (data) => {
+        const chunk = data.toString().trim();
+        if (!chunk)
+            return;
+        if (isStderrNoise(chunk))
+            return;
+        const raw = createStderrEvent(chunk);
+        const parsed = parseEventString(raw);
+        this.callbacks.onEvent({
+            raw,
+            parsed: parsed ?? { type: 'stderr', text: chunk },
+        });
+    };
+    onClose = (code, signal) => {
+        // Flush remaining stdout buffer
+        if (this.stdoutBuffer.trim()) {
+            const raw = parseCodexEvent(this.stdoutBuffer);
+            if (raw) {
+                const parsed = parseEventString(raw);
+                this.callbacks.onEvent({
+                    raw,
+                    parsed: parsed ?? { type: 'unknown' },
+                });
+            }
+        }
+        this.stdoutBuffer = '';
+        this._state = 'exited';
+        // Remove listeners to prevent leaks
+        this.removeListeners();
+        const exitInfo = {
+            exitCode: code,
+            signal,
+            wasKilled: this.wasKilledByUs,
+        };
+        // Resolve the exit promise
+        if (this.exitResolve) {
+            this.exitResolve(exitInfo);
+            this.exitResolve = null;
+        }
+        // Notify the owner
+        this.callbacks.onExit(exitInfo);
+    };
+    onError = (error) => {
+        this._state = 'exited';
+        this.removeListeners();
+        const exitInfo = {
+            exitCode: null,
+            signal: null,
+            wasKilled: this.wasKilledByUs,
+        };
+        if (this.exitResolve) {
+            this.exitResolve(exitInfo);
+            this.exitResolve = null;
+        }
+        this.callbacks.onExit(exitInfo);
+    };
+    /**
+     * Remove all listeners from the child process.
+     */
+    removeListeners() {
+        if (!this.child)
+            return;
+        this.child.stdout?.removeListener('data', this.onStdout);
+        this.child.stderr?.removeListener('data', this.onStderr);
+        this.child.removeListener('close', this.onClose);
+        this.child.removeListener('error', this.onError);
+    }
+}
+//# sourceMappingURL=runner.js.map

package/dist/process/runner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/process/runner.ts"],"names":[],"mappings":"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"}

package/dist/process/types.d.ts

@@ -0,0 +1,74 @@
+/**
+ * Types for the process management module.
+ */
+import type { ChildProcess } from 'child_process';
+/**
+ * Internal state of a CodexProcessRunner.
+ * - spawning: process.spawn() called but not yet confirmed running
+ * - running: process confirmed alive (PID assigned)
+ * - exiting: termination requested, waiting for exit
+ * - exited: process has exited (terminal)
+ */
+export type ProcessState = 'spawning' | 'running' | 'exiting' | 'exited';
+/**
+ * Options for spawning a codex process.
+ */
+export interface SpawnOptions {
+    /** Command args for `codex exec` */
+    args: string[];
+    /** Working directory */
+    cwd: string;
+    /** Environment overrides */
+    env?: Record<string, string | undefined>;
+    /** Grace period in ms between SIGTERM and SIGKILL (default: 5000) */
+    killGraceMs?: number;
+}
+/**
+ * A normalized event emitted by the process runner.
+ * The `raw` field is the JSON string for storage; `parsed` is the object for subscribers.
+ */
+export interface ProcessEvent {
+    /** The normalized JSON string (for storage in ring buffer / output file) */
+    raw: string;
+    /** The parsed event object (for EventBus subscribers) */
+    parsed: ParsedProcessEvent;
+}
+/**
+ * Parsed event from codex JSONL output.
+ */
+export interface ParsedProcessEvent {
+    type: string;
+    [key: string]: unknown;
+}
+/**
+ * Callbacks for process runner events.
+ */
+export interface ProcessCallbacks {
+    /** Called for each normalized JSONL event */
+    onEvent: (event: ProcessEvent) => void;
+    /** Called when the process exits */
+    onExit: (info: ProcessExitInfo) => void;
+}
+/**
+ * Information about how a process exited.
+ */
+export interface ProcessExitInfo {
+    exitCode: number | null;
+    signal: NodeJS.Signals | null;
+    /** Whether the process was killed by us (cancel/timeout/shutdown) */
+    wasKilled: boolean;
+}
+/**
+ * Handle to a running process, returned by the runner.
+ */
+export interface ProcessHandle {
+    /** The PID of the child process (undefined if spawn failed) */
+    pid: number | undefined;
+    /** The raw ChildProcess reference (for setProcess compatibility) */
+    childProcess: ChildProcess;
+    /** Current runner state */
+    readonly state: ProcessState;
+    /** Kill the process deterministically */
+    kill(): Promise<void>;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/process/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/process/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEzE;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,oCAAoC;IACpC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,wBAAwB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,4BAA4B;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IACzC,qEAAqE;IACrE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,4EAA4E;IAC5E,GAAG,EAAE,MAAM,CAAC;IACZ,yDAAyD;IACzD,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,6CAA6C;IAC7C,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;IACvC,oCAAoC;IACpC,MAAM,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,IAAI,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IAC9B,qEAAqE;IACrE,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,+DAA+D;IAC/D,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,oEAAoE;IACpE,YAAY,EAAE,YAAY,CAAC;IAC3B,2BAA2B;IAC3B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,yCAAyC;IACzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB"}

package/dist/process/types.js

@@ -0,0 +1,5 @@
+/**
+ * Types for the process management module.
+ */
+export {};
+//# sourceMappingURL=types.js.map

package/dist/process/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/process/types.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,KAAK,YAAY,EAKlB,MAAM,YAAY,CAAC;AAgNpB,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;gBAE1B,MAAM,EAAE,YAAY;IA6BhC,OAAO,CAAC,aAAa;IAqUrB,OAAO,CAAC,eAAe;IAIjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7B"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,KAAK,YAAY,EAKlB,MAAM,YAAY,CAAC;AA2MpB,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;gBAE1B,MAAM,EAAE,YAAY;IA6BhC,OAAO,CAAC,aAAa;IAqarB,OAAO,CAAC,eAAe;IAIjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7B"}

package/dist/server.js

@@ -4,9 +4,10 @@ import { CallToolRequestSchema, ListToolsRequestSchema, ListResourcesRequestSche
 import chalk from 'chalk';
 import { TOOLS, } from './types.js';
 import { handleError } from './errors.js';
-import { toolDefinitions } from './tools/definitions.js';
+import { getToolDefinitions } from './tools/definitions.js';
 import { toolHandlers, setNotificationSender } from './tools/handlers.js';
-import { getTask, getAllTasks, getTaskCounts, } from './services/task-manager.js';
+import { taskStore } from './task/store.js';
+import { groupRegistry } from './wave/registry.js';
 /**
  * Parse JSONL output lines into structured events.
  * Silently skips non-JSON lines (e.g. legacy output or header leftovers).
@@ -96,7 +97,6 @@ function buildAnalytics(events, outputFilePath) {
                 });
                 break;
             default:
-                // Items with _failed marker
                 if (evt._failed) {
                     errors.push({
                         type: `${evt.type}_failed`,
@@ -111,23 +111,18 @@ function buildAnalytics(events, outputFilePath) {
     const f = outputFilePath;
     if (f) {
         const jqPrefix = `cat ${f} | grep '^{'`;
-        // Always useful: agent responses
         if (agentMessages > 0) {
             suggested.push(`${jqPrefix} | jq -r 'select(.type=="agent_message") | .text'`);
         }
-        // Commands: show if any were run
         if (commandsRun > 0) {
             suggested.push(`${jqPrefix} | jq 'select(.type=="command_execution") | {command,exit_code,status}'`);
         }
-        // Errors: only if there are actual errors
         if (errors.length > 0) {
             suggested.push(`${jqPrefix} | jq 'select(._failed or .type=="error" or .type=="turn_failed" or (.type=="command_execution" and .exit_code!=0))'`);
         }
-        // File changes: show if any
         if (filesChanged > 0) {
             suggested.push(`${jqPrefix} | jq 'select(.type=="file_change") | .changes'`);
         }
-        // MCP calls: show if any
         if (mcpCalls > 0) {
             suggested.push(`${jqPrefix} | jq 'select(.type=="mcp_tool_call") | {server,tool,status}'`);
         }
@@ -147,6 +142,13 @@ function buildAnalytics(events, outputFilePath) {
         suggested_commands: suggested,
     };
 }
+/**
+ * Get the output array from a TaskRecord.
+ * Handles the ring buffer interface.
+ */
+function getTaskOutput(task) {
+    return task.output.toArray();
+}
 export class CodexMcpServer {
     server;
     config;
@@ -164,7 +166,7 @@ export class CodexMcpServer {
         this.setupHandlers();
         // Wire notification sender so handlers can send resource-changed notifications
         setNotificationSender({
-            sendNotification: async (notification) => {
+            sendNotification: async (_notification) => {
                 try {
                     await this.server.sendResourceListChanged();
                 }
@@ -175,9 +177,9 @@ export class CodexMcpServer {
         });
     }
     setupHandlers() {
-        // List tools handler
+        // List tools handler — dynamic so template discovery is fresh
         this.server.setRequestHandler(ListToolsRequestSchema, async () => {
-            return { tools: toolDefinitions };
+            return { tools: getToolDefinitions() };
         });
         // Call tool handler
         this.server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
@@ -231,8 +233,8 @@ export class CodexMcpServer {
         // --- MCP Resources ---
         // List resources
         this.server.setRequestHandler(ListResourcesRequestSchema, async () => {
-            const tasks = getAllTasks();
-            const counts = getTaskCounts();
+            const allTasks = taskStore.getAllTasks();
+            const counts = taskStore.getTaskCounts();
             const resources = [
                 {
                     uri: 'system:///status',
@@ -247,12 +249,12 @@ export class CodexMcpServer {
                     mimeType: 'application/json',
                 },
             ];
-            // Add individual task resources
-            for (const task of tasks) {
+            for (const task of allTasks) {
+                const summary = taskStore.toSummary(task);
                 resources.push({
                     uri: `task:///${task.id}`,
                     name: `Task: ${task.id}`,
-                    description: `[${task.status}] ${task.prompt.slice(0, 80)}`,
+                    description: `[${summary.status}] ${task.prompt.slice(0, 80)}`,
                     mimeType: 'application/json',
                 });
             }
@@ -268,6 +270,12 @@ export class CodexMcpServer {
                         description: 'Full task detail including output tail, metadata, and timing',
                         mimeType: 'application/json',
                     },
+                    {
+                        uriTemplate: 'group:///{group_id}',
+                        name: 'Agent Group Details',
+                        description: 'Detailed group state including per-agent summaries, branch, and commit',
+                        mimeType: 'application/json',
+                    },
                 ],
             };
         });
@@ -276,7 +284,7 @@ export class CodexMcpServer {
             const { uri } = request.params;
             // system:///status
             if (uri === 'system:///status') {
-                const counts = getTaskCounts();
+                const counts = taskStore.getTaskCounts();
                 const status = {
                     server: {
                         name: this.config.name,
@@ -298,11 +306,12 @@ export class CodexMcpServer {
             }
             // task:///all
             if (uri === 'task:///all') {
-                const tasks = getAllTasks();
+                const allTasks = taskStore.getAllTasks();
                 const summary = {
-                    count: tasks.length,
-                    tasks: tasks.map((t) => {
-                        const events = parseOutputLines(t.output);
+                    count: allTasks.length,
+                    tasks: allTasks.map((t) => {
+                        const output = getTaskOutput(t);
+                        const events = parseOutputLines(output);
                         const analytics = buildAnalytics(events);
                         let durationMs = null;
                         if (t.startTime) {
@@ -311,16 +320,17 @@ export class CodexMcpServer {
                                 : Date.now();
                             durationMs = end - new Date(t.startTime).getTime();
                         }
+                        const s = taskStore.toSummary(t);
                         return {
                             id: t.id,
-                            status: t.status,
+                            status: s.status,
                             role: t.role,
                             specialization: t.specialization,
                             model: t.model,
                             started: t.startTime,
                             ended: t.endTime,
                             duration_ms: durationMs,
-                            // Lightweight analytics summary
+                            pid: t.pid ?? null,
                             events: analytics.total_lines,
                             commands: analytics.commands_run,
                             commands_failed: analytics.commands_failed,
@@ -348,7 +358,7 @@ export class CodexMcpServer {
             const taskIdMatch = uri.match(/^task:\/\/\/(.+)$/);
             if (taskIdMatch) {
                 const taskId = taskIdMatch[1];
-                const task = getTask(taskId);
+                const task = taskStore.getTask(taskId);
                 if (!task) {
                     return {
                         contents: [
@@ -360,10 +370,9 @@ export class CodexMcpServer {
                         ],
                     };
                 }
-                // Parse JSONL output and build analytics dashboard
-                const events = parseOutputLines(task.output);
+                const output = getTaskOutput(task);
+                const events = parseOutputLines(output);
                 const analytics = buildAnalytics(events, task.outputFilePath);
-                // Duration
                 let durationMs = null;
                 if (task.startTime) {
                     const end = task.endTime
@@ -371,12 +380,9 @@ export class CodexMcpServer {
                         : Date.now();
                     durationMs = end - new Date(task.startTime).getTime();
                 }
-                // Extract last agent message as the "result" preview
                 const lastAgentMsg = events
                     .filter((e) => e.type === 'agent_message')
                     .pop();
-                // Build the output tail — only agent_message and command_execution
-                // (the stuff the caller actually cares about, not reasoning/stderr)
                 const meaningfulEvents = events.filter((e) => e.type === 'agent_message' ||
                     e.type === 'command_execution' ||
                     e.type === 'file_change' ||
@@ -386,8 +392,9 @@ export class CodexMcpServer {
                 const outputTail = meaningfulEvents
                     .slice(-30)
                     .map((e) => JSON.stringify(e));
+                const stallWarning = taskStore.getStallWarning(task);
+                const s = taskStore.toSummary(task);
                 const detail = {
-                    // — Dashboard / analytics (top-level summary) —
                     analytics: {
                         total_events: analytics.total_lines,
                         event_counts: analytics.event_counts,
@@ -402,9 +409,8 @@ export class CodexMcpServer {
                             errors: analytics.errors,
                         }),
                     },
-                    // — Task metadata —
                     id: task.id,
-                    status: task.status,
+                    status: s.status,
                     role: task.role,
                     specialization: task.specialization,
                     model: task.model,
@@ -413,16 +419,15 @@ export class CodexMcpServer {
                     cwd: task.cwd,
                     output_file: task.outputFilePath,
                     prompt: task.prompt,
+                    pid: task.pid ?? null,
+                    ...(stallWarning && { stall_warning: stallWarning }),
                     ...(task.error && { error: task.error }),
-                    // — Content —
                     ...(lastAgentMsg && { last_agent_message: lastAgentMsg.text }),
                     output_tail: outputTail.join('\n'),
-                    // — Suggested jq commands (only relevant ones) —
                     ...(analytics.suggested_commands.length > 0 && {
                         suggested_commands: analytics.suggested_commands,
                     }),
                 };
-                // Include last_message from metadata if available
                 if (task.metadata?.lastMessage) {
                     detail.last_message = task.metadata.lastMessage;
                 }
@@ -436,6 +441,93 @@ export class CodexMcpServer {
                     ],
                 };
             }
+            // group:///all
+            if (uri === 'group:///all') {
+                const allGroups = groupRegistry.getAllGroups();
+                const summary = {
+                    count: allGroups.length,
+                    groups: allGroups.map((g) => ({
+                        id: g.id,
+                        state: g.state,
+                        groupName: g.groupName,
+                        branch: g.branch,
+                        agentCount: g.agents.length,
+                        agentsDone: g.agents.filter((a) => a.state === 'done_success' ||
+                            a.state === 'done_failed' ||
+                            a.state === 'blocked' ||
+                            a.state === 'timed_out').length,
+                        commitSha: g.commitSha,
+                        createdAt: g.createdAt,
+                        completedAt: g.completedAt,
+                        error: g.error,
+                    })),
+                };
+                return {
+                    contents: [
+                        {
+                            uri,
+                            mimeType: 'application/json',
+                            text: JSON.stringify(summary, null, 2),
+                        },
+                    ],
+                };
+            }
+            // group:///{id}
+            const groupIdMatch = uri.match(/^group:\/\/\/(.+)$/);
+            if (groupIdMatch) {
+                const groupId = groupIdMatch[1];
+                const group = groupRegistry.getGroup(groupId);
+                if (!group) {
+                    return {
+                        contents: [
+                            {
+                                uri,
+                                mimeType: 'application/json',
+                                text: JSON.stringify({
+                                    error: `Group "${groupId}" not found`,
+                                }),
+                            },
+                        ],
+                    };
+                }
+                const detail = {
+                    id: group.id,
+                    state: group.state,
+                    groupName: group.groupName,
+                    branch: group.branch,
+                    worktreePath: group.worktreePath,
+                    baseCwd: group.baseCwd,
+                    baseCommit: group.baseCommit,
+                    commitSha: group.commitSha,
+                    dependsOn: group.dependsOn,
+                    createdAt: group.createdAt,
+                    completedAt: group.completedAt,
+                    error: group.error,
+                    agents: group.agents.map((a) => ({
+                        alias: a.alias,
+                        state: a.state,
+                        taskId: a.taskId,
+                        role: a.role,
+                        specialization: a.specialization,
+                        dependsOn: a.dependsOn,
+                        attempts: a.attempts,
+                        maxAttempts: a.maxAttempts,
+                        error: a.error,
+                        startedAt: a.startedAt,
+                        completedAt: a.completedAt,
+                        pid: a.pid,
+                    })),
+                };
+                return {
+                    contents: [
+                        {
+                            uri,
+                            mimeType: 'application/json',
+                            text: JSON.stringify(detail, null, 2),
+                        },
+                    ],
+                };
+            }
             // Unknown URI
             return {
                 contents: [