@pellux/goodvibes-agent 1.1.4 → 1.1.6

package/src/input/agent-workspace-subscription-editor.ts

@@ -0,0 +1,214 @@
+import { beginOpenAICodexLogin, exchangeOpenAICodexCode, getSubscriptionProviderConfig } from '@pellux/goodvibes-sdk/platform/config';
+import type { OAuthProviderConfig, ProviderSubscription } from '@pellux/goodvibes-sdk/platform/config';
+import { openExternalUrl } from '@pellux/goodvibes-sdk/platform/utils';
+import type { CommandContext } from './command-registry.ts';
+import { isAffirmative } from './agent-workspace-editors.ts';
+import { buildAgentWorkspaceRuntimeSnapshot } from './agent-workspace-snapshot.ts';
+import type { AgentWorkspaceActionResult, AgentWorkspaceLocalEditor, AgentWorkspaceRuntimeSnapshot } from './agent-workspace-types.ts';
+
+export interface AgentWorkspaceSubscriptionEditorHost {
+  localEditor: AgentWorkspaceLocalEditor | null;
+  runtimeSnapshot: AgentWorkspaceRuntimeSnapshot | null;
+  status: string;
+  lastActionResult: AgentWorkspaceActionResult | null;
+  clampSelection(): void;
+}
+
+export type AgentWorkspaceSubscriptionFieldReader = (id: string) => string;
+
+export async function submitAgentWorkspaceSubscriptionLoginStartEditor(
+  host: AgentWorkspaceSubscriptionEditorHost,
+  editor: AgentWorkspaceLocalEditor,
+  context: CommandContext | null,
+  readField: AgentWorkspaceSubscriptionFieldReader,
+): Promise<void> {
+  if (!isAffirmative(readField('confirm'))) {
+    host.localEditor = { ...editor, message: 'Subscription login start not confirmed. Type yes, then press Enter.' };
+    host.status = 'Subscription login start not confirmed.';
+    return;
+  }
+  try {
+    const provider = readField('provider') || 'openai';
+    const openBrowser = isAffirmative(readField('openBrowser'));
+    const { manager, services } = subscriptionServices(context);
+    const resolved = getSubscriptionProviderConfig(provider, services.get(provider));
+    if (!resolved) {
+      throw new Error(`OAuth is not configured for ${provider}. Add an OAuth provider service or choose a built-in subscription provider.`);
+    }
+
+    const started = provider === 'openai' && resolved.source === 'builtin'
+      ? await beginOpenAICodexLogin()
+      : null;
+    const authorizationUrl = started
+      ? started.authorizationUrl
+      : (await manager.beginOAuthLogin(provider, resolveManualLoginConfig(resolved.oauth))).authorizationUrl;
+
+    if (started) {
+      manager.savePending({
+        provider,
+        state: started.state,
+        verifier: started.verifier,
+        redirectUri: started.redirectUri,
+        createdAt: Date.now(),
+      });
+    }
+
+    const browserOpened = openBrowser ? await openExternalUrl(authorizationUrl) : false;
+    host.localEditor = null;
+    host.runtimeSnapshot = context ? buildAgentWorkspaceRuntimeSnapshot(context) : host.runtimeSnapshot;
+    host.status = `Subscription login started for ${provider}.`;
+    host.lastActionResult = {
+      kind: 'refreshed',
+      title: 'Subscription login started',
+      detail: [
+        `Provider: ${provider}.`,
+        `Browser: ${openBrowser ? (browserOpened ? 'opened' : 'open failed') : 'skipped'}.`,
+        'Use Finish subscription login with the callback code or redirect URL.',
+        `Authorization URL: ${authorizationUrl}`,
+      ].join(' '),
+      safety: 'safe',
+    };
+    host.clampSelection();
+  } catch (error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    host.localEditor = { ...editor, message: detail };
+    host.status = detail;
+    host.lastActionResult = { kind: 'error', title: 'Subscription login start failed', detail, safety: 'safe' };
+  }
+}
+
+export async function submitAgentWorkspaceSubscriptionLoginFinishEditor(
+  host: AgentWorkspaceSubscriptionEditorHost,
+  editor: AgentWorkspaceLocalEditor,
+  context: CommandContext | null,
+  readField: AgentWorkspaceSubscriptionFieldReader,
+): Promise<void> {
+  if (!isAffirmative(readField('confirm'))) {
+    host.localEditor = { ...editor, message: 'Subscription login finish not confirmed. Type yes, then press Enter.' };
+    host.status = 'Subscription login finish not confirmed.';
+    return;
+  }
+  try {
+    const provider = readField('provider') || 'openai';
+    const codeInput = readField('code');
+    const code = extractAuthorizationCode(codeInput) ?? codeInput;
+    const { manager, services } = subscriptionServices(context);
+    const resolved = getSubscriptionProviderConfig(provider, services.get(provider));
+    if (!resolved) {
+      throw new Error(`OAuth is not configured for ${provider}. Start with a configured or built-in subscription provider.`);
+    }
+
+    const record = provider === 'openai' && resolved.source === 'builtin'
+      ? (() => {
+        const pending = manager.getPending(provider);
+        if (!pending) throw new Error(`No pending OAuth login for ${provider}. Start subscription login first.`);
+        return exchangeOpenAICodexCode(code, pending.verifier).then((token) => {
+          const now = Date.now();
+          return manager.saveSubscription({
+            provider,
+            accessToken: token.accessToken,
+            tokenType: token.tokenType,
+            ...(typeof token.refreshToken === 'string' && token.refreshToken.length > 0
+              ? { refreshToken: token.refreshToken }
+              : {}),
+            ...(typeof token.expiresAt === 'number' && Number.isFinite(token.expiresAt)
+              ? { expiresAt: token.expiresAt }
+              : {}),
+            ...(token.scopes ? { scopes: token.scopes } : {}),
+            authMode: 'oauth',
+            overrideAmbientApiKeys: false,
+            createdAt: manager.get(provider)?.createdAt ?? now,
+            updatedAt: now,
+          });
+        });
+      })()
+      : manager.completeOAuthLogin(provider, resolveManualLoginConfig(resolved.oauth), code);
+
+    const saved = await record;
+    host.localEditor = null;
+    host.runtimeSnapshot = context ? buildAgentWorkspaceRuntimeSnapshot(context) : host.runtimeSnapshot;
+    host.status = `Subscription session saved for ${provider}.`;
+    host.lastActionResult = {
+      kind: 'refreshed',
+      title: 'Subscription session saved',
+      detail: [
+        `Provider: ${provider}.`,
+        `Token type: ${saved.tokenType}.`,
+        `Expires: ${saved.expiresAt ? new Date(saved.expiresAt).toISOString() : 'n/a'}.`,
+        describeSubscriptionPrecedence(saved),
+      ].join(' '),
+      safety: 'safe',
+    };
+    host.clampSelection();
+  } catch (error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    host.localEditor = { ...editor, message: detail };
+    host.status = detail;
+    host.lastActionResult = { kind: 'error', title: 'Subscription login finish failed', detail, safety: 'safe' };
+  }
+}
+
+export function submitAgentWorkspaceSubscriptionLogoutEditor(
+  host: AgentWorkspaceSubscriptionEditorHost,
+  editor: AgentWorkspaceLocalEditor,
+  context: CommandContext | null,
+  readField: AgentWorkspaceSubscriptionFieldReader,
+): void {
+  if (!isAffirmative(readField('confirm'))) {
+    host.localEditor = { ...editor, message: 'Subscription logout not confirmed. Type yes, then press Enter.' };
+    host.status = 'Subscription logout not confirmed.';
+    return;
+  }
+  try {
+    const provider = readField('provider') || 'openai';
+    const { manager } = subscriptionServices(context);
+    const removed = manager.logout(provider);
+    host.localEditor = null;
+    host.runtimeSnapshot = context ? buildAgentWorkspaceRuntimeSnapshot(context) : host.runtimeSnapshot;
+    host.status = removed ? `Logged out of ${provider}.` : `No subscription session existed for ${provider}.`;
+    host.lastActionResult = {
+      kind: removed ? 'refreshed' : 'guidance',
+      title: removed ? 'Subscription session removed' : 'No subscription session found',
+      detail: removed
+        ? `Removed active or pending subscription state for ${provider}. Ambient API key resolution applies if configured.`
+        : `No active or pending subscription state existed for ${provider}.`,
+      safety: 'safe',
+    };
+    host.clampSelection();
+  } catch (error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    host.localEditor = { ...editor, message: detail };
+    host.status = detail;
+    host.lastActionResult = { kind: 'error', title: 'Subscription logout failed', detail, safety: 'safe' };
+  }
+}
+
+function subscriptionServices(context: CommandContext | null) {
+  const manager = context?.platform.subscriptionManager;
+  const services = context?.platform.serviceRegistry;
+  if (!manager || !services) throw new Error('Subscription services are unavailable in this runtime.');
+  return { manager, services };
+}
+
+function extractAuthorizationCode(input: string): string | null {
+  const trimmed = input.trim();
+  if (!trimmed) return null;
+  try {
+    const url = new URL(trimmed);
+    return url.searchParams.get('code');
+  } catch {
+    return null;
+  }
+}
+
+function resolveManualLoginConfig(config: OAuthProviderConfig): OAuthProviderConfig {
+  return config.manualRedirectUri
+    ? { ...config, redirectUri: config.manualRedirectUri }
+    : config;
+}
+
+function describeSubscriptionPrecedence(record: Pick<ProviderSubscription, 'overrideAmbientApiKeys'>): string {
+  return record.overrideAmbientApiKeys
+    ? 'Subscription routing now overrides ambient API keys for this provider.'
+    : 'Subscription session is stored for subscription-backed flows; ambient API keys are unchanged.';
+}

