@pellux/goodvibes-agent 0.1.114 → 0.1.117

package/src/input/mcp-workspace.ts

@@ -16,7 +16,7 @@ export const MCP_WORKSPACE_MODAL_NAME = 'mcpWorkspace';
 const MCP_ROLES = ['general', 'docs', 'filesystem', 'git', 'database', 'browser', 'automation', 'ops', 'remote'] as const;
 const MCP_FORM_TRUST_MODES = ['constrained', 'ask-on-risk', 'blocked'] as const;
 
-export type McpWorkspaceMode = 'browse' | 'form' | 'delete-confirm';
+export type McpWorkspaceMode = 'browse' | 'form' | 'delete-confirm' | 'reload-confirm';
 
 export interface McpWorkspaceServerRow {
   readonly name: string;
@@ -62,6 +62,7 @@ export interface McpWorkspaceForm {
   env: string;
   allowedPaths: string;
   allowedHosts: string;
+  confirm: string;
 }
 
 interface McpWorkspaceSnapshot {
@@ -71,8 +72,12 @@ interface McpWorkspaceSnapshot {
   readonly servers: readonly McpWorkspaceServerRow[];
 }
 
-function isTextField(field: keyof McpWorkspaceForm | 'save' | 'cancel'): field is 'name' | 'command' | 'args' | 'env' | 'allowedPaths' | 'allowedHosts' {
-  return field === 'name' || field === 'command' || field === 'args' || field === 'env' || field === 'allowedPaths' || field === 'allowedHosts';
+function isTextField(field: keyof McpWorkspaceForm | 'save' | 'cancel'): field is 'name' | 'command' | 'args' | 'env' | 'allowedPaths' | 'allowedHosts' | 'confirm' {
+  return field === 'name' || field === 'command' || field === 'args' || field === 'env' || field === 'allowedPaths' || field === 'allowedHosts' || field === 'confirm';
+}
+
+function isAffirmative(value: string): boolean {
+  return /^(y|yes|true)$/i.test(value.trim());
 }
 
 function splitList(value: string): string[] {
@@ -141,6 +146,7 @@ function serverConfigToForm(server?: McpServerConfig): McpWorkspaceForm {
     env: server?.env ? Object.entries(server.env).map(([key, value]) => `${key}=${value}`).join(', ') : '',
     allowedPaths: server?.allowedPaths?.join(', ') ?? '',
     allowedHosts: server?.allowedHosts?.join(', ') ?? '',
+    confirm: '',
   };
 }
 
@@ -214,7 +220,7 @@ export class McpWorkspace {
   public formIndex = 0;
   public form: McpWorkspaceForm = serverConfigToForm();
   public editingServerName: string | null = null;
-  public status = 'Ready. Inspect MCP servers and tools. Config writes/reloads require explicit /mcp ... --yes commands.';
+  public status = 'Ready. Inspect MCP servers and tools. Config writes/reloads require explicit workspace confirmation.';
   public tools: readonly RegisteredTool[] = [];
   public loadingTools = false;
   public lastError: string | null = null;
@@ -257,8 +263,8 @@ export class McpWorkspace {
   get rows(): readonly McpWorkspaceRow[] {
     return [
       ...this.snapshot.servers.map((server): McpWorkspaceRow => ({ type: 'server', server })),
-      { type: 'action', id: 'add', label: 'Add server preview', detail: `Draft server details here, then run /mcp add ... --scope ${this.form.scope} --yes to write config.` },
-      { type: 'action', id: 'reload', label: 'Reload guidance', detail: 'Runtime reload is blocked from the workspace; run /mcp reload --yes explicitly.' },
+      { type: 'action', id: 'add', label: 'Add or update server', detail: `Open a confirmed Agent workspace form to save an MCP server in ${this.form.scope} scope.` },
+      { type: 'action', id: 'reload', label: 'Reload runtime', detail: 'Confirm an MCP runtime reload from this workspace after external config edits.' },
       { type: 'action', id: 'refresh-tools', label: 'Refresh tools', detail: 'Fetch the currently available MCP tool list from connected servers.' },
       { type: 'action', id: 'config', label: 'Config locations', detail: 'Show SDK-scanned config files and writable project/global paths.' },
     ];
@@ -284,7 +290,8 @@ export class McpWorkspace {
       { id: 'env', label: 'Environment', value: this.form.env, help: 'Comma-separated KEY=VALUE entries. Prefer env var references or secure secrets for sensitive values.', editable: true },
       { id: 'allowedPaths', label: 'Allowed paths', value: this.form.allowedPaths, help: 'Comma-separated path prefixes for filesystem-oriented servers.', editable: true },
       { id: 'allowedHosts', label: 'Allowed hosts', value: this.form.allowedHosts, help: 'Comma-separated hostnames for network-oriented servers.', editable: true },
-      { id: 'save', label: 'Show save command', value: '', help: 'No workspace write. Shows the explicit /mcp add ... --yes command to run from the prompt.', editable: false },
+      { id: 'confirm', label: 'Confirm', value: this.form.confirm, help: 'Type yes to save this MCP server through the TUI command dispatcher.', editable: true },
+      { id: 'save', label: 'Save server', value: '', help: 'Dispatch the confirmed MCP server add/update through the workspace.', editable: false },
       { id: 'cancel', label: 'Cancel', value: '', help: 'Return to the MCP server browser without changing config.', editable: false },
     ];
   }
@@ -323,11 +330,15 @@ export class McpWorkspace {
     }
   }
 
-  async reloadRuntime(): Promise<void> {
-    if (!this.context) return;
+  requestReload(): void {
     this.lastError = null;
-    this.status = 'MCP runtime reload is blocked in the workspace. Run /mcp reload --yes from the prompt to explicitly reload.';
-    this.context.renderRequest();
+    this.mode = 'reload-confirm';
+    this.status = 'Confirm MCP runtime reload. Press Enter or y to reload; Esc or n cancels.';
+    this.context?.renderRequest();
+  }
+
+  async reloadRuntime(): Promise<void> {
+    await this.dispatchMcpCommand(['reload', '--yes'], 'MCP runtime reload');
   }
 
   openAddForm(): void {
@@ -335,7 +346,7 @@ export class McpWorkspace {
     this.formIndex = 0;
     this.editingServerName = null;
     this.form = serverConfigToForm();
-    this.status = 'Draft an MCP server. Saving from this workspace is blocked; use the shown /mcp add ... --yes command.';
+    this.status = 'Draft an MCP server. Type yes on the Confirm field, then press Enter on Save server.';
   }
 
   openEditForm(serverName: string): void {
@@ -345,7 +356,7 @@ export class McpWorkspace {
     this.editingServerName = serverName;
     this.form = { ...serverConfigToForm(entry?.server), scope: entry?.source.scope === 'global' ? 'global' : 'project' };
     this.status = entry
-      ? `Viewing ${serverName}. Workspace saves are blocked; copy the generated /mcp add ... --yes command if you intend to change it.`
+      ? `Editing ${serverName}. Type yes on the Confirm field, then press Enter on Save server to update it.`
       : `Viewing ${serverName}. Runtime status exists, but no launch config was found.`;
   }
 
@@ -354,23 +365,38 @@ export class McpWorkspace {
     this.editingServerName = serverName;
     const entry = this.snapshot.effectiveConfig.servers.find((configEntry) => configEntry.server.name === serverName);
     const scope = entry?.source.scope === 'global' ? 'global' : 'project';
-    this.status = `MCP server removal is blocked in the workspace. Run /mcp remove ${serverName} --scope ${scope} --yes from the prompt.`;
+    this.status = `Confirm removal of ${serverName} from ${scope} MCP config. Press Enter or y to remove; Esc or n cancels.`;
   }
 
   async saveForm(): Promise<void> {
     if (!this.context) return;
     try {
+      if (!isAffirmative(this.form.confirm)) {
+        this.status = 'MCP server add/update not confirmed. Type yes on the Confirm field, then press Enter on Save server.';
+        this.context.renderRequest();
+        return;
+      }
       const server = formToServerConfig(this.form);
+      const args = [
+        'add',
+        server.name,
+        server.command,
+        ...(server.args ?? []),
+        '--scope',
+        this.form.scope,
+      ];
+      if (server.role) args.push('--role', server.role);
+      if (server.trustMode) args.push('--trust', server.trustMode);
+      for (const [key, value] of Object.entries(server.env ?? {})) args.push('--env', `${key}=${value}`);
+      for (const path of server.allowedPaths ?? []) args.push('--path', path);
+      for (const host of server.allowedHosts ?? []) args.push('--host', host);
+      args.push('--yes');
       this.mode = 'browse';
       this.editingServerName = null;
-      const args = server.args?.length ? ` ${server.args.join(' ')}` : '';
-      const role = server.role ? ` --role ${server.role}` : '';
-      const trust = server.trustMode ? ` --trust ${server.trustMode}` : '';
-      this.status = `MCP config write blocked here. Run: /mcp add ${server.name} ${server.command}${args} --scope ${this.form.scope}${role}${trust} --yes`;
-      this.context.renderRequest();
+      await this.dispatchMcpCommand(args, `MCP server ${server.name} add/update`);
     } catch (error) {
       this.lastError = summarizeError(error);
-      this.status = `Save command preview failed: ${this.lastError}`;
+      this.status = `MCP server save failed before dispatch: ${this.lastError}`;
       this.context.renderRequest();
     }
   }
@@ -382,8 +408,7 @@ export class McpWorkspace {
     const scope = server?.source.scope === 'global' ? 'global' : 'project';
     this.mode = 'browse';
     this.editingServerName = null;
-    this.status = `MCP removal blocked here. Run: /mcp remove ${name} --scope ${scope} --yes`;
-    this.context.renderRequest();
+    await this.dispatchMcpCommand(['remove', name, '--scope', scope, '--yes'], `MCP server ${name} removal`);
   }
 
   cancelForm(): void {
@@ -392,6 +417,35 @@ export class McpWorkspace {
     this.status = 'Returned to MCP server browser.';
   }
 
+  private async dispatchMcpCommand(args: readonly string[], summary: string): Promise<void> {
+    const context = this.context;
+    if (!context?.executeCommand) {
+      this.status = `${summary} blocked: command dispatch is unavailable in this workspace.`;
+      this.lastError = 'Command dispatch is unavailable.';
+      context?.renderRequest();
+      return;
+    }
+    this.status = `${summary} dispatched from MCP workspace.`;
+    this.lastError = null;
+    context.renderRequest();
+    try {
+      const handled = await context.executeCommand('mcp', [...args]);
+      if (!handled) {
+        this.status = `${summary} failed: the command router did not handle /mcp.`;
+        this.lastError = 'Command router did not handle /mcp.';
+        context.renderRequest();
+        return;
+      }
+      this.refreshSnapshot();
+      this.status = `${summary} completed through MCP workspace.`;
+    } catch (error) {
+      this.lastError = summarizeError(error);
+      this.status = `${summary} failed: ${this.lastError}`;
+    } finally {
+      context.renderRequest();
+    }
+  }
+
   moveSelection(delta: number): void {
     const total = this.mode === 'form' ? this.formFields.length : this.rows.length;
     if (total <= 0) return;
@@ -413,6 +467,11 @@ export class McpWorkspace {
       await this.confirmDelete();
       return;
     }
+    if (this.mode === 'reload-confirm') {
+      this.mode = 'browse';
+      await this.reloadRuntime();
+      return;
+    }
     const row = this.selectedRow;
     if (!row) return;
     if (row.type === 'server') {
@@ -420,7 +479,7 @@ export class McpWorkspace {
       return;
     }
     if (row.id === 'add') this.openAddForm();
-    else if (row.id === 'reload') await this.reloadRuntime();
+    else if (row.id === 'reload') this.requestReload();
     else if (row.id === 'refresh-tools') await this.refreshTools();
     else if (row.id === 'config') {
       this.status = [
@@ -478,12 +537,17 @@ export function handleMcpWorkspaceToken(
     } else if (workspace.mode === 'delete-confirm') {
       if (token.value.toLowerCase() === 'y') void workspace.confirmDelete();
       else if (token.value.toLowerCase() === 'n') workspace.cancelForm();
+    } else if (workspace.mode === 'reload-confirm') {
+      if (token.value.toLowerCase() === 'y') {
+        workspace.mode = 'browse';
+        void workspace.reloadRuntime();
+      } else if (token.value.toLowerCase() === 'n') workspace.cancelForm();
     } else {
       const value = token.value.toLowerCase();
       if (value === 'a') workspace.openAddForm();
       else if (value === 'e' && workspace.selectedServer) workspace.openEditForm(workspace.selectedServer.name);
       else if (value === 'd' && workspace.selectedServer) workspace.requestDelete(workspace.selectedServer.name);
-      else if (value === 'r') void workspace.reloadRuntime();
+      else if (value === 'r') workspace.requestReload();
       else if (value === 't') void workspace.refreshTools();
     }
     requestRender();
@@ -492,7 +556,7 @@ export function handleMcpWorkspaceToken(
 
   if (token.type !== 'key') return true;
   if (token.logicalName === 'escape') {
-    if (workspace.mode === 'form' || workspace.mode === 'delete-confirm') {
+    if (workspace.mode === 'form' || workspace.mode === 'delete-confirm' || workspace.mode === 'reload-confirm') {
       workspace.cancelForm();
       requestRender();
     } else {
@@ -520,7 +584,7 @@ export function handleMcpWorkspaceToken(
   } else if (token.logicalName === 'd' && workspace.mode === 'browse' && workspace.selectedServer) {
     workspace.requestDelete(workspace.selectedServer.name);
   } else if (token.logicalName === 'r' && workspace.mode === 'browse') {
-    void workspace.reloadRuntime();
+    workspace.requestReload();
   } else if (token.logicalName === 't' && workspace.mode === 'browse') {
     void workspace.refreshTools();
   }

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

@@ -62,7 +62,9 @@ export function handleOnboardingWizardToken(state: OnboardingRouteState, token:
     }
 
     if (editing) {
-      if (isEnterKey(token)) {
+      if (token.ctrl && (token.logicalName === 'j' || isEnterKey(token))) {
+        state.onboardingWizard.editNewline();
+      } else if (isEnterKey(token)) {
         state.onboardingWizard.commitEdit();
       } else if ((token.ctrl && token.logicalName === 'u') || token.logicalName === 'delete') {
         state.onboardingWizard.clearEditingValue();

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

@@ -21,6 +21,46 @@ export function buildOnboardingApplyRequest(controller: OnboardingWizardControll
         medium,
       });
     };
+    const readText = (fieldId: string): string => controller.getStringFieldValue(fieldId, '').trim();
+    const maybeCreateLocalPersona = (): void => {
+      const name = readText('agent-local-state.persona-name');
+      const description = readText('agent-local-state.persona-description');
+      const body = readText('agent-local-state.persona-body');
+      if (!name && !description && !body) return;
+      operations.push({
+        kind: 'create-local-persona',
+        name,
+        description,
+        body,
+        activate: true,
+      });
+    };
+    const maybeCreateLocalSkill = (): void => {
+      const name = readText('agent-local-state.skill-name');
+      const description = readText('agent-local-state.skill-description');
+      const procedure = readText('agent-local-state.skill-procedure');
+      if (!name && !description && !procedure) return;
+      operations.push({
+        kind: 'create-local-skill',
+        name,
+        description,
+        procedure,
+        enabled: true,
+      });
+    };
+    const maybeCreateLocalRoutine = (): void => {
+      const name = readText('agent-local-state.routine-name');
+      const description = readText('agent-local-state.routine-description');
+      const steps = readText('agent-local-state.routine-steps');
+      if (!name && !description && !steps) return;
+      operations.push({
+        kind: 'create-local-routine',
+        name,
+        description,
+        steps,
+        enabled: true,
+      });
+    };
 
     // GoodVibes Agent onboarding owns only Agent-local setup and provider
     // routing. Server lifecycle, non-Agent entrypoints, and non-Agent knowledge
@@ -46,7 +86,16 @@ export function buildOnboardingApplyRequest(controller: OnboardingWizardControll
         name: profileName,
         ...(selectedTemplate.length > 0 && selectedTemplate !== 'none' ? { templateId: selectedTemplate } : {}),
       });
+      if (controller.getBooleanFieldValue('agent-setup.profile-default', true)) {
+        operations.push({
+          kind: 'select-agent-profile',
+          name: profileName,
+        });
+      }
     }
+    maybeCreateLocalPersona();
+    maybeCreateLocalSkill();
+    maybeCreateLocalRoutine();
 
     return {
       mode: controller.mode,

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

@@ -49,7 +49,7 @@ export function buildDefaultDerivedState(): OnboardingStepDerivationState {
         required: false,
         accepted: false,
         reason: 'not-needed',
-        detail: 'No connected-service auth signal needs confirmation.',
+        detail: 'No connected-host auth signal needs confirmation.',
       },
     },
   };

package/src/input/onboarding/onboarding-wizard-operator-steps.ts

@@ -1,4 +1,31 @@
 import type { OnboardingWizardStepDefinition } from './onboarding-wizard-types.ts';
+import type { AgentBehaviorDiscoverySnapshot } from '../../agent/behavior-discovery-summary.ts';
+
+function discoveryCount(discovery: AgentBehaviorDiscoverySnapshot | undefined): number {
+  if (!discovery) return 0;
+  return discovery.personas.count + discovery.skills.count + discovery.routines.count;
+}
+
+function discoverySummary(discovery: AgentBehaviorDiscoverySnapshot | undefined): string {
+  if (!discovery || discoveryCount(discovery) === 0) return 'No importable local behavior files found yet';
+  return [
+    `${discovery.personas.count} persona file(s)`,
+    `${discovery.skills.count} skill file(s)`,
+    `${discovery.routines.count} routine file(s)`,
+  ].join('; ');
+}
+
+function discoverySample(discovery: AgentBehaviorDiscoverySnapshot | undefined): string {
+  if (!discovery) return '';
+  const names = [
+    ...discovery.personas.names,
+    ...discovery.skills.names,
+    ...discovery.routines.names,
+  ].slice(0, 4);
+  if (names.length === 0) return 'Use /personas discover, /agent-skills discover, and /routines discover after setup to rescan.';
+  const remaining = discoveryCount(discovery) > names.length ? `, +${discoveryCount(discovery) - names.length} more` : '';
+  return `Import candidates: ${names.join(', ')}${remaining}.`;
+}
 
 export function buildCommunicationStep(): OnboardingWizardStepDefinition {
   return {
@@ -8,7 +35,7 @@ export function buildCommunicationStep(): OnboardingWizardStepDefinition {
     description: 'Prepare companion pairing, messaging-channel readiness, notification delivery, and safe outbound communication for day-one Agent use.',
     summaryTitle: 'Communication posture',
     summaryLines: [
-      'Companion chat: paired through connected GoodVibes services',
+      'Companion chat: paired through the connected GoodVibes host',
       'Channel accounts: inspect readiness before using them',
       'Outbound messages: explicit user action only',
     ],
@@ -17,7 +44,7 @@ export function buildCommunicationStep(): OnboardingWizardStepDefinition {
         kind: 'status',
         id: 'agent-communication.companion',
         label: 'Companion pairing',
-        hint: 'Use /pair from the Agent workspace to pair companion clients through connected GoodVibes services.',
+        hint: 'Use /pair from the Agent workspace to pair companion clients through the connected GoodVibes host.',
         defaultValue: 'Pair when ready',
       },
       {
@@ -128,15 +155,19 @@ export function buildAgentKnowledgeStep(): OnboardingWizardStepDefinition {
   };
 }
 
-export function buildLocalStateStep(): OnboardingWizardStepDefinition {
+export function buildLocalStateStep(discovery?: AgentBehaviorDiscoverySnapshot): OnboardingWizardStepDefinition {
+  const discoveredCount = discoveryCount(discovery);
   return {
     id: 'agent-local-state',
     title: 'Local memory and behavior',
-    shortLabel: 'Memory',
-    description: 'Review the Agent-local behavior model. Memory, personas, skills, routines, and Agent profiles stay local until a stable shared registry exists.',
+    shortLabel: 'Behavior',
+    description: discoveredCount > 0
+      ? 'Review importable Agent-local behavior files, then create an isolated profile from them or import individual records.'
+      : 'Review the Agent-local behavior model. Memory, personas, skills, routines, and Agent profiles stay local until a stable shared registry exists.',
     summaryTitle: 'Local Agent state',
     summaryLines: [
       'Memory/personas/skills/routines: local Agent registries',
+      `Discovered behavior files: ${discoverySummary(discovery)}`,
       'Secrets: rejected or stored by secret reference',
       'Profiles: isolated Agent homes',
     ],
@@ -152,22 +183,106 @@ export function buildLocalStateStep(): OnboardingWizardStepDefinition {
         kind: 'status',
         id: 'agent-local-state.personas',
         label: 'Personas',
-        hint: 'Use /personas to create and activate serial operating modes for the main conversation.',
-        defaultValue: 'Local registry',
+        hint: discovery?.personas.count && discovery.personas.count > 0
+          ? `${discovery.personas.count} persona file(s) are available. Use the Profiles workspace to create a profile from discovered behavior, or preview individual files with /personas discover.`
+          : 'Use /personas to create and activate serial operating modes for the main conversation.',
+        defaultValue: discovery?.personas.count && discovery.personas.count > 0 ? `${discovery.personas.count} discovered` : 'Local registry',
       },
       {
         kind: 'status',
         id: 'agent-local-state.skills',
         label: 'Skills',
-        hint: 'Use /agent-skills and /skills local to manage reusable Agent procedures.',
-        defaultValue: 'Local registry',
+        hint: discovery?.skills.count && discovery.skills.count > 0
+          ? `${discovery.skills.count} skill file(s) are available. Use the Profiles workspace to create a profile from discovered behavior, or preview individual files with /agent-skills discover.`
+          : 'Use /agent-skills and /skills local to manage reusable Agent procedures.',
+        defaultValue: discovery?.skills.count && discovery.skills.count > 0 ? `${discovery.skills.count} discovered` : 'Local registry',
       },
       {
         kind: 'status',
         id: 'agent-local-state.routines',
         label: 'Routines',
-        hint: 'Use /routines for reusable local procedures. Starting a routine prints steps in the main conversation and does not spawn hidden work.',
-        defaultValue: 'Local registry',
+        hint: discovery?.routines.count && discovery.routines.count > 0
+          ? `${discovery.routines.count} routine file(s) are available. Use the Profiles workspace to create a profile from discovered behavior, or preview individual files with /routines discover. ${discoverySample(discovery)}`
+          : 'Use /routines for reusable local procedures. Starting a routine prints steps in the main conversation and does not launch local workers.',
+        defaultValue: discovery?.routines.count && discovery.routines.count > 0 ? `${discovery.routines.count} discovered` : 'Local registry',
+      },
+      {
+        kind: 'text',
+        id: 'agent-local-state.persona-name',
+        label: 'Initial persona name',
+        hint: 'Optional: create and activate a serial Agent persona during setup. Leave persona fields blank to skip.',
+        placeholder: 'Household Operator',
+        defaultValue: '',
+        spacerBeforeRows: 1,
+      },
+      {
+        kind: 'text',
+        id: 'agent-local-state.persona-description',
+        label: 'Initial persona description',
+        hint: 'Describe when this persona should shape the main conversation.',
+        placeholder: 'Handles day-to-day planning, reminders, device checks, and household coordination.',
+        defaultValue: '',
+      },
+      {
+        kind: 'text',
+        id: 'agent-local-state.persona-body',
+        label: 'Initial persona instructions',
+        hint: 'Tell Agent how to behave when this persona is active.',
+        placeholder: 'Be concise, proactive, and use safe local actions before asking for follow-up details.',
+        defaultValue: '',
+        multiline: true,
+      },
+      {
+        kind: 'text',
+        id: 'agent-local-state.skill-name',
+        label: 'Initial skill name',
+        hint: 'Optional: create and enable a reusable local procedure during setup.',
+        placeholder: 'Daily Briefing',
+        defaultValue: '',
+        spacerBeforeRows: 1,
+      },
+      {
+        kind: 'text',
+        id: 'agent-local-state.skill-description',
+        label: 'Initial skill description',
+        hint: 'Describe when Agent should use this skill.',
+        placeholder: 'Prepares a concise morning briefing from calendar, tasks, and current priorities.',
+        defaultValue: '',
+      },
+      {
+        kind: 'text',
+        id: 'agent-local-state.skill-procedure',
+        label: 'Initial skill procedure',
+        hint: 'Write the procedure Agent should reuse in the main conversation.',
+        placeholder: 'Check tasks, summarize important events, identify blockers, and ask only for missing critical inputs.',
+        defaultValue: '',
+        multiline: true,
+      },
+      {
+        kind: 'text',
+        id: 'agent-local-state.routine-name',
+        label: 'Initial routine name',
+        hint: 'Optional: create and enable a local routine. Routines print steps in the main conversation and do not launch hidden jobs.',
+        placeholder: 'Evening Reset',
+        defaultValue: '',
+        spacerBeforeRows: 1,
+      },
+      {
+        kind: 'text',
+        id: 'agent-local-state.routine-description',
+        label: 'Initial routine description',
+        hint: 'Describe when the routine should be suggested or started.',
+        placeholder: 'Reviews open tasks, tomorrow priorities, and pending approvals before the day ends.',
+        defaultValue: '',
+      },
+      {
+        kind: 'text',
+        id: 'agent-local-state.routine-steps',
+        label: 'Initial routine steps',
+        hint: 'Write the local routine steps. This stays in Agent-local state only.',
+        placeholder: 'Review open tasks; summarize unresolved approvals; list tomorrow priorities; ask what to defer.',
+        defaultValue: '',
+        multiline: true,
       },
     ],
   };

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

@@ -31,7 +31,7 @@ export function buildOnboardingWizardSteps(controller: OnboardingWizardControlle
     buildCommunicationStep(),
     buildToolsStep(),
     buildAgentKnowledgeStep(),
-    buildLocalStateStep(),
+    buildLocalStateStep(controller.runtimeSnapshot?.localBehaviorDiscovery),
     buildAutomationStep(),
     buildVoiceMediaStep(),
     buildDelegationPolicyStep(),
@@ -114,10 +114,10 @@ function buildReviewReadinessFields(controller: OnboardingWizardController): rea
     {
       kind: 'status',
       id: 'review.readiness.connection',
-      label: 'Connected services snapshot',
+      label: 'Connected host snapshot',
       hint: collectionIssues > 0
         ? `${collectionIssues} setup snapshot issue(s) need attention before this Agent is day-one ready.`
-        : 'The setup snapshot loaded cleanly from connected GoodVibes services.',
+        : 'The setup snapshot loaded cleanly from the connected GoodVibes host.',
       defaultValue: collectionIssues > 0 ? 'Needs attention' : 'Ready',
       spacerBeforeRows: 1,
     },
@@ -226,10 +226,10 @@ export function buildAgentSetupStep(controller: OnboardingWizardController): Onb
       {
         kind: 'status',
         id: 'agent-setup.connection',
-        label: 'Connected GoodVibes services',
+        label: 'Connected GoodVibes host',
         hint: collectionIssues > 0
           ? `${collectionIssues} setup snapshot issue(s) were reported. Status and doctor commands show connection details.`
-          : 'Agent uses connected GoodVibes services for companion chat, work plans, approvals, automation, and Agent Knowledge.',
+          : 'Agent uses the connected GoodVibes host for companion chat, work plans, approvals, automation, and Agent Knowledge.',
         defaultValue: collectionIssues > 0 ? `${collectionIssues} issue(s)` : 'Connected',
       },
       {
@@ -256,6 +256,13 @@ export function buildAgentSetupStep(controller: OnboardingWizardController): Onb
         options: buildStarterTemplateOptions(),
         defaultValue: 'none',
       },
+      {
+        kind: 'checklist',
+        id: 'agent-setup.profile-default',
+        label: 'Use created profile by default',
+        hint: 'When a starter profile name is provided, make that isolated Agent profile the default for future plain goodvibes-agent launches.',
+        defaultValue: true,
+      },
       {
         kind: 'status',
         id: 'agent-setup.profile-guide',
@@ -505,9 +512,9 @@ export function buildReviewStep(controller: OnboardingWizardController): Onboard
       {
         kind: 'status',
         id: 'review.global-marker',
-        label: 'Agent setup check',
-        hint: 'Opening this wizard marks Agent setup as shown for this user account, so it does not reopen automatically.',
-        defaultValue: 'Already marked as shown',
+        label: 'Agent setup completion',
+        hint: 'Successful apply marks Agent setup complete for this user account, so a bare launch opens the operator workspace next time.',
+        defaultValue: 'Marked after apply',
       },
       {
         kind: 'action',

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

@@ -87,6 +87,7 @@ export interface OnboardingWizardTextFieldDefinition extends OnboardingWizardFie
   readonly defaultValue: string;
   readonly placeholder: string;
   readonly required?: boolean;
+  readonly multiline?: boolean;
 }
 
 export interface OnboardingWizardMaskedFieldDefinition extends OnboardingWizardFieldBase {

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

@@ -295,6 +295,12 @@ export class OnboardingWizardController {
     return this.editingFieldId !== null;
   }
 
+  public isEditingMultilineTextField(): boolean {
+    if (this.editingFieldId === null) return false;
+    const field = this.getFieldById(this.editingFieldId);
+    return field?.kind === 'text' && field.multiline === true;
+  }
+
   public getFieldWindow(visibleFields: number): OnboardingWizardFieldWindow {
     const fields = this.currentStep.fields;
     const total = fields.length;
@@ -408,7 +414,7 @@ export class OnboardingWizardController {
     const field = this.getSelectedField();
     if (!field || (field.kind !== 'text' && field.kind !== 'masked')) return false;
     this.beginEdit(field.id);
-    this.editBuffer = initialText;
+    this.editBuffer = this.prepareTextInput(initialText);
     return true;
   }
 
@@ -432,7 +438,13 @@ export class OnboardingWizardController {
 
   public editChar(char: string): void {
     if (this.editingFieldId === null || char.length === 0) return;
-    this.editBuffer += char;
+    this.editBuffer += this.prepareTextInput(char);
+  }
+
+  public editNewline(): boolean {
+    if (!this.isEditingMultilineTextField()) return false;
+    this.editBuffer += '\n';
+    return true;
   }
 
   public editBackspace(): void {
@@ -455,6 +467,11 @@ export class OnboardingWizardController {
     return true;
   }
 
+  private prepareTextInput(text: string): string {
+    if (this.isEditingMultilineTextField()) return text.replace(/\r\n?/g, '\n');
+    return text.replace(/[\r\n]+/g, ' ');
+  }
+
   public setFieldValue(fieldId: string, value: boolean | string): void {
     const field = this.getFieldById(fieldId);
     if (!field) return;