@pellux/goodvibes-tui 0.23.0 → 0.24.0

package/src/input/commands/provider.ts

@@ -365,7 +365,7 @@ function handleFallbackTest(
 export const providerCommand: SlashCommand = {
   name: 'provider-opt',
   aliases: ['prov-opt'],
-  description: 'Manage provider routing optimizer (route, pin, explain, fallback).',
+  description: 'Manage provider routing optimizer (route, pin, explain, fallback)',
   usage: '<subcommand> [args]',
   argsHint: 'optimizer|route|explain-route|pin|fallback',
   handler: async (args: string[], context: CommandContext): Promise<void> => {

package/src/input/commands/qrcode-runtime.ts

@@ -12,7 +12,6 @@ export function registerQrcodeRuntimeCommands(registry: CommandRegistry): void {
     name: 'qrcode',
     aliases: ['qr', 'pair'],
     description: 'Open the QR code panel for companion app pairing',
-    usage: '',
     handler(_args, ctx) {
       openCommandPanel(ctx, 'qr-code');
     },

package/src/input/commands/session-content.ts

@@ -162,7 +162,7 @@ export function registerSessionContentCommands(registry: CommandRegistry): void
   registry.register({
     name: 'undo',
     aliases: [],
-    description: 'Undo last action. /undo file — revert last file write/edit. /undo — remove last conversation turn.',
+    description: 'Undo last action. /undo file — revert last file write/edit. /undo — remove last conversation turn',
     usage: '[file]',
     argsHint: '[file]',
     handler(args, ctx) {
@@ -191,7 +191,7 @@ export function registerSessionContentCommands(registry: CommandRegistry): void
 
   registry.register({
     name: 'redo',
-    description: 'Redo last undone action. /redo file — re-apply last reverted file. /redo — restore conversation turn.',
+    description: 'Redo last undone action. /redo file — re-apply last reverted file. /redo — restore conversation turn',
     usage: '[file]',
     argsHint: '[file]',
     handler(args, ctx) {

package/src/input/commands/session-workflow.ts

@@ -6,7 +6,8 @@ import type { TranscriptEventKind } from '@pellux/goodvibes-sdk/platform/core';
 import type { ConversationTitleSource } from '../../core/conversation';
 import type { SessionReturnContextSummary } from '@/runtime/index.ts';
 import { formatReturnContextForDisplay, getReturnContextMode, maybeAssistReturnContextSummary } from '@/runtime/index.ts';
-import { requirePanelManager, requireProviderApi, requireSessionManager } from './runtime-services.ts';
+import { requirePanelManager, requireProviderApi, requireSessionManager, requireShellPaths } from './runtime-services.ts';
+import { replayJournalForSession } from '../../core/session-recovery.ts';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 function parseTranscriptKind(raw: string | undefined): TranscriptEventKind | 'all' {
@@ -240,6 +241,26 @@ export async function handleSessionWorkflowCommand(args: string[], ctx: CommandC
       ctx.session.conversationManager.fromJSON({ messages: messages as never[], title: meta.title, titleSource: meta.titleSource });
       ctx.session.conversationManager.rebuildHistory();
       ctx.session.runtime.sessionId = found.name;
+
+      // Journal replay: recover turns that post-date the loaded snapshot.
+      const shellPaths = requireShellPaths(ctx);
+      const journalReplay = replayJournalForSession({
+        homeDirectory: shellPaths.homeDirectory,
+        snapshotTimestamp: meta.timestamp,
+        conversation: ctx.session.conversationManager,
+        sessionId: found.name,
+        persistSnapshot: (replayedMessages) => {
+          sm.save(found.name, replayedMessages as never[], {
+            title: ctx.session.conversationManager.title || meta.title,
+            model: meta.model,
+            provider: meta.provider,
+            timestamp: Date.now(),
+            titleSource: meta.titleSource,
+            returnContext: meta.returnContext,
+          });
+        },
+      });
+
       if (meta.model) {
         try {
           const selected = await providerApi.selectModel(meta.model);
@@ -252,7 +273,16 @@ export async function handleSessionWorkflowCommand(args: string[], ctx: CommandC
       }
       if (meta.provider) ctx.session.runtime.provider = meta.provider;
       ctx.renderRequest();
-      ctx.print(`Resumed session: ${found.name}\n  Name: ${meta.title || '(untitled)'}\n  Messages: ${messages.length}\n  Model: ${meta.model || ctx.session.runtime.model}`);
+      const resumedMsgCount = ctx.session.conversationManager.getMessageCount();
+      ctx.print(`Resumed session: ${found.name}\n  Name: ${meta.title || '(untitled)'}\n  Messages: ${resumedMsgCount}\n  Model: ${meta.model || ctx.session.runtime.model}`);
+      if (journalReplay.replayed > 0) {
+        ctx.print(`  [Recovery] Replayed ${journalReplay.replayed} journal record(s) — restored turns since last snapshot.`);
+      }
+      if (journalReplay.hadCorruptTail && journalReplay.replayed === 0) {
+        ctx.print('  [Recovery] Journal tail was corrupt or unrecognised (quarantined). Proceeding with snapshot only.');
+      } else if (journalReplay.hadCorruptTail) {
+        ctx.print('  [Recovery] Journal tail was partially corrupt (quarantined). Replay stopped at last good record.');
+      }
       const reopenedPanels = reopenPanelsFromReturnContext(ctx, meta.returnContext);
       const returnContextMode = getReturnContextMode(ctx.platform.configManager);
       if (returnContextMode !== 'off' && meta.returnContext) {

package/src/input/commands/session.ts

@@ -339,7 +339,7 @@ function handleCancel(args: string[], context: CommandContext): void {
 export const sessionCommand: SlashCommand = {
   name: 'session',
   aliases: ['sess'],
-  description: 'Session lifecycle and orchestration: list, resume, fork, save, export, link-task, handoff, graph, cancel.',
+  description: 'Session lifecycle and orchestration: list, resume, fork, save, export, link-task, handoff, graph, cancel',
   usage: '<subcommand> [args]',
   argsHint: 'list|rename|resume|fork|save|info|export|search|delete|events|groups|hotspots|link-task|handoff|graph|cancel',
   handler: async (args: string[], context: CommandContext): Promise<void> => {

package/src/input/commands/settings-sync-runtime.ts

@@ -24,8 +24,8 @@ import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export function registerSettingsSyncRuntimeCommands(registry: CommandRegistry): void {
   registry.register({
-    name: 'settingssync',
-    aliases: ['settings-sync'],
+    name: 'settings-sync',
+    aliases: ['settingssync'],
     description: 'Review sync posture, export/import settings-sync bundles, and open the settings sync workspace',
     usage: '[review|panel|show <key>|staged|conflicts|resolve <key> <local|synced>|failures|rollback-history|export <path>|inspect <path>|pull <path>|push <path>|lock <key> <source> <reason...>|unlock <key>]',
     handler(args, ctx) {
@@ -39,7 +39,7 @@ export function registerSettingsSyncRuntimeCommands(registry: CommandRegistry):
       if (sub === 'show') {
         const key = args[1] as ConfigKey | undefined;
         if (!key || !CONFIG_KEYS.has(key)) {
-          ctx.print('Usage: /settingssync show <config-key>');
+          ctx.print('Usage: /settings-sync show <config-key>');
           return;
         }
         ctx.print(formatResolvedSettingReview(ctx.platform.configManager, key));
@@ -63,7 +63,7 @@ export function registerSettingsSyncRuntimeCommands(registry: CommandRegistry):
         const key = args[1] as ConfigKey | undefined;
         const resolution = (args[2] ?? '').toLowerCase();
         if (!key || !CONFIG_KEYS.has(key) || (resolution !== 'local' && resolution !== 'synced')) {
-          ctx.print('Usage: /settingssync resolve <config-key> <local|synced>');
+          ctx.print('Usage: /settings-sync resolve <config-key> <local|synced>');
           return;
         }
         const changed = resolveSettingsSyncConflict(ctx.platform.configManager, key, resolution);
@@ -102,7 +102,7 @@ export function registerSettingsSyncRuntimeCommands(registry: CommandRegistry):
       if (sub === 'export' || sub === 'push') {
         const pathArg = args[1];
         if (!pathArg) {
-          ctx.print(`Usage: /settingssync ${sub} <path>`);
+          ctx.print(`Usage: /settings-sync ${sub} <path>`);
           return;
         }
         const targetPath = shellPaths.resolveWorkspacePath(pathArg);
@@ -122,7 +122,7 @@ export function registerSettingsSyncRuntimeCommands(registry: CommandRegistry):
       if (sub === 'inspect') {
         const pathArg = args[1];
         if (!pathArg) {
-          ctx.print('Usage: /settingssync inspect <path>');
+          ctx.print('Usage: /settings-sync inspect <path>');
           return;
         }
         const sourcePath = shellPaths.resolveWorkspacePath(pathArg);
@@ -133,7 +133,7 @@ export function registerSettingsSyncRuntimeCommands(registry: CommandRegistry):
       if (sub === 'pull') {
         const pathArg = args[1];
         if (!pathArg) {
-          ctx.print('Usage: /settingssync pull <path>');
+          ctx.print('Usage: /settings-sync pull <path>');
           return;
         }
         const sourcePath = shellPaths.resolveWorkspacePath(pathArg);
@@ -152,7 +152,7 @@ export function registerSettingsSyncRuntimeCommands(registry: CommandRegistry):
         const source = args[2];
         const reason = args.slice(3).join(' ').trim();
         if (!key || !source || !reason || !CONFIG_KEYS.has(key)) {
-          ctx.print('Usage: /settingssync lock <config-key> <source> <reason...>');
+          ctx.print('Usage: /settings-sync lock <config-key> <source> <reason...>');
           return;
         }
         setManagedSettingLock(key, source, reason, controlPlaneConfigDir);
@@ -162,7 +162,7 @@ export function registerSettingsSyncRuntimeCommands(registry: CommandRegistry):
       if (sub === 'unlock') {
         const key = args[1] as ConfigKey | undefined;
         if (!key || !CONFIG_KEYS.has(key)) {
-          ctx.print('Usage: /settingssync unlock <config-key>');
+          ctx.print('Usage: /settings-sync unlock <config-key>');
           return;
         }
         ctx.print(clearManagedSettingLock(key, controlPlaneConfigDir) ? `Managed lock cleared for ${key}.` : `No managed lock found for ${key}.`);

package/src/input/commands/shell-core.ts

@@ -15,7 +15,7 @@ export function registerShellCoreCommands(registry: CommandRegistry): void {
     aliases: ['m'],
     description: 'Select or display the current LLM model',
     usage: '[model-id]',
-    argsHint: '[name]',
+    argsHint: '[model-id]',
     async handler(args, ctx) {
       const providerApi = requireProviderApi(ctx);
       if (args.length === 0) {
@@ -294,7 +294,7 @@ export function registerShellCoreCommands(registry: CommandRegistry): void {
     aliases: ['e'],
     description: 'Show or set reasoning effort level',
     usage: '[level]',
-    argsHint: '<instant|low|medium|high>',
+    argsHint: '[instant|low|medium|high]',
     async handler(args, ctx) {
       const currentModel = await requireProviderApi(ctx).getCurrentModel();
       const validLevels = currentModel.reasoningEffort ?? [];

package/src/input/commands/work-plan-runtime.ts

@@ -37,7 +37,7 @@ function openPanel(ctx: import('../command-registry.ts').CommandContext): void {
 
 function formatList(store: WorkPlanStore): string {
   const items = store.listItems();
-  if (items.length === 0) return 'Work plan is empty. Add one with /workplan add <title>.';
+  if (items.length === 0) return 'Work plan is empty. Add one with /work-plan add <title>.';
   return [
     `Work Plan (${items.length})`,
     ...items.map((item) => {
@@ -78,8 +78,8 @@ function parseAddArgs(args: string[]): { title: string; owner?: string; source?:
 
 export function registerWorkPlanRuntimeCommands(registry: CommandRegistry): void {
   registry.register({
-    name: 'workplan',
-    aliases: ['wp', 'todo'],
+    name: 'work-plan',
+    aliases: ['wp', 'todo', 'workplan'],
     description: 'Track a persistent workspace-scoped work plan',
     usage: '[panel|list|show|add <title> [--owner name] [--source label] [--notes text]|done <id>|start <id>|block <id>|fail <id>|cancel <id>|pending <id>|remove <id>|clear-done]',
     argsHint: '[panel|add|list|done]',
@@ -107,7 +107,7 @@ export function registerWorkPlanRuntimeCommands(registry: CommandRegistry): void
         if (subcommand === 'add') {
           const parsed = parseAddArgs(args.slice(1));
           if (!parsed.title) {
-            ctx.print('Usage: /workplan add <title> [--owner name] [--source label] [--notes text]');
+            ctx.print('Usage: /work-plan add <title> [--owner name] [--source label] [--notes text]');
             return;
           }
           const addOptions = {
@@ -123,7 +123,7 @@ export function registerWorkPlanRuntimeCommands(registry: CommandRegistry): void
         if (subcommand === 'remove' || subcommand === 'delete' || subcommand === 'rm') {
           const id = args[1];
           if (!id) {
-            ctx.print(`Usage: /workplan ${subcommand} <id>`);
+            ctx.print(`Usage: /work-plan ${subcommand} <id>`);
             return;
           }
           const item = store.removeItem(id);
@@ -138,7 +138,7 @@ export function registerWorkPlanRuntimeCommands(registry: CommandRegistry): void
         if (subcommand === 'cycle' || subcommand === 'toggle') {
           const id = args[1];
           if (!id) {
-            ctx.print(`Usage: /workplan ${subcommand} <id>`);
+            ctx.print(`Usage: /work-plan ${subcommand} <id>`);
             return;
           }
           const item = store.cycleItemStatus(id);
@@ -149,7 +149,7 @@ export function registerWorkPlanRuntimeCommands(registry: CommandRegistry): void
         if (status) {
           const id = args[1];
           if (!id) {
-            ctx.print(`Usage: /workplan ${subcommand} <id>`);
+            ctx.print(`Usage: /work-plan ${subcommand} <id>`);
             return;
           }
           const item = store.setItemStatus(id, status);
@@ -157,7 +157,7 @@ export function registerWorkPlanRuntimeCommands(registry: CommandRegistry): void
           return;
         }
         if (WORK_PLAN_STATUSES.includes(subcommand as WorkPlanItemStatus)) {
-          ctx.print(`Usage: /workplan ${subcommand} <id>`);
+          ctx.print(`Usage: /work-plan ${subcommand} <id>`);
           return;
         }
         ctx.print(`Unknown workplan subcommand: ${subcommand}`);

package/src/input/feed-context-factory.ts

@@ -38,6 +38,7 @@ import type { Panel } from '../panels/types.ts';
 import type { PanelManager } from '../panels/panel-manager.ts';
 import type { KeybindingsManager } from './keybindings.ts';
 import type { ModelPickerTarget } from './model-picker.ts';
+import type { KillRing } from './kill-ring.ts';
 import type { PanelMouseLayout } from './handler-feed-routes.ts';
 
 /**
@@ -124,6 +125,7 @@ export interface FeedContextStableRefs {
   conversationManager: ConversationManager | null;
   panelManager: PanelManager;
   keybindingsManager: KeybindingsManager;
+  killRing: KillRing;
   getHistory: () => InfiniteBuffer;
   getViewportHeight: () => number;
   getScrollTop: () => number;
@@ -145,6 +147,10 @@ export interface FeedContextClosures {
   handleRedo: () => void;
   handlePaste: () => void;
   saveUndoState: () => void;
+  /** Save undo state with text-insertion coalescing (burst typing merges into one group). */
+  saveUndoStateForText: () => void;
+  /** Break the current coalescing group (call on cursor moves). */
+  breakUndoCoalesce: () => void;
   ensureInputCursorVisible: (contentWidth?: number) => void;
   registerPaste: (content: string) => string;
   executeBlockAction: (id: string) => void;

package/src/input/handler-feed-routes.ts

@@ -14,6 +14,7 @@ import {
 import { cleanupMarkerRegistry, expandPrompt, findMarkerAtPos, registerPaste } from './handler-content-actions.ts';
 import type { PanelManager } from '../panels/panel-manager.ts';
 import type { KeybindingsManager } from './keybindings.ts';
+import type { KillRing } from './kill-ring.ts';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export type PanelFocusRouteState = {
@@ -184,9 +185,12 @@ export type TextRouteState = {
   filePicker: { open: (insertPos: number, injectMode?: boolean) => void };
   modalOpened: (name: string) => void;
   saveUndoState: () => void;
+  /** Coalescing undo snapshot for plain text insertions. */
+  saveUndoStateForText: () => void;
   ensureInputCursorVisible: () => void;
   registerPaste: (content: string) => string;
   requestRender: () => void;
+  killRing: KillRing;
 };
 
 export function handlePromptTextToken(state: TextRouteState, token: InputToken): {
@@ -210,7 +214,8 @@ export function handlePromptTextToken(state: TextRouteState, token: InputToken):
   if (state.inputHistory?.isBrowsing) {
     state.inputHistory.resetPosition();
   }
-  state.saveUndoState();
+  state.killRing.clearYankState();
+  state.saveUndoStateForText();
   const text = state.registerPaste(token.value);
   let prompt = state.prompt.slice(0, state.cursorPos) + text + state.prompt.slice(state.cursorPos);
   let cursorPos = state.cursorPos + text.length;
@@ -261,6 +266,8 @@ export type KeyRouteState = {
   processModal: { open: () => void };
   modalOpened: (name: string) => void;
   saveUndoState: () => void;
+  /** Break the undo coalescing group (call on cursor moves). */
+  breakUndoCoalesce: () => void;
   ensureInputCursorVisible: (contentWidth?: number) => void;
   getWrappedPromptInfo: (contentWidth: number) => WrappedPromptInfo;
   moveCursorVertical: (direction: -1 | 1) => boolean;
@@ -272,6 +279,7 @@ export type KeyRouteState = {
   scroll: (delta: number) => void;
   exitApp: () => void;
   requestRender: () => void;
+  killRing: KillRing;
 };
 
 export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
@@ -372,6 +380,7 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
 
   if (token.logicalName === 'backspace') {
     if (cursorPos > 0) {
+      state.killRing.clearYankState();
       state.saveUndoState();
       let marker = state.findMarkerAtPos(cursorPos);
       if (!marker) {
@@ -396,6 +405,7 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
 
   if (token.logicalName === 'delete') {
     if (cursorPos < prompt.length) {
+      state.killRing.clearYankState();
       state.saveUndoState();
       const marker = state.findMarkerAtPos(cursorPos + 1);
       if (marker) {
@@ -417,6 +427,8 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
       cursorPos = marker ? marker.start : cursorPos - 1;
       ensureLocalInputCursorVisible();
     }
+    state.killRing.clearYankState();
+    state.breakUndoCoalesce();
     state.requestRender();
     return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
@@ -427,18 +439,24 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
       cursorPos = marker ? marker.end : cursorPos + 1;
       ensureLocalInputCursorVisible();
     }
+    state.killRing.clearYankState();
+    state.breakUndoCoalesce();
     state.requestRender();
     return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
 
   if (token.logicalName === 'home') {
     cursorPos = 0;
+    state.killRing.clearYankState();
+    state.breakUndoCoalesce();
     ensureLocalInputCursorVisible();
     return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
 
   if (token.logicalName === 'end') {
     cursorPos = prompt.length;
+    state.killRing.clearYankState();
+    state.breakUndoCoalesce();
     ensureLocalInputCursorVisible();
     return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }

package/src/input/handler-feed.ts

@@ -44,6 +44,7 @@ import { SelectionManager } from './selection.ts';
 import type { PanelManager } from '../panels/panel-manager.ts';
 import type { KeybindingsManager } from './keybindings.ts';
 import type { ModelPickerTarget } from './model-picker.ts';
+import type { KillRing } from './kill-ring.ts';
 
 /**
  * InputFeedContext — The single long-lived context object passed to feedInputTokens
@@ -129,6 +130,7 @@ export interface InputFeedContext {
   readonly modalStack: string[];
   inputHistory: InputHistory | null;
   conversationManager: ConversationManager | null;
+  readonly killRing: KillRing;
   readonly getHistory: () => InfiniteBuffer;
   readonly getViewportHeight: () => number;
   readonly getScrollTop: () => number;
@@ -146,6 +148,10 @@ export interface InputFeedContext {
   readonly handleRedo: () => void;
   readonly handlePaste: () => void;
   readonly saveUndoState: () => void;
+  /** Coalescing variant: consecutive text insertions within UNDO_COALESCE_MS merge into one group. */
+  readonly saveUndoStateForText: () => void;
+  /** Break the current coalescing group (cursor moves call this). */
+  readonly breakUndoCoalesce: () => void;
   readonly ensureInputCursorVisible: (contentWidth?: number) => void;
   readonly registerPaste: (content: string) => string;
   readonly executeBlockAction: (id: string) => void;
@@ -283,6 +289,7 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
         cyclePanelTab: context.cyclePanelTab,
         panelManager: context.panelManager,
         keybindingsManager: context.keybindingsManager,
+        killRing: context.killRing,
       };
       if (handleGlobalShortcutToken(shortcutState, token, viewportHeight)) {
         context.prompt = shortcutState.prompt;
@@ -336,9 +343,11 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       filePicker: context.filePicker,
       modalOpened: context.modalOpened,
       saveUndoState: context.saveUndoState,
+      saveUndoStateForText: context.saveUndoStateForText,
       ensureInputCursorVisible: () => context.ensureInputCursorVisible(),
       registerPaste: context.registerPaste,
       requestRender: context.requestRender,
+      killRing: context.killRing,
     }, token);
     if (textRoute.handled) {
       context.prompt = textRoute.prompt;
@@ -395,6 +404,7 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
         processModal: context.processModal,
         modalOpened: context.modalOpened,
         saveUndoState: context.saveUndoState,
+        breakUndoCoalesce: context.breakUndoCoalesce,
         ensureInputCursorVisible: context.ensureInputCursorVisible,
         getWrappedPromptInfo: context.getWrappedPromptInfo,
         moveCursorVertical: context.moveCursorVertical,
@@ -406,6 +416,7 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
         scroll: context.scroll,
         exitApp: context.exitApp,
         requestRender: context.requestRender,
+        killRing: context.killRing,
       }, token);
       if (keyRoute.handled) {
         context.prompt = keyRoute.prompt;

package/src/input/handler-prompt-buffer.ts

@@ -12,6 +12,34 @@ export type WrappedPromptInfo = {
 
 export type UndoState = { prompt: string; cursorPos: number };
 
+// ---------------------------------------------------------------------------
+// Undo coalescing support
+// ---------------------------------------------------------------------------
+
+/** Milliseconds within which consecutive text insertions are merged into one
+ *  undo group. Cursor moves or kill/yank operations always break the group. */
+export const UNDO_COALESCE_MS = 500;
+
+export type EditKind = 'text' | 'kill' | 'yank' | 'other';
+
+/**
+ * shouldCoalesceUndo — returns true when the new edit should be merged into
+ * the most recent undo group rather than creating a new snapshot.
+ *
+ * Coalesces only when:
+ *   - Both the last edit and the incoming edit are plain text insertions
+ *   - The time delta is within UNDO_COALESCE_MS
+ */
+export function shouldCoalesceUndo(
+  lastEditKind: EditKind,
+  incomingKind: EditKind,
+  lastEditMs: number,
+  nowMs: number,
+): boolean {
+  if (lastEditKind !== 'text' || incomingKind !== 'text') return false;
+  return (nowMs - lastEditMs) < UNDO_COALESCE_MS;
+}
+
 export function wordWrapLine(line: string, maxW: number): string[] {
   if (maxW <= 0) return [line];
   if (line.length === 0) return [''];

package/src/input/handler-shortcuts.ts

@@ -6,6 +6,8 @@ import type { ConversationManager } from '../core/conversation';
 import type { AutocompleteEngine } from './autocomplete.ts';
 import type { PanelManager } from '../panels/panel-manager.ts';
 import type { KeybindingsManager } from './keybindings.ts';
+import type { KillRing } from './kill-ring.ts';
+import { wordBoundaryBack, wordBoundaryForward } from './kill-ring.ts';
 
 type WrappedPromptInfo = {
   wrappedLines: string[];
@@ -43,6 +45,7 @@ export type GlobalShortcutRouteState = {
   handlePaste: () => void;
   handleEscape: () => void;
   cyclePanelTab: (direction: 'next' | 'prev') => void;
+  killRing: KillRing;
 };
 
 export function handleGlobalShortcutToken(
@@ -148,6 +151,8 @@ export function handleGlobalShortcutToken(
       let pos = state.cursorPos;
       while (pos > 0 && state.prompt[pos - 1] === ' ') pos--;
       while (pos > 0 && state.prompt[pos - 1] !== ' ') pos--;
+      const killedWord = state.prompt.slice(pos, state.cursorPos);
+      if (killedWord) { state.killRing.push(killedWord); state.killRing.clearYankState(); }
       state.prompt = state.prompt.slice(0, pos) + state.prompt.slice(state.cursorPos);
       state.cursorPos = pos;
       state.ensureInputCursorVisible();
@@ -179,13 +184,18 @@ export function handleGlobalShortcutToken(
       return true;
     }
 
-    case 'kill-line':
+    case 'kill-line': {
+      const killed = state.prompt.slice(state.cursorPos);
       state.saveUndoState();
+      state.killRing.push(killed);
+      state.killRing.clearYankState();
       state.prompt = state.prompt.slice(0, state.cursorPos);
       state.ensureInputCursorVisible();
       return true;
+    }
 
-    case 'clear-prompt':
+    case 'clear-prompt': {
+      // Legacy full-clear: keep as alias but do NOT call this when kill-to-start is bound.
       state.saveUndoState();
       state.prompt = '';
       state.cursorPos = 0;
@@ -194,6 +204,82 @@ export function handleGlobalShortcutToken(
         state.autocomplete?.reset();
       }
       return true;
+    }
+
+    case 'kill-to-start': {
+      // Kill from start of buffer to cursor, push to ring.
+      const killed = state.prompt.slice(0, state.cursorPos);
+      state.saveUndoState();
+      state.killRing.push(killed);
+      state.killRing.clearYankState();
+      state.prompt = state.prompt.slice(state.cursorPos);
+      state.cursorPos = 0;
+      state.ensureInputCursorVisible();
+      return true;
+    }
+
+    case 'kill-word-forward': {
+      // Kill from cursor to end of next word, push to ring.
+      const end = wordBoundaryForward(state.prompt, state.cursorPos);
+      const killed = state.prompt.slice(state.cursorPos, end);
+      if (killed) {
+        state.saveUndoState();
+        state.killRing.push(killed);
+        state.killRing.clearYankState();
+        state.prompt = state.prompt.slice(0, state.cursorPos) + state.prompt.slice(end);
+        state.ensureInputCursorVisible();
+      }
+      return true;
+    }
+
+    case 'word-back': {
+      const newPos = wordBoundaryBack(state.prompt, state.cursorPos);
+      if (newPos !== state.cursorPos) {
+        state.killRing.clearYankState();
+        state.cursorPos = newPos;
+        state.ensureInputCursorVisible();
+      }
+      return true;
+    }
+
+    case 'word-forward': {
+      const newPos = wordBoundaryForward(state.prompt, state.cursorPos);
+      if (newPos !== state.cursorPos) {
+        state.killRing.clearYankState();
+        state.cursorPos = newPos;
+        state.ensureInputCursorVisible();
+      }
+      return true;
+    }
+
+    case 'yank': {
+      const text = state.killRing.yank();
+      if (text) {
+        state.saveUndoState();
+        state.prompt = state.prompt.slice(0, state.cursorPos) + text + state.prompt.slice(state.cursorPos);
+        state.cursorPos += text.length;
+        state.ensureInputCursorVisible();
+      }
+      return true;
+    }
+
+    case 'yank-pop': {
+      // Only valid immediately after a yank or yank-pop.
+      if (!state.killRing.lastActionWasYank) return false;
+      // Undo the previous yank by restoring: we store the pre-yank snapshot on
+      // the undo stack so a single undo covers the whole yank sequence.
+      // For yank-pop: replace the last yanked text with the next ring entry.
+      // We rely on the undo stack having the pre-yank state at the top.
+      state.handleUndo();
+      const text = state.killRing.yankPop();
+      if (text) {
+        state.saveUndoState();
+        state.prompt = state.prompt.slice(0, state.cursorPos) + text + state.prompt.slice(state.cursorPos);
+        state.cursorPos += text.length;
+        state.ensureInputCursorVisible();
+      }
+      return true;
+    }
 
     case 'undo':
       state.handleUndo();

package/src/input/handler-ui-state.ts

@@ -267,13 +267,13 @@ export function handleSearchModeToken(
         searchManager.unlock();
       }
     } else if (token.type === 'text') {
-      if (token.value === 'j' || token.value === 'l') {
+      if (token.value === 'n' || token.value === 'j' || token.value === 'l') {
         searchManager.nextMatch();
         const matchLine = searchManager.getCurrentMatchLine();
         if (matchLine >= 0) {
           state.scroll(matchLine - state.getScrollTop() - Math.floor(state.getViewportHeight() / 2));
         }
-      } else if (token.value === 'k' || token.value === 'h') {
+      } else if (token.value === 'N' || token.value === 'k' || token.value === 'h') {
         searchManager.prevMatch();
         const matchLine = searchManager.getCurrentMatchLine();
         if (matchLine >= 0) {