@pellux/goodvibes-tui 0.26.0 → 0.28.0

package/src/core/turn-event-wiring.ts

@@ -1,6 +1,5 @@
 import type { UiRuntimeEvents } from '@/runtime/index.ts';
 import { buildPersistedSessionContext, persistConversation } from '@/runtime/index.ts';
-import { maybeAutoCompact } from './context-auto-compact.ts';
 import { logger } from '@pellux/goodvibes-sdk/platform/utils';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import type { HookDispatcher, HookPhase, HookCategory, HookEventPath } from '@pellux/goodvibes-sdk/platform/hooks';
@@ -20,6 +19,7 @@ interface TurnOrchestrator {
 /** Minimal provider registry surface required by turn-event wiring. */
 interface TurnProviderRegistry {
   getCurrentModel(): { readonly contextWindow: number };
+  getContextWindowForModel(model: { readonly contextWindow: number }): number;
 }
 
 /** Minimal config manager surface required by turn-event wiring. */
@@ -80,17 +80,21 @@ export interface WireTurnEventHandlersResult {
  * Responsibilities:
  *   - Auto-save conversation to persistent store after each LLM turn
  *   - Fire the Lifecycle:session:save hook
- *   - Trigger auto-compact when context usage exceeds the configured threshold
  *   - Refresh git status after turns and tool results
  *
+ * Note: auto-compaction is intentionally NOT performed here. The SDK
+ * Orchestrator already runs post-turn context maintenance every turn
+ * (handlePostTurnContextMaintenance) using the resolved context window and
+ * its own getAutoCompactDecision; re-triggering it from the TUI duplicated
+ * that work and raced the SDK's compaction on the shared message array.
+ *
  * Returns refreshGit (callable externally) and unsubs (push into parent unsubs).
  */
 export function wireTurnEventHandlers(
   options: WireTurnEventHandlersOptions,
 ): WireTurnEventHandlersResult {
   const {
-    events, conversation, runtime, orchestrator, configManager,
-    providerRegistry, systemMessageRouter, hookDispatcher,
+    events, conversation, runtime, configManager, hookDispatcher,
     workingDir, homeDirectory, sessionManager, gitStatusProvider,
     lastGitInfoRef, buildSessionContinuityHints, render, webhookNotifier,
     _clock = Date.now,
@@ -161,18 +165,11 @@ export function wireTurnEventHandlers(
       } catch { /* best-effort */ }
       logger.debug('auto-save on turn:complete failed', { error: summarizeError(e) });
     }
-    // Auto-compact: check context usage and compact if threshold exceeded
-    const currentModelForCompact = providerRegistry.getCurrentModel();
-    maybeAutoCompact({
-      configManager: configManager as Parameters<typeof maybeAutoCompact>[0]['configManager'],
-      conversation,
-      providerRegistry: providerRegistry as Parameters<typeof maybeAutoCompact>[0]['providerRegistry'],
-      systemMessageRouter: systemMessageRouter as Parameters<typeof maybeAutoCompact>[0]['systemMessageRouter'],
-      model: runtime.model,
-      provider: runtime.provider,
-      lastInputTokens: orchestrator.lastInputTokens,
-      contextWindow: currentModelForCompact.contextWindow,
-    }).catch((err: unknown) => logger.debug('maybeAutoCompact error', { error: summarizeError(err) }));
+    // Auto-compaction is owned by the SDK Orchestrator's post-turn maintenance
+    // (handlePostTurnContextMaintenance), which runs on every turn against the
+    // resolved context window (getContextWindowForModel) via the SDK's
+    // getAutoCompactDecision (percentage threshold + 15k safety buffer +
+    // small-window handling). The TUI must not independently re-trigger it.
     refreshGit();
   }));
 

package/src/daemon/handlers/calendar/caldav-client.ts

@@ -26,6 +26,7 @@ import {
   type GenerateICalInput,
   type ParsedICalEvent,
 } from './ics.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 // ---------------------------------------------------------------------------
 // Configuration
@@ -586,7 +587,7 @@ export function createCalDavClient(options: CreateCalDavClientOptions): CalDavCl
           eventIds.push(toRelativeHref(joinUrl(collectionPathOrRoot(collectionUrl, config.baseUrl), resourcePath)));
           imported += 1;
         } catch (error) {
-          const message = error instanceof HandlerError ? error.message : error instanceof Error ? error.message : String(error);
+          const message = error instanceof HandlerError ? error.message : summarizeError(error);
           errors.push(`${uid}: ${message}`);
         }
       }

