@pellux/goodvibes-agent 0.1.116 → 0.1.117

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

@@ -81,11 +81,6 @@ export function registerSubscriptionRuntimeCommands(registry: CommandRegistry):
     async handler(args, ctx) {
       const parsed = stripYesFlag(args);
       const commandArgs = [...parsed.rest];
-      const shellPaths = requireShellPaths(ctx);
-      if (args.length === 0 && ctx.openSubscriptionPanel) {
-        ctx.openSubscriptionPanel();
-        return;
-      }
       const sub = (commandArgs[0] ?? 'review').toLowerCase();
       const manager = requireSubscriptionManager(ctx);
       const services = requireServiceRegistry(ctx);
@@ -419,7 +414,7 @@ export function registerSubscriptionRuntimeCommands(registry: CommandRegistry):
           ctx.print('Usage: /subscription bundle <export|inspect> <path>');
           return;
         }
-        const targetPath = shellPaths.resolveWorkspacePath(pathArg);
+        const targetPath = requireShellPaths(ctx).resolveWorkspacePath(pathArg);
         if (mode === 'export') {
           if (!parsed.yes) {
             requireYesFlag(ctx, `export subscription bundle to ${pathArg}`, '/subscription bundle export <path> --yes');

package/src/input/commands/support-bundle-runtime.ts

@@ -0,0 +1,53 @@
+import type { CommandRegistry } from '../command-registry.ts';
+import type { CliCommandRuntime } from '../../cli/management.ts';
+import { handleBundleCommand } from '../../cli/bundle-command.ts';
+import { parseGoodVibesCli } from '../../cli/parser.ts';
+import { requireShellPaths } from './runtime-services.ts';
+import { requireYesFlag, stripYesFlag } from './confirmation.ts';
+
+function bundleUsageFor(subcommand: string | undefined): string {
+  if (subcommand === 'export') return '/bundle export [path] --yes';
+  if (subcommand === 'import') return '/bundle import <path> --yes';
+  if (subcommand === 'inspect') return '/bundle inspect <path>';
+  return '/bundle [export [path] --yes|inspect <path>|import <path> --yes]';
+}
+
+function bundleActionFor(subcommand: string): string | null {
+  if (subcommand === 'export') return 'export Agent support bundle';
+  if (subcommand === 'import') return 'import Agent support bundle';
+  return null;
+}
+
+export function registerSupportBundleRuntimeCommands(registry: CommandRegistry): void {
+  registry.register({
+    name: 'bundle',
+    description: 'Export, inspect, or import redacted Agent support bundles from the TUI',
+    usage: '[export [path] --yes|inspect <path>|import <path> --yes]',
+    argsHint: 'export|inspect|import',
+    async handler(args, ctx) {
+      const confirmation = stripYesFlag(args);
+      const cli = parseGoodVibesCli(['bundle', ...confirmation.rest], 'goodvibes-agent');
+      if (cli.errors.length > 0) {
+        ctx.print(cli.errors.join('\n'));
+        return;
+      }
+
+      const subcommand = cli.commandArgs[0] ?? 'inspect';
+      const guardedAction = bundleActionFor(subcommand);
+      if (guardedAction !== null && !confirmation.yes) {
+        requireYesFlag(ctx, guardedAction, bundleUsageFor(subcommand));
+        return;
+      }
+
+      const shellPaths = requireShellPaths(ctx);
+      const runtime: CliCommandRuntime = {
+        cli,
+        configManager: ctx.platform.configManager,
+        workingDirectory: shellPaths.workingDirectory,
+        homeDirectory: shellPaths.homeDirectory,
+      };
+      const result = await handleBundleCommand(runtime);
+      ctx.print(result.output);
+    },
+  });
+}

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

@@ -16,7 +16,7 @@ const BLOCKED_TASK_MUTATIONS: ReadonlySet<string> = new Set([
 function printTaskMutationBlocked(print: (text: string) => void, subcommand: string): void {
   print([
     `Task mutation "${subcommand}" is blocked in GoodVibes Agent.`,
-    '  policy: connected-service tasks are read-only from the Agent TUI; normal work stays in the main conversation.',
+    '  policy: connected-host tasks are read-only from the Agent TUI; normal work stays in the main conversation.',
     '  durable tasks: use /workplan for visible planning and task tracking.',
     '  build/fix/review: use /delegate <task> to hand explicit implementation work to GoodVibes TUI.',
     '  result: no local task state was changed.',
@@ -51,7 +51,7 @@ export function registerTasksRuntimeCommands(registry: CommandRegistry): void {
   registry.register({
     name: 'tasks',
     aliases: ['task'],
-    description: 'Inspect connected-service tasks without starting or mutating local background work',
+    description: 'Inspect connected-host tasks without starting or mutating local background work',
     usage: '[list [status|kind] | show <taskId> | output <taskId>]',
     handler(args, ctx) {
       const subcommand = args[0]?.toLowerCase() ?? 'list';

package/src/input/commands.ts

@@ -36,6 +36,8 @@ import { registerAgentSkillsRuntimeCommands } from './commands/agent-skills-runt
 import { registerRoutinesRuntimeCommands } from './commands/routines-runtime.ts';
 import { registerChannelsRuntimeCommands } from './commands/channels-runtime.ts';
 import { registerBriefRuntimeCommands } from './commands/brief-runtime.ts';
+import { registerSupportBundleRuntimeCommands } from './commands/support-bundle-runtime.ts';
+import { registerCompatRuntimeCommands } from './commands/compat-runtime.ts';
 
 function registerAgentMemoryCommand(registry: CommandRegistry): void {
   registry.register({
@@ -58,6 +60,8 @@ export function registerBuiltinCommands(registry: CommandRegistry): void {
   registerShellCoreCommands(registry);
   registerAgentWorkspaceRuntimeCommands(registry);
   registerBriefRuntimeCommands(registry);
+  registerSupportBundleRuntimeCommands(registry);
+  registerCompatRuntimeCommands(registry);
   registerAgentRuntimeProfileRuntimeCommands(registry);
   registerPersonasRuntimeCommands(registry);
   registerAgentSkillsRuntimeCommands(registry);

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

@@ -140,7 +140,6 @@ export interface FeedContextClosures {
   handleBlockCopy: () => void;
   handleBookmark: () => void;
   handleBlockSave: () => void;
-  handleDiffApply: () => boolean;
   handleUndo: () => void;
   handleRedo: () => void;
   handlePaste: () => void;

package/src/input/handler-content-actions.ts

@@ -2,9 +2,7 @@ import { readFileSync, existsSync } from 'node:fs';
 import { copyToClipboard, pasteFromClipboard, pasteImageFromClipboard } from '../utils/clipboard.ts';
 import type { InfiniteBuffer } from '../core/history.ts';
 import type { ConversationManager } from '../core/conversation';
-import type { PermissionCategory } from '@pellux/goodvibes-sdk/platform/permissions';
 import type { ContentPart } from '@pellux/goodvibes-sdk/platform/providers';
-import type { CommandContext } from './command-registry.ts';
 import type { BookmarkManager } from '@pellux/goodvibes-sdk/platform/bookmarks';
 import { resolveAndValidatePath } from '@pellux/goodvibes-sdk/platform/utils';
 import { logger } from '@pellux/goodvibes-sdk/platform/utils';
@@ -337,29 +335,6 @@ export function handleBlockToggle(
   }
 }
 
-export function handleDiffApply(
-  conversationManager: ConversationManager | null,
-  getScrollTop: () => number,
-  commandContext: CommandContext | undefined,
-  requestRender: () => void,
-  getCallId: () => string,
-  category: PermissionCategory,
-): boolean {
-  void commandContext;
-  void getCallId;
-  void category;
-  if (!conversationManager) return false;
-  const lineIndex = getScrollTop();
-  const diff = conversationManager.getDiffAtLine(lineIndex);
-  if (!diff || !diff.filePath) return false;
-  conversationManager.log(
-    `[Diff apply blocked in GoodVibes Agent: ${diff.filePath}. Delegate build/fix work to GoodVibes TUI with /delegate <task>.]`,
-    { fg: '#f59e0b' },
-  );
-  requestRender();
-  return true;
-}
-
 export function handleCtrlC(
   prompt: string,
   saveUndoState: () => void,

package/src/input/handler-feed.ts

@@ -141,7 +141,6 @@ export interface InputFeedContext {
   readonly handleBlockCopy: () => void;
   readonly handleBookmark: () => void;
   readonly handleBlockSave: () => void;
-  readonly handleDiffApply: () => boolean;
   readonly handleUndo: () => void;
   readonly handleRedo: () => void;
   readonly handlePaste: () => void;
@@ -272,7 +271,6 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
         handleBlockCopy: context.handleBlockCopy,
         handleBookmark: context.handleBookmark,
         handleBlockSave: context.handleBlockSave,
-        handleDiffApply: context.handleDiffApply,
         handleUndo: context.handleUndo,
         handleRedo: context.handleRedo,
         handlePaste: context.handlePaste,

package/src/input/handler-interactions.ts

@@ -1,7 +1,7 @@
 import { buildProviderAccountSnapshot } from '@/runtime/index.ts';
 import type { OnboardingWizardMode } from './onboarding/onboarding-wizard.ts';
-import { collectOnboardingSnapshot, readOnboardingCheckMarker, writeOnboardingCheckMarker } from '../runtime/onboarding/index.ts';
-import { cleanupMarkerRegistry, expandPrompt, findMarkerAtPos, handleBlockCopy, handleBlockRerun, handleBlockSave, handleBlockToggle, handleBookmark, handleClipboardPaste, handleCopy, handleCtrlC, handleDiffApply, registerPaste } from './handler-content-actions.ts';
+import { collectOnboardingSnapshot } from '../runtime/onboarding/index.ts';
+import { cleanupMarkerRegistry, expandPrompt, findMarkerAtPos, handleBlockCopy, handleBlockRerun, handleBlockSave, handleBlockToggle, handleBookmark, handleClipboardPaste, handleCopy, handleCtrlC, registerPaste } from './handler-content-actions.ts';
 import { clearModalStack, handleEscape, modalOpened } from './handler-modal-stack.ts';
 import { openOnboardingWizardState, type OpenOnboardingWizardOptions } from './handler-ui-state.ts';
 import type { InputHandler } from './handler.ts';
@@ -11,19 +11,6 @@ export function openOnboardingWizardForHandler(
     modeOrOptions: OnboardingWizardMode | OpenOnboardingWizardOptions = 'new',
   ): void {
     const options = typeof modeOrOptions === 'string' ? { mode: modeOrOptions } : modeOrOptions;
-    const userMarker = readOnboardingCheckMarker(handler.uiServices.environment.shellPaths, 'user');
-    if (!userMarker.payload) {
-      try {
-        writeOnboardingCheckMarker(handler.uiServices.environment.shellPaths, {
-          scope: 'user',
-          source: 'wizard',
-          mode: options.mode ?? 'new',
-        });
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        handler.commandContext?.print?.(`Onboarding check marker could not be written: ${message}`);
-      }
-    }
     if (!handler.modalStack.includes('onboarding')) handler.modalOpened('onboarding');
     handler.clearOnboardingModelPickerCancelState();
     openOnboardingWizardState(handler.onboardingWizard, options);
@@ -152,7 +139,6 @@ export function executeBlockActionForHandler(handler: InputHandler, actionId: st
       case 'copy':     handler.handleBlockCopy(); break;
       case 'bookmark': handler.handleBookmark(); break;
       case 'toggle':   handler.handleBlockToggle(); break;
-      case 'apply':    handler.handleDiffApply(); break;
       case 'rerun':    handler.handleBlockRerun(); break;
     }
   }
@@ -172,21 +158,6 @@ export function handleBlockToggleForHandler(handler: InputHandler): void {
     handleBlockToggle(handler.conversationManager, handler.getScrollTop, handler.requestRender);
   }
 
-  /**
-   * handleDiffApply - Ctrl+A when a diff block is nearest: request approval and apply the diff.
-   * Returns true if a diff was found and applied (so caller can skip default Ctrl+A).
-   */
-export function handleDiffApplyForHandler(handler: InputHandler): boolean {
-    return handleDiffApply(
-      handler.conversationManager,
-      handler.getScrollTop,
-      handler.commandContext,
-      handler.requestRender,
-      () => `diff-apply-${Date.now()}`,
-      'write',
-    );
-  }
-
   /**
    * Handle Ctrl+C:
    * - If prompt has text: clear it

package/src/input/handler-onboarding.ts

@@ -4,7 +4,7 @@ import { openExternalUrl } from '@pellux/goodvibes-sdk/platform/utils';
 import { getProviderIdFromModel } from '../config/provider-model.ts';
 import { buildProviderAccountSnapshot } from '@/runtime/index.ts';
 import { OnboardingWizardController, type OnboardingWizardAction, type OnboardingWizardApplyFeedback } from './onboarding/onboarding-wizard.ts';
-import { applyOnboardingRequest, collectOnboardingSnapshot, verifyOnboardingRequest } from '../runtime/onboarding/index.ts';
+import { applyOnboardingRequest, collectOnboardingSnapshot, verifyOnboardingRequest, writeOnboardingCheckMarker } from '../runtime/onboarding/index.ts';
 import type { OnboardingApplyRequest, OnboardingVerificationItem } from '../runtime/onboarding/index.ts';
 import type { ModelPickerTarget } from './model-picker.ts';
 import { captureOnboardingWizardSnapshot, restoreOnboardingWizardSnapshot } from './handler-ui-state.ts';
@@ -219,7 +219,7 @@ export async function handleOnboardingActionForHandler(handler: InputHandler, ac
       showOnboardingApplyFeedbackForHandler(handler, {
         severity: 'error',
         title: 'Apply failed',
-        summary: 'The wizard could not persist these settings. No service restart was attempted.',
+        summary: 'The wizard could not persist these settings. No connected-host restart was attempted.',
         messages: [error instanceof Error ? error.message : String(error)],
       });
       return;
@@ -240,6 +240,16 @@ export async function handleOnboardingActionForHandler(handler: InputHandler, ac
 
     handler.syncRuntimeFromOnboardingRequest(request);
     handler.onboardingWizard.markApplied();
+    let markerWarning: string | null = null;
+    try {
+      writeOnboardingCheckMarker(handler.uiServices.environment.shellPaths, {
+        scope: 'user',
+        source: 'wizard',
+        mode: request.mode,
+      });
+    } catch (error) {
+      markerWarning = error instanceof Error ? error.message : String(error);
+    }
     handler.onboardingWizard.close();
     for (let index = handler.modalStack.length - 1; index >= 0; index -= 1) {
       if (handler.modalStack[index] === 'onboarding') handler.modalStack.splice(index, 1);
@@ -250,7 +260,14 @@ export async function handleOnboardingActionForHandler(handler: InputHandler, ac
       handler.indicatorFocused = returnFocus === 'indicator';
       handler.modalReturnFocus = 'prompt';
     }
-    handler.commandContext?.print?.(formatOnboardingApplyCompletionMessage(verificationItems));
+    const completionMessage = formatOnboardingApplyCompletionMessage(verificationItems);
+    handler.commandContext?.print?.(markerWarning
+      ? `${completionMessage}\nSetup check marker could not be written: ${markerWarning}`
+      : completionMessage);
+    if (handler.commandContext) {
+      handler.openAgentWorkspace(handler.commandContext, 'setup');
+      return;
+    }
     handler.requestRender();
   }
 
@@ -455,7 +472,7 @@ export async function handleOpenAiSubscriptionFinishForHandler(handler: InputHan
   }
 
 export function syncRuntimeFromOnboardingRequestForHandler(handler: InputHandler, request: ReturnType<OnboardingWizardController['buildApplyRequest']>): void {
-    const runtime = handler.commandContext?.session.runtime;
+    const runtime = handler.commandContext?.session?.runtime;
     if (!runtime) return;
 
     for (const operation of request.operations) {
@@ -487,12 +504,12 @@ export function getOnboardingRuntimePostureForHandler(handler: InputHandler, req
 export async function restartOnboardingExternalServicesIfNeededForHandler(handler: InputHandler, request: OnboardingApplyRequest): Promise<OnboardingVerificationItem[]> {
     const externalServices = handler.uiServices.platform.externalServices;
     const state = externalServices?.inspect();
-    const serviceStatus = state?.daemonStatus?.reason ?? (state?.daemonRunning ? 'connected GoodVibes services appear active' : 'connected GoodVibes services are not verified from this shell');
+    const hostStatus = state?.daemonStatus?.reason ?? (state?.daemonRunning ? 'connected GoodVibes host appears active' : 'connected GoodVibes host is not verified from this shell');
     return [{
-      id: 'runtime:external-service-owned',
+      id: 'runtime:external-host-owned',
       status: 'pass',
-      message: `GoodVibes Agent did not start, stop, restart, or reconfigure connected services. ${serviceStatus}`,
-      target: 'service',
+      message: `GoodVibes Agent did not start, stop, restart, or reconfigure the connected host. ${hostStatus}`,
+      target: 'host',
     }];
   }
 
@@ -500,11 +517,11 @@ export function verifyOnboardingRuntimePostureForHandler(handler: InputHandler,
     const externalServices = handler.uiServices.platform.externalServices;
     const externalState = externalServices?.inspect();
     return [{
-      id: 'runtime:external-service-owned',
+      id: 'runtime:external-host-owned',
       status: 'pass',
       message: externalState
-        ? 'Connected GoodVibes services are managed outside Agent; Agent onboarding did not request shutdown, startup, restart, bind, or surface changes.'
-        : 'Connected GoodVibes services are managed outside Agent; no local service controller is required for Agent onboarding.',
-      target: 'service',
+        ? 'The connected GoodVibes host is managed outside Agent; Agent onboarding did not request shutdown, startup, restart, bind, or surface changes.'
+        : 'The connected GoodVibes host is managed outside Agent; no local host controller is required for Agent onboarding.',
+      target: 'host',
     }];
   }

package/src/input/handler-shortcuts.ts

@@ -37,7 +37,6 @@ export type GlobalShortcutRouteState = {
   handleBlockCopy: () => void;
   handleBookmark: () => void;
   handleBlockSave: () => void;
-  handleDiffApply: () => boolean;
   handleUndo: () => void;
   handleRedo: () => void;
   handlePaste: () => void;
@@ -154,8 +153,7 @@ export function handleGlobalShortcutToken(
       return true;
     }
 
-    case 'apply-diff-line-start': {
-      if (!state.commandMode && state.handleDiffApply()) return true;
+    case 'line-start': {
       const info = state.getWrappedPromptInfo(state.contentWidth);
       state.cursorPos = info.wrappedLines.length > 1 ? info.segments[info.cursorWrappedLine].rawStart : 0;
       state.ensureInputCursorVisible();

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, handleBlockRerunForHandler, handleBlockSaveForHandler, handleBlockToggleForHandler, handleBookmarkForHandler, handleCopyForHandler, handleCtrlCForHandler, handleDiffApplyForHandler, handleEscapeForHandler, hydrateOnboardingWizardFromRuntimeForHandler, modalOpenedForHandler, openOnboardingWizardForHandler, registerPasteForHandler } from './handler-interactions.ts';
+import { clearModalStackForHandler, cleanupMarkerRegistryForHandler, executeBlockActionForHandler, expandPromptForHandler, findMarkerAtPosForHandler, getImageAttachmentsForHandler, handleBlockCopyForHandler, handleBlockRerunForHandler, handleBlockSaveForHandler, handleBlockToggleForHandler, handleBookmarkForHandler, handleCopyForHandler, handleCtrlCForHandler, handleEscapeForHandler, hydrateOnboardingWizardFromRuntimeForHandler, modalOpenedForHandler, openOnboardingWizardForHandler, registerPasteForHandler } from './handler-interactions.ts';
 import { clearOnboardingModelPickerCancelStateForHandler, clearOnboardingPendingModelPickerTargetForHandler, completeOpenAiSubscriptionFromListenerForHandler, getOnboardingConfigValueForHandler, getOnboardingRuntimePostureForHandler, handleModelPickerCommitForHandler, handleOnboardingActionForHandler, handleOpenAiSubscriptionFinishForHandler, handleOpenAiSubscriptionStartForHandler, openModelPickerWithTargetForHandler, openProviderModelPickerWithTargetForHandler, refreshOnboardingHydrationForHandler, restartOnboardingExternalServicesIfNeededForHandler, restoreOnboardingModelPickerCancelStateForHandler, syncRuntimeFromOnboardingRequestForHandler, verifyOnboardingRuntimePostureForHandler, type OnboardingRuntimePosture } from './handler-onboarding.ts';
 import { beginOpenAICodexLogin, exchangeOpenAICodexCode } from '@pellux/goodvibes-sdk/platform/config';
 import { openExternalUrl } from '@pellux/goodvibes-sdk/platform/utils';
@@ -56,7 +56,6 @@ import {
   handleClipboardPaste,
   handleCopy,
   handleCtrlC,
-  handleDiffApply,
   mediaTypeFromExt,
   registerPaste,
 } from './handler-content-actions.ts';
@@ -302,7 +301,6 @@ export class InputHandler {
         handleBlockCopy: () => this.handleBlockCopy(),
         handleBookmark: () => this.handleBookmark(),
         handleBlockSave: () => this.handleBlockSave(),
-        handleDiffApply: () => this.handleDiffApply(),
         handleUndo: () => { this.handleUndo(); this.syncFeedContextMutableFields(); },
         handleRedo: () => { this.handleRedo(); this.syncFeedContextMutableFields(); },
         handlePaste: () => { this.handlePaste(); this.syncFeedContextMutableFields(); },
@@ -351,7 +349,7 @@ export class InputHandler {
     this.autocomplete = new AutocompleteEngine(registry);
   }
 
-  /** Wire in the conversation manager for block copy/apply/collapse. */
+  /** Wire in the conversation manager for block copy/collapse. */
   public setConversationManager(cm: ConversationManager): void { this.conversationManager = cm; }
 
   /**
@@ -393,7 +391,6 @@ export class InputHandler {
   public executeBlockAction(actionId: string): void { executeBlockActionForHandler(this, actionId); }
   public handleBlockRerun(): void { handleBlockRerunForHandler(this); }
   public handleBlockToggle(): void { handleBlockToggleForHandler(this); }
-  public handleDiffApply(): boolean { return handleDiffApplyForHandler(this); }
   public handleCtrlC(): void { handleCtrlCForHandler(this); }
   public modalOpened(name: string): void { modalOpenedForHandler(this, name); }
   public clearModalStack(): void { clearModalStackForHandler(this); }
@@ -411,11 +408,11 @@ export class InputHandler {
     this.mcpWorkspace.open(context);
     this.requestRender();
   }
-  public openAgentWorkspace(context: CommandContext): void {
+  public openAgentWorkspace(context: CommandContext, categoryId?: string): void {
     this.panelFocused = false;
     this.indicatorFocused = false;
     this.modalOpened('agentWorkspace');
-    this.agentWorkspace.open(context, (command) => this.dispatchAgentWorkspaceCommand(command, context));
+    this.agentWorkspace.open(context, (command) => this.dispatchAgentWorkspaceCommand(command, context), categoryId);
     this.requestRender();
   }
 

package/src/input/keybindings.ts

@@ -45,7 +45,7 @@ export type KeyAction =
   | 'bookmark'
   | 'block-save'
   | 'delete-word'
-  | 'apply-diff-line-start'
+  | 'line-start'
   | 'next-error-line-end'
   | 'kill-line'
   | 'clear-prompt'
@@ -59,25 +59,25 @@ export const ACTION_DESCRIPTIONS: Record<KeyAction, string> = {
   'copy-selection':        'Copy selected text to clipboard',
   'clear-cancel':          'Clear input / cancel generation / exit (double)',
   'screen-clear':          'Repaint the screen',
-  'panel-picker':          'Open, focus, or hide the panel workspace',
-  'panel-close':            'Close the currently active panel',
-  'panel-close-all':         'Close all open panels',
-  'panel-tab-next':        'Next workspace panel tab',
-  'panel-tab-prev':        'Previous workspace panel tab',
+  'panel-picker':          'Open the Agent operator workspace',
+  'panel-close':            'Dismiss deferred panel focus',
+  'panel-close-all':         'Dismiss deferred workspace focus',
+  'panel-tab-next':        'Reserved for future Agent workspace tabs',
+  'panel-tab-prev':        'Reserved for future Agent workspace tabs',
   'history-search':        'Reverse input history search',
   'search':                'Toggle conversation search',
   'block-copy':            'Copy nearest block to clipboard',
   'bookmark':              'Bookmark / unbookmark nearest block',
   'block-save':            'Block file save disabled; copy block or export conversation',
   'delete-word':           'Delete word backward',
-  'apply-diff-line-start': 'Delegate diff changes / move to line start',
+  'line-start':            'Move to start of line',
   'next-error-line-end':   'Navigate to next error / move to line end',
   'kill-line':             'Kill to end of line',
   'clear-prompt':          'Clear the prompt',
   'undo':                  'Undo last prompt edit',
   'redo':                  'Redo last undone edit',
   'paste':                 'Paste from clipboard (image priority)',
-  'replay-panel':          'Open / close the Replay panel',
+  'replay-panel':          'Reserved replay workspace shortcut',
 };
 
 /** Default key bindings for all actions. */
@@ -96,7 +96,7 @@ export const DEFAULT_KEYBINDINGS: Record<KeyAction, KeyCombo[]> = {
   'bookmark':              [{ key: 'b', ctrl: true }],
   'block-save':            [{ key: 's', ctrl: true }],
   'delete-word':           [{ key: 'w', ctrl: true }],
-  'apply-diff-line-start': [{ key: 'a', ctrl: true }],
+  'line-start':            [{ key: 'a', ctrl: true }],
   'next-error-line-end':   [{ key: 'e', ctrl: true }],
   'kill-line':             [{ key: 'k', ctrl: true }],
   'clear-prompt':          [{ key: 'u', ctrl: true }],