pi-interactive-shell 0.6.1 → 0.6.3

package/CHANGELOG.md

@@ -4,6 +4,21 @@ All notable changes to the `pi-interactive-shell` extension will be documented i
 
 ## [Unreleased]
 
+## [0.6.3] - 2026-01-30
+
+### Fixed
+- **Garbled output on Ctrl+T transfer** - Transfer and handoff preview captured raw PTY output via `getRawStream()`, which includes every intermediate frame of TUI spinners (e.g., Codex's "Working" spinner produced `WorkingWorking•orking•rking•king•ing...`). Switched both `captureTransferOutput()` and `maybeBuildHandoffPreview()` to use `getTailLines()` which reads from the xterm terminal emulator buffer. The emulator correctly processes carriage returns and cursor movements, so only the final rendered state of each line is captured. Fixed in both `overlay-component.ts` and `reattach-overlay.ts`.
+- **Removed dead code** - Cleaned up unused private fields (`timedOut`, `lastDataTime`) and unreachable method (`getSessionId()`) from `InteractiveShellOverlay`.
+
+## [0.6.2] - 2026-01-28
+
+### Fixed
+- **Ctrl+T transfer now works in hands-free mode** - When using Ctrl+T to transfer output in non-blocking hands-free mode, the captured output is now properly sent back to the main agent using `pi.sendMessage()` with `triggerTurn: true`. Previously, the transfer data was captured but never delivered to the agent because the tool had already returned. The fix uses the event bus pattern to wake the agent with the transferred content.
+- **Race condition when Ctrl+T during polling** - Added guard in `getOutputSinceLastCheck()` to return empty output if the session is finished. This prevents errors when a query races with Ctrl+T transfer (PTY disposed before query completes).
+
+### Added
+- **New event: `interactive-shell:transfer`** - Emitted via `pi.events` when Ctrl+T transfer occurs, allowing other extensions to hook into transfer events.
+
 ## [0.6.1] - 2026-01-27
 
 ### Added

package/README.md

@@ -25,11 +25,9 @@ Works with any CLI: `vim`, `htop`, `psql`, `ssh`, `docker logs -f`, `npm run dev
 ## Install
 
 ```bash
-npx pi-interactive-shell
+pi install npm:pi-interactive-shell
 ```
 
-Installs to `~/.pi/agent/extensions/interactive-shell/`.
-
 The `interactive-shell` skill is automatically symlinked to `~/.pi/agent/skills/interactive-shell/`.
 
 **Requires:** Node.js, build tools for `node-pty` (Xcode CLI tools on macOS).

package/index.ts

@@ -437,10 +437,37 @@ export default function interactiveShellExtension(pi: ExtensionAPI) {
 				// Handle overlay completion in background (cleanup when user closes)
 				overlayPromise.then((result) => {
 					overlayOpen = false;
-					// Session already handles cleanup via finishWith* methods
-					// This just ensures the promise doesn't cause unhandled rejection
-					if (result.userTookOver) {
-						// User took over - session continues interactively
+					
+					// Handle Ctrl+T transfer: send output back to main agent
+					if (result.transferred) {
+						const truncatedNote = result.transferred.truncated
+							? ` (truncated from ${result.transferred.totalLines} total lines)`
+							: "";
+						const content = `Session ${generatedSessionId} output transferred (${result.transferred.lines.length} lines${truncatedNote}):\n\n${result.transferred.lines.join("\n")}`;
+						
+						// Send message with triggerTurn to wake the agent
+						pi.sendMessage({
+							customType: "interactive-shell-transfer",
+							content,
+							display: true,
+							details: {
+								sessionId: generatedSessionId,
+								transferred: result.transferred,
+								exitCode: result.exitCode,
+								signal: result.signal,
+							},
+						}, { triggerTurn: true });
+						
+						// Emit event for extensions that want to handle transfers
+						pi.events.emit("interactive-shell:transfer", {
+							sessionId: generatedSessionId,
+							transferred: result.transferred,
+							exitCode: result.exitCode,
+							signal: result.signal,
+						});
+						
+						// Unregister session - PTY is disposed, agent has the output via sendMessage
+						sessionManager.unregisterActive(generatedSessionId, true);
 					}
 				}).catch(() => {
 					overlayOpen = false;

package/overlay-component.ts

@@ -43,7 +43,6 @@ export class InteractiveShellOverlay implements Component, Focusable {
 	private sessionUnregistered = false;
 	// Timeout
 	private timeoutTimer: ReturnType<typeof setTimeout> | null = null;
-	private timedOut = false;
 	// Prevent double done() calls
 	private finished = false;
 	// Budget tracking for hands-free updates
@@ -52,7 +51,6 @@ export class InteractiveShellOverlay implements Component, Focusable {
 	private currentUpdateInterval: number;
 	private currentQuietThreshold: number;
 	private updateMode: "on-quiet" | "interval";
-	private lastDataTime = 0;
 	private quietTimer: ReturnType<typeof setTimeout> | null = null;
 	private hasUnsentData = false;
 	// Non-blocking mode: track status for agent queries
@@ -101,7 +99,6 @@ export class InteractiveShellOverlay implements Component, Focusable {
 
 					// Track activity for on-quiet mode
 					if (this.state === "hands-free" && this.updateMode === "on-quiet") {
-						this.lastDataTime = Date.now();
 						this.hasUnsentData = true;
 						this.resetQuietTimer();
 					}
@@ -190,6 +187,16 @@ export class InteractiveShellOverlay implements Component, Focusable {
 
 	/** Get rendered terminal output (last N lines, truncated if too large) */
 	getOutputSinceLastCheck(options: { skipRateLimit?: boolean; lines?: number; maxChars?: number; offset?: number; drain?: boolean; incremental?: boolean } | boolean = false): { output: string; truncated: boolean; totalBytes: number; totalLines?: number; hasMore?: boolean; rateLimited?: boolean; waitSeconds?: number } {
+		// Guard: if session is finished (PTY disposed), return empty output
+		// This handles race conditions where query arrives after Ctrl+T transfer
+		if (this.finished) {
+			return {
+				output: "",
+				truncated: false,
+				totalBytes: 0,
+			};
+		}
+
 		// Handle legacy boolean parameter
 		const opts = typeof options === "boolean" ? { skipRateLimit: options } : options;
 		const skipRateLimit = opts.skipRateLimit ?? false;
@@ -357,11 +364,6 @@ export class InteractiveShellOverlay implements Component, Focusable {
 		}, 16);
 	}
 
-	/** Get the session ID */
-	getSessionId(): string | null {
-		return this.sessionId;
-	}
-
 	/** Kill the session programmatically */
 	killSession(): void {
 		if (!this.finished) {
@@ -616,35 +618,19 @@ export class InteractiveShellOverlay implements Component, Focusable {
 		const maxLines = this.config.transferLines;
 		const maxChars = this.config.transferMaxChars;
 
-		// Use raw output stream for clean content
-		const rawOutput = this.session.getRawStream({ stripAnsi: true });
-		if (!rawOutput) {
-			return { lines: [], totalLines: 0, truncated: false };
-		}
-
-		const allLines = rawOutput.split("\n");
-		const totalLines = allLines.length;
-
-		// Get last N lines, respecting maxChars
-		let capturedLines: string[] = [];
-		let charCount = 0;
-		let truncated = false;
-
-		for (let i = allLines.length - 1; i >= 0 && capturedLines.length < maxLines; i--) {
-			const line = allLines[i]!;
-			if (charCount + line.length > maxChars && capturedLines.length > 0) {
-				truncated = true;
-				break;
-			}
-			capturedLines.unshift(line);
-			charCount += line.length + 1; // +1 for newline
-		}
+		const result = this.session.getTailLines({
+			lines: maxLines,
+			ansi: false,
+			maxChars,
+		});
 
-		if (capturedLines.length < totalLines) {
-			truncated = true;
-		}
+		const truncated = result.lines.length < result.totalLinesInBuffer || result.truncatedByChars;
 
-		return { lines: capturedLines, totalLines, truncated };
+		return {
+			lines: result.lines,
+			totalLines: result.totalLinesInBuffer,
+			truncated,
+		};
 	}
 
 	private maybeBuildHandoffPreview(when: "exit" | "detach" | "kill" | "timeout" | "transfer"): InteractiveShellResult["handoffPreview"] | undefined {
@@ -655,24 +641,13 @@ export class InteractiveShellOverlay implements Component, Focusable {
 		const maxChars = this.options.handoffPreviewMaxChars ?? this.config.handoffPreviewMaxChars;
 		if (lines <= 0 || maxChars <= 0) return undefined;
 
-		// Use raw output stream instead of xterm buffer - TUI apps using alternate
-		// screen buffer can have misleading content in getTailLines()
-		const rawOutput = this.session.getRawStream({ stripAnsi: true });
-		if (!rawOutput) return { type: "tail", when, lines: [] };
-		
-		const outputLines = rawOutput.split("\n");
-
-		// Get last N lines, respecting maxChars
-		let tail: string[] = [];
-		let charCount = 0;
-		for (let i = outputLines.length - 1; i >= 0 && tail.length < lines; i--) {
-			const line = outputLines[i];
-			if (charCount + line.length > maxChars && tail.length > 0) break;
-			tail.unshift(line);
-			charCount += line.length + 1; // +1 for newline
-		}
+		const result = this.session.getTailLines({
+			lines,
+			ansi: false,
+			maxChars,
+		});
 
-		return { type: "tail", when, lines: tail };
+		return { type: "tail", when, lines: result.lines };
 	}
 
 	private maybeWriteHandoffSnapshot(when: "exit" | "detach" | "kill" | "timeout" | "transfer"): InteractiveShellResult["handoff"] | undefined {
@@ -874,7 +849,6 @@ export class InteractiveShellOverlay implements Component, Focusable {
 		}
 
 		this.stopHandsFreeUpdates();
-		this.timedOut = true;
 		const handoffPreview = this.maybeBuildHandoffPreview("timeout");
 		const handoff = this.maybeWriteHandoffSnapshot("timeout");
 		this.session.kill();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-interactive-shell",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Run AI coding agents as foreground subagents in pi TUI overlays with hands-free monitoring",
   "type": "module",
   "bin": {

package/reattach-overlay.ts

@@ -106,35 +106,19 @@ export class ReattachOverlay implements Component, Focusable {
 		const maxLines = this.config.transferLines;
 		const maxChars = this.config.transferMaxChars;
 
-		// Use raw output stream for clean content
-		const rawOutput = this.session.getRawStream({ stripAnsi: true });
-		if (!rawOutput) {
-			return { lines: [], totalLines: 0, truncated: false };
-		}
-
-		const allLines = rawOutput.split("\n");
-		const totalLines = allLines.length;
-
-		// Get last N lines, respecting maxChars
-		let capturedLines: string[] = [];
-		let charCount = 0;
-		let truncated = false;
-
-		for (let i = allLines.length - 1; i >= 0 && capturedLines.length < maxLines; i--) {
-			const line = allLines[i]!;
-			if (charCount + line.length > maxChars && capturedLines.length > 0) {
-				truncated = true;
-				break;
-			}
-			capturedLines.unshift(line);
-			charCount += line.length + 1; // +1 for newline
-		}
+		const result = this.session.getTailLines({
+			lines: maxLines,
+			ansi: false,
+			maxChars,
+		});
 
-		if (capturedLines.length < totalLines) {
-			truncated = true;
-		}
+		const truncated = result.lines.length < result.totalLinesInBuffer || result.truncatedByChars;
 
-		return { lines: capturedLines, totalLines, truncated };
+		return {
+			lines: result.lines,
+			totalLines: result.totalLinesInBuffer,
+			truncated,
+		};
 	}
 
 	private maybeBuildHandoffPreview(when: "exit" | "detach" | "kill" | "transfer"): InteractiveShellResult["handoffPreview"] | undefined {
@@ -143,24 +127,13 @@ export class ReattachOverlay implements Component, Focusable {
 		const maxChars = this.config.handoffPreviewMaxChars;
 		if (lines <= 0 || maxChars <= 0) return undefined;
 
-		// Use raw output stream instead of xterm buffer - TUI apps using alternate
-		// screen buffer can have misleading content in getTailLines()
-		const rawOutput = this.session.getRawStream({ stripAnsi: true });
-		if (!rawOutput) return { type: "tail", when, lines: [] };
-		
-		const outputLines = rawOutput.split("\n");
-
-		// Get last N lines, respecting maxChars
-		let tail: string[] = [];
-		let charCount = 0;
-		for (let i = outputLines.length - 1; i >= 0 && tail.length < lines; i--) {
-			const line = outputLines[i];
-			if (charCount + line.length > maxChars && tail.length > 0) break;
-			tail.unshift(line);
-			charCount += line.length + 1; // +1 for newline
-		}
+		const result = this.session.getTailLines({
+			lines,
+			ansi: false,
+			maxChars,
+		});
 
-		return { type: "tail", when, lines: tail };
+		return { type: "tail", when, lines: result.lines };
 	}
 
 	private maybeWriteHandoffSnapshot(when: "exit" | "detach" | "kill" | "transfer"): InteractiveShellResult["handoff"] | undefined {