tmux-team 3.2.2 → 3.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmux-team",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "CLI tool for AI agent collaboration in tmux - manage cross-pane communication",
   "type": "module",
   "bin": {

package/src/cli.test.ts

@@ -16,7 +16,7 @@ function makeStubContext(): Context {
     config: {
       mode: 'polling',
       preambleMode: 'always',
-      defaults: { timeout: 180, pollInterval: 1, captureLines: 100, preambleEvery: 3 },
+      defaults: { timeout: 180, pollInterval: 1, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3 },
       agents: {},
       paneRegistry: {},
     },

package/src/commands/basic-commands.test.ts

@@ -53,7 +53,7 @@ function createCtx(
   const baseConfig: ResolvedConfig = {
     mode: 'polling',
     preambleMode: 'always',
-    defaults: { timeout: 180, pollInterval: 1, captureLines: 100, preambleEvery: 3 },
+    defaults: { timeout: 180, pollInterval: 1, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3 },
     agents: {},
     paneRegistry: {},
     ...overrides?.config,

package/src/commands/config-command.test.ts

@@ -34,7 +34,7 @@ function createCtx(
   const config: ResolvedConfig = {
     mode: 'polling',
     preambleMode: 'always',
-    defaults: { timeout: 180, pollInterval: 1, captureLines: 100, preambleEvery: 3 },
+    defaults: { timeout: 180, pollInterval: 1, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3 },
     agents: {},
     paneRegistry: {},
     ...configOverrides,

package/src/commands/config.ts

@@ -155,6 +155,7 @@ function setConfig(ctx: Context, key: string, value: string, global: boolean): v
           timeout: 180,
           pollInterval: 1,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: parseInt(value, 10),
         };
       } else {

package/src/commands/install.test.ts

@@ -26,7 +26,7 @@ function createCtx(testDir: string, overrides?: Partial<{ flags: Partial<Flags>
   const config: ResolvedConfig = {
     mode: 'polling',
     preambleMode: 'always',
-    defaults: { timeout: 180, pollInterval: 1, captureLines: 100, preambleEvery: 3 },
+    defaults: { timeout: 180, pollInterval: 1, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3 },
     agents: {},
     paneRegistry: {},
   };

package/src/commands/setup.test.ts

@@ -26,7 +26,7 @@ function createCtx(testDir: string, tmux: Tmux, flags?: Partial<Flags>): Context
   const config: ResolvedConfig = {
     mode: 'polling',
     preambleMode: 'always',
-    defaults: { timeout: 180, pollInterval: 1, captureLines: 100, preambleEvery: 3 },
+    defaults: { timeout: 180, pollInterval: 1, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3 },
     agents: {},
     paneRegistry: {},
   };

package/src/commands/talk.test.ts

@@ -79,6 +79,7 @@ function createDefaultConfig(): ResolvedConfig {
       timeout: 60,
       pollInterval: 0.1, // Fast polling for tests
       captureLines: 100,
+      maxCaptureLines: 2000,
       preambleEvery: 3,
     },
     agents: {},
@@ -236,6 +237,7 @@ describe('buildMessage (via cmdTalk)', () => {
         timeout: 60,
         pollInterval: 0.1,
         captureLines: 100,
+        maxCaptureLines: 2000,
         preambleEvery: 3,
       },
     };
@@ -272,6 +274,7 @@ describe('buildMessage (via cmdTalk)', () => {
         timeout: 60,
         pollInterval: 0.1,
         captureLines: 100,
+        maxCaptureLines: 2000,
         preambleEvery: 1,
       },
     };
@@ -295,6 +298,7 @@ describe('buildMessage (via cmdTalk)', () => {
         timeout: 60,
         pollInterval: 0.1,
         captureLines: 100,
+        maxCaptureLines: 2000,
         preambleEvery: 0,
       },
     };
@@ -491,6 +495,7 @@ describe('cmdTalk - --wait mode', () => {
           timeout: 5,
           pollInterval: 0.01,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
       },
@@ -534,6 +539,7 @@ describe('cmdTalk - --wait mode', () => {
           timeout: 5,
           pollInterval: 0.01,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
       },
@@ -564,6 +570,7 @@ describe('cmdTalk - --wait mode', () => {
           timeout: 0.1,
           pollInterval: 0.02,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
       },
@@ -611,6 +618,7 @@ describe('cmdTalk - --wait mode', () => {
           timeout: 5,
           pollInterval: 0.01,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
       },
@@ -646,6 +654,7 @@ describe('cmdTalk - --wait mode', () => {
           timeout: 5,
           pollInterval: 0.01,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
       },
@@ -674,6 +683,7 @@ describe('cmdTalk - --wait mode', () => {
           timeout: 0.05,
           pollInterval: 0.01,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
       },
@@ -728,6 +738,7 @@ describe('cmdTalk - --wait mode', () => {
           timeout: 5,
           pollInterval: 0.05,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
         paneRegistry: {
@@ -775,6 +786,7 @@ describe('cmdTalk - --wait mode', () => {
           timeout: 0.5,
           pollInterval: 0.02,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
         paneRegistry: {
@@ -832,6 +844,7 @@ describe('cmdTalk - --wait mode', () => {
           timeout: 5,
           pollInterval: 0.02,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
         paneRegistry: {
@@ -941,6 +954,7 @@ describe('cmdTalk - nonce collision handling', () => {
           timeout: 5,
           pollInterval: 0.01,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
       },
@@ -995,6 +1009,7 @@ describe('cmdTalk - JSON output contract', () => {
           timeout: 5,
           pollInterval: 0.01,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
       },
@@ -1035,6 +1050,7 @@ describe('cmdTalk - JSON output contract', () => {
           timeout: 0.05,
           pollInterval: 0.01,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
       },
@@ -1076,6 +1092,7 @@ describe('cmdTalk - JSON output contract', () => {
           timeout: 0.05,
           pollInterval: 0.01,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
       },
@@ -1112,6 +1129,7 @@ describe('cmdTalk - JSON output contract', () => {
           timeout: 0.05,
           pollInterval: 0.01,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
       },
@@ -1162,6 +1180,7 @@ describe('cmdTalk - JSON output contract', () => {
           timeout: 0.5,
           pollInterval: 0.02,
           captureLines: 100,
+          maxCaptureLines: 2000,
           preambleEvery: 3,
         },
         paneRegistry: {
@@ -1244,7 +1263,7 @@ describe('cmdTalk - end marker detection', () => {
       ui,
       paths: createTestPaths(testDir),
       flags: { wait: true, json: true, timeout: 5 },
-      config: { defaults: { timeout: 5, pollInterval: 0.01, captureLines: 100, preambleEvery: 3 } },
+      config: { defaults: { timeout: 5, pollInterval: 0.01, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3 } },
     });
 
     await cmdTalk(ctx, 'claude', 'Test message');
@@ -1277,7 +1296,7 @@ describe('cmdTalk - end marker detection', () => {
       ui,
       paths: createTestPaths(testDir),
       flags: { wait: true, json: true, timeout: 5 },
-      config: { defaults: { timeout: 5, pollInterval: 0.01, captureLines: 100, preambleEvery: 3 } },
+      config: { defaults: { timeout: 5, pollInterval: 0.01, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3 } },
     });
 
     await cmdTalk(ctx, 'claude', 'Test');
@@ -1311,7 +1330,7 @@ Line 4 final`;
       ui,
       paths: createTestPaths(testDir),
       flags: { wait: true, json: true, timeout: 5 },
-      config: { defaults: { timeout: 5, pollInterval: 0.01, captureLines: 100, preambleEvery: 3 } },
+      config: { defaults: { timeout: 5, pollInterval: 0.01, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3 } },
     });
 
     await cmdTalk(ctx, 'claude', 'Test');
@@ -1342,7 +1361,7 @@ Line 4 final`;
       ui,
       paths: createTestPaths(testDir),
       flags: { wait: true, json: true, timeout: 5 },
-      config: { defaults: { timeout: 5, pollInterval: 0.01, captureLines: 100, preambleEvery: 3 } },
+      config: { defaults: { timeout: 5, pollInterval: 0.01, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3 } },
     });
 
     await cmdTalk(ctx, 'claude', 'Test');
@@ -1379,7 +1398,7 @@ Line 4 final`;
       ui,
       paths: createTestPaths(testDir),
       flags: { wait: true, json: true, timeout: 5 },
-      config: { defaults: { timeout: 5, pollInterval: 0.01, captureLines: 100, preambleEvery: 3 } },
+      config: { defaults: { timeout: 5, pollInterval: 0.01, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3 } },
     });
 
     await cmdTalk(ctx, 'claude', 'Test');
@@ -1415,7 +1434,7 @@ Line 4 final`;
       ui,
       paths: createTestPaths(testDir),
       flags: { wait: true, json: true, timeout: 5 },
-      config: { defaults: { timeout: 5, pollInterval: 0.01, captureLines: 200, preambleEvery: 3 } },
+      config: { defaults: { timeout: 5, pollInterval: 0.01, captureLines: 200, maxCaptureLines: 2000, preambleEvery: 3 } },
     });
 
     await cmdTalk(ctx, 'claude', 'Test');

package/src/commands/talk.ts

@@ -118,6 +118,99 @@ function extractPartialResponse(
   return partial || null;
 }
 
+// ─────────────────────────────────────────────────────────────
+// Expandable capture extraction
+// ─────────────────────────────────────────────────────────────
+
+interface ExtractResult {
+  response: string;
+  truncated: boolean;
+}
+
+/**
+ * Extract response with expandable capture.
+ *
+ * When the instruction line is not found in the initial capture (response too long),
+ * retry with progressively larger captures up to maxCaptureLines.
+ */
+function extractWithExpandableCapture(
+  tmux: Context['tmux'],
+  pane: string,
+  nonce: string,
+  endMarkerRegex: RegExp,
+  initialCapture: string,
+  captureLines: number,
+  maxCaptureLines: number,
+  responseLines: number,
+  debug?: boolean
+): ExtractResult {
+  let output = initialCapture;
+  let currentCaptureLines = captureLines;
+  let truncated = false;
+
+  // Try extraction with progressively larger captures
+  while (true) {
+    const lines = output.split('\n');
+
+    // Find end marker line (case-insensitive, last occurrence)
+    let endMarkerLineIndex = -1;
+    for (let i = lines.length - 1; i >= 0; i--) {
+      if (endMarkerRegex.test(lines[i])) {
+        endMarkerLineIndex = i;
+        break;
+      }
+    }
+
+    if (endMarkerLineIndex === -1) {
+      // No marker found - shouldn't happen if called correctly
+      return { response: '', truncated: true };
+    }
+
+    // Find instruction line (contains nonce but is not the marker)
+    const instructionLineIndex = lines.findIndex(
+      (line) =>
+        line.toLowerCase().includes(`response-end-${nonce.toLowerCase()}`) &&
+        !endMarkerRegex.test(line)
+    );
+
+    if (instructionLineIndex !== -1 && instructionLineIndex < endMarkerLineIndex) {
+      // Instruction visible: extract from after instruction to marker
+      const response = lines.slice(instructionLineIndex + 1, endMarkerLineIndex).join('\n').trim();
+      return { response, truncated: false };
+    }
+
+    // Instruction not found - try larger capture if possible
+    if (currentCaptureLines >= maxCaptureLines) {
+      // Already at max, fall back to N lines before marker
+      if (debug) {
+        console.error(
+          `[DEBUG] Instruction line not found after max capture (${maxCaptureLines} lines), falling back`
+        );
+      }
+      truncated = true;
+      const startLine = Math.max(0, endMarkerLineIndex - responseLines);
+      const response = lines.slice(startLine, endMarkerLineIndex).join('\n').trim();
+      return { response, truncated };
+    }
+
+    // Double capture size and retry
+    currentCaptureLines = Math.min(currentCaptureLines * 2, maxCaptureLines);
+    if (debug) {
+      console.error(`[DEBUG] Expanding capture to ${currentCaptureLines} lines`);
+    }
+
+    try {
+      output = tmux.capture(pane, currentCaptureLines);
+    } catch {
+      // Capture failed, use what we have
+      truncated = true;
+      const startLine = Math.max(0, endMarkerLineIndex - responseLines);
+      const response = lines.slice(startLine, endMarkerLineIndex).join('\n').trim();
+      return { response, truncated };
+    }
+  }
+}
+
 // ─────────────────────────────────────────────────────────────
 // Types for broadcast wait mode
 // ─────────────────────────────────────────────────────────────
@@ -131,6 +224,7 @@ interface AgentWaitState {
   status: 'pending' | 'completed' | 'timeout' | 'error';
   response?: string;
   partialResponse?: string | null;
+  truncated?: boolean;
   error?: string;
   elapsedMs?: number;
   // Per-agent timing
@@ -140,6 +234,20 @@ interface AgentWaitState {
   lastOutputChangeAt: number;
 }
 
+interface AgentResultOutput {
+  agent: string;
+  pane: string;
+  requestId: string;
+  nonce: string;
+  endMarker: string;
+  status: 'pending' | 'completed' | 'timeout' | 'error';
+  response?: string;
+  partialResponse?: string | null;
+  truncated?: boolean;
+  error?: string;
+  elapsedMs?: number;
+}
+
 interface BroadcastWaitResult {
   target: 'all';
   mode: 'wait';
@@ -152,7 +260,7 @@ interface BroadcastWaitResult {
     error: number;
     skipped: number;
   };
-  results: AgentWaitState[];
+  results: AgentResultOutput[];
 }
 
 /**
@@ -483,47 +591,24 @@ export async function cmdTalk(ctx: Context, target: string, message: string): Pr
         console.error(`[DEBUG] Agent completed (elapsed: ${elapsedMs}ms, idle: ${idleMs}ms)`);
       }
 
-      // Extract response: get N lines before the end marker
+      // Extract response with expandable capture (handles long responses)
       const responseLines = flags.lines ?? 100;
-      const lines = output.split('\n');
-
-      // Find the line with the end marker (last occurrence = agent's marker)
-      // Find end marker line (case-insensitive)
-      let endMarkerLineIndex = -1;
-      for (let i = lines.length - 1; i >= 0; i--) {
-        if (endMarkerRegex.test(lines[i])) {
-          endMarkerLineIndex = i;
-          break;
-        }
-      }
+      const maxCaptureLines = config.defaults.maxCaptureLines;
 
-      if (endMarkerLineIndex === -1) continue;
-
-      // Protocol: instruction describes the marker verbally but doesn't contain the literal string.
-      // So any occurrence of the literal marker is definitively from the agent.
-      //
-      // Try to anchor extraction to the instruction line (cleaner output when visible).
-      // Fall back to N lines before marker if instruction scrolled off.
-      let startLine: number;
-      const instructionLineIndex = lines.findIndex(
-        (line) =>
-          line.toLowerCase().includes(`response-end-${nonce.toLowerCase()}`) &&
-          !endMarkerRegex.test(line)
+      const { response: extractedResponse, truncated } = extractWithExpandableCapture(
+        tmux,
+        pane,
+        nonce,
+        endMarkerRegex,
+        output,
+        captureLines,
+        maxCaptureLines,
+        responseLines,
+        flags.debug
       );
 
-      if (instructionLineIndex !== -1 && instructionLineIndex < endMarkerLineIndex) {
-        // Instruction visible: extract from after instruction to marker
-        startLine = instructionLineIndex + 1;
-      } else {
-        // Instruction scrolled off: extract N lines before marker
-        startLine = Math.max(0, endMarkerLineIndex - responseLines);
-      }
-
-      let response = lines.slice(startLine, endMarkerLineIndex).join('\n').trim();
       // Clean Gemini CLI UI artifacts
-      if (target === 'gemini') {
-        response = cleanGeminiResponse(response);
-      }
+      const response = target === 'gemini' ? cleanGeminiResponse(extractedResponse) : extractedResponse;
 
       if (!flags.json && isTTY) {
         process.stdout.write('\r' + ' '.repeat(80) + '\r');
@@ -536,8 +621,11 @@ export async function cmdTalk(ctx: Context, target: string, message: string): Pr
 
       const result: WaitResult = { requestId, nonce, endMarker, response };
       if (flags.json) {
-        ui.json({ target, pane, status: 'completed', ...result });
+        ui.json({ target, pane, status: 'completed', truncated, ...result });
       } else {
+        if (truncated) {
+          ui.warn('Response may be truncated (instruction line not found in scrollback)');
+        }
         console.log(colors.cyan(`─── Response from ${target} (${pane}) ───`));
         console.log(response);
       }
@@ -765,47 +853,26 @@ async function cmdTalkAllWait(
           continue;
         }
 
-        // Extract response: get N lines before the agent's end marker
+        // Extract response with expandable capture (handles long responses)
         const responseLines = flags.lines ?? 100;
-        const lines = output.split('\n');
-
-        // Find end marker line (case-insensitive)
-        let endMarkerLineIndex = -1;
-        for (let i = lines.length - 1; i >= 0; i--) {
-          if (endMarkerRegex.test(lines[i])) {
-            endMarkerLineIndex = i;
-            break;
-          }
-        }
-
-        if (endMarkerLineIndex === -1) continue;
-
-        // Protocol: instruction describes the marker verbally but doesn't contain the literal string.
-        // So any occurrence of the literal marker is definitively from the agent.
-        //
-        // Try to anchor extraction to the instruction line (cleaner output when visible).
-        // Fall back to N lines before marker if instruction scrolled off.
-        let startLine: number;
-        const instructionLineIndex = lines.findIndex(
-          (line) =>
-            line.toLowerCase().includes(`response-end-${state.nonce.toLowerCase()}`) &&
-            !endMarkerRegex.test(line)
+        const maxCaptureLines = config.defaults.maxCaptureLines;
+
+        const { response: extractedResponse, truncated } = extractWithExpandableCapture(
+          tmux,
+          state.pane,
+          state.nonce,
+          endMarkerRegex,
+          output,
+          captureLines,
+          maxCaptureLines,
+          responseLines,
+          flags.debug
         );
 
-        if (instructionLineIndex !== -1 && instructionLineIndex < endMarkerLineIndex) {
-          // Instruction visible: extract from after instruction to marker
-          startLine = instructionLineIndex + 1;
-        } else {
-          // Instruction scrolled off: extract N lines before marker
-          startLine = Math.max(0, endMarkerLineIndex - responseLines);
-        }
-
-        let response = lines.slice(startLine, endMarkerLineIndex).join('\n').trim();
         // Clean Gemini CLI UI artifacts
-        if (state.agent === 'gemini') {
-          response = cleanGeminiResponse(response);
-        }
+        const response = state.agent === 'gemini' ? cleanGeminiResponse(extractedResponse) : extractedResponse;
         state.response = response;
+        state.truncated = truncated;
         state.status = 'completed';
         state.elapsedMs = elapsedMs;
         clearActiveRequest(paths, state.agent, state.requestId);
@@ -871,6 +938,7 @@ function outputBroadcastResults(
         status: s.status,
         response: s.response,
         partialResponse: s.partialResponse,
+        truncated: s.truncated,
         error: s.error,
         elapsedMs: s.elapsedMs,
       })),
@@ -889,6 +957,9 @@ function outputBroadcastResults(
   // Print responses
   for (const state of agentStates) {
     if (state.status === 'completed' && state.response) {
+      if (state.truncated) {
+        ui.warn(`Response from ${state.agent} may be truncated`);
+      }
       console.log(colors.cyan(`─── Response from ${state.agent} (${state.pane}) ───`));
       console.log(state.response);
       console.log();

package/src/config.ts

@@ -26,7 +26,8 @@ const DEFAULT_CONFIG: GlobalConfig = {
     timeout: 180,
     pollInterval: 1,
     captureLines: 100,
-    preambleEvery: 3, // inject preamble every 3 messages
+    maxCaptureLines: 2000, // max lines for final extraction (expandable capture)
+    preambleEvery: 3, // inject preamble every N messages
   },
 };
 

package/src/context.test.ts

@@ -18,7 +18,7 @@ describe('createContext', () => {
     const config: ResolvedConfig = {
       mode: 'polling',
       preambleMode: 'always',
-      defaults: { timeout: 180, pollInterval: 1, captureLines: 100, preambleEvery: 3 },
+      defaults: { timeout: 180, pollInterval: 1, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3 },
       agents: {},
       paneRegistry: {},
     };

package/src/types.ts

@@ -18,6 +18,7 @@ export interface ConfigDefaults {
   timeout: number; // seconds
   pollInterval: number; // seconds
   captureLines: number;
+  maxCaptureLines: number; // max lines for final extraction (default: 2000)
   preambleEvery: number; // inject preamble every N messages (default: 3)
 }