agent-relay 1.0.7 → 1.0.9

package/dist/wrapper/parser.js

@@ -3,30 +3,101 @@
  * Extracts relay commands from agent terminal output.
  *
  * Supports two formats:
- * 1. Inline: @relay:<target> <message> (single line, start of line only)
+ * 1. Inline: ->relay:<target> <message> (single line, start of line only)
  * 2. Block: [[RELAY]]{ json }[[/RELAY]] (multi-line, structured)
  *
  * Rules:
  * - Inline only matches at start of line (after whitespace)
  * - Ignores content inside code fences
- * - Escape with \@relay: to output literal
+ * - Escape with \->relay: to output literal
  * - Block format is preferred for structured data
  */
 const DEFAULT_OPTIONS = {
     maxBlockBytes: 1024 * 1024, // 1 MiB
     enableInline: true,
     enableBlock: true,
+    prefix: '->relay:',
+    thinkingPrefix: '->thinking:',
 };
-// Patterns
-// Allow common input prefixes: >, $, %, #, →, ➜, bullets (●•◦‣⁃-*⏺◆◇○□■), and their variations
-const INLINE_RELAY = /^(?:\s*(?:[>$%#→➜›»●•◦‣⁃\-*⏺◆◇○□■]\s*)*)?@relay:(\S+)\s+(.+)$/;
-const INLINE_THINKING = /^(?:\s*(?:[>$%#→➜›»●•◦‣⁃\-*⏺◆◇○□■]\s*)*)?@thinking:(\S+)\s+(.+)$/;
+// Static patterns (not prefix-dependent)
 const BLOCK_END = /\[\[\/RELAY\]\]/;
+const BLOCK_METADATA_START = '[[RELAY_METADATA]]';
+const BLOCK_METADATA_END = /\[\[\/RELAY_METADATA\]\]/;
 const CODE_FENCE = /^```/;
-const ESCAPE_PREFIX = /^(\s*)\\@(relay|thinking):/;
+// Fenced inline patterns: ->relay:Target <<< ... >>>
+// FENCE_END is lenient - matches >>> at start of line regardless of trailing content
+// This prevents stuck fenced mode when >>> has trailing text like ">>> done"
+const FENCE_END = /^(?:\s*)?>>>/;
+// Maximum lines in a fenced block before assuming it's stuck
+const MAX_FENCED_LINES = 200;
+// Continuation helpers
+const BULLET_OR_NUMBERED_LIST = /^[ \t]*([\-*•◦‣⏺◆◇○□■]|[0-9]+[.)])\s+/;
+const PROMPTISH_LINE = /^[\s]*[>$%#➜›»][\s]*$/;
+const RELAY_INJECTION_PREFIX = /^\s*Relay message from /;
+const MAX_INLINE_CONTINUATION_LINES = 30;
+// Claude extended thinking block markers - skip content inside these
+const THINKING_START = /<antml:thinking>/;
+const THINKING_END = /<\/thinking>/;
+/**
+ * Escape special regex characters in a string
+ */
+function escapeRegex(str) {
+    return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+/**
+ * Build inline pattern for a given prefix
+ * Allow common input prefixes: >, $, %, #, →, ➜, bullets (●•◦‣⁃-*⏺◆◇○□■), box chars (│┃┆┇┊┋╎╏), and their variations
+ *
+ * Supports optional thread syntax: ->relay:Target [thread:id] message
+ * Thread IDs can contain alphanumeric chars, hyphens, underscores
+ */
+function buildInlinePattern(prefix) {
+    const escaped = escapeRegex(prefix);
+    // Group 1: target, Group 2: optional thread ID (without brackets), Group 3: message body
+    // Includes box drawing characters (│┃┆┇┊┋╎╏) and sparkle (✦) for Gemini CLI output
+    return new RegExp(`^(?:\\s*(?:[>$%#→➜›»●•◦‣⁃\\-*⏺◆◇○□■│┃┆┇┊┋╎╏✦]\\s*)*)?${escaped}(\\S+)(?:\\s+\\[thread:([\\w-]+)\\])?\\s+(.+)$`);
+}
+/**
+ * Build fenced inline pattern for multi-line messages: ->relay:Target <<<
+ * This opens a fenced block that continues until >>> is seen on its own line.
+ * Group 1: target, Group 2: optional thread ID
+ */
+function buildFencedInlinePattern(prefix) {
+    const escaped = escapeRegex(prefix);
+    return new RegExp(`^(?:\\s*(?:[>$%#→➜›»●•◦‣⁃\\-*⏺◆◇○□■│┃┆┇┊┋╎╏✦]\\s*)*)?${escaped}(\\S+)(?:\\s+\\[thread:([\\w-]+)\\])?\\s+<<<\\s*$`);
+}
+/**
+ * Build escape pattern for a given prefix (e.g., \->relay: or \->)
+ */
+function buildEscapePattern(prefix, thinkingPrefix) {
+    // Extract the first character(s) that would be escaped
+    const prefixEscaped = escapeRegex(prefix);
+    const thinkingEscaped = escapeRegex(thinkingPrefix);
+    return new RegExp(`^(\\s*)\\\\(${prefixEscaped}|${thinkingEscaped})`);
+}
 // ANSI escape sequence pattern for stripping
 // eslint-disable-next-line no-control-regex
 const ANSI_PATTERN = /\x1b\[[0-9;?]*[a-zA-Z]|\x1b\].*?(?:\x07|\x1b\\)|\r/g;
+/**
+ * Parse a target string that may contain cross-project syntax.
+ * Supports: "agent" (local) or "project:agent" (cross-project)
+ *
+ * @param target The raw target string from the relay command
+ * @returns Object with `to` (agent name) and optional `project`
+ */
+function parseTarget(target) {
+    // Check for cross-project syntax: project:agent
+    // Only split on FIRST colon to allow agent names with colons
+    const colonIndex = target.indexOf(':');
+    if (colonIndex > 0 && colonIndex < target.length - 1) {
+        // Has a colon with content on both sides
+        const project = target.substring(0, colonIndex);
+        const agent = target.substring(colonIndex + 1);
+        return { to: agent, project };
+    }
+    // Local target (no colon or malformed)
+    return { to: target };
+}
 /**
  * Strip ANSI escape codes from a string for pattern matching.
  */
@@ -38,8 +109,38 @@ export class OutputParser {
     inCodeFence = false;
     inBlock = false;
     blockBuffer = '';
+    blockType = null;
+    lastParsedMetadata = null;
+    // Claude extended thinking block state - skip content inside <thinking>...</thinking>
+    inThinkingBlock = false;
+    // Fenced inline state: ->relay:Target <<< ... >>>
+    inFencedInline = false;
+    fencedInlineBuffer = '';
+    fencedInlineTarget = '';
+    fencedInlineThread = undefined;
+    fencedInlineProject = undefined;
+    fencedInlineRaw = [];
+    fencedInlineKind = 'message';
+    // Dynamic patterns based on prefix configuration
+    inlineRelayPattern;
+    inlineThinkingPattern;
+    fencedRelayPattern;
+    fencedThinkingPattern;
+    escapePattern;
     constructor(options = {}) {
         this.options = { ...DEFAULT_OPTIONS, ...options };
+        // Build patterns based on configured prefixes
+        this.inlineRelayPattern = buildInlinePattern(this.options.prefix);
+        this.inlineThinkingPattern = buildInlinePattern(this.options.thinkingPrefix);
+        this.fencedRelayPattern = buildFencedInlinePattern(this.options.prefix);
+        this.fencedThinkingPattern = buildFencedInlinePattern(this.options.thinkingPrefix);
+        this.escapePattern = buildEscapePattern(this.options.prefix, this.options.thinkingPrefix);
+    }
+    /**
+     * Get the configured relay prefix
+     */
+    get prefix() {
+        return this.options.prefix;
     }
     /**
      * Push data into the parser and extract commands.
@@ -51,16 +152,20 @@ export class OutputParser {
     parse(data) {
         const commands = [];
         let output = '';
+        // If we're inside a fenced inline block, accumulate until we see >>>
+        if (this.inFencedInline) {
+            return this.parseFencedInlineMode(data, commands);
+        }
         // If we're inside a block, accumulate until we see the end
-        if (this.inBlock) {
-            return this.parseInBlockMode(data, commands);
+        if (this.inBlock && this.blockType) {
+            return this.parseInBlockMode(data, commands, this.blockType);
         }
-        // Find [[RELAY]] that's at the start of a line (or start of input)
-        // and NOT inside a code fence
-        const blockStartIdx = this.findBlockStart(data);
-        if (this.options.enableBlock && blockStartIdx !== -1) {
-            const before = data.substring(0, blockStartIdx);
-            const after = data.substring(blockStartIdx + '[[RELAY]]'.length);
+        // Find [[RELAY_METADATA]] or [[RELAY]] that's at the start of a line
+        const blockStart = this.findBlockStart(data);
+        if (this.options.enableBlock && blockStart.index !== -1 && blockStart.identifier) {
+            const blockStartIdentifier = blockStart.identifier;
+            const before = data.substring(0, blockStart.index);
+            const after = data.substring(blockStart.index + blockStartIdentifier.length);
             // Output everything before the block start
             if (before) {
                 const beforeResult = this.parsePassThrough(before, commands);
@@ -68,17 +173,20 @@ export class OutputParser {
             }
             // Enter block mode
             this.inBlock = true;
+            this.blockType = blockStartIdentifier === BLOCK_METADATA_START ? 'RELAY_METADATA' : 'RELAY';
             this.blockBuffer = after;
             // Check size limit before processing
             if (this.blockBuffer.length > this.options.maxBlockBytes) {
                 console.error('[parser] Block too large, discarding');
                 this.inBlock = false;
                 this.blockBuffer = '';
+                this.blockType = null;
                 return { commands, output };
             }
             // Check if block ends in same chunk
-            if (BLOCK_END.test(this.blockBuffer)) {
-                const blockResult = this.finishBlock();
+            const blockEndPattern = this.blockType === 'RELAY_METADATA' ? BLOCK_METADATA_END : BLOCK_END;
+            if (blockEndPattern.test(this.blockBuffer)) {
+                const blockResult = this.finishBlock(this.blockType);
                 if (blockResult.command) {
                     commands.push(blockResult.command);
                 }
@@ -96,59 +204,66 @@ export class OutputParser {
         return { commands, output };
     }
     /**
-     * Find [[RELAY]] that's at the start of a line and not inside a code fence.
-     * Returns the index, or -1 if not found.
+     * Find [[RELAY_METADATA]] or [[RELAY]] that's at the start of a line and not inside a code fence.
+     * Returns the index and identifier, or -1 and null if not found.
      */
     findBlockStart(data) {
         // Track code fence state through the data
         let inFence = this.inCodeFence;
         let searchStart = 0;
+        // Prioritize RELAY_METADATA over RELAY
+        const blockIdentifiers = [BLOCK_METADATA_START, '[[RELAY]]'];
         while (searchStart < data.length) {
-            // Look for next [[RELAY]] or code fence
-            const relayIdx = data.indexOf('[[RELAY]]', searchStart);
-            const fenceIdx = data.indexOf('```', searchStart);
-            // No more [[RELAY]] found
-            if (relayIdx === -1) {
+            let earliestBlockIdx = -1;
+            let earliestBlockIdentifier = null;
+            for (const identifier of blockIdentifiers) {
+                const currentBlockIdx = data.indexOf(identifier, searchStart);
+                if (currentBlockIdx !== -1 && (earliestBlockIdx === -1 || currentBlockIdx < earliestBlockIdx)) {
+                    earliestBlockIdx = currentBlockIdx;
+                    earliestBlockIdentifier = identifier;
+                }
+            }
+            // No more blocks found
+            if (earliestBlockIdx === -1) {
                 // Still update code fence state for remaining data
+                let fenceIdx = data.indexOf('```', searchStart);
                 while (fenceIdx !== -1) {
-                    const nextFence = data.indexOf('```', searchStart);
-                    if (nextFence === -1)
-                        break;
                     inFence = !inFence;
-                    searchStart = nextFence + 3;
+                    searchStart = fenceIdx + 3;
+                    fenceIdx = data.indexOf('```', searchStart);
                 }
-                return -1;
+                return { index: -1, identifier: null };
             }
-            // Process any code fences before this [[RELAY]]
+            // Process any code fences before this block
             let tempIdx = searchStart;
             while (true) {
                 const nextFence = data.indexOf('```', tempIdx);
-                if (nextFence === -1 || nextFence >= relayIdx)
+                if (nextFence === -1 || nextFence >= earliestBlockIdx)
                     break;
                 inFence = !inFence;
                 tempIdx = nextFence + 3;
             }
-            // If we're inside a code fence, skip this [[RELAY]]
+            // If we're inside a code fence, skip this block
             if (inFence) {
-                searchStart = relayIdx + 9; // Skip past [[RELAY]]
+                searchStart = earliestBlockIdx + (earliestBlockIdentifier?.length ?? 0); // Skip past the block
                 continue;
             }
-            // Check if [[RELAY]] is at start of a line
-            if (relayIdx === 0) {
-                return 0; // At very start
+            // Check if block is at start of a line
+            if (earliestBlockIdx === 0) {
+                return { index: 0, identifier: earliestBlockIdentifier }; // At very start
             }
             // Look backwards for the start of line
-            const beforeRelay = data.substring(0, relayIdx);
-            const lastNewline = beforeRelay.lastIndexOf('\n');
-            const lineStart = beforeRelay.substring(lastNewline + 1);
-            // Must be only whitespace before [[RELAY]] on this line
+            const beforeBlock = data.substring(0, earliestBlockIdx);
+            const lastNewline = beforeBlock.lastIndexOf('\n');
+            const lineStart = beforeBlock.substring(lastNewline + 1);
+            // Must be only whitespace before block on this line
             if (/^\s*$/.test(lineStart)) {
-                return relayIdx;
+                return { index: earliestBlockIdx, identifier: earliestBlockIdentifier };
             }
             // Not at start of line, keep searching
-            searchStart = relayIdx + 9;
+            searchStart = earliestBlockIdx + (earliestBlockIdentifier?.length ?? 0);
         }
-        return -1;
+        return { index: -1, identifier: null };
     }
     /**
      * Parse data in pass-through mode - TRUE pass-through for terminal rendering.
@@ -164,6 +279,79 @@ export class OutputParser {
         // Simple approach: split data, check each line (complete or not), rebuild output
         const lines = data.split('\n');
         const hasTrailingNewline = data.endsWith('\n');
+        const isInlineStart = (line) => {
+            return this.inlineRelayPattern.test(line) || this.inlineThinkingPattern.test(line);
+        };
+        const isFencedInlineStart = (line) => {
+            const stripped = stripAnsi(line);
+            const relayMatch = stripped.match(this.fencedRelayPattern);
+            if (relayMatch) {
+                const [, target, threadId] = relayMatch;
+                const { to, project } = parseTarget(target);
+                return { target: to, thread: threadId || undefined, project, kind: 'message' };
+            }
+            const thinkingMatch = stripped.match(this.fencedThinkingPattern);
+            if (thinkingMatch) {
+                const [, target, threadId] = thinkingMatch;
+                const { to, project } = parseTarget(target);
+                return { target: to, thread: threadId || undefined, project, kind: 'thinking' };
+            }
+            return null;
+        };
+        const isBlockMarker = (line) => {
+            return CODE_FENCE.test(line) || line.includes('[[RELAY]]') || BLOCK_END.test(line);
+        };
+        const shouldStopContinuation = (line, continuationCount, lines, currentIndex) => {
+            const trimmed = line.trim();
+            if (isInlineStart(line))
+                return true;
+            if (isFencedInlineStart(line))
+                return true;
+            if (isBlockMarker(line))
+                return true;
+            if (PROMPTISH_LINE.test(trimmed))
+                return true;
+            if (RELAY_INJECTION_PREFIX.test(line))
+                return true; // Avoid swallowing injected inbound messages
+            // Allow blank lines only in structured content like tables or between numbered sections
+            if (trimmed === '') {
+                // If we haven't started continuation yet, stop on blank
+                if (continuationCount === 0)
+                    return true;
+                // Look ahead to see if there's more content that looks like structured markdown
+                for (let j = currentIndex + 1; j < lines.length; j++) {
+                    const nextLine = lines[j].trim();
+                    if (nextLine === '') {
+                        // Double blank line always stops
+                        return true;
+                    }
+                    // Only continue for table rows or numbered list items after blank
+                    if (/^\|/.test(nextLine))
+                        return false; // Table row
+                    if (/^\d+[.)]\s/.test(nextLine))
+                        return false; // Numbered list like "1." or "2)"
+                    // Stop for anything else after a blank line
+                    return true;
+                }
+                return true; // No more content, stop
+            }
+            return false;
+        };
+        const isContinuationLine = (original, stripped, prevStripped, continuationCount) => {
+            // Note: shouldStopContinuation is already checked in the main loop before calling this
+            if (/^[ \t]/.test(original))
+                return true; // Indented lines from TUI wrapping
+            if (BULLET_OR_NUMBERED_LIST.test(stripped))
+                return true; // Bullet/numbered lists after ->relay:
+            const prevTrimmed = prevStripped.trimEnd();
+            const prevSuggestsContinuation = prevTrimmed !== '' && /[:;,\-–—…]$/.test(prevTrimmed);
+            if (prevSuggestsContinuation)
+                return true;
+            // If we've already continued once, allow subsequent lines until a stop condition
+            if (continuationCount > 0)
+                return true;
+            return false;
+        };
         const outputLines = [];
         let strippedCount = 0;
         for (let i = 0; i < lines.length; i++) {
@@ -179,6 +367,62 @@ export class OutputParser {
                 outputLines.push(line);
                 continue;
             }
+            // Skip Claude extended thinking blocks - don't parse or output their content
+            // Check for thinking end first (to handle end tag on same line as start)
+            if (this.inThinkingBlock) {
+                if (THINKING_END.test(line)) {
+                    this.inThinkingBlock = false;
+                }
+                // Skip this line - don't output thinking content
+                strippedCount++;
+                continue;
+            }
+            // Check for thinking start
+            if (THINKING_START.test(line)) {
+                this.inThinkingBlock = true;
+                // Also check if it ends on the same line (inline thinking block)
+                if (THINKING_END.test(line)) {
+                    this.inThinkingBlock = false;
+                }
+                // Skip this line - don't output thinking content
+                strippedCount++;
+                continue;
+            }
+            // Check for fenced inline start: ->relay:Target <<<
+            const fencedStart = isFencedInlineStart(line);
+            if (fencedStart && this.options.enableInline) {
+                // Enter fenced inline mode
+                this.inFencedInline = true;
+                this.fencedInlineTarget = fencedStart.target;
+                this.fencedInlineThread = fencedStart.thread;
+                this.fencedInlineProject = fencedStart.project;
+                this.fencedInlineKind = fencedStart.kind;
+                this.fencedInlineBuffer = '';
+                this.fencedInlineRaw = [line];
+                // Process remaining lines in fenced mode
+                if (i + 1 < lines.length) {
+                    // Don't double-add trailing newline - the empty string at end of lines array
+                    // already accounts for it when we join
+                    const remainingLines = lines.slice(i + 1);
+                    const remaining = remainingLines.join('\n') + (hasTrailingNewline && remainingLines[remainingLines.length - 1] !== '' ? '\n' : '');
+                    const result = this.parseFencedInlineMode(remaining, commands);
+                    strippedCount++;
+                    // Combine output
+                    let output = outputLines.join('\n');
+                    if (hasTrailingNewline && outputLines.length > 0 && !this.inFencedInline) {
+                        output += '\n';
+                    }
+                    output += result.output;
+                    return output;
+                }
+                // No more lines - waiting for more data
+                strippedCount++;
+                let output = outputLines.join('\n');
+                if (hasTrailingNewline && outputLines.length > 0) {
+                    output += '\n';
+                }
+                return output;
+            }
             if (line.length > 0) {
                 // Only check complete lines for relay commands.
                 const result = this.processLine(line);
@@ -187,6 +431,7 @@ export class OutputParser {
                     let body = result.command.body;
                     const rawLines = [result.command.raw];
                     let consumed = 0;
+                    let continuationLines = 0;
                     while (i + 1 < lines.length) {
                         const nextIsLast = i + 1 === lines.length - 1;
                         const nextLine = lines[i + 1];
@@ -195,26 +440,21 @@ export class OutputParser {
                             break;
                         }
                         const nextStripped = stripAnsi(nextLine);
-                        // Stop at empty lines - they end the continuation
-                        if (nextStripped.trim() === '') {
+                        const prevStripped = stripAnsi(rawLines[rawLines.length - 1] ?? '');
+                        // Stop if this line clearly marks a new block, prompt, or inline command
+                        if (shouldStopContinuation(nextStripped, continuationLines, lines, i + 1)) {
                             break;
                         }
-                        // Stop if the next line starts another inline command, code fence, or block marker
-                        if (INLINE_RELAY.test(nextStripped) ||
-                            INLINE_THINKING.test(nextStripped) ||
-                            CODE_FENCE.test(nextStripped) ||
-                            nextStripped.includes('[[RELAY]]') ||
-                            BLOCK_END.test(nextStripped)) {
+                        if (continuationLines >= MAX_INLINE_CONTINUATION_LINES) {
                             break;
                         }
-                        // Only consume as continuation if the line is INDENTED (starts with whitespace)
-                        // This handles TUI wrapping where continuation lines are indented
-                        // Non-indented lines are regular output, not continuation
-                        if (!/^[ \t]/.test(nextLine)) {
+                        // Consume as continuation if it looks like it belongs to the ->relay message
+                        if (!isContinuationLine(nextLine, nextStripped, prevStripped, continuationLines)) {
                             break;
                         }
                         consumed++;
                         i++; // Skip the consumed continuation line
+                        continuationLines++;
                         body += '\n' + nextLine;
                         rawLines.push(nextLine);
                     }
@@ -250,18 +490,20 @@ export class OutputParser {
     /**
      * Parse while inside a [[RELAY]] block - buffer until we see [[/RELAY]].
      */
-    parseInBlockMode(data, commands) {
+    parseInBlockMode(data, commands, blockType) {
         this.blockBuffer += data;
         // Check size limit
         if (this.blockBuffer.length > this.options.maxBlockBytes) {
             console.error('[parser] Block too large, discarding');
             this.inBlock = false;
             this.blockBuffer = '';
+            this.blockType = null;
             return { commands, output: '' };
         }
         // Check for block end
-        if (BLOCK_END.test(this.blockBuffer)) {
-            const result = this.finishBlock();
+        const blockEndPattern = blockType === 'RELAY_METADATA' ? BLOCK_METADATA_END : BLOCK_END;
+        if (blockEndPattern.test(this.blockBuffer)) {
+            const result = this.finishBlock(blockType);
             if (result.command) {
                 commands.push(result.command);
             }
@@ -297,35 +539,41 @@ export class OutputParser {
             return { command: null, output: line };
         }
         // Check for escaped inline (on stripped text)
-        const escapeMatch = stripped.match(ESCAPE_PREFIX);
+        const escapeMatch = stripped.match(this.escapePattern);
         if (escapeMatch) {
-            // Output with escape removed
-            const unescaped = line.replace(/\\@/, '@');
+            // Output with escape removed (remove the backslash before the prefix)
+            const unescaped = line.replace(/\\/, '');
             return { command: null, output: unescaped };
         }
         // Check for inline relay (on stripped text)
         if (this.options.enableInline) {
-            const relayMatch = stripped.match(INLINE_RELAY);
+            const relayMatch = stripped.match(this.inlineRelayPattern);
             if (relayMatch) {
-                const [raw, target, body] = relayMatch;
+                const [raw, target, threadId, body] = relayMatch;
+                const { to, project } = parseTarget(target);
                 return {
                     command: {
-                        to: target,
+                        to,
                         kind: 'message',
                         body,
+                        thread: threadId || undefined, // undefined if no thread specified
+                        project, // undefined if local, set if cross-project
                         raw,
                     },
                     output: null, // Don't output relay commands
                 };
             }
-            const thinkingMatch = stripped.match(INLINE_THINKING);
+            const thinkingMatch = stripped.match(this.inlineThinkingPattern);
             if (thinkingMatch) {
-                const [raw, target, body] = thinkingMatch;
+                const [raw, target, threadId, body] = thinkingMatch;
+                const { to, project } = parseTarget(target);
                 return {
                     command: {
-                        to: target,
+                        to,
                         kind: 'thinking',
                         body,
+                        thread: threadId || undefined,
+                        project,
                         raw,
                     },
                     output: null,
@@ -339,34 +587,211 @@ export class OutputParser {
      * Finish processing a block and extract command.
      * Returns the command (if valid) and any remaining content after [[/RELAY]].
      */
-    finishBlock() {
-        const endIdx = this.blockBuffer.indexOf('[[/RELAY]]');
+    finishBlock(blockType) {
+        const blockEndIdentifier = blockType === 'RELAY_METADATA' ? BLOCK_METADATA_END.source : BLOCK_END.source;
+        const endIdx = this.blockBuffer.indexOf(blockEndIdentifier.replace(/\\/g, '')); // Remove regex escapes for indexOf
         const jsonStr = this.blockBuffer.substring(0, endIdx).trim();
-        const remaining = this.blockBuffer.substring(endIdx + '[[/RELAY]]'.length) || null;
+        const remaining = this.blockBuffer.substring(endIdx + blockEndIdentifier.replace(/\\/g, '').length) || null;
         this.inBlock = false;
         this.blockBuffer = '';
-        try {
-            const parsed = JSON.parse(jsonStr);
-            // Validate required fields
-            if (!parsed.to || !parsed.type) {
-                console.error('[parser] Block missing required fields (to, type)');
-                return { command: null, remaining };
-            }
-            return {
-                command: {
-                    to: parsed.to,
+        this.blockType = null;
+        if (blockType === 'RELAY_METADATA') {
+            try {
+                const metadata = JSON.parse(jsonStr);
+                this.lastParsedMetadata = metadata;
+                return { command: null, remaining, metadata };
+            }
+            catch (err) {
+                console.error('[parser] Invalid JSON in RELAY_METADATA block:', err);
+                this.lastParsedMetadata = null;
+                return { command: null, remaining, metadata: null };
+            }
+        }
+        else { // blockType === 'RELAY'
+            try {
+                const parsed = JSON.parse(jsonStr);
+                // Validate required fields
+                if (!parsed.to || !parsed.type) {
+                    console.error('[parser] Block missing required fields (to, type)');
+                    this.lastParsedMetadata = null; // Clear metadata even if RELAY block is invalid
+                    return { command: null, remaining, metadata: null };
+                }
+                // Handle cross-project syntax in block format
+                // Supports both explicit "project" field and "project:agent" in "to" field
+                let to = parsed.to;
+                let project = parsed.project;
+                if (!project && typeof to === 'string') {
+                    // Check if "to" field uses project:agent syntax
+                    const targetParsed = parseTarget(to);
+                    to = targetParsed.to;
+                    project = targetParsed.project;
+                }
+                const command = {
+                    to,
                     kind: parsed.type,
                     body: parsed.body ?? parsed.text ?? '',
                     data: parsed.data,
+                    thread: parsed.thread || undefined,
+                    project: project || undefined,
                     raw: jsonStr,
-                },
-                remaining,
-            };
+                    meta: this.lastParsedMetadata || undefined, // Attach last parsed metadata
+                };
+                this.lastParsedMetadata = null; // Clear after use
+                return {
+                    command,
+                    remaining,
+                    metadata: null,
+                };
+            }
+            catch (err) {
+                console.error('[parser] Invalid JSON in RELAY block:', err);
+                this.lastParsedMetadata = null;
+                return { command: null, remaining, metadata: null };
+            }
         }
-        catch (err) {
-            console.error('[parser] Invalid JSON in block:', err);
-            return { command: null, remaining };
+    }
+    /**
+     * Parse while inside a fenced inline block (->relay:Target <<< ... >>>).
+     * Accumulates lines until >>> is seen on its own line.
+     */
+    parseFencedInlineMode(data, commands) {
+        const lines = data.split('\n');
+        const hasTrailingNewline = data.endsWith('\n');
+        let output = '';
+        let consecutiveBlankLines = 0;
+        for (let i = 0; i < lines.length; i++) {
+            const line = lines[i];
+            const isLastLine = i === lines.length - 1;
+            const stripped = stripAnsi(line);
+            // Track consecutive blank lines for auto-close
+            if (stripped === '') {
+                consecutiveBlankLines++;
+            }
+            else {
+                consecutiveBlankLines = 0;
+            }
+            // Auto-close on double blank line (agent forgot >>>)
+            // Only if we have actual content to send
+            if (consecutiveBlankLines >= 2 && this.fencedInlineBuffer.trim().length > 0) {
+                const body = this.fencedInlineBuffer.trim();
+                const command = {
+                    to: this.fencedInlineTarget,
+                    kind: this.fencedInlineKind,
+                    body,
+                    thread: this.fencedInlineThread,
+                    project: this.fencedInlineProject,
+                    raw: this.fencedInlineRaw.join('\n'),
+                };
+                commands.push(command);
+                // Reset fenced inline state
+                this.inFencedInline = false;
+                this.fencedInlineBuffer = '';
+                this.fencedInlineTarget = '';
+                this.fencedInlineThread = undefined;
+                this.fencedInlineProject = undefined;
+                this.fencedInlineRaw = [];
+                this.fencedInlineKind = 'message';
+                // Process remaining lines in normal mode
+                const remainingLines = lines.slice(i);
+                const remaining = remainingLines.join('\n') + (hasTrailingNewline ? '\n' : '');
+                const result = this.parse(remaining);
+                commands.push(...result.commands);
+                return { commands, output: result.output };
+            }
+            // Check if a new relay command started (means previous fenced block was never closed)
+            // This prevents a stuck fenced block from swallowing all subsequent messages
+            // Note: This is an expected recovery path, not an error - don't log to avoid noise
+            if (this.inlineRelayPattern.test(stripped) || this.fencedRelayPattern.test(stripped)) {
+                // Discard the incomplete fenced block
+                this.inFencedInline = false;
+                this.fencedInlineBuffer = '';
+                this.fencedInlineTarget = '';
+                this.fencedInlineThread = undefined;
+                this.fencedInlineProject = undefined;
+                this.fencedInlineRaw = [];
+                this.fencedInlineKind = 'message';
+                // Process remaining lines (including this one) in normal mode
+                const remainingLines = lines.slice(i);
+                const remaining = remainingLines.join('\n') + (hasTrailingNewline ? '\n' : '');
+                const result = this.parse(remaining);
+                commands.push(...result.commands);
+                return { commands, output: result.output };
+            }
+            // Check if this line closes the fenced block
+            if (FENCE_END.test(stripped)) {
+                // Complete the fenced inline command
+                const body = this.fencedInlineBuffer.trim();
+                this.fencedInlineRaw.push(line);
+                const command = {
+                    to: this.fencedInlineTarget,
+                    kind: this.fencedInlineKind,
+                    body,
+                    thread: this.fencedInlineThread,
+                    project: this.fencedInlineProject,
+                    raw: this.fencedInlineRaw.join('\n'),
+                };
+                commands.push(command);
+                // Reset fenced inline state
+                this.inFencedInline = false;
+                this.fencedInlineBuffer = '';
+                this.fencedInlineTarget = '';
+                this.fencedInlineThread = undefined;
+                this.fencedInlineProject = undefined;
+                this.fencedInlineRaw = [];
+                this.fencedInlineKind = 'message';
+                // Process remaining lines after the fence close
+                // Only process if there's actual content after the closing fence
+                const remainingLines = lines.slice(i + 1);
+                // Filter out trailing empty string from split
+                const hasContent = remainingLines.some((l, idx) => l.trim() !== '' || (idx < remainingLines.length - 1));
+                if (hasContent) {
+                    const remaining = remainingLines.join('\n') + (hasTrailingNewline ? '\n' : '');
+                    const result = this.parse(remaining);
+                    commands.push(...result.commands);
+                    output += result.output;
+                }
+                return { commands, output };
+            }
+            // Accumulate this line into the buffer (preserving blank lines within content)
+            // But skip trailing empty line from split (when input ends with \n)
+            const isTrailingEmpty = isLastLine && line === '' && hasTrailingNewline;
+            if (!isTrailingEmpty) {
+                if (this.fencedInlineBuffer.length > 0) {
+                    this.fencedInlineBuffer += '\n' + line;
+                }
+                else if (line.trim() !== '') {
+                    // Start accumulating from first non-blank line
+                    this.fencedInlineBuffer = line;
+                }
+                this.fencedInlineRaw.push(line);
+            }
+            // Check size limit
+            if (this.fencedInlineBuffer.length > this.options.maxBlockBytes) {
+                console.error('[parser] Fenced inline block too large, discarding');
+                this.inFencedInline = false;
+                this.fencedInlineBuffer = '';
+                this.fencedInlineTarget = '';
+                this.fencedInlineThread = undefined;
+                this.fencedInlineProject = undefined;
+                this.fencedInlineRaw = [];
+                this.fencedInlineKind = 'message';
+                return { commands, output: '' };
+            }
+            // Check line count limit - prevents stuck fenced mode from blocking all messages
+            if (this.fencedInlineRaw.length > MAX_FENCED_LINES) {
+                console.error('[parser] Fenced inline block exceeded max lines, discarding');
+                this.inFencedInline = false;
+                this.fencedInlineBuffer = '';
+                this.fencedInlineTarget = '';
+                this.fencedInlineThread = undefined;
+                this.fencedInlineProject = undefined;
+                this.fencedInlineRaw = [];
+                this.fencedInlineKind = 'message';
+                return { commands, output: '' };
+            }
         }
+        // Still waiting for >>> - return empty output (content is buffered)
+        return { commands, output: '' };
     }
     /**
      * Flush any remaining buffer (call on stream end).
@@ -375,7 +800,17 @@ export class OutputParser {
         const result = this.parse('\n');
         this.inBlock = false;
         this.blockBuffer = '';
+        this.blockType = null;
+        this.lastParsedMetadata = null;
         this.inCodeFence = false;
+        this.inThinkingBlock = false;
+        this.inFencedInline = false;
+        this.fencedInlineBuffer = '';
+        this.fencedInlineTarget = '';
+        this.fencedInlineThread = undefined;
+        this.fencedInlineProject = undefined;
+        this.fencedInlineRaw = [];
+        this.fencedInlineKind = 'message';
         return result;
     }
     /**
@@ -384,7 +819,17 @@ export class OutputParser {
     reset() {
         this.inBlock = false;
         this.blockBuffer = '';
+        this.blockType = null;
+        this.lastParsedMetadata = null;
         this.inCodeFence = false;
+        this.inThinkingBlock = false;
+        this.inFencedInline = false;
+        this.fencedInlineBuffer = '';
+        this.fencedInlineTarget = '';
+        this.fencedInlineThread = undefined;
+        this.fencedInlineProject = undefined;
+        this.fencedInlineRaw = [];
+        this.fencedInlineKind = 'message';
     }
 }
 /**
@@ -394,4 +839,95 @@ export function formatIncomingMessage(from, body, kind = 'message') {
     const prefix = kind === 'thinking' ? '[THINKING]' : '[MSG]';
     return `\n${prefix} from ${from}: ${body}\n`;
 }
+/**
+ * Parse [[RELAY_METADATA]]...[[/RELAY_METADATA]] blocks from agent output.
+ * Agents can output metadata to enhance messages.
+ *
+ * Format:
+ * [[RELAY_METADATA]]
+ * {
+ *   "subject": "Task update",
+ *   "importance": 80,
+ *   "replyTo": "msg-abc123",
+ *   "ackRequired": true
+ * }
+ * [[/RELAY_METADATA]]
+ */
+export function parseRelayMetadataFromOutput(output) {
+    const match = output.match(/\[\[RELAY_METADATA\]\]([\s\S]*?)\[\[\/RELAY_METADATA\]\]/);
+    if (!match) {
+        return { found: false, valid: false, metadata: null, rawContent: null };
+    }
+    const rawContent = match[1].trim();
+    try {
+        const metadata = JSON.parse(rawContent);
+        return { found: true, valid: true, metadata, rawContent };
+    }
+    catch {
+        return { found: true, valid: false, metadata: null, rawContent };
+    }
+}
+/**
+ * Parse [[SUMMARY]]...[[/SUMMARY]] blocks from agent output.
+ * Agents can output summaries to keep a running context of their work.
+ *
+ * Format:
+ * [[SUMMARY]]
+ * {
+ *   "currentTask": "Working on auth module",
+ *   "context": "Completed login flow, now implementing logout",
+ *   "files": ["src/auth.ts", "src/session.ts"]
+ * }
+ * [[/SUMMARY]]
+ */
+export function parseSummaryFromOutput(output) {
+    const result = parseSummaryWithDetails(output);
+    return result.summary;
+}
+/**
+ * Parse SUMMARY block with full details for deduplication.
+ * Returns raw content to allow caller to dedupe before logging errors.
+ */
+export function parseSummaryWithDetails(output) {
+    const match = output.match(/\[\[SUMMARY\]\]([\s\S]*?)\[\[\/SUMMARY\]\]/);
+    if (!match) {
+        return { found: false, valid: false, summary: null, rawContent: null };
+    }
+    const rawContent = match[1].trim();
+    try {
+        const summary = JSON.parse(rawContent);
+        return { found: true, valid: true, summary, rawContent };
+    }
+    catch {
+        return { found: true, valid: false, summary: null, rawContent };
+    }
+}
+/**
+ * Parse [[SESSION_END]]...[[/SESSION_END]] blocks from agent output.
+ * Agents output this to explicitly mark their session as complete.
+ *
+ * Format:
+ * [[SESSION_END]]
+ * {"summary": "Completed auth module implementation", "completedTasks": ["login", "logout"]}
+ * [[/SESSION_END]]
+ *
+ * Or simply: [[SESSION_END]][[/SESSION_END]] for a clean close without summary.
+ */
+export function parseSessionEndFromOutput(output) {
+    const match = output.match(/\[\[SESSION_END\]\]([\s\S]*?)\[\[\/SESSION_END\]\]/);
+    if (!match) {
+        return null;
+    }
+    const content = match[1].trim();
+    if (!content) {
+        return {}; // Empty marker = session ended without summary
+    }
+    try {
+        return JSON.parse(content);
+    }
+    catch {
+        // If not valid JSON, treat the content as a plain summary string
+        return { summary: content };
+    }
+}
 //# sourceMappingURL=parser.js.map