@pellux/goodvibes-tui 2.0.8 → 2.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pellux/goodvibes-tui",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "Terminal-native GoodVibes client for coding, operations, knowledge and channel workflows — a pure client of the GoodVibes daemon.",
   "type": "module",
   "main": "src/main.ts",
@@ -95,8 +95,8 @@
     "@anthropic-ai/bedrock-sdk": "^0.29.1",
     "@anthropic-ai/sdk": "^0.92.0",
     "@ast-grep/napi": "^0.42.0",
-    "@pellux/goodvibes-sdk": "2.0.8",
-    "@pellux/goodvibes-terminal-shell": "2.0.8",
+    "@pellux/goodvibes-sdk": "2.0.9",
+    "@pellux/goodvibes-terminal-shell": "2.0.9",
     "bash-language-server": "^5.6.0",
     "fuse.js": "^7.1.0",
     "@pellux/goodvibes-daemon": "1.28.7",

package/src/input/handler-interactions.ts

@@ -58,6 +58,45 @@ export async function hydrateOnboardingWizardFromRuntimeForHandler(handler: Inpu
     }
   }
 
+/**
+ * handlePasteForHandler - Shared paste path for Ctrl+V and middle-click.
+ *
+ * Tries the clipboard's image first, then its text. The clipboard itself comes
+ * from `handler.clipboardSource`, so tests can hand in a clipboard without
+ * touching the real one.
+ *
+ * The prompt is edited on the HANDLER here, not on the shortcut route state
+ * that dispatched the key. feedInputTokens snapshots the prompt before
+ * dispatching and would write that snapshot back over this edit, erasing the
+ * paste — it does not, because it only restores a field the action left
+ * untouched (see the promptBefore guard in handler-feed.ts). That guard is the
+ * only reason Ctrl+V works, so it is pinned by test.
+ */
+export function handlePasteForHandler(handler: InputHandler): ReturnType<typeof handleClipboardPaste> {
+  const result = handleClipboardPaste({
+    prompt: handler.prompt,
+    cursorPos: handler.cursorPos,
+    pasteRegistry: handler.pasteRegistry,
+    nextPasteId: handler.nextPasteId,
+    imageRegistry: handler.imageRegistry,
+    nextImageId: handler.nextImageId,
+    saveUndoState: () => handler.saveUndoState(),
+    ensureInputCursorVisible: () => handler.ensureInputCursorVisible(),
+    requestRender: handler.requestRender,
+  }, handler.uiServices.environment.shellPaths.workingDirectory, handler.clipboardSource);
+
+  handler.prompt = result.prompt;
+  handler.cursorPos = result.cursorPos;
+  handler.nextImageId = result.nextImageId;
+  handler.nextPasteId = result.nextPasteId;
+
+  if (!result.pasted) {
+    handler.conversationManager?.log('[Paste: clipboard does not contain supported text or image data]', { fg: '240' });
+    handler.requestRender();
+  }
+  return result;
+}
+
 export function registerPasteForHandler(handler: InputHandler, content: string): string {
     const result = registerPaste({
       pasteRegistry: handler.pasteRegistry,

package/src/input/handler-types.ts

@@ -19,6 +19,7 @@ import type { UiRuntimeServices } from '../runtime/ui-services.ts';
 import type { CommandContext } from './command-registry.ts';
 import type { ConversationManager } from '../core/conversation';
 import type { ModelPickerModal, ModelPickerTarget } from './model-picker.ts';
+import type { ClipboardPasteSource } from './handler-content-actions.ts';
 import type { SelectionManager } from '@pellux/goodvibes-terminal-shell';
 import type { InfiniteBuffer } from '@pellux/goodvibes-terminal-shell';
 import type { AutocompleteEngine } from './autocomplete.ts';
@@ -81,6 +82,11 @@ export interface InputHandlerLike {
   nextPasteId: number;
   imageRegistry: Map<string, { data: string; mediaType: string }>;
   nextImageId: number;
+  /**
+   * The clipboard this composer pastes from. Swappable so tests can supply a
+   * clipboard instead of reaching for the machine's real one.
+   */
+  clipboardSource: ClipboardPasteSource;
 
   // ── Timing ───────────────────────────────────────────────────────────────
   lastCopyTime: number;
@@ -124,6 +130,7 @@ export interface InputHandlerLike {
   // ── Methods: modal lifecycle ──────────────────────────────────────────────
   modalOpened(name: string): void;
   saveUndoState(): void;
+  ensureInputCursorVisible(contentWidth?: number): void;
 
   // ── Methods: block actions (dispatched in executeBlockAction) ────────────
   handleBlockCopy(): void;

package/src/input/handler.ts

@@ -2,7 +2,7 @@ import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node
 import { dirname } from 'node:path';
 import { InputTokenizer } from '@pellux/goodvibes-sdk/platform/core';
 import { createOAuthLocalListener } from '@pellux/goodvibes-sdk/platform/config';
-import { clearModalStackForHandler, cleanupMarkerRegistryForHandler, executeBlockActionForHandler, expandPromptForHandler, findMarkerAtPosForHandler, getImageAttachmentsForHandler, handleBlockCopyForHandler, handleBlockSaveForHandler, handleBlockToggleForHandler, handleBookmarkForHandler, handleCopyForHandler, handleCtrlCForHandler, handleDiffApplyForHandler, handleEscapeForHandler, hydrateOnboardingWizardFromRuntimeForHandler, modalOpenedForHandler, openOnboardingWizardForHandler, registerPasteForHandler } from './handler-interactions.ts';
+import { clearModalStackForHandler, cleanupMarkerRegistryForHandler, executeBlockActionForHandler, expandPromptForHandler, findMarkerAtPosForHandler, getImageAttachmentsForHandler, handleBlockCopyForHandler, handleBlockSaveForHandler, handleBlockToggleForHandler, handleBookmarkForHandler, handleCopyForHandler, handleCtrlCForHandler, handleDiffApplyForHandler, handleEscapeForHandler, handlePasteForHandler, hydrateOnboardingWizardFromRuntimeForHandler, modalOpenedForHandler, openOnboardingWizardForHandler, registerPasteForHandler } from './handler-interactions.ts';
 import { getViewportBottomLine } from '../renderer/conversation-layout.ts';
 import { clearOnboardingModelPickerCancelStateForHandler, clearOnboardingPendingModelPickerTargetForHandler, completeOpenAiSubscriptionFromListenerForHandler, getOnboardingConfigValueForHandler, getOnboardingRuntimePostureForHandler, handleModelPickerCommitForHandler, handleOnboardingActionForHandler, handleOpenAiSubscriptionFinishForHandler, handleOpenAiSubscriptionStartForHandler, openModelPickerWithTargetForHandler, openProviderModelPickerWithTargetForHandler, refreshOnboardingHydrationForHandler, restartOnboardingExternalServicesIfNeededForHandler, restoreOnboardingModelPickerCancelStateForHandler, saveWizardProgressForHandler, syncRuntimeFromOnboardingRequestForHandler, verifyOnboardingRuntimePostureForHandler, } from './handler-onboarding.ts';
 import type { OnboardingRuntimePosture } from './handler-types.ts';
@@ -53,12 +53,14 @@ import {
   handleBlockToggle,
   handleBookmark,
   handleClipboardPaste,
+  type ClipboardPasteSource,
   handleCopy,
   handleCtrlC,
   handleDiffApply,
   mediaTypeFromExt,
   registerPaste,
 } from './handler-content-actions.ts';
+import { pasteFromClipboard, pasteImageFromClipboard } from '../utils/clipboard.ts';
 import {
   handleIndicatorFocusToken,
   handleMouseToken,
@@ -574,28 +576,15 @@ export class InputHandler implements InputHandlerLike {
    * Tries image clipboard first, falls back to text paste.
    */
   public handlePaste(): ReturnType<typeof handleClipboardPaste> {
-    const result = handleClipboardPaste({
-      prompt: this.prompt,
-      cursorPos: this.cursorPos,
-      pasteRegistry: this.pasteRegistry,
-      nextPasteId: this.nextPasteId,
-      imageRegistry: this.imageRegistry,
-      nextImageId: this.nextImageId,
-      saveUndoState: () => this.saveUndoState(),
-      ensureInputCursorVisible: () => this.ensureInputCursorVisible(),
-      requestRender: this.requestRender,
-    }, this.uiServices.environment.shellPaths.workingDirectory);
-    this.prompt = result.prompt;
-    this.cursorPos = result.cursorPos;
-    this.nextImageId = result.nextImageId;
-    this.nextPasteId = result.nextPasteId;
-    if (!result.pasted) {
-      this.conversationManager?.log('[Paste: clipboard does not contain supported text or image data]', { fg: '240' });
-      this.requestRender();
-    }
-    return result;
+    return handlePasteForHandler(this);
   }
 
+  /**
+   * The clipboard this composer pastes from. Swappable so tests can supply a
+   * clipboard instead of reaching for the machine's real one.
+   */
+  public clipboardSource: ClipboardPasteSource = { pasteImageFromClipboard, pasteFromClipboard };
+
   /** Content width for wrapping — set by main.ts via setContentWidth(). */
   public contentWidth = 76;
   public panelMouseLayout: PanelMouseLayout | null = null;

package/src/version.ts

@@ -6,7 +6,7 @@ import { join } from 'node:path';
 // The prebuild script updates the fallback value before compilation.
 // Uses import.meta.dir (Bun) to locate package.json relative to this file,
 // which is correct regardless of the process working directory.
-let _version = '2.0.8';
+let _version = '2.0.9';
 try {
   const pkg = JSON.parse(readFileSync(join(import.meta.dir, '..', 'package.json'), 'utf-8'));
   // Only trust a version read from OUR OWN package.json. A Bun single-file