package/src/daemon/handlers/inbox/index.ts

@@ -40,6 +40,7 @@ import { InboundPoller } from './poller.ts';
 import { createSlackAdapter, SLACK_PROVIDER_ID } from './providers/slack.ts';
 import { createDiscordAdapter, DISCORD_PROVIDER_ID } from './providers/discord.ts';
 import { createEmailAdapter, EMAIL_PROVIDER_ID } from './providers/email.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export const INBOX_LIST_METHOD_ID = 'channels.inbox.list';
 const DEFAULT_LIMIT = 50;
@@ -173,7 +174,7 @@ export function registerInboxMethods(
     poller.start();
   })().catch((error: unknown) => {
     ctx.logger.error('inbox surface bootstrap failed', {
-      error: error instanceof Error ? error.message : String(error),
+      error: summarizeError(error),
     });
   });
 

package/src/daemon/handlers/inbox/poller.ts

@@ -17,6 +17,7 @@
 import type { InboundProviderAdapter, ProviderState } from './provider-adapter.ts';
 import type { InboxCursorStore } from './cursor-store.ts';
 import type { HandlerLogger } from '../context.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export interface ProviderStatus {
   id: string;
@@ -115,7 +116,7 @@ export class InboundPoller {
         lastPolledAt: Date.now(),
       });
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
+      const message = summarizeError(error);
       this.logger.warn('inbound poll failed', { provider: id, error: message });
       this.setStatus(id, {
         id,

package/src/daemon/handlers/inbox/providers/discord.ts

@@ -31,6 +31,7 @@ import type {
 import { POLL_CADENCE_MS } from '../provider-adapter.ts';
 import { digestSender, toBodyPreview, toSubjectPreview } from '../mapping.ts';
 import { resolveRouteId } from './route-util.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 const DISCORD_API = 'https://discord.com/api/v10';
 // Discord epoch (2015-01-01T00:00:00Z) in ms, used to decode snowflakes.
@@ -247,5 +248,5 @@ function unavailable(error: string): ProviderPollResult {
 }
 
 function errMsg(error: unknown): string {
-  return error instanceof Error ? error.message : String(error);
+  return summarizeError(error);
 }

package/src/daemon/handlers/inbox/providers/email.ts

@@ -25,6 +25,7 @@ import { digestSender, toBodyPreview, toSubjectPreview } from '../mapping.ts';
 import { resolveRouteId } from './route-util.ts';
 import { ImapClient } from './imap-client.ts';
 import type { ImapConfig, ImapEnvelope } from './imap-client.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export const EMAIL_PROVIDER_ID = 'email';
 export const EMAIL_HOST_KEY = 'surfaces.email.imapHost';
@@ -147,5 +148,5 @@ function unavailable(error: string): ProviderPollResult {
 }
 
 function errMsg(error: unknown): string {
-  return error instanceof Error ? error.message : String(error);
+  return summarizeError(error);
 }

package/src/daemon/handlers/inbox/providers/route-util.ts

@@ -3,6 +3,7 @@
 // surface) so a route lookup can never crash a provider poll.
 
 import type { AdapterContext, InboundChannelItem } from '../provider-adapter.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export async function resolveRouteId(
   ctx: AdapterContext,
@@ -16,7 +17,7 @@ export async function resolveRouteId(
   } catch (error) {
     ctx.logger.warn('route resolution failed', {
       provider,
-      error: error instanceof Error ? error.message : String(error),
+      error: summarizeError(error),
     });
     return undefined;
   }

package/src/daemon/handlers/inbox/providers/slack.ts

@@ -30,6 +30,7 @@ import type {
 import { POLL_CADENCE_MS } from '../provider-adapter.ts';
 import { digestSender, toBodyPreview, toSubjectPreview } from '../mapping.ts';
 import { resolveRouteId } from './route-util.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 const SLACK_API = 'https://slack.com/api';
 export const SLACK_PROVIDER_ID = 'slack';
@@ -258,5 +259,5 @@ function unavailable(error: string): ProviderPollResult {
 }
 
 function errMsg(error: unknown): string {
-  return error instanceof Error ? error.message : String(error);
+  return summarizeError(error);
 }

package/src/daemon/handlers/triage/integration.ts

@@ -47,6 +47,7 @@ import {
   type TriageTagger,
   type TriageTaggerOptions,
 } from './tagger/index.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 /**
  * Canonical id of the inbox list method whose handler we decorate. This is the
@@ -151,7 +152,7 @@ function withInboxEnrichment(ctx: HandlerContext): EnrichmentProxy {
         // Triage is best-effort: a missing/locked store must never break the
         // read-only inbox feed. Log and return the un-enriched result.
         ctx.logger.warn('triage: inbox enrichment skipped', {
-          message: error instanceof Error ? error.message : String(error),
+          message: summarizeError(error),
         });
         return result;
       }

package/src/daemon/handlers/triage/pipeline.ts

@@ -23,6 +23,7 @@ import {
   type TriageScore,
   type TriageScorerOptions,
 } from './scorer.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export const TRIAGE_STORE_FILE = 'inbox-triage.sqlite';
 
@@ -158,7 +159,7 @@ export async function runInboxTriage(
     if (ownsStore) await store.save();
   } catch (error) {
     ctx.logger.error('triage: failed to persist scores', {
-      message: error instanceof Error ? error.message : String(error),
+      message: summarizeError(error),
     });
     throw error;
   } finally {

package/src/daemon/handlers/triage/tagger/discord.ts

@@ -19,6 +19,7 @@ import { HandlerError } from '../../errors.ts';
 import type { InboundChannelItem } from '../types.ts';
 import type { ApplyTagsResult, TaggerProviderConfig } from './shared.ts';
 import { discordEmojiForTag, stringMeta } from './shared.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export async function applyDiscord(
   item: InboundChannelItem,
@@ -179,7 +180,7 @@ async function fetchDiscordAppliedTags(
     return current.filter((t): t is string => typeof t === 'string');
   } catch (error) {
     ctx.logger.warn('triage: discord thread tag read errored', {
-      message: error instanceof Error ? error.message : String(error),
+      message: summarizeError(error),
     });
     return null;
   }

package/src/daemon/handlers/triage/tagger/imap.ts

@@ -14,6 +14,7 @@ import type { DaemonCredentialStore } from '../../credentials.ts';
 import type { InboundChannelItem } from '../types.ts';
 import type { ApplyTagsResult, TaggerProviderConfig } from './shared.ts';
 import { imapKeywordForTag } from './shared.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export interface ImapStoreArgs {
   host: string;
@@ -227,7 +228,7 @@ export function imapStoreFlagOverTls(
       reject(
         err instanceof ImapStoreError
           ? err
-          : new ImapStoreError(err instanceof Error ? err.message : String(err), false),
+          : new ImapStoreError(summarizeError(err), false),
       );
       return;
     }
@@ -288,7 +289,7 @@ export function imapStoreFlagOverTls(
           finish(
             err instanceof ImapStoreError
               ? err
-              : new ImapStoreError(err instanceof Error ? err.message : String(err), false),
+              : new ImapStoreError(summarizeError(err), false),
           ),
         );
         return;
@@ -318,7 +319,7 @@ export function imapStoreFlagOverTls(
     };
 
     socket.on('error', (err) =>
-      finish(new ImapStoreError(err instanceof Error ? err.message : String(err), true)),
+      finish(new ImapStoreError(summarizeError(err), true)),
     );
     socket.on('close', () => {
       if (completed) finish();

package/src/export/gist-uploader.ts

@@ -16,6 +16,8 @@
 // the URL can view it).
 // ---------------------------------------------------------------------------
 
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
+
 export type UploadResult =
   | { ok: true; url: string }
   | { ok: false; error: string };
@@ -96,7 +98,7 @@ export class GistUploadTarget implements UploadTarget {
         body,
       });
     } catch (fetchErr: unknown) {
-      const msg = fetchErr instanceof Error ? fetchErr.message : String(fetchErr);
+      const msg = summarizeError(fetchErr);
       return { ok: false, error: `Network error: ${msg}` };
     }
 

package/src/input/command-registry.ts

@@ -139,6 +139,7 @@ export interface CommandSessionServices {
   readonly sessionManager?: import('@pellux/goodvibes-sdk/platform/sessions').SessionManager;
   readonly sessionMemoryStore?: import('@pellux/goodvibes-sdk/platform/core').SessionMemoryStore;
   readonly sessionLineageTracker?: import('@pellux/goodvibes-sdk/platform/core').SessionLineageTracker;
+  readonly wrfcController?: import('@pellux/goodvibes-sdk/platform/agents').WrfcController;
   readonly changeTracker?: import('@pellux/goodvibes-sdk/platform/sessions').SessionChangeTracker;
 }
 

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

@@ -11,6 +11,7 @@ import {
 } from '../../runtime/cloudflare-control-plane.ts';
 import type { CommandContext, CommandRegistry } from '../command-registry.ts';
 import { requireShellPaths } from './runtime-services.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 interface ParsedCloudflareArgs {
   readonly positional: readonly string[];
@@ -366,5 +367,5 @@ function formatCloudflareError(error: unknown): string {
   if (error instanceof CloudflareDaemonRouteError) {
     return `${error.message} (HTTP ${error.status}, ${error.code})`;
   }
-  return error instanceof Error ? error.message : String(error);
+  return summarizeError(error);
 }

package/src/input/commands/eval.ts

@@ -109,8 +109,9 @@ async function handleCompare(args: string[], context: CommandContext): Promise<v
 // ── /eval gate ────────────────────────────────────────────────────────────────
 
 async function handleGate(args: string[], context: CommandContext): Promise<void> {
-  const suiteName = args[0];
-  const baselineFile = args[1] ?? '.goodvibes/eval/baseline.json';
+  const positionals = args.filter(a => !a.startsWith('--'));
+  const suiteName = positionals[0];
+  const baselineFile = positionals[1] ?? '.goodvibes/eval/baseline.json';
   const saveFlag = args.includes('--save-baseline');
   const projectRoot = requireShellPaths(context).workingDirectory;
 
@@ -141,7 +142,7 @@ async function handleGate(args: string[], context: CommandContext): Promise<void
   context.print(formatGateResult(gate));
 
   if (saveFlag || !baseline) {
-    const label = args[0] ?? 'latest';
+    const label = positionals[0] ?? 'latest';
     const newBaseline = captureBaseline(label, [fresh]);
     try {
       await writeBaseline(baselineFile, newBaseline, projectRoot);

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

@@ -2,7 +2,7 @@ import { estimateConversationTokens } from '@pellux/goodvibes-sdk/platform/core'
 import { evaluateSessionMaintenance, formatSessionMaintenanceLines, getGuidanceMode } from '@/runtime/index.ts';
 import { dismissGuidance, evaluateContextualGuidance, formatGuidanceItems, resetGuidance } from '@/runtime/index.ts';
 import type { CommandRegistry } from '../command-registry.ts';
-import { requireProviderApi, requireReadModels, requireSessionMemoryStore, requireShellPaths } from './runtime-services.ts';
+import { requireReadModels, requireSessionMemoryStore, requireShellPaths } from './runtime-services.ts';
 
 export function registerGuidanceRuntimeCommands(registry: CommandRegistry): void {
   registry.register({
@@ -68,8 +68,6 @@ export function registerGuidanceRuntimeCommands(registry: CommandRegistry): void
         return;
       }
 
-      const providerApi = requireProviderApi(ctx);
-      const currentModel = await providerApi.getCurrentModel().catch(() => null); // best-effort: null handled as unknown context window
       const llmMessages = ctx.session.conversationManager.getMessagesForLLM();
       const readModels = requireReadModels(ctx);
       const session = readModels.session.getSnapshot();
@@ -80,7 +78,7 @@ export function registerGuidanceRuntimeCommands(registry: CommandRegistry): void
       const maintenance = evaluateSessionMaintenance({
         configManager: ctx.platform.configManager,
         currentTokens: estimateConversationTokens(llmMessages),
-        contextWindow: currentModel?.contextWindow ?? 0,
+        contextWindow: ctx.provider.providerRegistry.getContextWindowForModel(ctx.provider.providerRegistry.getCurrentModel()),
         messageCount: llmMessages.length,
         sessionMemoryCount: requireSessionMemoryStore(ctx).list().length,
         session: session.session,

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

@@ -13,7 +13,6 @@ import {
   openCommandPanel,
   requireLocalUserAuthManager,
   requireOperatorClient,
-  requireProviderApi,
   requireReadModels,
   requireSecretsManager,
   requireServiceRegistry,
@@ -240,15 +239,19 @@ export function registerHealthRuntimeCommands(registry: CommandRegistry): void {
 
       if (sub === 'maintenance') {
         const session = readModels.session.getSnapshot();
-        const providerApi = requireProviderApi(ctx);
-        const currentModel = await providerApi.getCurrentModel().catch(() => null); // best-effort: null handled as unknown context window
+        const providerRegistry = ctx.provider.providerRegistry;
+        // Resolve the context window the same way the Tokens panel does so the
+        // maintenance usage %/remaining agree across every diagnostics surface.
+        const contextWindow = providerRegistry.getContextWindowForModel(
+          providerRegistry.getCurrentModel(),
+        );
         const llmMessages = typeof ctx.session.conversationManager.getMessagesForLLM === 'function'
           ? ctx.session.conversationManager.getMessagesForLLM()
           : [];
         const maintenance = evaluateSessionMaintenance({
           configManager: ctx.platform.configManager,
           currentTokens: estimateConversationTokens(llmMessages),
-          contextWindow: currentModel?.contextWindow ?? 0,
+          contextWindow,
           messageCount: llmMessages.length,
           sessionMemoryCount: requireSessionMemoryStore(ctx).list().length,
           session: session.session,
@@ -386,12 +389,15 @@ export function registerHealthRuntimeCommands(registry: CommandRegistry): void {
       }
 
       const session = readModels.session.getSnapshot();
-      const providerApi = requireProviderApi(ctx);
-      const currentModel = await providerApi.getCurrentModel().catch(() => null); // best-effort: null handled as unknown context window
+      const providerRegistry = ctx.provider.providerRegistry;
       const llmMessages = typeof ctx.session.conversationManager.getMessagesForLLM === 'function'
         ? ctx.session.conversationManager.getMessagesForLLM()
         : [];
-      const contextWindow = currentModel?.contextWindow ?? 0;
+      // Resolve the context window the same way the Tokens panel does so the
+      // maintenance usage %/remaining agree across every diagnostics surface.
+      const contextWindow = providerRegistry.getContextWindowForModel(
+        providerRegistry.getCurrentModel(),
+      );
       const maintenance = evaluateSessionMaintenance({
         configManager: ctx.platform.configManager,
         currentTokens: estimateConversationTokens(llmMessages),

package/src/input/commands/knowledge.ts

@@ -1,5 +1,6 @@
 import type { KnowledgeService } from '@pellux/goodvibes-sdk/platform/knowledge';
 import type { CommandContext, SlashCommand } from '../command-registry.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 const KNOWLEDGE_REVIEW_ACTIONS = ['accept', 'reject', 'resolve', 'reopen', 'edit', 'forget'] as const;
 
@@ -397,7 +398,7 @@ export const knowledgeCommand: SlashCommand = {
             ...(result.appliedFacts ? [`  applied facts: ${Object.keys(result.appliedFacts).join(', ') || 'none'}`] : []),
           ].join('\n'));
         } catch (error) {
-          context.print(`[knowledge] ${error instanceof Error ? error.message : String(error)}`);
+          context.print(`[knowledge] ${summarizeError(error)}`);
         }
         break;
       }

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

@@ -7,7 +7,7 @@ import type {
   CommandSessionServices,
   CommandWorkspaceServices,
 } from '../command-registry.ts';
-import { getLastCompactionEvent } from '@pellux/goodvibes-sdk/platform/core';
+import { compactSmallWindow, getLastCompactionEvent, SMALL_WINDOW_THRESHOLD } from '@pellux/goodvibes-sdk/platform/core';
 import type { CompactionContext, CompactionEvent } from '@pellux/goodvibes-sdk/platform/core';
 import type { UiReadModels } from '../../runtime/ui-read-models.ts';
 import type { ShellPathService } from '@/runtime/index.ts';
@@ -244,23 +244,53 @@ export function requireProviderApi(context: CommandContext): ProviderApi {
  * change).
  */
 export async function compactConversation(context: CommandContext): Promise<CompactionEvent | null> {
+  const conversationManager = context.session.conversationManager;
+  const providerRegistry = context.provider.providerRegistry;
+  // Resolve the live context window for the current model so manual /compact
+  // matches the auto-compaction path (which scales behaviour by window size)
+  // instead of passing a meaningless 0.
+  const contextWindow = providerRegistry.getContextWindowForModel(
+    providerRegistry.getCurrentModel(),
+  );
+
+  // Small-window models lack room for the structured (multi-LLM) extraction
+  // pipeline, so mirror the SDK auto-compaction path and degrade to the
+  // simplified "keep the most recent messages" compaction.
+  if (contextWindow > 0 && contextWindow < SMALL_WINDOW_THRESHOLD) {
+    const compacted = compactSmallWindow(conversationManager.getMessagesForLLM(), 10);
+    conversationManager.replaceMessagesForLLM(compacted);
+    return null;
+  }
+
   const eventBefore = getLastCompactionEvent();
   const sessionMemories = context.session.sessionMemoryStore?.list() ?? [];
+  const lineageTracker = context.session.sessionLineageTracker;
+  const agentManager = context.ops.agentManager;
+  const planManager = context.ops.planManager;
   const compactionCtx: CompactionContext = {
-    messages: context.session.conversationManager.getMessagesForLLM(),
+    messages: conversationManager.getMessagesForLLM(),
     sessionMemories,
-    agents: [],
-    wrfcChains: [],
-    activePlan: null,
-    lineageEntries: [],
-    compactionCount: 0,
-    contextWindow: 0,
+    // Mirror buildAutoCompactionContext: pass the running/pending agents, the
+    // active execution plan, and the session-lineage log so the handoff summary
+    // and lineage section are populated correctly (not "compaction #0").
+    agents:
+      agentManager
+        ?.exportState()
+        .filter((agent) => agent.status === 'running' || agent.status === 'pending') ?? [],
+    // Mirror buildAutoCompactionContext: include the live WRFC chains (wired
+    // through context.session.wrfcController) so the handoff summary's
+    // orchestration section matches the SDK auto-compaction path.
+    wrfcChains: context.session.wrfcController?.listChains() ?? [],
+    activePlan: planManager?.getActive(context.session.runtime.sessionId) ?? null,
+    lineageEntries: lineageTracker?.getEntries() ?? [],
+    compactionCount: lineageTracker?.getCompactionCount() ?? 0,
+    contextWindow,
     trigger: 'manual',
     extractionModelId: context.session.runtime.model,
     extractionProvider: context.session.runtime.provider,
   };
-  await context.session.conversationManager.compact(
-    context.provider.providerRegistry,
+  await conversationManager.compact(
+    providerRegistry,
     context.session.runtime.model,
     'manual',
     context.session.runtime.provider,

package/src/input/handler-command-route.ts

@@ -117,7 +117,7 @@ export function handleCommandModeToken(state: CommandModeRouteState, token: Inpu
     return true;
   }
 
-  return token.logicalName !== 'left' && token.logicalName !== 'right';
+  return token.logicalName !== 'left' && token.logicalName !== 'right' && token.logicalName !== 'home' && token.logicalName !== 'end';
 }
 
 function withPanelFocusSync(context: CommandContext, state: CommandModeRouteState): CommandContext {

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

@@ -13,6 +13,8 @@ import {
 } from './handler-prompt-buffer.ts';
 import { cleanupMarkerRegistry, expandPrompt, findMarkerAtPos, registerPaste } from './handler-content-actions.ts';
 import type { PanelManager } from '../panels/panel-manager.ts';
+import { renderPanelWorkspaceBar } from '../renderer/panel-workspace-bar.ts';
+import type { TabHitRegion } from '../renderer/tab-strip.ts';
 import type { KeybindingsManager } from './keybindings.ts';
 import type { KillRing } from './kill-ring.ts';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
@@ -84,6 +86,23 @@ export function handlePanelFocusToken(state: PanelFocusRouteState, token: InputT
       state.cyclePanelTab('prev');
       return { handled: true, panelFocused };
     }
+    if (kb.matches('panel-focus-toggle', token)) {
+      // Switch keyboard focus between the top and bottom panes (no-op when
+      // there is no visible, non-empty bottom pane).
+      state.panelManager.togglePaneFocus();
+      state.requestRender();
+      return { handled: true, panelFocused };
+    }
+    // Alt+1..9 — jump directly to the Nth workspace tab (across both panes).
+    // The tokenizer maps the Alt modifier onto `meta`, so an Alt-held digit
+    // arrives as { logicalName: '1'..'9', meta: true }. Gating on the modifier
+    // keeps plain digits reaching the focused panel.
+    if (token.meta && !token.ctrl && /^[1-9]$/.test(token.logicalName ?? '')) {
+      const index = Number(token.logicalName) - 1;
+      state.panelManager.activateWorkspaceIndex(index);
+      state.requestRender();
+      return { handled: true, panelFocused };
+    }
     if (kb.matches('panel-close-all', token)) {
       const pm = state.panelManager;
       for (const p of pm.getAllOpen()) pm.close(p.id);
@@ -577,18 +596,48 @@ function getPanelUnderMouse(
     return getActivePanelInPane(panelManager, 'top');
   }
 
+  // Single consolidated workspace bar (row 0) + h-separator; the rest splits
+  // between the two panes' content.
   const panelAreaRows = Math.max(0, layout.height - 1);
-  const contentRows = Math.max(0, panelAreaRows - 3);
+  const contentRows = Math.max(0, panelAreaRows - 1);
   const topContentRows = contentRows <= 1
     ? contentRows
     : Math.max(1, Math.floor(contentRows * clampRatio(layout.verticalSplitRatio)));
-  const topLastRow = 2 + topContentRows;
-
-  return panelRow <= topLastRow
+  // panelRow 0 = workspace bar; rows 1..topContentRows = top pane; rest = bottom.
+  return panelRow <= topContentRows
     ? getActivePanelInPane(panelManager, 'top')
     : getActivePanelInPane(panelManager, 'bottom');
 }
 
+/**
+ * If the mouse is over the consolidated workspace tab bar (the first panel
+ * row), return the index of the tab under the cursor, else null. Recomputes the
+ * tab hit regions by rendering the bar with a layout callback — cheap and keeps
+ * the click geometry in lockstep with what was drawn.
+ */
+function workspaceTabAtMouse(
+  panelManager: PanelManager,
+  layout: PanelMouseLayout | null,
+  row: number,
+  col: number,
+): number | null {
+  if (
+    layout === null
+    || !panelManager.isVisible()
+    || panelManager.getAllOpen().length === 0
+    || row !== layout.y // workspace bar is the first panel row
+    || col < layout.x
+    || col >= layout.x + layout.width
+  ) {
+    return null;
+  }
+  let regions: readonly TabHitRegion[] = [];
+  renderPanelWorkspaceBar(panelManager.getWorkspaceTabs(), layout.width, true, (r) => { regions = r; });
+  const relCol = col - layout.x;
+  const hit = regions.find((rg) => relCol >= rg.startCol && relCol < rg.endCol);
+  return hit ? hit.index : null;
+}
+
 function scrollPanelUnderMouse(
   state: MouseRouteState,
   token: Extract<InputToken, { type: 'mouse' }>,
@@ -634,6 +683,14 @@ export function handleMouseToken(state: MouseRouteState, token: InputToken): {
     return { handled: true, mouseDownRow, mouseDownCol };
   }
   if (token.button === 0 && token.action === 'press') {
+    // Click on a workspace tab activates it (checked before starting a text
+    // selection so a tab click doesn't begin a drag-select).
+    const tabIndex = workspaceTabAtMouse(state.panelManager, state.panelMouseLayout, token.row, token.col);
+    if (tabIndex !== null) {
+      state.panelManager.activateWorkspaceIndex(tabIndex);
+      state.requestRender();
+      return { handled: true, mouseDownRow, mouseDownCol };
+    }
     mouseDownRow = token.row;
     mouseDownCol = token.col;
     state.selection.startSelection(token.col, viewportRow, state.scrollTop, state.viewportHeight, state.lineCount);

package/src/input/handler-feed.ts

@@ -296,6 +296,19 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
         context.cursorPos = shortcutState.cursorPos;
         context.commandMode = shortcutState.commandMode;
         context.panelFocused = shortcutState.panelFocused;
+        if (context.commandMode) {
+          if (!context.prompt.startsWith('/')) {
+            context.commandMode = false;
+            context.autocomplete?.reset();
+          } else {
+            const q = context.prompt.slice(1);
+            if (q.indexOf(' ') === -1) {
+              context.autocomplete?.update(q);
+            } else {
+              context.autocomplete?.reset();
+            }
+          }
+        }
         continue;
       }
     }