@pellux/goodvibes-tui 0.19.59 → 0.19.61

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

@@ -1,10 +1,10 @@
 import { readFileSync } from 'node:fs';
-import type { InputToken } from '@pellux/goodvibes-sdk/platform/core/tokenizer';
+import type { InputToken } from '@pellux/goodvibes-sdk/platform/core';
 import type { CommandContext } from './command-registry.ts';
 import type { CapabilityFilter, CategoryFilter, ModelPickerModal } from './model-picker.ts';
 import { MODEL_PICKER_CHROME_LINES } from '../renderer/model-picker-overlay.ts';
-import { resolveAndValidatePath } from '@pellux/goodvibes-sdk/platform/utils/path-safety';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
+import { resolveAndValidatePath } from '@pellux/goodvibes-sdk/platform/utils';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
 import type { ProcessEntry } from '../renderer/process-modal.ts';
 import type { BlockActionId } from '../renderer/block-actions.ts';
 

package/src/input/handler-shortcuts.ts

@@ -1,4 +1,4 @@
-import type { InputToken } from '@pellux/goodvibes-sdk/platform/core/tokenizer';
+import type { InputToken } from '@pellux/goodvibes-sdk/platform/core';
 import type { CommandContext } from './command-registry.ts';
 import type { SearchManager } from './search.ts';
 import type { HistorySearch } from './input-history.ts';

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

@@ -1,4 +1,4 @@
-import type { InputToken } from '@pellux/goodvibes-sdk/platform/core/tokenizer';
+import type { InputToken } from '@pellux/goodvibes-sdk/platform/core';
 import type { InfiniteBuffer } from '../core/history.ts';
 import type { SearchManager } from './search.ts';
 import type { HistorySearch } from './input-history.ts';

package/src/input/handler.ts

