@pellux/goodvibes-tui 0.19.59 → 0.19.61

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

@@ -1,8 +1,8 @@
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import type { CommandRegistry } from '../command-registry.ts';
-import type { ProfileBundleEntry, ProfileSyncBundle } from '@pellux/goodvibes-sdk/platform/runtime/sandbox/types';
-import { recordSettingsSyncEvent, recordSettingsSyncFailure } from '@pellux/goodvibes-sdk/platform/runtime/settings/control-plane';
+import type { ProfileBundleEntry, ProfileSyncBundle } from '@/runtime/index.ts';
+import { recordSettingsSyncEvent, recordSettingsSyncFailure } from '@/runtime/index.ts';
 import { requireProfileManager, requireShellPaths } from './runtime-services.ts';
 
 function inspectProfileSyncBundle(bundle: ProfileSyncBundle): string {

package/src/input/commands/provider-accounts-runtime.ts

@@ -2,7 +2,7 @@ import type { CommandContext, CommandRegistry } from '../command-registry.ts';
 import type {
   ProviderAccountRecord,
   ProviderAccountSnapshot,
-} from '@pellux/goodvibes-sdk/platform/runtime/provider-accounts/registry';
+} from '@/runtime/index.ts';
 import {
   openCommandPanel,
   requireOperatorClient,

package/src/input/commands/provider.ts

@@ -13,9 +13,9 @@
  */
 
 import type { SlashCommand, CommandContext } from '../command-registry.ts';
-import type { RouteExplanation } from '@pellux/goodvibes-sdk/platform/providers/capabilities';
-import type { FallbackTestResult, FallbackTransition } from '@pellux/goodvibes-sdk/platform/providers/optimizer';
-import type { ProviderApiModelRecord } from '@pellux/goodvibes-sdk/platform/providers/provider-api';
+import type { RouteExplanation } from '@pellux/goodvibes-sdk/platform/providers';
+import type { FallbackTestResult, FallbackTransition } from '@pellux/goodvibes-sdk/platform/providers';
+import type { ProviderApiModelRecord } from '@pellux/goodvibes-sdk/platform/providers';
 import { requireProviderApi } from './runtime-services.ts';
 
 // ---------------------------------------------------------------------------

package/src/input/commands/quit-shared.ts

@@ -1,8 +1,8 @@
 import type { StatusResult } from 'simple-git';
 import { basename } from 'path';
 import type { CommandContext } from '../command-registry.ts';
-import { GitService } from '@pellux/goodvibes-sdk/platform/git/service';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { GitService } from '@pellux/goodvibes-sdk/platform/git';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 type GitLike = Pick<GitService, 'addAll' | 'status' | 'commit'>;
 

package/src/input/commands/recall-bundle.ts

@@ -1,11 +1,11 @@
 import { dirname } from 'node:path';
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import type { CommandContext } from '../command-registry.ts';
-import type { MemoryBundle, MemorySearchFilter } from '@pellux/goodvibes-sdk/platform/state/memory-store';
+import type { MemoryBundle, MemorySearchFilter } from '@pellux/goodvibes-sdk/platform/state';
 import { VALID_CLASSES, VALID_SCOPES, isValidClass, isValidScope, resolveBundlePath } from './recall-shared.ts';
 import { requireShellPaths } from './runtime-services.ts';
 import { getMemoryApi } from './recall-query.ts';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export function handleRecallExport(args: string[], context: CommandContext): void {
   const memory = getMemoryApi(context);

package/src/input/commands/recall-capture.ts

@@ -1,11 +1,11 @@
 import type { CommandContext } from '../command-registry.ts';
-import type { ProvenanceLink } from '@pellux/goodvibes-sdk/platform/state/memory-store';
+import type { ProvenanceLink } from '@pellux/goodvibes-sdk/platform/state';
 import {
   buildIncidentMemoryAddOptions,
   buildMcpSecurityMemoryAddOptions,
   buildPluginSecurityMemoryAddOptions,
   buildPolicyPreflightMemoryAddOptions,
-} from '@pellux/goodvibes-sdk/platform/state/memory-ingest';
+} from '@pellux/goodvibes-sdk/platform/state';
 import { VALID_CLASSES, VALID_SCOPES, isValidClass, isValidScope } from './recall-shared.ts';
 import { getMemoryApi } from './recall-query.ts';
 

package/src/input/commands/recall-query.ts

@@ -1,6 +1,6 @@
 import type { CommandContext } from '../command-registry.ts';
-import type { MemoryApi } from '@pellux/goodvibes-sdk/platform/knowledge/knowledge-api';
-import type { MemorySearchFilter } from '@pellux/goodvibes-sdk/platform/state/memory-store';
+import type { MemoryApi } from '@pellux/goodvibes-sdk/platform/knowledge';
+import type { MemorySearchFilter } from '@pellux/goodvibes-sdk/platform/state';
 import { VALID_CLASSES, VALID_SCOPES, isValidClass, isValidScope } from './recall-shared.ts';
 
 export function getMemoryApi(context: CommandContext): MemoryApi | null {

package/src/input/commands/recall-shared.ts

@@ -1,5 +1,5 @@
-import type { ShellPathService } from '@pellux/goodvibes-sdk/platform/runtime/shell-paths';
-import type { MemoryClass, MemoryReviewState, MemoryScope } from '@pellux/goodvibes-sdk/platform/state/memory-store';
+import type { ShellPathService } from '@/runtime/index.ts';
+import type { MemoryClass, MemoryReviewState, MemoryScope } from '@pellux/goodvibes-sdk/platform/state';
 
 export const VALID_CLASSES: MemoryClass[] = ['decision', 'constraint', 'incident', 'pattern', 'fact', 'risk', 'runbook', 'architecture', 'ownership'];
 export const VALID_SCOPES: MemoryScope[] = ['session', 'project', 'team'];

package/src/input/commands/remote-runtime-setup.ts

@@ -1,8 +1,8 @@
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
-import { getDefaultAcpAgentCommand } from '@pellux/goodvibes-sdk/platform/acp/manager';
+import { getDefaultAcpAgentCommand } from '@pellux/goodvibes-sdk/platform/acp';
 import type { CommandContext, RemoteCommandService } from '../command-registry.ts';
-import type { RemoteSessionBundle } from '@pellux/goodvibes-sdk/platform/runtime/remote/types';
+import type { RemoteSessionBundle } from '@/runtime/index.ts';
 import { requireShellPaths } from './runtime-services.ts';
 
 type RemoteRegistryLike = Pick<RemoteCommandService, 'listContracts' | 'exportSessionBundle' | 'importSessionBundle'>;

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

@@ -1,6 +1,6 @@
 import { resolve } from 'node:path';
 import type { CommandRegistry, CommandContext } from '../command-registry.ts';
-import { AGENT_TEMPLATES } from '@pellux/goodvibes-sdk/platform/tools/agent/manager';
+import { AGENT_TEMPLATES } from '@pellux/goodvibes-sdk/platform/tools';
 import { handleRemoteSetupCommand } from './remote-runtime-setup.ts';
 import { handleRemotePoolCommand } from './remote-runtime-pool.ts';
 import { requireAgentManager, requireAcpManager, requirePeerClient, requireShellPaths } from './runtime-services.ts';

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

@@ -1,5 +1,5 @@
 import type { CommandRegistry } from '../command-registry.ts';
-import { handleReplayCommand } from '@pellux/goodvibes-sdk/platform/core/replay-command-handler';
+import { handleReplayCommand } from '@pellux/goodvibes-sdk/platform/core';
 import { requireReplayEngine } from './runtime-services.ts';
 
 export function registerReplayRuntimeCommands(registry: CommandRegistry): void {

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

@@ -8,17 +8,17 @@ import type {
   CommandWorkspaceServices,
 } from '../command-registry.ts';
 import type { UiReadModels } from '../../runtime/ui-read-models.ts';
-import type { ShellPathService } from '@pellux/goodvibes-sdk/platform/runtime/shell-paths';
-import type { EcosystemCatalogPathOptions } from '@pellux/goodvibes-sdk/platform/runtime/ecosystem/catalog';
+import type { ShellPathService } from '@/runtime/index.ts';
+import type { EcosystemCatalogPathOptions } from '@/runtime/index.ts';
 import type { PluginPathOptions } from '../../plugins/loader';
-import type { DirectTransport } from '@pellux/goodvibes-sdk/platform/runtime/transports/direct';
-import type { KnowledgeApi } from '@pellux/goodvibes-sdk/platform/knowledge/knowledge-api';
-import type { HookApi } from '@pellux/goodvibes-sdk/platform/hooks/hook-api';
-import type { McpApi } from '@pellux/goodvibes-sdk/platform/mcp/mcp-api';
-import type { OperatorClient } from '@pellux/goodvibes-sdk/platform/runtime/operator-client';
-import type { OpsApi } from '@pellux/goodvibes-sdk/platform/runtime/ops-api';
-import type { PeerClient } from '@pellux/goodvibes-sdk/platform/runtime/peer-client';
-import type { ProviderApi } from '@pellux/goodvibes-sdk/platform/providers/provider-api';
+import type { DirectTransport } from '@/runtime/index.ts';
+import type { KnowledgeApi } from '@pellux/goodvibes-sdk/platform/knowledge';
+import type { HookApi } from '@pellux/goodvibes-sdk/platform/hooks';
+import type { McpApi } from '@pellux/goodvibes-sdk/platform/mcp';
+import type { OperatorClient } from '@/runtime/index.ts';
+import type { OpsApi } from '@/runtime/index.ts';
+import type { PeerClient } from '@/runtime/index.ts';
+import type { ProviderApi } from '@pellux/goodvibes-sdk/platform/providers';
 import type {
   ShellAgentManagerService,
   ShellAcpManagerService,
@@ -27,7 +27,7 @@ import type {
   ShellModeManagerService,
   ShellPlanManagerService,
   ShellSessionOrchestrationService,
-} from '@pellux/goodvibes-sdk/platform/runtime/shell-command-ops';
+} from '@/runtime/index.ts';
 
 function requireContextValue<T>(value: T | null | undefined, name: string): T {
   if (value == null) {

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

@@ -5,17 +5,17 @@ import {
   normalizeAtSchedule,
   normalizeCronSchedule,
   normalizeEverySchedule,
-} from '@pellux/goodvibes-sdk/platform/automation/index';
-import type { AutomationManager } from '@pellux/goodvibes-sdk/platform/automation/index';
-import type { AutomationJob } from '@pellux/goodvibes-sdk/platform/automation/jobs';
-import type { AutomationScheduleDefinition } from '@pellux/goodvibes-sdk/platform/automation/schedules';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+} from '@pellux/goodvibes-sdk/platform/automation';
+import type { AutomationManager } from '@pellux/goodvibes-sdk/platform/automation';
+import type { AutomationJob } from '@pellux/goodvibes-sdk/platform/automation';
+import type { AutomationScheduleDefinition } from '@pellux/goodvibes-sdk/platform/automation';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import type {
   AutomationExecutionPolicy,
   AutomationExternalContentSource,
   AutomationSessionTarget,
   AutomationWakeMode,
-} from '@pellux/goodvibes-sdk/platform/automation/session-targets';
+} from '@pellux/goodvibes-sdk/platform/automation';
 
 function formatSchedule(schedule: AutomationScheduleDefinition): string {
   switch (schedule.kind) {

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

@@ -3,7 +3,7 @@ import { dirname, join, resolve } from 'node:path';
 import type { CommandRegistry } from '../command-registry.ts';
 import type { SelectionAction, SelectionItem } from '../selection-modal.ts';
 import { openCommandPanel, requireServiceRegistry, requireShellPaths } from './runtime-services.ts';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export function registerServicesRuntimeCommands(registry: CommandRegistry): void {
   registry.register({

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

@@ -3,10 +3,10 @@ import { existsSync, mkdirSync, unlinkSync } from 'node:fs';
 import { writeFile } from 'node:fs/promises';
 import type { CommandRegistry } from '../command-registry.ts';
 import type { SelectionItem } from '../selection-modal.ts';
-import { exportToMarkdown } from '@pellux/goodvibes-sdk/platform/export/markdown';
-import { TemplateManager, parseTemplateArgs } from '@pellux/goodvibes-sdk/platform/templates/manager';
+import { exportToMarkdown } from '@pellux/goodvibes-sdk/platform/export';
+import { TemplateManager, parseTemplateArgs } from '@pellux/goodvibes-sdk/platform/templates';
 import { requireSessionManager, requireSessionMemoryStore, requireShellPaths } from './runtime-services.ts';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export function registerSessionContentCommands(registry: CommandRegistry): void {
   registry.register({
@@ -43,9 +43,9 @@ export function registerSessionContentCommands(registry: CommandRegistry): void
           const exportMsgs = msgs.map(m => ({
             role: String(m.role ?? 'user') as 'user' | 'assistant' | 'system' | 'tool',
             content: Array.isArray(m.content)
-              ? m.content as import('@pellux/goodvibes-sdk/platform/providers/interface').ContentPart[]
+              ? m.content as import('@pellux/goodvibes-sdk/platform/providers').ContentPart[]
               : String(m.content ?? ''),
-            toolCalls: m.toolCalls as import('@pellux/goodvibes-sdk/platform/types/tools').ToolCall[] | undefined,
+            toolCalls: m.toolCalls as import('@pellux/goodvibes-sdk/platform/types').ToolCall[] | undefined,
             callId: m.callId as string | undefined,
             toolName: m.toolName as string | undefined,
             reasoningContent: m.reasoningContent as string | undefined,

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

@@ -1,13 +1,13 @@
 import { randomBytes } from 'node:crypto';
 
 import type { CommandContext, CommandRegistry } from '../command-registry.ts';
-import { type SessionMeta } from '@pellux/goodvibes-sdk/platform/sessions/manager';
-import type { TranscriptEventKind } from '@pellux/goodvibes-sdk/platform/core/transcript-events/index';
+import { type SessionMeta } from '@pellux/goodvibes-sdk/platform/sessions';
+import type { TranscriptEventKind } from '@pellux/goodvibes-sdk/platform/core';
 import type { ConversationTitleSource } from '../../core/conversation';
-import type { SessionReturnContextSummary } from '@pellux/goodvibes-sdk/platform/runtime/session-return-context';
-import { formatReturnContextForDisplay, getReturnContextMode, maybeAssistReturnContextSummary } from '@pellux/goodvibes-sdk/platform/runtime/session-return-context';
+import type { SessionReturnContextSummary } from '@/runtime/index.ts';
+import { formatReturnContextForDisplay, getReturnContextMode, maybeAssistReturnContextSummary } from '@/runtime/index.ts';
 import { requirePanelManager, requireProviderApi, requireSessionManager } from './runtime-services.ts';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 function parseTranscriptKind(raw: string | undefined): TranscriptEventKind | 'all' {
   const normalized = (raw ?? 'all').toLowerCase().replace(/-/g, '_');

package/src/input/commands/session.ts

@@ -18,8 +18,8 @@
  */
 
 import type { SlashCommand, CommandContext } from '../command-registry.ts';
-import type { CancellationScope, CrossSessionTaskRef } from '@pellux/goodvibes-sdk/platform/sessions/orchestration/index';
-import { VALID_SCOPES } from '@pellux/goodvibes-sdk/platform/sessions/orchestration/index';
+import type { CancellationScope, CrossSessionTaskRef } from '@pellux/goodvibes-sdk/platform/sessions';
+import { VALID_SCOPES } from '@pellux/goodvibes-sdk/platform/sessions';
 import { handleSessionWorkflowCommand } from './session-workflow.ts';
 import { requireSessionOrchestration } from './runtime-services.ts';
 

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

@@ -14,12 +14,13 @@ import {
   recordSettingsSyncFailure,
   setManagedSettingLock,
   type SettingsSyncBundle,
-} from '@pellux/goodvibes-sdk/platform/runtime/settings/control-plane';
+} from '@/runtime/index.ts';
+import { getProviderIdFromModel } from '../../config/provider-model.ts';
 import { type ConfigKey } from '../../config/index.ts';
-import { CONFIG_KEYS } from '@pellux/goodvibes-sdk/platform/config/schema';
+import { CONFIG_KEYS } from '@pellux/goodvibes-sdk/platform/config';
 import type { CommandRegistry } from '../command-registry.ts';
 import { openCommandPanel, requireShellPaths } from './runtime-services.ts';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export function registerSettingsSyncRuntimeCommands(registry: CommandRegistry): void {
   registry.register({
@@ -71,7 +72,7 @@ export function registerSettingsSyncRuntimeCommands(registry: CommandRegistry):
           return;
         }
         ctx.session.runtime.model = String(ctx.platform.configManager.get('provider.model'));
-        ctx.session.runtime.provider = String(ctx.platform.configManager.get('provider.provider'));
+        ctx.session.runtime.provider = getProviderIdFromModel(ctx.platform.configManager.get('provider.model'));
         ctx.session.runtime.reasoningEffort = ctx.platform.configManager.get('provider.reasoningEffort') as string;
         ctx.print(`Resolved synced conflict for ${key} using the ${resolution} value.`);
         return;

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

@@ -7,10 +7,10 @@ import {
   exportToHTML,
   exportToJSON,
   exportToMarkdownExtended,
-} from '@pellux/goodvibes-sdk/platform/export/session-export';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
+} from '@pellux/goodvibes-sdk/platform/export';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
 import { requireShellPaths } from './runtime-services.ts';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export function registerShareRuntimeCommands(registry: CommandRegistry): void {
   registry.register({

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

@@ -1,11 +1,11 @@
 import type { CommandRegistry } from '../command-registry.ts';
 import type { SelectionItem } from '../selection-modal.ts';
-import { EFFORT_DESCRIPTIONS } from '@pellux/goodvibes-sdk/platform/providers/effort-levels';
-import { REASONING_BUDGET_MAP } from '@pellux/goodvibes-sdk/platform/providers/interface';
+import { EFFORT_DESCRIPTIONS } from '@pellux/goodvibes-sdk/platform/providers';
+import { REASONING_BUDGET_MAP } from '@pellux/goodvibes-sdk/platform/providers';
 import { executeWriteQuit } from './quit-shared.ts';
 import { compactConversation, requireKeybindingsManager, requireProviderApi } from './runtime-services.ts';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
 
 export function registerShellCoreCommands(registry: CommandRegistry): void {
   registry.register({
@@ -33,7 +33,6 @@ export function registerShellCoreCommands(registry: CommandRegistry): void {
           ctx.session.runtime.model = selected.registryKey;
           ctx.session.runtime.provider = selected.providerId;
           ctx.platform.configManager.set('provider.model', selected.registryKey);
-          ctx.platform.configManager.set('provider.provider', selected.providerId);
           ctx.print(`Switched to model: ${selected.displayName} (${selected.providerId})`);
           void providerApi.recordModelUsage(selected.registryKey).catch((err) => { logger.debug('model usage record failed', { err }); });
         } catch (e) {

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

@@ -10,7 +10,7 @@ import {
   uninstallEcosystemCatalogEntry,
   updateInstalledEcosystemEntry,
   upsertEcosystemCatalogEntry,
-} from '@pellux/goodvibes-sdk/platform/runtime/ecosystem/catalog';
+} from '@/runtime/index.ts';
 import { requireEcosystemCatalogPaths, requirePanelManager, requireShellPaths } from './runtime-services.ts';
 
 export function registerSkillsRuntimeCommands(registry: CommandRegistry): void {

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

@@ -1,14 +1,14 @@
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import type { CommandContext, CommandRegistry } from '../command-registry.ts';
-import { createOAuthLocalListener } from '@pellux/goodvibes-sdk/platform/config/oauth-local-listener';
-import { beginOpenAICodexLogin, exchangeOpenAICodexCode } from '@pellux/goodvibes-sdk/platform/config/openai-codex-auth';
-import type { OAuthProviderConfig, ProviderSubscription } from '@pellux/goodvibes-sdk/platform/config/subscriptions';
-import { getSubscriptionProviderConfig, listAvailableSubscriptionProviders } from '@pellux/goodvibes-sdk/platform/config/subscription-providers';
-import { inspectProviderAuth } from '@pellux/goodvibes-sdk/platform/runtime/auth/inspection';
-import { openExternalUrl } from '@pellux/goodvibes-sdk/platform/utils/open-external';
+import { createOAuthLocalListener } from '@pellux/goodvibes-sdk/platform/config';
+import { beginOpenAICodexLogin, exchangeOpenAICodexCode } from '@pellux/goodvibes-sdk/platform/config';
+import type { OAuthProviderConfig, ProviderSubscription } from '@pellux/goodvibes-sdk/platform/config';
+import { getSubscriptionProviderConfig, listAvailableSubscriptionProviders } from '@pellux/goodvibes-sdk/platform/config';
+import { inspectProviderAuth } from '@/runtime/index.ts';
+import { openExternalUrl } from '@pellux/goodvibes-sdk/platform/utils';
 import { requireSecretsManager, requireServiceRegistry, requireShellPaths, requireSubscriptionManager } from './runtime-services.ts';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 interface SubscriptionBundle {
   readonly version: 1;

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

@@ -1,8 +1,8 @@
 import type { CommandRegistry } from '../command-registry.ts';
-import type { RuntimeTask, TaskLifecycleState } from '@pellux/goodvibes-sdk/platform/runtime/store/domains/tasks';
-import { reviewWorktreeAttachments } from '@pellux/goodvibes-sdk/platform/runtime/worktree/registry';
+import type { RuntimeTask, TaskLifecycleState } from '@/runtime/index.ts';
+import { reviewWorktreeAttachments } from '@/runtime/index.ts';
 import { requireOperatorClient, requireOpsApi, requirePanelManager, requireShellPaths } from './runtime-services.ts';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 function sortRuntimeTasks(tasks: RuntimeTask[]): RuntimeTask[] {
   const statusOrder: TaskLifecycleState[] = ['running', 'queued', 'blocked', 'failed', 'completed', 'cancelled'];
@@ -95,7 +95,7 @@ export function registerTasksRuntimeCommands(registry: CommandRegistry): void {
             });
             return worktrees.total > 0
               ? [
-                  `  worktrees: ${worktrees.total} tracked (${worktrees.active} active / ${worktrees.paused} paused / ${worktrees.cleanupPending} cleanup)`,
+                  `  worktrees: ${worktrees.total} tracked (${worktrees.active} active / ${worktrees.paused} paused / ${worktrees.pendingCleanup} cleanup)`,
                   `  worktree next: /worktree task ${task.id}`,
                 ]
               : [];
@@ -140,7 +140,7 @@ export function registerTasksRuntimeCommands(registry: CommandRegistry): void {
           return;
         }
         const task = opsApi.tasks.create({
-          kind: kind as import('@pellux/goodvibes-sdk/platform/runtime/store/domains/tasks').TaskKind,
+          kind: kind as import('@/runtime/index.ts').TaskKind,
           owner,
           title,
           description: title,

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

@@ -1,9 +1,9 @@
 import type { CommandRegistry, CommandContext } from '../command-registry.ts';
 import { join } from 'node:path';
-import { AGENT_TEMPLATES } from '@pellux/goodvibes-sdk/platform/tools/agent/manager';
-import { ArchetypeLoader, type AgentArchetype } from '@pellux/goodvibes-sdk/platform/agents/archetypes';
+import { AGENT_TEMPLATES } from '@pellux/goodvibes-sdk/platform/tools';
+import { ArchetypeLoader, type AgentArchetype } from '@pellux/goodvibes-sdk/platform/agents';
 import { requireOpsApi, requireReadModels, requireShellPaths } from './runtime-services.ts';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 type TeamworkModeId =
   | 'local-engineer'

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

@@ -1,6 +1,6 @@
 import { readFileSync } from 'node:fs';
 import type { CommandRegistry } from '../command-registry.ts';
-import type { RemoteSessionBundle } from '@pellux/goodvibes-sdk/platform/runtime/remote/types';
+import type { RemoteSessionBundle } from '@/runtime/index.ts';
 import { requirePeerClient, requireShellPaths } from './runtime-services.ts';
 
 function inspectRemoteSessionBundle(bundle: RemoteSessionBundle): string {

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

@@ -1,4 +1,4 @@
-import { getPersistedWorktreeMeta, reviewWorktreeAttachments, summarizeWorktreeOwnership } from '@pellux/goodvibes-sdk/platform/runtime/worktree/registry';
+import { getPersistedWorktreeMeta, reviewWorktreeAttachments, summarizeWorktreeOwnership } from '@/runtime/index.ts';
 import type { CommandRegistry } from '../command-registry.ts';
 import { openCommandPanel, requireShellPaths } from './runtime-services.ts';
 
@@ -33,7 +33,7 @@ export function registerWorktreeRuntimeCommands(registry: CommandRegistry): void
         }
         const nextSteps = [
           record.state === 'paused' ? `/worktree resume ${record.path}` : null,
-          record.state === 'discard' || record.state === 'cleanup-pending' ? `/worktree cleanup ${record.path}` : null,
+          record.state === 'discard' || record.state === 'pending-cleanup' ? `/worktree cleanup ${record.path}` : null,
           record.state === 'kept' ? `/worktree keep ${record.path}` : null,
           record.sessionId ? `/worktree session ${record.sessionId}` : null,
           record.taskId ? `/worktree task ${record.taskId}` : null,
@@ -78,7 +78,7 @@ export function registerWorktreeRuntimeCommands(registry: CommandRegistry): void
           ? [
               `${header}: ${targetKind} ${targetId}`,
               `  total: ${review.total}`,
-              `  active: ${review.active}  paused: ${review.paused}  kept: ${review.kept}  discard: ${review.discard}  cleanup: ${review.cleanupPending}`,
+              `  active: ${review.active}  paused: ${review.paused}  kept: ${review.kept}  discard: ${review.discard}  cleanup: ${review.pendingCleanup}`,
               ...review.records.map((record) => `  ${record.state.padEnd(15)} ${record.kind.padEnd(12)} ${record.path}`),
               ...(sub === 'recover'
                 ? [

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

@@ -150,7 +150,7 @@ export interface FeedContextClosures {
   handleBlockToggle: () => void;
   findMarkerAtPos: (pos: number) => { start: number; end: number } | null;
   cleanupMarkerRegistry: (text: string) => void;
-  expandPrompt: (text: string) => string | import('@pellux/goodvibes-sdk/platform/providers/interface').ContentPart[];
+  expandPrompt: (text: string) => string | import('@pellux/goodvibes-sdk/platform/providers').ContentPart[];
   openModelPickerWithTarget: (target: ModelPickerTarget, source?: 'settings' | 'onboarding') => boolean;
   openProviderModelPickerWithTarget: (target: ModelPickerTarget, source?: 'settings' | 'onboarding') => boolean;
   onModelPickerCommit: () => boolean;

package/src/input/file-picker.ts

@@ -1,6 +1,6 @@
 import { readdir } from 'node:fs/promises';
 import { join, relative } from 'node:path';
-import type { ShellPathService } from '@pellux/goodvibes-sdk/platform/runtime/shell-paths';
+import type { ShellPathService } from '@/runtime/index.ts';
 
 /**
  * FilePickerModal - Fuzzy file finder triggered by @ in the input area.

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

@@ -1,7 +1,7 @@
-import { loadSkillByTrigger } from '@pellux/goodvibes-sdk/platform/tools/registry-tool/skill-loader';
+import { loadSkillByTrigger } from '@pellux/goodvibes-sdk/platform/tools';
 import type { CommandContext, CommandRegistry } from './command-registry.ts';
 import type { AutocompleteEngine } from './autocomplete.ts';
-import type { InputToken } from '@pellux/goodvibes-sdk/platform/core/tokenizer';
+import type { InputToken } from '@pellux/goodvibes-sdk/platform/core';
 import type { ConversationManager } from '../core/conversation';
 
 export type CommandModeRouteState = {

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

@@ -2,15 +2,15 @@ import { readFileSync, writeFileSync, existsSync } from 'node:fs';
 import { copyToClipboard, pasteFromClipboard, pasteImageFromClipboard } from '../utils/clipboard.ts';
 import type { InfiniteBuffer } from '../core/history.ts';
 import type { ConversationManager } from '../core/conversation';
-import type { PermissionCategory } from '@pellux/goodvibes-sdk/platform/permissions/manager';
-import type { ContentPart } from '@pellux/goodvibes-sdk/platform/providers/interface';
+import type { PermissionCategory } from '@pellux/goodvibes-sdk/platform/permissions';
+import type { ContentPart } from '@pellux/goodvibes-sdk/platform/providers';
 import type { CommandContext } from './command-registry.ts';
-import type { BookmarkManager } from '@pellux/goodvibes-sdk/platform/bookmarks/manager';
-import { resolveAndValidatePath } from '@pellux/goodvibes-sdk/platform/utils/path-safety';
-import { analyzePermissionRequest } from '@pellux/goodvibes-sdk/platform/permissions/analysis';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
+import type { BookmarkManager } from '@pellux/goodvibes-sdk/platform/bookmarks';
+import { resolveAndValidatePath } from '@pellux/goodvibes-sdk/platform/utils';
+import { analyzePermissionRequest } from '@pellux/goodvibes-sdk/platform/permissions';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils';
 import type { SelectionManager } from './selection.ts';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export const MARKER_REGEX = /\[(TEXT|IMAGE): [^\]]+\]/g;
 

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

@@ -1,7 +1,7 @@
-import type { InputToken } from '@pellux/goodvibes-sdk/platform/core/tokenizer';
+import type { InputToken } from '@pellux/goodvibes-sdk/platform/core';
 import type { BlockMeta, ConversationManager } from '../core/conversation';
 import type { InputHistory } from './input-history.ts';
-import type { ContentPart } from '@pellux/goodvibes-sdk/platform/providers/interface';
+import type { ContentPart } from '@pellux/goodvibes-sdk/platform/providers';
 import type { CommandRegistry, CommandContext } from './command-registry.ts';
 import type { AutocompleteEngine } from './autocomplete.ts';
 import type { SelectionManager } from './selection.ts';
@@ -9,7 +9,7 @@ import type { WrappedPromptInfo } from './handler-prompt-buffer.ts';
 import { cleanupMarkerRegistry, expandPrompt, findMarkerAtPos, registerPaste } from './handler-content-actions.ts';
 import type { PanelManager } from '../panels/panel-manager.ts';
 import type { KeybindingsManager } from './keybindings.ts';
-import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 export type PanelFocusRouteState = {
   panelManager: PanelManager;

package/src/input/handler-feed.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 { CommandContext, CommandRegistry } from './command-registry.ts';
 import { AutocompleteEngine } from './autocomplete.ts';
@@ -151,7 +151,7 @@ export interface InputFeedContext {
   readonly handleBlockToggle: () => void;
   readonly findMarkerAtPos: (pos: number) => { start: number; end: number } | null;
   readonly cleanupMarkerRegistry: (text: string) => void;
-  readonly expandPrompt: (text: string) => string | import('@pellux/goodvibes-sdk/platform/providers/interface').ContentPart[];
+  readonly expandPrompt: (text: string) => string | import('@pellux/goodvibes-sdk/platform/providers').ContentPart[];
   readonly openModelPickerWithTarget: (target: ModelPickerTarget, source?: 'settings' | 'onboarding') => boolean;
   readonly openProviderModelPickerWithTarget: (target: ModelPickerTarget, source?: 'settings' | 'onboarding') => boolean;
   readonly onModelPickerCommit: () => boolean;

package/src/input/handler-interactions.ts

@@ -1,4 +1,4 @@
-import { buildProviderAccountSnapshot } from '@pellux/goodvibes-sdk/platform/runtime/provider-accounts/registry';
+import { buildProviderAccountSnapshot } from '@/runtime/index.ts';
 import type { OnboardingWizardMode } from './onboarding/onboarding-wizard.ts';
 import { collectOnboardingSnapshot, readOnboardingCheckMarker, writeOnboardingCheckMarker } from '../runtime/onboarding/index.ts';
 import { cleanupMarkerRegistry, expandPrompt, findMarkerAtPos, handleBlockCopy, handleBlockRerun, handleBlockSave, handleBlockToggle, handleBookmark, handleClipboardPaste, handleCopy, handleCtrlC, handleDiffApply, registerPaste } from './handler-content-actions.ts';

package/src/input/handler-modal-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 type { SelectionResult, SelectionAction } from './selection-modal.ts';
 import type { CommandContext } from './command-registry.ts';
 import { openTtsProviderPicker, openTtsVoicePicker } from './tts-settings-actions.ts';
@@ -244,7 +244,6 @@ type SettingsRouteState = {
 function syncRuntimeAfterSettingReset(ctx: CommandContext | undefined, key: string, value: unknown): void {
   if (!ctx) return;
   if (key === 'provider.model') ctx.session.runtime.model = String(value);
-  if (key === 'provider.provider') ctx.session.runtime.provider = String(value);
   if (key === 'provider.reasoningEffort') ctx.session.runtime.reasoningEffort = String(value);
 }
 

package/src/input/handler-modal-token-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 type { InfiniteBuffer } from '../core/history.ts';
 import type { SelectionResult, SelectionModal } from './selection-modal.ts';
 import type { BookmarkModal } from './bookmark-modal.ts';

package/src/input/handler-onboarding.ts

@@ -1,7 +1,8 @@
-import { createOAuthLocalListener } from '@pellux/goodvibes-sdk/platform/config/oauth-local-listener';
-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 { createOAuthLocalListener } from '@pellux/goodvibes-sdk/platform/config';
+import { beginOpenAICodexLogin, exchangeOpenAICodexCode } from '@pellux/goodvibes-sdk/platform/config';
+import { openExternalUrl } from '@pellux/goodvibes-sdk/platform/utils';
+import { getProviderIdFromModel } from '../config/provider-model.ts';
+import { buildProviderAccountSnapshot } from '@/runtime/index.ts';
 import { OnboardingWizardController, type OnboardingWizardAction, type OnboardingWizardApplyFeedback } from './onboarding/onboarding-wizard.ts';
 import { handleCloudflareOnboardingActionForHandler, maybeProvisionCloudflareOnFinalApplyForHandler } from './handler-onboarding-cloudflare.ts';
 import { applyOnboardingRequest, collectOnboardingSnapshot, verifyOnboardingRequest } from '../runtime/onboarding/index.ts';
@@ -545,8 +546,10 @@ export function syncRuntimeFromOnboardingRequestForHandler(handler: InputHandler
 
     for (const operation of request.operations) {
       if (operation.kind !== 'set-config') continue;
-      if (operation.key === 'provider.model' && typeof operation.value === 'string') runtime.model = operation.value;
-      if (operation.key === 'provider.provider' && typeof operation.value === 'string') runtime.provider = operation.value;
+      if (operation.key === 'provider.model' && typeof operation.value === 'string') {
+        runtime.model = operation.value;
+        runtime.provider = getProviderIdFromModel(operation.value);
+      }
       if (operation.key === 'provider.reasoningEffort' && typeof operation.value === 'string') runtime.reasoningEffort = operation.value;
     }
   }