package/src/input/agent-workspace-types.ts

@@ -1,3 +1,4 @@
+import type { ModelPickerTarget } from './model-picker.ts';
 import type { AgentWorkspaceChannelStatus } from './agent-workspace-channels.ts';
 import type { AgentWorkspaceSetupChecklistItem } from './agent-workspace-setup.ts';
 import type { AgentWorkspaceVoiceMediaReadiness } from './agent-workspace-voice-media.ts';
@@ -17,7 +18,7 @@ export const AGENT_WORKSPACE_CATEGORY_IDS = [
   'onboarding-channels',
   'onboarding-voice-media',
   'onboarding-context',
-  'onboarding-verify',
+  'onboarding-automation',
   'research',
   'artifacts',
   'conversation',
@@ -40,7 +41,7 @@ export const AGENT_WORKSPACE_CATEGORY_IDS = [
 
 export type AgentWorkspaceCategoryId = (typeof AGENT_WORKSPACE_CATEGORY_IDS)[number];
 
-export type AgentWorkspaceActionKind = 'command' | 'guidance' | 'workspace' | 'editor' | 'setting' | 'settings-import' | 'local-selection' | 'local-operation' | 'onboarding-complete';
+export type AgentWorkspaceActionKind = 'command' | 'guidance' | 'workspace' | 'editor' | 'setting' | 'settings-import' | 'model-picker' | 'settings-modal' | 'local-selection' | 'local-operation' | 'onboarding-complete';
 
 export type AgentWorkspaceLocalEditorKind = 'memory' | 'note' | 'persona' | 'skill' | 'routine' | 'profile';
 
@@ -258,6 +259,9 @@ export interface AgentWorkspaceAction {
   readonly editorKind?: AgentWorkspaceEditorKind;
   readonly settingKey?: string;
   readonly settingValueHint?: string;
+  readonly modelPickerTarget?: ModelPickerTarget;
+  readonly modelPickerFlow?: 'providerModel' | 'model';
+  readonly settingsTarget?: string;
   readonly visibleWhenSettingKey?: string;
   readonly visibleWhenSettingValue?: string | boolean | number;
   readonly localKind?: AgentWorkspaceLocalEditorKind;
@@ -362,11 +366,49 @@ export interface AgentWorkspaceRuntimeSnapshot {
   readonly provider: string;
   readonly model: string;
   readonly modelDisplayName: string;
+  readonly embeddingProvider: string;
+  readonly reasoningEffort: string;
+  readonly helperEnabled: boolean;
+  readonly toolLlmEnabled: boolean;
+  readonly providerFailureHints: boolean;
+  readonly cacheEnabled: boolean;
+  readonly cacheStableTtl: string;
+  readonly cacheMonitorHitRate: boolean;
+  readonly cacheHitRateWarningThreshold: number;
+  readonly hitlMode: string;
+  readonly guidanceMode: string;
+  readonly saveHistory: boolean;
+  readonly autoApprove: boolean;
+  readonly autoCompactThreshold: number;
+  readonly staleContextWarnings: boolean;
+  readonly showThinking: boolean;
+  readonly showReasoningSummary: boolean;
+  readonly theme: string;
+  readonly stream: boolean;
+  readonly lineNumbers: string;
+  readonly operationalMessages: string;
+  readonly systemMessages: string;
+  readonly releaseChannel: string;
+  readonly permissionMode: string;
+  readonly toolAutoHeal: boolean;
+  readonly toolsDefaultTokenBudget: number;
+  readonly artifactMaxBytes: number;
+  readonly rawPromptTelemetry: boolean;
+  readonly automationEnabled: boolean;
+  readonly automationMaxConcurrentRuns: number;
+  readonly automationRunHistoryLimit: number;
+  readonly automationDefaultTimeoutMs: number;
+  readonly automationCatchUpWindowMinutes: number;
+  readonly automationFailureCooldownMs: number;
+  readonly automationDeleteAfterRun: boolean;
   readonly sessionId: string;
   readonly workingDirectory: string;
   readonly homeDirectory: string;
   readonly runtimeBaseUrl: string;
   readonly runtimeOwnership: 'external';
+  readonly activeSubscriptionCount: number;
+  readonly pendingSubscriptionCount: number;
+  readonly availableSubscriptionProviderCount: number;
   readonly sessionMemoryCount: number;
   readonly localMemoryCount: number;
   readonly localMemoryReviewQueueCount: number;

package/src/input/agent-workspace.ts

@@ -6,21 +6,21 @@ import type { CommandContext } from './command-registry.ts';
 import { AgentNoteRegistry } from '../agent/note-registry.ts';
 import { AgentPersonaRegistry } from '../agent/persona-registry.ts';
 import { AgentRoutineRegistry } from '../agent/routine-registry.ts';
-import { createAgentRuntimeProfile, type AgentRuntimeProfileInfo } from '../agent/runtime-profile.ts';
+import type { AgentRuntimeProfileInfo } from '../agent/runtime-profile.ts';
 import { AgentSkillRegistry } from '../agent/skill-registry.ts';
 import { activateAgentWorkspaceSelection } from './agent-workspace-activation.ts';
 import { AGENT_WORKSPACE_CATEGORIES } from './agent-workspace-categories.ts';
 import { buildAgentWorkspaceCommandEditorSubmission, isAgentWorkspaceCommandEditorKind } from './agent-workspace-command-editor.ts';
-import { createDeleteEditor, editorCategoryId, isAffirmative, splitList } from './agent-workspace-editors.ts';
-import { createAgentWorkspaceLearnedBehavior } from './agent-workspace-learned-behavior.ts';
+import { createDeleteEditor, editorCategoryId } from './agent-workspace-editors.ts';
+import { submitAgentWorkspaceLocalRegistryEditor } from './agent-workspace-local-editor-submission.ts';
 import { clampAgentWorkspaceLocalLibrarySelection, moveAgentWorkspaceLocalLibraryItemSelection, selectedAgentWorkspaceLocalLibraryItem, type AgentWorkspaceLocalSelectionIndexes } from './agent-workspace-local-selection.ts';
 import { applyAgentWorkspaceLocalLibraryOperation } from './agent-workspace-local-operations.ts';
 import { deleteAgentWorkspaceMemoryEditor, submitAgentWorkspaceMemoryEditor } from './agent-workspace-memory-editor.ts';
 import { jumpAgentWorkspaceSelection, moveAgentWorkspaceSelection, selectAgentWorkspaceCategory } from './agent-workspace-navigation.ts';
-import { buildAgentWorkspaceRequirements } from './agent-workspace-requirements.ts';
 import { appendAgentWorkspaceActionSearchText, backspaceAgentWorkspaceActionSearch, beginAgentWorkspaceActionSearch, clearAgentWorkspaceActionSearch, commitAgentWorkspaceActionSearchSelection, searchAgentWorkspaceActions } from './agent-workspace-search.ts';
 import { agentWorkspaceSettingSchema, applyAgentWorkspaceSettingValue, buildAgentWorkspaceSettingActionEffect, importAgentWorkspaceTuiSettings, isAgentWorkspaceActionVisible } from './agent-workspace-settings.ts';
 import { buildAgentWorkspaceRuntimeSnapshot } from './agent-workspace-snapshot.ts';
+import { submitAgentWorkspaceSubscriptionLoginFinishEditor, submitAgentWorkspaceSubscriptionLoginStartEditor, submitAgentWorkspaceSubscriptionLogoutEditor } from './agent-workspace-subscription-editor.ts';
 import type { AgentWorkspaceAction, AgentWorkspaceActionResult, AgentWorkspaceActionSearchResult, AgentWorkspaceCategory, AgentWorkspaceCommandDispatcher, AgentWorkspaceEditorField, AgentWorkspaceFocusPane, AgentWorkspaceLocalEditor, AgentWorkspaceLocalEditorKind, AgentWorkspaceLocalLibraryItem, AgentWorkspaceLocalOperation, AgentWorkspacePromptDispatcher, AgentWorkspaceRuntimeSnapshot } from './agent-workspace-types.ts';
 import { writeOnboardingCheckMarker, writeOnboardingCompletionMarker } from '../runtime/onboarding/index.ts';
 
@@ -333,6 +333,55 @@ export class AgentWorkspace {
     }
   }
 
+  openModelPickerAction(action: AgentWorkspaceAction, requestRender?: () => void): void {
+    const target = action.modelPickerTarget ?? 'main';
+    const opened = action.modelPickerFlow === 'model'
+      ? this.context?.openModelPickerWithTarget?.(target)
+      : this.context?.openProviderModelPickerWithTarget?.(target);
+    if (!opened) {
+      this.status = 'Model picker is unavailable.';
+      this.lastActionResult = {
+        kind: 'error',
+        title: 'Model picker unavailable',
+        detail: 'This runtime cannot open the model picker from Agent workspace.',
+        safety: action.safety,
+      };
+      requestRender?.();
+      return;
+    }
+    this.status = `Opening ${action.label}.`;
+    this.lastActionResult = {
+      kind: 'dispatched',
+      title: `Opening ${action.label}`,
+      detail: 'Opened the shared provider/model picker for this setup target.',
+      safety: action.safety,
+    };
+    requestRender?.();
+  }
+
+  openSettingsModalAction(action: AgentWorkspaceAction, requestRender?: () => void): void {
+    if (!this.context?.openSettingsModal) {
+      this.status = 'Settings are unavailable.';
+      this.lastActionResult = {
+        kind: 'error',
+        title: 'Settings unavailable',
+        detail: 'This runtime cannot open settings from Agent workspace.',
+        safety: action.safety,
+      };
+      requestRender?.();
+      return;
+    }
+    this.context.openSettingsModal(action.settingsTarget);
+    this.status = `Opening ${action.label}.`;
+    this.lastActionResult = {
+      kind: 'dispatched',
+      title: `Opening ${action.label}`,
+      detail: 'Opened the shared settings surface for this setup area.',
+      safety: action.safety,
+    };
+    requestRender?.();
+  }
+
   applySettingAction(action: AgentWorkspaceAction, requestRender?: () => void): void {
     const effect = buildAgentWorkspaceSettingActionEffect(this.context, action);
     if (effect.kind === 'result') {
@@ -446,6 +495,19 @@ export class AgentWorkspace {
       this.status = `${missing.label} is required.`;
       return;
     }
+    if (editor.kind === 'subscription-login-start') {
+      void submitAgentWorkspaceSubscriptionLoginStartEditor(this, editor, this.context, (id) => this.editorField(id)).finally(() => requestRender?.());
+      return;
+    }
+    if (editor.kind === 'subscription-login-finish') {
+      void submitAgentWorkspaceSubscriptionLoginFinishEditor(this, editor, this.context, (id) => this.editorField(id)).finally(() => requestRender?.());
+      return;
+    }
+    if (editor.kind === 'subscription-logout') {
+      submitAgentWorkspaceSubscriptionLogoutEditor(this, editor, this.context, (id) => this.editorField(id));
+      requestRender?.();
+      return;
+    }
     if (isAgentWorkspaceCommandEditorKind(editor.kind)) {
       this.submitCommandEditor(editor);
       requestRender?.();
@@ -496,135 +558,13 @@ export class AgentWorkspace {
       return;
     }
     try {
-      if (editor.mode === 'delete') {
-        this.submitLocalDeleteEditor(shellPaths, editor);
-        return;
-      }
-      if (editor.kind === 'learned-behavior') {
-        const created = createAgentWorkspaceLearnedBehavior(shellPaths, {
-          target: this.learnedBehaviorTarget(),
-          name: this.editorField('name'),
-          description: this.editorField('description'),
-          notes: this.editorField('notes'),
-          tags: splitList(this.editorField('tags')),
-          triggers: splitList(this.editorField('triggers')),
-          enable: isAffirmative(this.editorField('enable')),
-        });
-        this.finishLocalEditor(created.kind, created.id, created.name, 'Created');
-      } else if (editor.kind === 'profile') {
-        const template = this.editorField('template');
-        const templateId = template && template.toLowerCase() !== 'none' ? template : undefined;
-        const profile = createAgentRuntimeProfile(shellPaths.homeDirectory, this.editorField('name'), {
-          ...(templateId ? { templateId } : {}),
-        });
-        this.finishProfileEditor(profile);
-      } else if (editor.kind === 'note') {
-        const registry = AgentNoteRegistry.fromShellPaths(shellPaths);
-        if (editor.mode === 'update' && editor.recordId) {
-          const updated = registry.update(editor.recordId, {
-            title: this.editorField('title'),
-            body: this.editorField('body'),
-            sourceUrl: this.editorField('sourceUrl'),
-            tags: splitList(this.editorField('tags')),
-            provenance: 'Workspace',
-          });
-          this.finishLocalEditor(editor.kind, updated.id, updated.title, 'Updated');
-          return;
-        }
-        const created = registry.create({
-          title: this.editorField('title'),
-          body: this.editorField('body'),
-          sourceUrl: this.editorField('sourceUrl'),
-          tags: splitList(this.editorField('tags')),
-          source: 'user',
-          provenance: 'Workspace',
-        });
-        this.finishLocalEditor(editor.kind, created.id, created.title, 'Created');
-      } else if (editor.kind === 'persona') {
-        const registry = AgentPersonaRegistry.fromShellPaths(shellPaths);
-        if (editor.mode === 'update' && editor.recordId) {
-          const wasActive = registry.snapshot().activePersonaId === editor.recordId;
-          const updated = registry.update(editor.recordId, {
-            name: this.editorField('name'),
-            description: this.editorField('description'),
-            body: this.editorField('body'),
-            tags: splitList(this.editorField('tags')),
-            triggers: splitList(this.editorField('triggers')),
-            provenance: 'Workspace',
-          });
-          if (isAffirmative(this.editorField('activate'))) registry.setActive(updated.id);
-          else if (wasActive) registry.clearActive();
-          this.finishLocalEditor(editor.kind, updated.id, updated.name, 'Updated');
-          return;
-        }
-        const created = registry.create({
-          name: this.editorField('name'),
-          description: this.editorField('description'),
-          body: this.editorField('body'),
-          tags: splitList(this.editorField('tags')),
-          triggers: splitList(this.editorField('triggers')),
-          source: 'user',
-          provenance: 'Workspace',
-        });
-        if (isAffirmative(this.editorField('activate'))) registry.setActive(created.id);
-        this.finishLocalEditor(editor.kind, created.id, created.name, 'Created');
-      } else if (editor.kind === 'skill') {
-        const registry = AgentSkillRegistry.fromShellPaths(shellPaths);
-        if (editor.mode === 'update' && editor.recordId) {
-          const updated = registry.update(editor.recordId, {
-            name: this.editorField('name'),
-            description: this.editorField('description'),
-            procedure: this.editorField('procedure'),
-            triggers: splitList(this.editorField('triggers')),
-            tags: splitList(this.editorField('tags')),
-            requirements: buildAgentWorkspaceRequirements((id) => this.editorField(id)),
-            provenance: 'Workspace',
-          });
-          registry.setEnabled(updated.id, isAffirmative(this.editorField('enabled')));
-          this.finishLocalEditor(editor.kind, updated.id, updated.name, 'Updated');
-          return;
-        }
-        const created = registry.create({
-          name: this.editorField('name'),
-          description: this.editorField('description'),
-          procedure: this.editorField('procedure'),
-          triggers: splitList(this.editorField('triggers')),
-          tags: splitList(this.editorField('tags')),
-          requirements: buildAgentWorkspaceRequirements((id) => this.editorField(id)),
-          enabled: isAffirmative(this.editorField('enabled')),
-          source: 'user',
-          provenance: 'Workspace',
-        });
-        this.finishLocalEditor(editor.kind, created.id, created.name, 'Created');
-      } else {
-        const registry = AgentRoutineRegistry.fromShellPaths(shellPaths);
-        if (editor.mode === 'update' && editor.recordId) {
-          const updated = registry.update(editor.recordId, {
-            name: this.editorField('name'),
-            description: this.editorField('description'),
-            steps: this.editorField('steps'),
-            triggers: splitList(this.editorField('triggers')),
-            tags: splitList(this.editorField('tags')),
-            requirements: buildAgentWorkspaceRequirements((id) => this.editorField(id)),
-            provenance: 'Workspace',
-          });
-          registry.setEnabled(updated.id, isAffirmative(this.editorField('enabled')));
-          this.finishLocalEditor(editor.kind, updated.id, updated.name, 'Updated');
-          return;
-        }
-        const created = registry.create({
-          name: this.editorField('name'),
-          description: this.editorField('description'),
-          steps: this.editorField('steps'),
-          triggers: splitList(this.editorField('triggers')),
-          tags: splitList(this.editorField('tags')),
-          requirements: buildAgentWorkspaceRequirements((id) => this.editorField(id)),
-          enabled: isAffirmative(this.editorField('enabled')),
-          source: 'user',
-          provenance: 'Workspace',
-        });
-        this.finishLocalEditor(editor.kind, created.id, created.name, 'Created');
-      }
+      submitAgentWorkspaceLocalRegistryEditor(shellPaths, editor, {
+        readField: (id) => this.editorField(id),
+        learnedBehaviorTarget: () => this.learnedBehaviorTarget(),
+        submitDeleteEditor: () => this.submitLocalDeleteEditor(shellPaths, editor),
+        finishLocalEditor: (kind, id, name, verb) => this.finishLocalEditor(kind, id, name, verb),
+        finishProfileEditor: (profile) => this.finishProfileEditor(profile),
+      });
     } catch (error) {
       const detail = error instanceof Error ? error.message : String(error);
       this.localEditor = { ...editor, message: detail };

package/src/input/handler-modal-token-routes.ts

@@ -131,6 +131,18 @@ export function handleModalTokenRoutes(state: ModalTokenRouteState, token: Input
     return withState(state, true);
   }
 
+  if (handleModelPickerToken({
+    modelPicker: state.modelPicker,
+    modalStack: state.modalStack,
+    commandContext: state.commandContext,
+    getViewportHeight: state.getViewportHeight,
+    requestRender: state.requestRender,
+    handleEscape: state.handleEscape,
+    onModelPickerCommit: state.onModelPickerCommit,
+  }, token)) {
+    return withState(state, true);
+  }
+
   if (handleSettingsModalToken({
     settingsModal: state.settingsModal,
     commandContext: state.commandContext,
@@ -200,18 +212,6 @@ export function handleModalTokenRoutes(state: ModalTokenRouteState, token: Input
     return withState(state, true, historyState);
   }
 
-  if (handleModelPickerToken({
-    modelPicker: state.modelPicker,
-    modalStack: state.modalStack,
-    commandContext: state.commandContext,
-    getViewportHeight: state.getViewportHeight,
-    requestRender: state.requestRender,
-    handleEscape: state.handleEscape,
-    onModelPickerCommit: state.onModelPickerCommit,
-  }, token)) {
-    return withState(state, true);
-  }
-
   if (handleLiveTailToken({
     liveTailModal: state.liveTailModal,
     processModal: state.processModal,

package/src/input/handler.ts

@@ -336,7 +336,8 @@ export class InputHandler {
   public handleBlockToggle(): void { handleBlockToggleForHandler(this); }
   public handleCtrlC(): void { handleCtrlCForHandler(this); }
   public modalOpened(name: string): void {
-    if (name !== 'agentWorkspace' && this.agentWorkspace.active) {
+    const keepAgentWorkspaceUnderlay = name === 'modelPicker' || name === 'settings';
+    if (name !== 'agentWorkspace' && !keepAgentWorkspaceUnderlay && this.agentWorkspace.active) {
       this.closeAgentWorkspaceModal();
     }
     modalOpenedForHandler(this, name);

package/src/main.ts

@@ -15,6 +15,8 @@ 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 { renderModelWorkspace } from './renderer/model-workspace.ts';
+import { renderSettingsModal } from './renderer/settings-modal.ts';
 import { registerBuiltinCommands } from './input/commands.ts';
 import { ScheduleManager } from '@pellux/goodvibes-sdk/platform/tools';
 import { InputHistory } from './input/input-history.ts';
@@ -40,7 +42,7 @@ import {
 } from '@/runtime/index.ts';
 import type { SessionSnapshot } from '@/runtime/index.ts';
 import { handleBlockingShellInput, type PendingPermissionState } from './shell/blocking-input.ts';
-import { createAgentWorkspaceFullscreenComposite } from './shell/agent-workspace-fullscreen.ts';
+import { createAgentWorkspaceFullscreenComposite, createFullscreenCompositeFromLines } from './shell/agent-workspace-fullscreen.ts';
 import { getTerminalSize } from './shell/terminal-size.ts';
 import { wireShellUiOpeners } from './shell/ui-openers.ts';
 import { deriveComposerState } from './core/composer-state.ts';
@@ -477,6 +479,14 @@ async function main() {
       input.setPanelMouseLayout(null);
       activeConversationWidth = width;
       conversation.setSplashSuppressed(true);
+      if (input.modelPicker.active) {
+        compositor.composite(createFullscreenCompositeFromLines(renderModelWorkspace(input.modelPicker, width, height), width, height));
+        return;
+      }
+      if (input.settingsModal.active) {
+        compositor.composite(createFullscreenCompositeFromLines(renderSettingsModal(input.settingsModal, width, height), width, height));
+        return;
+      }
       compositor.composite(createAgentWorkspaceFullscreenComposite(input.agentWorkspace, width, height));
       return;
     }
@@ -709,7 +719,6 @@ async function main() {
     streamTokenSpeed = elapsed > 0 ? streamDeltaCount / elapsed : 0;
   }));
 
-  // --- Terminal setup ---
   stdin.setRawMode(true);
   stdin.resume();
   stdin.setEncoding('utf8');
@@ -748,11 +757,9 @@ async function main() {
   process.on('unhandledRejection', unhandledRejectionHandler);
   stdout.on('resize', resizeHandler);
 
-  // Initial render
   conversation.rebuildHistory();
   render();
 
-  // --- Crash recovery check ---
   const recoveryInfo = checkRecoveryFile({ workingDirectory: workingDir, homeDirectory });
   if (recoveryInfo) {
     systemMessageRouter.high(`[Recovery] Found unsaved session from ${new Date(recoveryInfo.timestamp).toLocaleString()}. Title: "${recoveryInfo.title}". Press Ctrl+R to restore, Esc to discard, or start typing to ignore it.`);
@@ -763,7 +770,6 @@ async function main() {
     recoveryPending = true;
   }
 
-  // --- Auto-save to recovery file every 60s ---
   recoveryInterval = setInterval(() => {
     const snapshot = buildCurrentSessionSnapshot();
     writeRecoveryFile(
@@ -773,9 +779,7 @@ async function main() {
       { workingDirectory: workingDir, homeDirectory },
     );
   }, 60_000);
-
 }
-
 main().catch((err: unknown) => {
   const detail = formatFatalStartupErrorForLog(err);
   try {