@@ -1,12 +1,12 @@
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname } from 'node:path';
-import { InputTokenizer } from '@pellux/goodvibes-sdk/platform/core/tokenizer';
-import { createOAuthLocalListener } from '@pellux/goodvibes-sdk/platform/config/oauth-local-listener';
+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 { 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/openai-codex-auth';
-import { openExternalUrl } from '@pellux/goodvibes-sdk/platform/utils/open-external';
-import { buildProviderAccountSnapshot } from '@pellux/goodvibes-sdk/platform/runtime/provider-accounts/registry';
+import { beginOpenAICodexLogin, exchangeOpenAICodexCode } from '@pellux/goodvibes-sdk/platform/config';
+import { openExternalUrl } from '@pellux/goodvibes-sdk/platform/utils';
+import { buildProviderAccountSnapshot } from '@/runtime/index.ts';
 import { SelectionManager } from './selection.ts';
 import type { InfiniteBuffer } from '../core/history.ts';
 import type { CommandRegistry, CommandContext } from './command-registry.ts';

package/src/input/input-history.ts

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { dirname, join } from 'path';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 /**
  * InputHistory — Persisted command history with arrow-key navigation.

package/src/input/keybindings.ts

@@ -15,9 +15,9 @@
 
 import { readFileSync, existsSync } from 'node:fs';
 import { join } from 'node:path';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
-import { resolveSurfaceDirectory } from '@pellux/goodvibes-sdk/platform/runtime/surface-root';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
+import { resolveSurfaceDirectory } from '@/runtime/index.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 /** Identifies a specific key press with modifiers. */
 export interface KeyCombo {

package/src/input/model-picker-types.ts

@@ -1,4 +1,4 @@
-import type { ModelDefinition } from '@pellux/goodvibes-sdk/platform/providers/registry';
+import type { ModelDefinition } from '@pellux/goodvibes-sdk/platform/providers';
 
 export type PickerMode = 'model' | 'provider' | 'effort' | 'contextCap';
 

package/src/input/model-picker.ts

@@ -1,9 +1,9 @@
-import type { ModelDefinition } from '@pellux/goodvibes-sdk/platform/providers/registry';
-import type { FavoritesStore } from '@pellux/goodvibes-sdk/platform/providers/favorites';
-import { EFFORT_DESCRIPTIONS } from '@pellux/goodvibes-sdk/platform/providers/effort-levels';
-import { getQualityTier, getQualityTierFromScore, compositeScore, A_TIER_THRESHOLD } from '@pellux/goodvibes-sdk/platform/providers/model-benchmarks';
-import type { BenchmarkStore } from '@pellux/goodvibes-sdk/platform/providers/model-benchmarks';
-import type { ProviderRegistry } from '@pellux/goodvibes-sdk/platform/providers/registry';
+import type { ModelDefinition } from '@pellux/goodvibes-sdk/platform/providers';
+import type { FavoritesStore } from '@pellux/goodvibes-sdk/platform/providers';
+import { EFFORT_DESCRIPTIONS } from '@pellux/goodvibes-sdk/platform/providers';
+import { getQualityTier, getQualityTierFromScore, compositeScore, A_TIER_THRESHOLD } from '@pellux/goodvibes-sdk/platform/providers';
+import type { BenchmarkStore } from '@pellux/goodvibes-sdk/platform/providers';
+import type { ProviderRegistry } from '@pellux/goodvibes-sdk/platform/providers';
 import { detectFamily, POPULAR_PROVIDERS, tierToCategoryFilter } from './model-picker-types.ts';
 import type { BenchmarkSort, CapabilityFilter, CategoryFilter, FilteredModelsCache, FilteredProvidersCache, GroupByMode, ModelItemsCache, ModelPickerFocusPane, ModelPickerTarget, ModelPickerTargetInfo, PickerItem, PickerMode, ProviderItemsCache } from './model-picker-types.ts';
 import { filterProviders, groupProviders } from './model-picker-provider-filter.ts';

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

@@ -1,4 +1,4 @@
-import type { InputToken } from '@pellux/goodvibes-sdk/platform/core/tokenizer';
+import type { InputToken } from '@pellux/goodvibes-sdk/platform/core';
 import {
   getOnboardingWizardVisibleFieldCount,
   type OnboardingWizardAction,

package/src/input/onboarding/onboarding-runtime-status.ts

@@ -1,4 +1,4 @@
-import type { HostServiceStatus } from '@pellux/goodvibes-sdk/platform/runtime/bootstrap-services';
+import type { HostServiceStatus } from '@/runtime/index.ts';
 
 export interface OnboardingExternalServiceState {
   readonly daemonRunning?: boolean;

package/src/input/onboarding/onboarding-wizard-apply.ts

@@ -1,4 +1,5 @@
 import type { OnboardingAcknowledgementTarget, OnboardingApplyOperation, OnboardingApplyRequest } from '../../runtime/onboarding/index.ts';
+import { formatProviderModel } from '../../config/provider-model.ts';
 import { getServerSurfaceFeatureFlags } from '../../runtime/surface-feature-flags.ts';
 import {
   buildCloudflareApiTokenRef,
@@ -108,8 +109,7 @@ export function buildOnboardingApplyRequest(controller: OnboardingWizardControll
 
     const defaultModel = controller.modelSelectionState.get('main');
     if (defaultModel && defaultModel.enabled !== false && defaultModel.providerId.length > 0 && defaultModel.modelId.length > 0) {
-      setConfig('provider.provider', defaultModel.providerId);
-      setConfig('provider.model', defaultModel.modelId);
+      setConfig('provider.model', formatProviderModel(defaultModel.providerId, defaultModel.modelId));
     }
     setConfig('provider.reasoningEffort', controller.getStringFieldValue('default-model.reasoning', controller.runtimeSnapshot?.providerRouting.primaryReasoningEffort ?? 'medium'));
     setConfig('behavior.hitlMode', controller.getStringFieldValue('experience.hitl', controller.runtimeSnapshot?.runtimeDefaults.behavior.hitlMode ?? 'balanced'));

package/src/input/onboarding/onboarding-wizard-external-surfaces.ts

@@ -3,7 +3,7 @@ import {
   GOODVIBES_NTFY_CHAT_TOPIC,
   GOODVIBES_NTFY_REMOTE_TOPIC,
   resolveGoodVibesNtfyTopics,
-} from '@pellux/goodvibes-sdk/platform/integrations/ntfy';
+} from '@pellux/goodvibes-sdk/platform/integrations';
 import { DEFAULT_CONFIG, type ConfigKey } from '../../config/index.ts';
 import type { OnboardingSnapshotState } from '../../runtime/onboarding/index.ts';
 import { TELEGRAM_MODE_OPTIONS, WHATSAPP_PROVIDER_OPTIONS } from './onboarding-wizard-constants.ts';

package/src/input/panel-integration-actions.ts

@@ -1,5 +1,5 @@
 import type { CommandContext } from './command-registry.ts';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
 import type { Panel } from '../panels/types.ts';
 import type { PanelManager } from '../panels/panel-manager.ts';
 import { FileExplorerPanel } from '../panels/file-explorer-panel.ts';

package/src/input/profile-picker-modal.ts

@@ -5,11 +5,11 @@
  * and handles load/delete/save actions.
  */
 
-import type { ProfileInfo, ProfileData, ProfileManager } from '@pellux/goodvibes-sdk/platform/profiles/manager';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
-import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
-import type { ConfigKey } from '@pellux/goodvibes-sdk/platform/config/schema';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import type { ProfileInfo, ProfileData, ProfileManager } from '@pellux/goodvibes-sdk/platform/profiles';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
+import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+import type { ConfigKey } from '@pellux/goodvibes-sdk/platform/config';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 /** Known display setting keys (subset of ConfigKey that maps to display.*). */
 const DISPLAY_KEYS: ConfigKey[] = [

package/src/input/session-picker-modal.ts

@@ -6,9 +6,9 @@
  */
 
 import { unlinkSync } from 'node:fs';
-import type { SessionInfo, SessionManager } from '@pellux/goodvibes-sdk/platform/sessions/manager';
+import type { SessionInfo, SessionManager } from '@pellux/goodvibes-sdk/platform/sessions';
 import type { ConversationManager } from '../core/conversation';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 // ---------------------------------------------------------------------------
 // SessionPickerModal

package/src/input/settings-modal-behavior.ts

@@ -1,4 +1,4 @@
-import type { ConfigSetting } from '@pellux/goodvibes-sdk/platform/config/schema';
+import type { ConfigSetting } from '@pellux/goodvibes-sdk/platform/config';
 import type { ModelPickerTarget } from './model-picker.ts';
 
 export type ModelPickerLaunch =
@@ -6,12 +6,10 @@ export type ModelPickerLaunch =
   | { readonly flow: 'model'; readonly target: ModelPickerTarget };
 
 /**
- * Map config keys to the shared provider/model picker flows. Provider rows open
- * provider first; model rows open directly to models for the same target.
+ * Map config keys to the shared provider/model picker flows.
  */
 export function modelPickerLaunchForKey(key: string): ModelPickerLaunch | null {
-  if (key === 'provider.provider') return { flow: 'providerModel', target: 'main' };
-  if (key === 'provider.model') return { flow: 'model', target: 'main' };
+  if (key === 'provider.model') return { flow: 'providerModel', target: 'main' };
   if (key === 'helper.globalProvider') return { flow: 'providerModel', target: 'helper' };
   if (key === 'helper.globalModel') return { flow: 'model', target: 'helper' };
   if (key === 'tools.llmProvider') return { flow: 'providerModel', target: 'tool' };

package/src/input/settings-modal-secrets.ts

@@ -1,7 +1,7 @@
-import type { ConfigKey } from '@pellux/goodvibes-sdk/platform/config/schema';
-import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import type { ConfigKey } from '@pellux/goodvibes-sdk/platform/config';
+import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import type { SecretsManager } from '../config/secrets.ts';
 import {
   buildSecretBackedConfigUpdate,

package/src/input/settings-modal-subscriptions.ts

@@ -1,6 +1,6 @@
-import type { ProviderAuthFreshness } from '@pellux/goodvibes-sdk/platform/runtime/provider-accounts/registry';
-import { listBuiltinSubscriptionProviders } from '@pellux/goodvibes-sdk/platform/config/subscription-providers';
-import type { SubscriptionManager } from '@pellux/goodvibes-sdk/platform/config/subscriptions';
+import type { ProviderAuthFreshness } from '@/runtime/index.ts';
+import { listBuiltinSubscriptionProviders } from '@pellux/goodvibes-sdk/platform/config';
+import type { SubscriptionManager } from '@pellux/goodvibes-sdk/platform/config';
 import type { ServiceInspectionQuery } from '../runtime/ui-service-queries.ts';
 import type { SubscriptionEntry } from './settings-modal-types.ts';
 

package/src/input/settings-modal-types.ts

@@ -1,6 +1,6 @@
-import type { ConfigSetting } from '@pellux/goodvibes-sdk/platform/config/schema';
-import type { ProviderAuthFreshness, ProviderAuthRoute } from '@pellux/goodvibes-sdk/platform/runtime/provider-accounts/registry';
-import type { FeatureFlag, FlagState } from '@pellux/goodvibes-sdk/platform/runtime/feature-flags/types';
+import type { ConfigSetting } from '@pellux/goodvibes-sdk/platform/config';
+import type { ProviderAuthFreshness, ProviderAuthRoute } from '@/runtime/index.ts';
+import type { FeatureFlag, FlagState } from '@/runtime/index.ts';
 
 export type SettingsCategory =
   | 'display'
@@ -88,7 +88,7 @@ export interface FlagEntry {
 export interface McpEntry {
   name: string;
   connected: boolean;
-  role: 'general' | 'docs' | 'filesystem' | 'git' | 'database' | 'browser' | 'automation' | 'ops' | 'remote';
+  role: string;
   trustMode: 'constrained' | 'ask-on-risk' | 'allow-all' | 'blocked';
   allowedPaths: string[];
   allowedHosts: string[];

package/src/input/settings-modal.ts

@@ -10,11 +10,11 @@
  * Saves changes via configManager.set(key, value) or featureFlagManager methods.
  */
 
-import { CONFIG_SCHEMA, type ConfigKey, type PersistedFlagState } from '@pellux/goodvibes-sdk/platform/config/schema';
+import { CONFIG_SCHEMA, type ConfigKey, type PersistedFlagState } from '@pellux/goodvibes-sdk/platform/config';
 import type { ModelPickerTarget } from './model-picker.ts';
-import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
-import type { SubscriptionManager } from '@pellux/goodvibes-sdk/platform/config/subscriptions';
-import { getResolvedSettingLookup } from '@pellux/goodvibes-sdk/platform/runtime/settings/control-plane';
+import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+import type { SubscriptionManager } from '@pellux/goodvibes-sdk/platform/config';
+import { getResolvedSettingLookup } from '@/runtime/index.ts';
 import type { ServiceInspectionQuery } from '../runtime/ui-service-queries.ts';
 import { buildGoodVibesSecretKey, isSecretConfigKey } from '../config/secret-config.ts';
 import {
@@ -27,11 +27,11 @@ import {
   type SettingsSecretsManager,
 } from './settings-modal-secrets.ts';
 import { buildSubscriptionEntries } from './settings-modal-subscriptions.ts';
-import type { FeatureFlagManager } from '@pellux/goodvibes-sdk/platform/runtime/feature-flags/index';
-import type { FeatureFlag, FlagState } from '@pellux/goodvibes-sdk/platform/runtime/feature-flags/types';
-import type { McpRegistry } from '@pellux/goodvibes-sdk/platform/mcp/registry';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import type { FeatureFlagManager } from '@/runtime/index.ts';
+import type { FeatureFlag, FlagState } from '@/runtime/index.ts';
+import type { McpRegistry } from '@pellux/goodvibes-sdk/platform/mcp';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import {
   SETTINGS_CATEGORIES,
   type FlagEntry,

package/src/input/tts-settings-actions.ts

@@ -1,4 +1,4 @@
-import type { ConfigKey } from '@pellux/goodvibes-sdk/platform/config/schema';
+import type { ConfigKey } from '@pellux/goodvibes-sdk/platform/config';
 import type { CommandContext } from './command-registry.ts';
 import type { SelectionItem } from './selection-modal.ts';
 

package/src/main.ts

@@ -6,21 +6,21 @@ import { UIFactory } from './renderer/ui-factory.ts';
 import { Orchestrator } from './core/orchestrator';
 import { InputHandler } from './input/handler.ts';
 import { SelectionManager } from './input/selection.ts';
-import type { ContentPart } from '@pellux/goodvibes-sdk/platform/providers/interface';
-import { ToolRegistry } from '@pellux/goodvibes-sdk/platform/tools/registry';
-import { registerAllTools } from '@pellux/goodvibes-sdk/platform/tools/index';
-import { FileUndoManager } from '@pellux/goodvibes-sdk/platform/state/file-undo';
-import { PermissionManager } from '@pellux/goodvibes-sdk/platform/permissions/manager';
-import { AcpManager } from '@pellux/goodvibes-sdk/platform/acp/manager';
+import type { ContentPart } from '@pellux/goodvibes-sdk/platform/providers';
+import { ToolRegistry } from '@pellux/goodvibes-sdk/platform/tools';
+import { registerAllTools } from '@pellux/goodvibes-sdk/platform/tools';
+import { FileUndoManager } from '@pellux/goodvibes-sdk/platform/state';
+import { PermissionManager } from '@pellux/goodvibes-sdk/platform/permissions';
+import { AcpManager } from '@pellux/goodvibes-sdk/platform/acp';
 import { PermissionPromptUI } from './permissions/prompt.ts';
 import { CommandRegistry } from './input/command-registry.ts';
 import type { CommandContext } from './input/command-registry.ts';
 import { renderProcessIndicator } from './renderer/process-indicator.ts';
-import { WrfcController } from '@pellux/goodvibes-sdk/platform/agents/wrfc-controller';
+import { WrfcController } from '@pellux/goodvibes-sdk/platform/agents';
 import { registerBuiltinCommands } from './input/commands.ts';
-import { ScheduleManager } from '@pellux/goodvibes-sdk/platform/tools/workflow/index';
+import { ScheduleManager } from '@pellux/goodvibes-sdk/platform/tools';
 import { InputHistory } from './input/input-history.ts';
-import { getTierPromptSupplement, getTierForContextWindow } from '@pellux/goodvibes-sdk/platform/providers/tier-prompts';
+import { getTierPromptSupplement, getTierForContextWindow } from '@pellux/goodvibes-sdk/platform/providers';
 import { GitStatusProvider } from './renderer/git-status.ts';
 import type { GitHeaderInfo } from './renderer/git-status.ts';
 import { createShellLayout } from './renderer/layout-engine.ts';
@@ -30,25 +30,25 @@ import {
 } from './renderer/conversation-layout.ts';
 import { applyConversationOverlays } from './renderer/conversation-overlays.ts';
 import { buildPanelCompositeData } from './renderer/panel-composite.ts';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
 import { registerBuiltinPanels } from './panels/builtin-panels.ts';
 import { renderPanelTabBar } from './renderer/panel-tab-bar.ts';
 import { bootstrapRuntime } from './runtime/bootstrap.ts';
 import type { BootstrapContext } from './runtime/bootstrap.ts';
-import type { HITLMode } from '@pellux/goodvibes-sdk/platform/state/mode-manager';
-import type { HookPhase, HookCategory, HookEventPath } from '@pellux/goodvibes-sdk/platform/hooks/types';
+import type { HITLMode } from '@pellux/goodvibes-sdk/platform/state';
+import type { HookPhase, HookCategory, HookEventPath } from '@pellux/goodvibes-sdk/platform/hooks';
 import {
   checkRecoveryFile,
   deleteRecoveryFile,
   loadRecoveryConversation,
   persistConversation,
   writeRecoveryFile,
-} from '@pellux/goodvibes-sdk/platform/runtime/session-persistence';
+} from '@/runtime/index.ts';
 import { handleBlockingShellInput, type PendingPermissionState } from './shell/blocking-input.ts';
 import { wireShellUiOpeners } from './shell/ui-openers.ts';
 import { deriveComposerState } from './core/composer-state.ts';
-import { buildPersistedSessionContext, formatReturnContextForDisplay, getReturnContextMode, maybeAssistReturnContextSummary } from '@pellux/goodvibes-sdk/platform/runtime/session-return-context';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { buildPersistedSessionContext, formatReturnContextForDisplay, getReturnContextMode, maybeAssistReturnContextSummary } from '@/runtime/index.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import { prepareShellCliRuntime } from './cli/entrypoint.ts';
 import { applyInitialTuiCliState } from './cli/tui-startup.ts';
 import { wireSpokenTurnRuntime } from './audio/spoken-turn-wiring.ts';
@@ -290,8 +290,7 @@ async function main() {
         const def = providerRegistry.getCurrentModel();
         runtime.model = def.id;
         runtime.provider = def.provider;
-        configManager.set('provider.model', def.id);
-        configManager.set('provider.provider', def.provider);
+        configManager.set('provider.model', def.registryKey);
         systemMessageRouter.high(`[Model] Switched to ${def.displayName} (${def.provider}) via @model:`);
       } catch {
         systemMessageRouter.high(`[Model] Unknown model: ${modelId}`);

package/src/panels/agent-inspector-panel.ts

@@ -8,9 +8,9 @@ import { readFile } from 'node:fs/promises';
 import type { Line } from '../types/grid.ts';
 import { createEmptyLine } from '../types/grid.ts';
 import { BasePanel } from './base-panel.ts';
-import type { AgentManager, AgentRecord } from '@pellux/goodvibes-sdk/platform/tools/agent/index';
-import type { AgentMessageBus } from '@pellux/goodvibes-sdk/platform/agents/message-bus';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
+import type { AgentManager, AgentRecord } from '@pellux/goodvibes-sdk/platform/tools';
+import type { AgentMessageBus } from '@pellux/goodvibes-sdk/platform/agents';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
 import {
   buildEmptyState,
   buildPanelLine,
@@ -22,7 +22,7 @@ import {
   DEFAULT_PANEL_PALETTE,
 } from './polish.ts';
 import { truncateDisplay } from '../utils/terminal-width.ts';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import {
   type AgentDisplayRow as DisplayRow,
   type AgentInspectorEntryKind as EntryKind,

package/src/panels/agent-logs-panel.ts

@@ -2,8 +2,8 @@ import { promises as fsPromises, watch, type FSWatcher } from 'fs';
 import type { Line } from '../types/grid.ts';
 import { createEmptyLine, createStyledCell } from '../types/grid.ts';
 import { ScrollableListPanel } from './scrollable-list-panel.ts';
-import type { AgentManager, AgentRecord } from '@pellux/goodvibes-sdk/platform/tools/agent/index';
-import type { AgentEvent } from '@pellux/goodvibes-sdk/platform/runtime/events/index';
+import type { AgentManager, AgentRecord } from '@pellux/goodvibes-sdk/platform/tools';
+import type { AgentEvent } from '@/runtime/index.ts';
 import type { UiEventFeed } from '../runtime/ui-events.ts';
 import {
   buildEmptyState,

package/src/panels/approval-panel.ts

@@ -6,8 +6,8 @@ import {
   buildPanelLine,
   DEFAULT_PANEL_PALETTE,
 } from './polish.ts';
-import type { PolicyRuntimeState } from '@pellux/goodvibes-sdk/platform/runtime/permissions/policy-runtime';
-import { buildPermissionRuleSuggestions } from '@pellux/goodvibes-sdk/platform/runtime/permissions/rule-suggestions';
+import type { PolicyRuntimeState } from '@/runtime/index.ts';
+import { buildPermissionRuleSuggestions } from '@/runtime/index.ts';
 
 const C = {
   ...DEFAULT_PANEL_PALETTE,

package/src/panels/builtin/operations.ts

@@ -35,7 +35,7 @@ import {
   createEnvironmentVariableQuery,
   createProviderRuntimeInspectionQuery,
 } from '../../runtime/ui-service-queries.ts';
-import { createRuntimeProviderApi } from '@pellux/goodvibes-sdk/platform/runtime/runtime-provider-api';
+import { createRuntimeProviderApi } from '@/runtime/index.ts';
 import type { ResolvedBuiltinPanelDeps } from './shared.ts';
 import { requireAutomationManager, requireControlPlanePanelDeps, requireHookPanelDeps, requireMcpRegistry, requirePluginManager, requireUiServices } from './shared.ts';
 

package/src/panels/builtin/session.ts

@@ -12,7 +12,7 @@ import {
   getOrCreateCompanionToken,
   regenerateCompanionToken,
   buildCompanionConnectionInfo,
-} from '@pellux/goodvibes-sdk/platform/pairing/index';
+} from '@pellux/goodvibes-sdk/platform/pairing';
 import { copyToClipboard } from '../../utils/clipboard.ts';
 
 function getLocalNetworkIp(): string {
@@ -63,7 +63,7 @@ export function registerSessionPanels(manager: PanelManager, deps: ResolvedBuilt
         surface: 'tui',
       });
       const regenerate = (): typeof connectionInfo => {
-        const newRecord = regenerateCompanionToken('tui', { daemonHomeDir });
+        const newRecord = regenerateCompanionToken({ daemonHomeDir });
         return buildCompanionConnectionInfo({
           daemonUrl,
           token: newRecord.token,

package/src/panels/builtin/shared.ts

@@ -1,30 +1,30 @@
-import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
-import type { ServiceRegistry } from '@pellux/goodvibes-sdk/platform/config/service-registry';
-import type { ToolRegistry } from '@pellux/goodvibes-sdk/platform/tools/registry';
-import type { ProviderRegistry } from '@pellux/goodvibes-sdk/platform/providers/registry';
+import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+import type { ServiceRegistry } from '@pellux/goodvibes-sdk/platform/config';
+import type { ToolRegistry } from '@pellux/goodvibes-sdk/platform/tools';
+import type { ProviderRegistry } from '@pellux/goodvibes-sdk/platform/providers';
 import type { Orchestrator } from '../../core/orchestrator';
-import type { MemoryRegistry } from '@pellux/goodvibes-sdk/platform/state/memory-store';
-import type { ApprovalBroker, SharedSessionBroker } from '@pellux/goodvibes-sdk/platform/control-plane/index';
-import type { AutomationManager } from '@pellux/goodvibes-sdk/platform/automation/index';
-import type { ControlPlaneRecentEvent } from '@pellux/goodvibes-sdk/platform/control-plane/gateway';
+import type { MemoryRegistry } from '@pellux/goodvibes-sdk/platform/state';
+import type { ApprovalBroker, SharedSessionBroker } from '@pellux/goodvibes-sdk/platform/control-plane';
+import type { AutomationManager } from '@pellux/goodvibes-sdk/platform/automation';
+import type { ControlPlaneRecentEvent } from '@pellux/goodvibes-sdk/platform/control-plane';
 import type { UiRuntimeServices } from '../../runtime/ui-services.ts';
-import type { PluginManagerObserver } from '@pellux/goodvibes-sdk/platform/plugins/manager';
-import type { HookWorkbench } from '@pellux/goodvibes-sdk/platform/hooks/workbench';
-import type { HookDispatcher } from '@pellux/goodvibes-sdk/platform/hooks/dispatcher';
-import type { HookActivityTracker } from '@pellux/goodvibes-sdk/platform/hooks/activity';
-import type { McpRegistry } from '@pellux/goodvibes-sdk/platform/mcp/registry';
-import type { PolicyRuntimeState } from '@pellux/goodvibes-sdk/platform/runtime/permissions/policy-runtime';
-import type { SessionManager } from '@pellux/goodvibes-sdk/platform/sessions/manager';
-import type { SubscriptionManager } from '@pellux/goodvibes-sdk/platform/config/subscriptions';
-import type { UserAuthManager } from '@pellux/goodvibes-sdk/platform/security/user-auth';
-import type { SessionMemoryStore } from '@pellux/goodvibes-sdk/platform/core/session-memory';
-import type { ExecutionPlanManager } from '@pellux/goodvibes-sdk/platform/core/execution-plan';
-import type { AdaptivePlanner } from '@pellux/goodvibes-sdk/platform/core/adaptive-planner';
-import type { ProjectPlanningService } from '@pellux/goodvibes-sdk/platform/knowledge/index';
-import type { ApiTokenAuditor } from '@pellux/goodvibes-sdk/platform/security/token-audit';
+import type { PluginManagerObserver } from '@pellux/goodvibes-sdk/platform/plugins';
+import type { HookWorkbench } from '@pellux/goodvibes-sdk/platform/hooks';
+import type { HookDispatcher } from '@pellux/goodvibes-sdk/platform/hooks';
+import type { HookActivityTracker } from '@pellux/goodvibes-sdk/platform/hooks';
+import type { McpRegistry } from '@pellux/goodvibes-sdk/platform/mcp';
+import type { PolicyRuntimeState } from '@/runtime/index.ts';
+import type { SessionManager } from '@pellux/goodvibes-sdk/platform/sessions';
+import type { SubscriptionManager } from '@pellux/goodvibes-sdk/platform/config';
+import type { UserAuthManager } from '@pellux/goodvibes-sdk/platform/security';
+import type { SessionMemoryStore } from '@pellux/goodvibes-sdk/platform/core';
+import type { ExecutionPlanManager } from '@pellux/goodvibes-sdk/platform/core';
+import type { AdaptivePlanner } from '@pellux/goodvibes-sdk/platform/core';
+import type { ProjectPlanningService } from '@pellux/goodvibes-sdk/platform/knowledge';
+import type { ApiTokenAuditor } from '@pellux/goodvibes-sdk/platform/security';
 import type { ComponentHealthMonitor } from '../../runtime/perf/panel-health-monitor.ts';
-import type { WorktreeRegistry } from '@pellux/goodvibes-sdk/platform/runtime/worktree/registry';
-import type { SandboxSessionRegistry } from '@pellux/goodvibes-sdk/platform/runtime/sandbox/session-registry';
+import type { WorktreeRegistry } from '@/runtime/index.ts';
+import type { SandboxSessionRegistry } from '@/runtime/index.ts';
 
 export interface BuiltinPanelDeps {
   /** Config manager for settings-sync and other config-backed panels. */
@@ -56,13 +56,13 @@ export interface BuiltinPanelDeps {
   /** Request a shell repaint directly rather than routing through a retired event path. */
   requestRender?: () => void;
   /** ForensicsRegistry for the Forensics panel. */
-  forensicsRegistry?: import('@pellux/goodvibes-sdk/platform/runtime/forensics/registry').ForensicsRegistry;
+  forensicsRegistry?: import('@/runtime/index.ts').ForensicsRegistry;
   /** EvalRegistry for the Eval panel. */
   evalRegistry?: import('../eval-panel.ts').EvalRegistry;
   /** MemoryRegistry for the Memory panel. */
   memoryRegistry?: MemoryRegistry;
   /** Shared policy runtime state for governance/policy diagnostics. */
-  policyRuntimeState?: import('@pellux/goodvibes-sdk/platform/runtime/permissions/policy-runtime').PolicyRuntimeState;
+  policyRuntimeState?: import('@/runtime/index.ts').PolicyRuntimeState;
   /** Approval broker for control-plane/operator panels. */
   approvalBroker?: ApprovalBroker;
   /** Shared session broker for control-plane/operator panels. */

package/src/panels/context-visualizer-panel.ts

@@ -2,11 +2,11 @@
 // ContextVisualizerPanel — stacked bar showing context window composition.
 // ---------------------------------------------------------------------------
 
-import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
+import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
 import type { Line } from '../types/grid.ts';
 import { BasePanel } from './base-panel.ts';
-import { evaluateSessionMaintenance } from '@pellux/goodvibes-sdk/platform/runtime/session-maintenance';
-import type { TurnEvent } from '@pellux/goodvibes-sdk/platform/runtime/events/index';
+import { evaluateSessionMaintenance } from '@/runtime/index.ts';
+import type { TurnEvent } from '@/runtime/index.ts';
 import type { UiEventFeed } from '../runtime/ui-events.ts';
 import type { UiReadModel, UiSessionSnapshot } from '../runtime/ui-read-models.ts';
 import type { SessionMemoryQuery } from '../runtime/ui-service-queries.ts';

package/src/panels/cost-tracker-panel.ts

@@ -5,7 +5,7 @@
 import type { Line } from '../types/grid.ts';
 import { createStyledCell, createEmptyLine } from '../types/grid.ts';
 import { BasePanel } from './base-panel.ts';
-import type { AgentEvent, TurnEvent } from '@pellux/goodvibes-sdk/platform/runtime/events/index';
+import type { AgentEvent, TurnEvent } from '@/runtime/index.ts';
 import type { UiEventFeed } from '../runtime/ui-events.ts';
 import {
   buildEmptyState,

package/src/panels/debug-panel.ts

@@ -1,6 +1,6 @@
 import { BasePanel } from './base-panel.ts';
 import { createEmptyLine, createStyledCell, type Line } from '../types/grid.ts';
-import type { TurnEvent } from '@pellux/goodvibes-sdk/platform/runtime/events/index';
+import type { TurnEvent } from '@/runtime/index.ts';
 import type { UiEventFeed } from '../runtime/ui-events.ts';
 import type { Orchestrator } from '../core/orchestrator';
 import {

package/src/panels/eval-panel.ts

@@ -23,7 +23,7 @@ import type {
   EvalResult,
   EvalGateResult,
   EvalDimension,
-} from '@pellux/goodvibes-sdk/platform/runtime/eval/types';
+} from '@/runtime/index.ts';
 
 /**
  * Holds the latest eval run state for display in EvalPanel.

package/src/panels/forensics-panel.ts

@@ -7,9 +7,9 @@
  * Open via /forensics or the panel picker.
  */
 import type { Line } from '../types/grid.ts';
-import type { ForensicsRegistry } from '@pellux/goodvibes-sdk/platform/runtime/forensics/registry';
-import type { FailureReport, CausalChainEntry, PhaseTimingEntry } from '@pellux/goodvibes-sdk/platform/runtime/forensics/types';
-import { ForensicsDataPanel } from '@pellux/goodvibes-sdk/platform/runtime/diagnostics/panels/forensics';
+import type { ForensicsRegistry } from '@/runtime/index.ts';
+import type { FailureReport, CausalChainEntry, PhaseTimingEntry } from '@/runtime/index.ts';
+import { ForensicsDataPanel } from '@/runtime/index.ts';
 import { BasePanel } from './base-panel.ts';
 import { createEmptyLine } from '../types/grid.ts';
 import {

package/src/panels/git-panel.ts

@@ -1,8 +1,8 @@
 import { BasePanel } from './base-panel.ts';
 import { createEmptyLine, createStyledCell, type Line } from '../types/grid.ts';
-import { GitService } from '@pellux/goodvibes-sdk/platform/git/service';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { GitService } from '@pellux/goodvibes-sdk/platform/git';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import {
   buildEmptyState,
   buildPanelLine,