@pellux/goodvibes-tui 0.19.60 → 0.19.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pellux/goodvibes-tui",
-  "version": "0.19.60",
+  "version": "0.19.61",
   "description": "Terminal-native GoodVibes product for coding, operations, automation, knowledge, channels, and daemon-backed control-plane workflows.",
   "type": "module",
   "main": "src/main.ts",
@@ -91,7 +91,7 @@
     "@anthropic-ai/vertex-sdk": "^0.16.0",
     "@ast-grep/napi": "^0.42.0",
     "@aws/bedrock-token-generator": "^1.1.0",
-    "@pellux/goodvibes-sdk": "0.28.3",
+    "@pellux/goodvibes-sdk": "0.33.4",
     "bash-language-server": "^5.6.0",
     "fuse.js": "^7.1.0",
     "graphql": "^16.13.2",

package/src/audio/player.ts

@@ -2,7 +2,7 @@ import { accessSync, constants } from 'node:fs';
 import { delimiter, join } from 'node:path';
 import { spawn } from 'node:child_process';
 import type { Writable } from 'node:stream';
-import type { VoiceAudioChunk } from '@pellux/goodvibes-sdk/platform/voice/index';
+import type { VoiceAudioChunk } from '@pellux/goodvibes-sdk/platform/voice';
 
 export interface StreamingAudioPlayerCommand {
   readonly command: string;

package/src/audio/spoken-turn-controller.ts

@@ -1,8 +1,8 @@
-import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
-import type { ConfigKey } from '@pellux/goodvibes-sdk/platform/config/schema';
-import type { TurnEvent } from '@pellux/goodvibes-sdk/platform/runtime/events/index';
-import type { VoiceService, VoiceSynthesisStreamResult } from '@pellux/goodvibes-sdk/platform/voice/index';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+import type { ConfigKey } from '@pellux/goodvibes-sdk/platform/config';
+import type { TurnEvent } from '@/runtime/index.ts';
+import type { VoiceService, VoiceSynthesisStreamResult } from '@pellux/goodvibes-sdk/platform/voice';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import { TtsTextChunker } from './text-chunker.ts';
 import type { StreamingAudioPlayer } from './player.ts';
 

package/src/audio/spoken-turn-model-routing.ts

@@ -1,6 +1,6 @@
-import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
-import type { ModelDefinition, ProviderRegistry } from '@pellux/goodvibes-sdk/platform/providers/registry';
-import type { ContentPart } from '@pellux/goodvibes-sdk/platform/providers/interface';
+import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+import type { ModelDefinition, ProviderRegistry } from '@pellux/goodvibes-sdk/platform/providers';
+import type { ContentPart } from '@pellux/goodvibes-sdk/platform/providers';
 import type { Orchestrator, OrchestratorUserInputOptions } from '../core/orchestrator.ts';
 
 const SPOKEN_TURN_SOURCE = 'tts';

package/src/audio/spoken-turn-wiring.ts

@@ -1,6 +1,6 @@
-import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
-import type { UiRuntimeEvents } from '@pellux/goodvibes-sdk/platform/runtime/ui-events';
-import type { VoiceService } from '@pellux/goodvibes-sdk/platform/voice/index';
+import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+import type { UiRuntimeEvents } from '@/runtime/index.ts';
+import type { VoiceService } from '@pellux/goodvibes-sdk/platform/voice';
 import { LocalStreamingAudioPlayer } from './player.ts';
 import { SpokenTurnController } from './spoken-turn-controller.ts';
 

package/src/cli/bundle-command.ts

@@ -1,8 +1,8 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
-import { RuntimeEventBus } from '@pellux/goodvibes-sdk/platform/runtime/events/index';
-import { createShellPathService } from '@pellux/goodvibes-sdk/platform/runtime/shell-paths';
-import { listProviderRuntimeSnapshots } from '@pellux/goodvibes-sdk/platform/providers/runtime-snapshot';
+import { RuntimeEventBus } from '@/runtime/index.ts';
+import { createShellPathService } from '@/runtime/index.ts';
+import { listProviderRuntimeSnapshots } from '@pellux/goodvibes-sdk/platform/providers';
 import { createRuntimeServices } from '../runtime/services.ts';
 import { createRuntimeStore } from '../runtime/store/index.ts';
 import { getOnboardingCheckMarkerPath } from '../runtime/onboarding/index.ts';

package/src/cli/entrypoint.ts

@@ -1,10 +1,11 @@
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { ConfigManager } from '../config/index.ts';
+import { formatProviderModel, getModelIdFromProviderModel, getProviderIdFromModel } from '../config/provider-model.ts';
 import { readOnboardingCheckMarkers } from '../runtime/onboarding/index.ts';
-import { GlobalNetworkTransportInstaller } from '@pellux/goodvibes-sdk/platform/runtime/network/index';
-import { createShellPathService } from '@pellux/goodvibes-sdk/platform/runtime/shell-paths';
-import { configureActivityLogger } from '@pellux/goodvibes-sdk/platform/utils/logger';
+import { GlobalNetworkTransportInstaller } from '@/runtime/index.ts';
+import { createShellPathService } from '@/runtime/index.ts';
+import { configureActivityLogger } from '@pellux/goodvibes-sdk/platform/utils';
 import {
   applyRuntimeCommandEndpointFlagOverrides,
   applyRuntimeConfigOverrides,
@@ -105,11 +106,11 @@ export async function prepareShellCliRuntime(
     disableFeatures: cli.flags.disableFeatures,
   });
 
-  if (cli.flags.provider !== undefined) {
-    applyRuntimeConfigValue(configManager, 'provider.provider', cli.flags.provider);
-  }
-  if (cli.flags.model !== undefined) {
-    applyRuntimeConfigValue(configManager, 'provider.model', cli.flags.model);
+  if (cli.flags.provider !== undefined || cli.flags.model !== undefined) {
+    const currentModel = configManager.get('provider.model');
+    const provider = cli.flags.provider ?? getProviderIdFromModel(currentModel);
+    const model = cli.flags.model ?? getModelIdFromProviderModel(currentModel);
+    applyRuntimeConfigValue(configManager, 'provider.model', formatProviderModel(provider, model));
   }
   const endpointOverrideErrors = applyRuntimeCommandEndpointFlagOverrides(configManager, cli.command, cli.flags);
   if (endpointOverrideErrors.length > 0) {

package/src/cli/management-commands.ts

@@ -1,12 +1,12 @@
 import { mkdirSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { SecretsManager } from '../config/secrets.ts';
-import { BUILTIN_SECRET_PROVIDER_SOURCES, describeSecretRef, isSecretRefInput, resolveSecretRef } from '@pellux/goodvibes-sdk/platform/config/secret-refs';
-import { getSubscriptionProviderConfig, listAvailableSubscriptionProviders } from '@pellux/goodvibes-sdk/platform/config/subscription-providers';
-import { beginOpenAICodexLogin, exchangeOpenAICodexCode } from '@pellux/goodvibes-sdk/platform/config/openai-codex-auth';
-import { inspectProviderAuth } from '@pellux/goodvibes-sdk/platform/runtime/auth/inspection';
-import { getOrCreateCompanionToken, buildCompanionConnectionInfo, encodeConnectionPayload, formatConnectionBlock } from '@pellux/goodvibes-sdk/platform/pairing/index';
-import { generateQrMatrix, renderQrToString } from '@pellux/goodvibes-sdk/platform/pairing/qr-generator';
+import { BUILTIN_SECRET_PROVIDER_SOURCES, describeSecretRef, isSecretRefInput, resolveSecretRef } from '@pellux/goodvibes-sdk/platform/config';
+import { getSubscriptionProviderConfig, listAvailableSubscriptionProviders } from '@pellux/goodvibes-sdk/platform/config';
+import { beginOpenAICodexLogin, exchangeOpenAICodexCode } from '@pellux/goodvibes-sdk/platform/config';
+import { inspectProviderAuth } from '@/runtime/index.ts';
+import { getOrCreateCompanionToken, buildCompanionConnectionInfo, encodeConnectionPayload, formatConnectionBlock } from '@pellux/goodvibes-sdk/platform/pairing';
+import { generateQrMatrix, renderQrToString } from '@pellux/goodvibes-sdk/platform/pairing';
 import { resolveRuntimeEndpointBinding } from './endpoints.ts';
 import { classifyBindPosture, isNetworkFacing } from './network-posture.ts';
 import type { CliCommandRuntime } from './management.ts';

package/src/cli/management.ts

@@ -5,21 +5,22 @@ import { spawn } from 'node:child_process';
 import { networkInterfaces } from 'node:os';
 import type { ConfigManager, ConfigKey, GoodVibesConfig } from '../config/index.ts';
 import { CONFIG_SCHEMA } from '../config/index.ts';
+import { formatProviderModel, getModelIdFromProviderModel } from '../config/provider-model.ts';
 import { bootstrapRuntime } from '../runtime/bootstrap.ts';
 import { createRuntimeServices } from '../runtime/services.ts';
 import { createRuntimeStore } from '../runtime/store/index.ts';
 import type { RuntimeServices } from '../runtime/services.ts';
 import { SecretsManager } from '../config/secrets.ts';
-import { RuntimeEventBus, type TurnEvent } from '@pellux/goodvibes-sdk/platform/runtime/events/index';
-import { createShellPathService } from '@pellux/goodvibes-sdk/platform/runtime/shell-paths';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
-import { listProviderRuntimeSnapshots } from '@pellux/goodvibes-sdk/platform/providers/runtime-snapshot';
-import { BUILTIN_SECRET_PROVIDER_SOURCES, describeSecretRef, isSecretRefInput, resolveSecretRef } from '@pellux/goodvibes-sdk/platform/config/secret-refs';
-import { getSubscriptionProviderConfig, listAvailableSubscriptionProviders } from '@pellux/goodvibes-sdk/platform/config/subscription-providers';
-import { beginOpenAICodexLogin, exchangeOpenAICodexCode } from '@pellux/goodvibes-sdk/platform/config/openai-codex-auth';
-import { inspectProviderAuth } from '@pellux/goodvibes-sdk/platform/runtime/auth/inspection';
-import { getOrCreateCompanionToken, buildCompanionConnectionInfo, encodeConnectionPayload, formatConnectionBlock } from '@pellux/goodvibes-sdk/platform/pairing/index';
-import { generateQrMatrix, renderQrToString } from '@pellux/goodvibes-sdk/platform/pairing/qr-generator';
+import { RuntimeEventBus, type TurnEvent } from '@/runtime/index.ts';
+import { createShellPathService } from '@/runtime/index.ts';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
+import { listProviderRuntimeSnapshots } from '@pellux/goodvibes-sdk/platform/providers';
+import { BUILTIN_SECRET_PROVIDER_SOURCES, describeSecretRef, isSecretRefInput, resolveSecretRef } from '@pellux/goodvibes-sdk/platform/config';
+import { getSubscriptionProviderConfig, listAvailableSubscriptionProviders } from '@pellux/goodvibes-sdk/platform/config';
+import { beginOpenAICodexLogin, exchangeOpenAICodexCode } from '@pellux/goodvibes-sdk/platform/config';
+import { inspectProviderAuth } from '@/runtime/index.ts';
+import { getOrCreateCompanionToken, buildCompanionConnectionInfo, encodeConnectionPayload, formatConnectionBlock } from '@pellux/goodvibes-sdk/platform/pairing';
+import { generateQrMatrix, renderQrToString } from '@pellux/goodvibes-sdk/platform/pairing';
 import type { GoodVibesCliParseResult } from './types.ts';
 import { formatProviderAuthRoute, summarizeProviderAuthRoutes } from './provider-auth-routes.ts';
 import { classifyProviderSetup } from './provider-classification.ts';
@@ -409,13 +410,15 @@ async function renderProviders(runtime: CliCommandRuntime): Promise<string> {
         ? providerModels.find((model) => model.registryKey === requestedModel || model.id === requestedModel)
         : providerModels.find((model) => model.registryKey === current.registryKey) ?? providerModels[0];
       if (providerModels.length === 0 || !selected) {
-        runtime.configManager.setDynamic('provider.provider', provider);
-        if (requestedModel) runtime.configManager.setDynamic('provider.model', requestedModel);
+        if (requestedModel) {
+          runtime.configManager.setDynamic('provider.model', formatProviderModel(provider, requestedModel));
+        } else {
+          runtime.configManager.setDynamic('provider.model', formatProviderModel(provider, getModelIdFromProviderModel(runtime.configManager.get('provider.model'))));
+        }
         return requestedModel
           ? `Provider selected: ${provider} (${requestedModel})\n  warning: model catalog entry was not available locally; saved explicit selection.`
           : `Provider selected: ${provider}\n  warning: model catalog entry was not available locally; model selection was left unchanged.`;
       }
-      runtime.configManager.setDynamic('provider.provider', selected.provider);
       runtime.configManager.setDynamic('provider.model', selected.registryKey);
       return `Provider selected: ${selected.provider} (${selected.registryKey})`;
     }
@@ -519,12 +522,10 @@ async function renderModels(runtime: CliCommandRuntime): Promise<string> {
         .find((candidate) => candidate.registryKey === modelKey || candidate.id === modelKey);
       if (!model) {
         const provider = inferProviderFromRegistryKey(modelKey);
-        runtime.configManager.setDynamic('provider.provider', provider);
-        runtime.configManager.setDynamic('provider.model', modelKey);
+        runtime.configManager.setDynamic('provider.model', formatProviderModel(provider, modelKey));
         await services.favoritesStore.recordUsage(modelKey);
         return `Model selected: ${modelKey}\n  warning: model catalog entry was not available locally; saved explicit selection.`;
       }
-      runtime.configManager.setDynamic('provider.provider', model.provider);
       runtime.configManager.setDynamic('provider.model', model.registryKey);
       await services.favoritesStore.recordUsage(model.registryKey);
       return `Model selected: ${model.registryKey}`;

package/src/cli/provider-auth-routes.ts

@@ -1,4 +1,4 @@
-import type { ProviderAuthRouteDescriptor } from '@pellux/goodvibes-sdk/platform/providers/interface';
+import type { ProviderAuthRouteDescriptor } from '@pellux/goodvibes-sdk/platform/providers';
 
 function routeUsable(route: ProviderAuthRouteDescriptor): boolean {
   return route.usable ?? route.configured;

package/src/cli/service-posture.ts

@@ -1,8 +1,8 @@
 import { closeSync, existsSync, openSync, readSync, statSync } from 'node:fs';
 import net from 'node:net';
 import { join } from 'node:path';
-import { PlatformServiceManager } from '@pellux/goodvibes-sdk/platform/daemon/service-manager';
-import type { ManagedServiceStatus } from '@pellux/goodvibes-sdk/platform/daemon/service-manager';
+import { PlatformServiceManager } from '@pellux/goodvibes-sdk/platform/daemon';
+import type { ManagedServiceStatus } from '@pellux/goodvibes-sdk/platform/daemon';
 import type { ConfigManager } from '../config/index.ts';
 import { resolveRuntimeEndpointBinding } from './endpoints.ts';
 import type { RuntimeEndpointBinding, RuntimeEndpointId } from './endpoints.ts';

package/src/cli/status.ts

@@ -1,9 +1,10 @@
-import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
+import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
 import type { OnboardingCheckMarkersState } from '../runtime/onboarding/index.ts';
 import { resolveRuntimeEndpointBinding } from './endpoints.ts';
 import { isNetworkFacing } from './network-posture.ts';
 import type { GoodVibesCliOutputFormat } from './types.ts';
 import type { CliServicePosture } from './service-posture.ts';
+import { getProviderIdFromModel } from '../config/provider-model.ts';
 
 export interface CliStatusOptions {
   readonly configManager: Pick<ConfigManager, 'get'>;
@@ -254,7 +255,7 @@ export function buildCliStatusSnapshot(options: CliStatusOptions): CliStatusSnap
     workingDirectory: options.workingDirectory,
     homeDirectory: options.homeDirectory,
     provider: {
-      provider: String(config.get('provider.provider')),
+      provider: getProviderIdFromModel(config.get('provider.model')),
       model: String(config.get('provider.model')),
       reasoning: String(config.get('provider.reasoningEffort')),
     },
@@ -308,7 +309,7 @@ export function renderCliStatus(options: CliStatusOptions): string {
     `  homeDir: ${options.homeDirectory}`,
     '',
     'Provider:',
-    `  provider: ${String(config.get('provider.provider'))}`,
+    `  provider: ${getProviderIdFromModel(config.get('provider.model'))}`,
     `  model: ${String(config.get('provider.model'))}`,
     `  reasoning: ${String(config.get('provider.reasoningEffort'))}`,
     '',

package/src/cli/surface-command.ts

@@ -4,7 +4,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 { enableFeatureFlags, getMissingSurfaceFeatureFlags, getServerSurfaceFeatureFlags } from '../runtime/surface-feature-flags.ts';
 import { resolveRuntimeEndpointBinding } from './endpoints.ts';
 import { classifyBindPosture, isNetworkFacing } from './network-posture.ts';

package/src/config/index.ts

@@ -6,17 +6,18 @@
  * - Pure helpers that derive values from an explicit ConfigManager instance
  */
 
-export { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
-export type { DeepReadonly } from '@pellux/goodvibes-sdk/platform/config/manager';
-export type { GoodVibesConfig, ConfigKey, ConfigValue, ConfigSetting, PermissionMode, PermissionAction, PermissionsToolConfig, NotificationsConfig, PersistedFlagState } from '@pellux/goodvibes-sdk/platform/config/schema';
-export { DEFAULT_CONFIG, CONFIG_SCHEMA } from '@pellux/goodvibes-sdk/platform/config/schema';
-export { ConfigError } from '@pellux/goodvibes-sdk/platform/types/errors';
+export { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+export type { DeepReadonly } from '@pellux/goodvibes-sdk/platform/config';
+export type { GoodVibesConfig, ConfigKey, ConfigValue, ConfigSetting, PermissionMode, PermissionAction, PermissionsToolConfig, NotificationsConfig, PersistedFlagState } from '@pellux/goodvibes-sdk/platform/config';
+export { DEFAULT_CONFIG, CONFIG_SCHEMA } from '@pellux/goodvibes-sdk/platform/config';
+export { ConfigError } from '@pellux/goodvibes-sdk/platform/types';
 
 import { readFileSync } from 'fs';
-import { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
-import type { GoodVibesConfig } from '@pellux/goodvibes-sdk/platform/config/schema';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+import type { GoodVibesConfig } from '@pellux/goodvibes-sdk/platform/config';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
+import { getProviderIdFromModel } from './provider-model.ts';
 
 export function getConfigSnapshot(configManager: Pick<ConfigManager, 'getRaw'>): Readonly<GoodVibesConfig> {
   return configManager.getRaw();
@@ -27,7 +28,7 @@ export function getConfiguredModelId(configManager: Pick<ConfigManager, 'get'>):
 }
 
 export function getConfiguredProviderId(configManager: Pick<ConfigManager, 'get'>): string {
-  return configManager.get('provider.provider');
+  return getProviderIdFromModel(configManager.get('provider.model'));
 }
 
 export function getConfiguredEmbeddingProviderId(configManager: Pick<ConfigManager, 'get'>): string {
@@ -53,4 +54,4 @@ export function getConfiguredSystemPrompt(configManager: Pick<ConfigManager, 'ge
   }
 }
 
-export { getConfiguredApiKeys, resolveApiKeys } from '@pellux/goodvibes-sdk/platform/config/api-keys';
+export { getConfiguredApiKeys, resolveApiKeys } from '@pellux/goodvibes-sdk/platform/config';

package/src/config/provider-model.ts

@@ -0,0 +1,23 @@
+import { DEFAULT_CONFIG } from '@pellux/goodvibes-sdk/platform/config';
+
+export function getProviderIdFromModel(model: unknown): string {
+  const raw = String(model ?? '').trim();
+  if (!raw) return getProviderIdFromModel(DEFAULT_CONFIG.provider.model);
+  const separator = raw.indexOf(':');
+  return separator > 0 ? raw.slice(0, separator) : raw;
+}
+
+export function getModelIdFromProviderModel(model: unknown): string {
+  const raw = String(model ?? '').trim();
+  if (!raw) return String(DEFAULT_CONFIG.provider.model);
+  const separator = raw.indexOf(':');
+  return separator > 0 ? raw.slice(separator + 1) : raw;
+}
+
+export function formatProviderModel(providerId: string, modelId: string): string {
+  const provider = providerId.trim();
+  const model = modelId.trim();
+  if (!provider) return model;
+  if (!model) return `${provider}:`;
+  return model.includes(':') ? model : `${provider}:${model}`;
+}

package/src/config/secret-config.ts

@@ -1,4 +1,4 @@
-import { isSecretRefInput } from '@pellux/goodvibes-sdk/platform/config/secret-refs';
+import { isSecretRefInput } from '@pellux/goodvibes-sdk/platform/config';
 import type { ConfigKey } from './index.ts';
 import type { SecretScope, SecretStorageMedium } from './secrets.ts';
 

package/src/config/secrets.ts

@@ -7,13 +7,13 @@ export type {
   SecretStorageMode,
   SecretStorageReview,
   SecretWriteOptions,
-} from '@pellux/goodvibes-sdk/platform/config/secrets';
+} from '@pellux/goodvibes-sdk/platform/config';
 
 import {
   SecretsManager as SdkSecretsManager,
   type SecretsManagerOptions as SdkSecretsManagerOptions,
-} from '@pellux/goodvibes-sdk/platform/config/secrets';
-import { isSecretRefInput } from '@pellux/goodvibes-sdk/platform/config/secret-refs';
+} from '@pellux/goodvibes-sdk/platform/config';
+import { isSecretRefInput } from '@pellux/goodvibes-sdk/platform/config';
 
 export type SecretsManagerOptions = Omit<SdkSecretsManagerOptions, 'surfaceRoot'>;
 

package/src/core/composer-state.ts

@@ -1,6 +1,6 @@
 import type { SubmissionIntent } from '../input/submission-intent.ts';
 import { routeSubmissionIntent, type SubmissionRouterInput } from '../input/submission-router.ts';
-import type { TurnState } from '@pellux/goodvibes-sdk/platform/runtime/store/domains/conversation';
+import type { TurnState } from '@/runtime/index.ts';
 
 export interface ComposerState {
   readonly intent: SubmissionIntent;

package/src/core/conversation-rendering.ts

@@ -7,12 +7,12 @@ import { createEmptyLine, type Line, type Cell } from '../types/grid.ts';
 import { getSplashLines, type SplashOptions } from '../utils/splash-lines.ts';
 import { interpolateColor, getDisplayWidth, wrapText } from '../utils/terminal-width.ts';
 import { LAYOUT } from '../renderer/layout.ts';
-import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
+import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
 import { renderConversationCollapsedFragment, renderConversationEventLine } from '../renderer/conversation-surface.ts';
 import { GLYPHS } from '../renderer/ui-primitives.ts';
 import type { BlockMeta, ConversationMessageSnapshot } from './conversation';
-import { parseDiffForApply } from '@pellux/goodvibes-sdk/platform/core/conversation-diff';
-import { extractUserDisplayText } from '@pellux/goodvibes-sdk/platform/core/conversation-utils';
+import { parseDiffForApply } from '@pellux/goodvibes-sdk/platform/core';
+import { extractUserDisplayText } from '@pellux/goodvibes-sdk/platform/core';
 
 type Message = ConversationMessageSnapshot;
 

package/src/core/conversation.ts

@@ -1,14 +1,14 @@
 import { InfiniteBuffer } from './history.ts';
 import { createEmptyLine, type Line, type Cell } from '../types/grid.ts';
 import type { SplashOptions } from '../utils/splash-lines.ts';
-import type { ToolCall, ToolResult } from '@pellux/goodvibes-sdk/platform/types/tools';
-import type { ProviderMessage, ContentPart } from '@pellux/goodvibes-sdk/platform/providers/interface';
-import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
-import type { TranscriptEventKind } from '@pellux/goodvibes-sdk/platform/core/transcript-events/index';
+import type { ToolCall, ToolResult } from '@pellux/goodvibes-sdk/platform/types';
+import type { ProviderMessage, ContentPart } from '@pellux/goodvibes-sdk/platform/providers';
+import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+import type { TranscriptEventKind } from '@pellux/goodvibes-sdk/platform/core';
 import {
   ConversationManager as SdkConversationManager,
   type BlockMeta as SdkBlockMeta,
-} from '@pellux/goodvibes-sdk/platform/core/conversation';
+} from '@pellux/goodvibes-sdk/platform/core';
 import {
   addConversationSplashScreen,
   appendConversationMessages,
@@ -33,7 +33,7 @@ export type {
   TokenUsage,
   ConversationMessageSnapshot,
   ConversationTitleSource,
-} from '@pellux/goodvibes-sdk/platform/core/conversation';
+} from '@pellux/goodvibes-sdk/platform/core';
 
 export type { SdkBlockMeta };
 
@@ -50,7 +50,7 @@ export interface BlockMeta extends SdkBlockMeta {
 }
 
 // Import internal types needed for rendering helpers
-import type { ConversationMessageSnapshot } from '@pellux/goodvibes-sdk/platform/core/conversation';
+import type { ConversationMessageSnapshot } from '@pellux/goodvibes-sdk/platform/core';
 type Message = ConversationMessageSnapshot;
 
 export class ConversationManager extends SdkConversationManager {
@@ -120,7 +120,7 @@ export class ConversationManager extends SdkConversationManager {
       toolCalls?: ToolCall[];
       reasoningContent?: string;
       reasoningSummary?: string;
-      usage?: import('@pellux/goodvibes-sdk/platform/core/conversation').TokenUsage;
+      usage?: import('@pellux/goodvibes-sdk/platform/core').TokenUsage;
       model?: string;
       provider?: string;
     },
@@ -269,7 +269,7 @@ export class ConversationManager extends SdkConversationManager {
     branches?: Record<string, Message[]>;
     currentBranch?: string;
     title?: string;
-    titleSource?: import('@pellux/goodvibes-sdk/platform/core/conversation').ConversationTitleSource;
+    titleSource?: import('@pellux/goodvibes-sdk/platform/core').ConversationTitleSource;
   }): void {
     super.fromJSON(data);
     this.history.clear();
@@ -548,4 +548,4 @@ export class ConversationManager extends SdkConversationManager {
   }
 }
 
-export { parseDiffForApply, applyDiffContent } from '@pellux/goodvibes-sdk/platform/core/conversation-diff';
+export { parseDiffForApply, applyDiffContent } from '@pellux/goodvibes-sdk/platform/core';

package/src/core/orchestrator.ts

@@ -4,4 +4,4 @@ export {
   Orchestrator,
   type OrchestratorOptions,
   type OrchestratorUserInputOptions,
-} from '@pellux/goodvibes-sdk/platform/core/orchestrator';
+} from '@pellux/goodvibes-sdk/platform/core';

package/src/core/system-message-router.ts

@@ -29,7 +29,7 @@
  */
 
 import { getConfigSnapshot } from '../config/index.ts';
-import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
+import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
 import type { ConversationManager } from './conversation';
 import type { SystemMessagesPanel, SystemMessagePriority } from '../panels/system-messages-panel.ts';
 import {
@@ -39,12 +39,12 @@ import {
   resolveSystemMessageDelivery,
   type SystemMessageKind,
   type SystemMessageTarget,
-} from '@pellux/goodvibes-sdk/platform/runtime/system-message-policy';
+} from '@/runtime/index.ts';
 
 export type {
   SystemMessageKind,
   SystemMessageTarget,
-} from '@pellux/goodvibes-sdk/platform/runtime/system-message-policy';
+} from '@/runtime/index.ts';
 
 function targetForKind(
   configManager: Pick<ConfigManager, 'getRaw'>,

package/src/daemon/cli.ts

@@ -1,31 +1,31 @@
 import { homedir, networkInterfaces } from 'node:os';
 import { join } from 'node:path';
 import { readFileSync } from 'node:fs';
-import { ConfigManager } from '@pellux/goodvibes-sdk/platform/config/manager';
-import { RuntimeEventBus } from '@pellux/goodvibes-sdk/platform/runtime/events/index';
-import { createFeatureFlagManager } from '@pellux/goodvibes-sdk/platform/runtime/feature-flags/index';
-import type { FlagState } from '@pellux/goodvibes-sdk/platform/runtime/feature-flags/types';
+import { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+import { formatProviderModel, getModelIdFromProviderModel, getProviderIdFromModel } from '../config/provider-model.ts';
+import { RuntimeEventBus, GlobalNetworkTransportInstaller } from '@/runtime/index.ts';
+import { createFeatureFlagManager } from '@/runtime/index.ts';
+import type { FlagState } from '@/runtime/index.ts';
 import { createRuntimeStore } from '../runtime/store/index.ts';
 import { createRuntimeServices } from '../runtime/services.ts';
-import { DaemonServer } from '@pellux/goodvibes-sdk/platform/daemon/server';
-import { HttpListener } from '@pellux/goodvibes-sdk/platform/daemon/http-listener';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
-import { GlobalNetworkTransportInstaller } from '@pellux/goodvibes-sdk/platform/runtime/network/index';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { DaemonServer, HttpListener } from '@pellux/goodvibes-sdk/platform/daemon';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import {
   getOrCreateCompanionToken,
   pruneStaleOperatorTokens,
   buildCompanionConnectionInfo,
   encodeConnectionPayload,
   formatConnectionBlock,
-} from '@pellux/goodvibes-sdk/platform/pairing/index';
-import { generateQrMatrix, renderQrToString } from '@pellux/goodvibes-sdk/platform/pairing/qr-generator';
+  generateQrMatrix,
+  renderQrToString,
+} from '@pellux/goodvibes-sdk/platform/pairing';
 import { workspaceOperatorTokenCandidates } from '../runtime/operator-token-cleanup.ts';
 import {
   scan,
   loadPersistedProviders,
   persistProviders,
-} from '@pellux/goodvibes-sdk/platform/discovery/index';
+} from '@pellux/goodvibes-sdk/platform/discovery';
 import { createSafeHostServeFactory } from './safe-serve.ts';
 
 import {
@@ -138,13 +138,13 @@ async function main(): Promise<void> {
 
   // Apply remaining CLI flags before the provider registry is constructed.
   // These are runtime-only overrides; they must not rewrite settings.json.
-  if (cliFlags.provider !== undefined) {
-    applyRuntimeConfigValue(config, 'provider.provider', cliFlags.provider);
-    logger.info('daemon: --provider flag applied', { provider: cliFlags.provider });
-  }
-  if (cliFlags.model !== undefined) {
-    applyRuntimeConfigValue(config, 'provider.model', cliFlags.model);
-    logger.info('daemon: --model flag applied', { model: cliFlags.model });
+  if (cliFlags.provider !== undefined || cliFlags.model !== undefined) {
+    const currentModel = config.get('provider.model');
+    const provider = cliFlags.provider ?? getProviderIdFromModel(currentModel);
+    const model = cliFlags.model ?? getModelIdFromProviderModel(currentModel);
+    const registryKey = formatProviderModel(provider, model);
+    applyRuntimeConfigValue(config, 'provider.model', registryKey);
+    logger.info('daemon: provider/model flags applied', { provider, model: registryKey });
   }
   const endpointOverrideErrors = applyRuntimeEndpointFlagOverrides(config, 'controlPlane', cliFlags);
   if (endpointOverrideErrors.length > 0) {

package/src/daemon/safe-serve.ts

@@ -1,5 +1,5 @@
-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';
 
 type HostServeFetch = (
   request: Request,

package/src/input/bookmark-modal.ts

@@ -5,7 +5,7 @@
  * selected index, scroll offset, and pending action.
  */
 
-import type { BookmarkEntry, BookmarkManager } from '@pellux/goodvibes-sdk/platform/bookmarks/manager';
+import type { BookmarkEntry, BookmarkManager } from '@pellux/goodvibes-sdk/platform/bookmarks';
 
 // ---------------------------------------------------------------------------
 // BookmarkModal