@pellux/goodvibes-agent 1.5.5 → 1.5.6

package/src/input/agent-workspace-provider-command-editors.ts

@@ -1,4 +1,6 @@
 import type { AgentWorkspaceEditorKind, AgentWorkspaceLocalEditor } from './agent-workspace-types.ts';
+import type { AgentWorkspaceEditorSpecEntry } from './agent-workspace-command-editor-engine.ts';
+import { createAgentWorkspaceEditorFromTable } from './agent-workspace-command-editor-engine.ts';
 
 export type AgentWorkspaceProviderCommandEditorKind = Extract<
   AgentWorkspaceEditorKind,
@@ -14,73 +16,57 @@ export function isAgentWorkspaceProviderCommandEditorKind(kind: AgentWorkspaceEd
     || kind === 'provider-account-repair';
 }
 
-export function createAgentWorkspaceProviderCommandEditor(kind: AgentWorkspaceProviderCommandEditorKind): AgentWorkspaceLocalEditor {
-  if (kind === 'provider-use') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Use Provider',
-      selectedFieldIndex: 0,
-      message: 'Switch the Agent chat provider through the TUI command router. Add a model id when you want an exact provider/model route.',
-      fields: [
-        { id: 'provider', label: 'Provider id', value: '', required: true, multiline: false, hint: 'Provider row id, such as openai-subscriber, openai, anthropic, or a custom provider.' },
-        { id: 'model', label: 'Model id', value: '', required: false, multiline: false, hint: 'Optional model id or provider:model registry key. Blank uses the provider default selectable model.' },
-      ],
-    };
-  }
-  if (kind === 'provider-inspect') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Inspect Provider',
-      selectedFieldIndex: 0,
-      message: 'Inspect provider auth and setup routes from the Agent TUI without changing provider selection.',
-      fields: [
-        { id: 'provider', label: 'Provider id', value: '', required: true, multiline: false, hint: 'Provider row id to inspect.' },
-      ],
-    };
-  }
-  if (kind === 'provider-routes') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Inspect Provider Routes',
-      selectedFieldIndex: 0,
-      message: 'Inspect provider account routes from the Agent TUI without changing routing or auth.',
-      fields: [
-        { id: 'provider', label: 'Provider id', value: '', required: true, multiline: false, hint: 'Provider row id to inspect.' },
-      ],
-    };
-  }
-  if (kind === 'provider-account-repair') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Review Provider Account Repair',
-      selectedFieldIndex: 0,
-      message: 'Show provider account repair guidance from the Agent TUI without starting login or storing tokens.',
-      fields: [
-        { id: 'provider', label: 'Provider id', value: '', required: true, multiline: false, hint: 'Provider row id to inspect.' },
-      ],
-    };
-  }
-  if (kind === 'provider-add') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Add Custom Provider',
-      selectedFieldIndex: 0,
-      message: 'Add an OpenAI-compatible provider for Agent chat/model routing. Type yes on the final field to confirm.',
-      fields: [
-        { id: 'name', label: 'Provider name', value: '', required: true, multiline: false, hint: 'Letters, numbers, hyphens, and underscores only.' },
-        { id: 'baseUrl', label: 'Base URL', value: '', required: true, multiline: false, hint: 'OpenAI-compatible base URL, such as http://127.0.0.1:8000/v1.' },
-        { id: 'apiKey', label: 'API key', value: '', required: false, multiline: false, hint: 'Optional API key. Prefer a local provider or a secret-backed provider config when possible.', redact: true },
-        { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /provider add with --yes.' },
-      ],
-    };
-  }
-  return {
-    kind,
+const PROVIDER_COMMAND_EDITOR_SPECS: Readonly<Record<AgentWorkspaceProviderCommandEditorKind, AgentWorkspaceEditorSpecEntry<AgentWorkspaceProviderCommandEditorKind>>> = {
+  'provider-use': {
+    mode: 'create',
+    title: 'Use Provider',
+    selectedFieldIndex: 0,
+    message: 'Switch the Agent chat provider through the TUI command router. Add a model id when you want an exact provider/model route.',
+    fields: [
+      { id: 'provider', label: 'Provider id', value: '', required: true, multiline: false, hint: 'Provider row id, such as openai-subscriber, openai, anthropic, or a custom provider.' },
+      { id: 'model', label: 'Model id', value: '', required: false, multiline: false, hint: 'Optional model id or provider:model registry key. Blank uses the provider default selectable model.' },
+    ],
+  },
+  'provider-inspect': {
+    mode: 'create',
+    title: 'Inspect Provider',
+    selectedFieldIndex: 0,
+    message: 'Inspect provider auth and setup routes from the Agent TUI without changing provider selection.',
+    fields: [
+      { id: 'provider', label: 'Provider id', value: '', required: true, multiline: false, hint: 'Provider row id to inspect.' },
+    ],
+  },
+  'provider-routes': {
+    mode: 'create',
+    title: 'Inspect Provider Routes',
+    selectedFieldIndex: 0,
+    message: 'Inspect provider account routes from the Agent TUI without changing routing or auth.',
+    fields: [
+      { id: 'provider', label: 'Provider id', value: '', required: true, multiline: false, hint: 'Provider row id to inspect.' },
+    ],
+  },
+  'provider-account-repair': {
+    mode: 'create',
+    title: 'Review Provider Account Repair',
+    selectedFieldIndex: 0,
+    message: 'Show provider account repair guidance from the Agent TUI without starting login or storing tokens.',
+    fields: [
+      { id: 'provider', label: 'Provider id', value: '', required: true, multiline: false, hint: 'Provider row id to inspect.' },
+    ],
+  },
+  'provider-add': {
+    mode: 'create',
+    title: 'Add Custom Provider',
+    selectedFieldIndex: 0,
+    message: 'Add an OpenAI-compatible provider for Agent chat/model routing. Type yes on the final field to confirm.',
+    fields: [
+      { id: 'name', label: 'Provider name', value: '', required: true, multiline: false, hint: 'Letters, numbers, hyphens, and underscores only.' },
+      { id: 'baseUrl', label: 'Base URL', value: '', required: true, multiline: false, hint: 'OpenAI-compatible base URL, such as http://127.0.0.1:8000/v1.' },
+      { id: 'apiKey', label: 'API key', value: '', required: false, multiline: false, hint: 'Optional API key. Prefer a local provider or a secret-backed provider config when possible.', redact: true },
+      { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /provider add with --yes.' },
+    ],
+  },
+  'provider-remove': {
     mode: 'delete',
     title: 'Remove Custom Provider',
     selectedFieldIndex: 0,
@@ -89,5 +75,9 @@ export function createAgentWorkspaceProviderCommandEditor(kind: AgentWorkspacePr
       { id: 'name', label: 'Provider name', value: '', required: true, multiline: false, hint: 'Existing custom provider name.' },
       { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /provider remove with --yes.' },
     ],
-  };
+  },
+};
+
+export function createAgentWorkspaceProviderCommandEditor(kind: AgentWorkspaceProviderCommandEditorKind): AgentWorkspaceLocalEditor {
+  return createAgentWorkspaceEditorFromTable(kind, PROVIDER_COMMAND_EDITOR_SPECS);
 }

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

@@ -136,7 +136,14 @@ export function clearAgentWorkspaceActionSearch(host: AgentWorkspaceSearchHost):
   if (!host.actionSearchActive) return;
   host.actionSearchActive = false;
   host.actionSearchQuery = '';
-  host.selectedActionIndex = Math.max(0, Math.min(host.selectedActionIndex, host.selectedCategory.actions.length - 1));
+  // selectedActionIndex was an index into the SEARCH RESULTS, which can span
+  // every category. Reinterpreting that number as an index into the
+  // originating category's own (unrelated) action list silently highlights
+  // an arbitrary, wrong action — the highlight desyncs from what the user
+  // was just looking at. There is no principled position to preserve across
+  // an arbitrary category switch, so return to the top of the list, same as
+  // beginning/typing/backspacing a search already does.
+  host.selectedActionIndex = 0;
   host.status = 'Action search cleared.';
   host.clampSelection();
 }

package/src/input/agent-workspace-session-command-editor-submission.ts

@@ -1,199 +1,171 @@
-import type { AgentWorkspaceActionResult, AgentWorkspaceLocalEditor } from './agent-workspace-types.ts';
+import type { AgentWorkspaceLocalEditor } from './agent-workspace-types.ts';
 import type { AgentWorkspaceSessionCommandEditorKind } from './agent-workspace-session-command-editors.ts';
 import { isAgentWorkspaceSessionCommandEditorKind } from './agent-workspace-session-command-editors.ts';
 import { quoteSlashCommandArg } from './slash-command-parser.ts';
+import type { AgentWorkspaceCommandEditorSubmission, AgentWorkspaceCommandSubmissionHandler, AgentWorkspaceFieldReader } from './agent-workspace-command-editor-engine.ts';
+import { buildCommandEditorSubmissionFromTable, dispatchCommandEditorSubmission, editorMessageSubmission, isAffirmative } from './agent-workspace-command-editor-engine.ts';
 
-type AgentWorkspaceFieldReader = (fieldId: string) => string;
-
-export type AgentWorkspaceSessionCommandEditorSubmission =
-  | {
-    readonly kind: 'editor';
-    readonly editor: AgentWorkspaceLocalEditor;
-    readonly status: string;
-    readonly actionResult?: AgentWorkspaceActionResult;
-  }
-  | {
-    readonly kind: 'dispatch';
-    readonly command: string;
-    readonly status: string;
-    readonly actionResult: AgentWorkspaceActionResult;
-  };
+export type AgentWorkspaceSessionCommandEditorSubmission = AgentWorkspaceCommandEditorSubmission;
 
 export function isAgentWorkspaceSessionCommandSubmissionKind(kind: string): kind is AgentWorkspaceSessionCommandEditorKind {
   return isAgentWorkspaceSessionCommandEditorKind(kind as AgentWorkspaceSessionCommandEditorKind);
 }
 
-function isAffirmative(value: string): boolean {
-  return /^(y|yes|true)$/i.test(value.trim());
-}
-
-function unconfirmed(editor: AgentWorkspaceLocalEditor, message: string): AgentWorkspaceSessionCommandEditorSubmission {
-  return {
-    kind: 'editor',
-    editor: { ...editor, message },
-    status: message,
-  };
-}
-
-function dispatch(command: string, title: string, detail: string, safety: AgentWorkspaceActionResult['safety']): AgentWorkspaceSessionCommandEditorSubmission {
-  return {
-    kind: 'dispatch',
-    command,
-    status: `${title}.`,
-    actionResult: { kind: 'dispatched', title, detail, command, safety },
-  };
+function unconfirmed(editor: AgentWorkspaceLocalEditor, message: string): AgentWorkspaceCommandEditorSubmission {
+  return editorMessageSubmission(editor, message);
 }
 
-export function buildAgentWorkspaceSessionCommandEditorSubmission(
-  editor: AgentWorkspaceLocalEditor,
-  readField: AgentWorkspaceFieldReader,
-): AgentWorkspaceSessionCommandEditorSubmission {
-  if (editor.kind === 'conversation-export') {
+const SESSION_COMMAND_SUBMISSION_HANDLERS: Readonly<Record<AgentWorkspaceSessionCommandEditorKind, AgentWorkspaceCommandSubmissionHandler>> = {
+  'conversation-export': (editor, readField) => {
     if (!isAffirmative(readField('confirm'))) return unconfirmed(editor, 'Conversation export not confirmed. Type yes, then press Enter.');
-    return dispatch(
+    return dispatchCommandEditorSubmission(
       `/export ${quoteSlashCommandArg(readField('format'))} ${quoteSlashCommandArg(readField('path'))} --yes`,
       'Opening conversation export',
       'The workspace handed a confirmed conversation export command to the shell-owned command router.',
       'safe',
     );
-  }
-  if (editor.kind === 'conversation-events' || editor.kind === 'conversation-groups') {
-    const subcommand = editor.kind === 'conversation-groups' ? 'groups' : 'events';
-    const eventKind = readField('kind');
-    const command = eventKind.length > 0
-      ? `/conversation ${subcommand} ${quoteSlashCommandArg(eventKind)}`
-      : `/conversation ${subcommand}`;
-    return dispatch(
-      command,
-      editor.kind === 'conversation-groups' ? 'Opening transcript groups' : 'Opening transcript events',
-      'The workspace handed read-only transcript structure inspection to the shell-owned command router.',
-      'read-only',
-    );
-  }
-  if (editor.kind === 'conversation-find') {
+  },
+  'conversation-events': (editor, readField) => conversationEventsOrGroups(editor, readField),
+  'conversation-groups': (editor, readField) => conversationEventsOrGroups(editor, readField),
+  'conversation-find': (_editor, readField) => {
     const kind = readField('kind');
     const command = kind.length > 0
       ? `/conversation find ${quoteSlashCommandArg(readField('query'))} ${quoteSlashCommandArg(kind)}`
       : `/conversation find ${quoteSlashCommandArg(readField('query'))}`;
-    return dispatch(
+    return dispatchCommandEditorSubmission(
       command,
       'Opening transcript search',
       'The workspace handed read-only transcript search to the shell-owned command router.',
       'read-only',
     );
-  }
-  if (editor.kind === 'effort-level') {
-    return dispatch(
-      `/effort ${quoteSlashCommandArg(readField('level'))}`,
-      'Opening reasoning effort change',
-      'The workspace handed reasoning effort selection to the shell-owned command router.',
-      'safe',
-    );
-  }
-  if (editor.kind === 'session-save') {
+  },
+  'effort-level': (_editor, readField) => dispatchCommandEditorSubmission(
+    `/effort ${quoteSlashCommandArg(readField('level'))}`,
+    'Opening reasoning effort change',
+    'The workspace handed reasoning effort selection to the shell-owned command router.',
+    'safe',
+  ),
+  'session-save': (editor, readField) => {
     if (!isAffirmative(readField('confirm'))) return unconfirmed(editor, 'Session save not confirmed. Type yes, then press Enter.');
-    return dispatch(
+    return dispatchCommandEditorSubmission(
       `/save ${quoteSlashCommandArg(readField('name'))}`,
       'Opening session save',
       'The workspace handed a confirmed session save command to the shell-owned command router.',
       'safe',
     );
-  }
-  if (editor.kind === 'session-load') {
+  },
+  'session-load': (editor, readField) => {
     if (!isAffirmative(readField('confirm'))) return unconfirmed(editor, 'Session load not confirmed. Type yes, then press Enter.');
-    return dispatch(
+    return dispatchCommandEditorSubmission(
       `/load ${quoteSlashCommandArg(readField('name'))}`,
       'Opening session load',
       'The workspace handed a confirmed session load command to the shell-owned command router.',
       'safe',
     );
-  }
-  if (editor.kind === 'session-rename') {
-    return dispatch(
-      `/session rename ${quoteSlashCommandArg(readField('name'))}`,
-      'Opening session rename',
-      'The workspace handed current-session rename to the shell-owned command router.',
-      'safe',
-    );
-  }
-  if (editor.kind === 'session-resume') {
-    return dispatch(
-      `/session resume ${quoteSlashCommandArg(readField('target'))}`,
-      'Opening session resume',
-      'The workspace handed saved-session resume to the shell-owned command router.',
-      'safe',
-    );
-  }
-  if (editor.kind === 'session-info') {
-    return dispatch(
-      `/session info ${quoteSlashCommandArg(readField('target'))}`,
-      'Opening session inspection',
-      'The workspace handed read-only saved-session inspection to the shell-owned command router.',
-      'read-only',
-    );
-  }
-  if (editor.kind === 'session-export-saved') {
-    return dispatch(
-      `/session export ${quoteSlashCommandArg(readField('target'))} ${quoteSlashCommandArg(readField('format'))}`,
-      'Opening saved-session export',
-      'The workspace handed saved-session transcript export to the shell-owned command router.',
-      'read-only',
-    );
-  }
-  if (editor.kind === 'session-search') {
-    return dispatch(
-      `/session search ${quoteSlashCommandArg(readField('query'))}`,
-      'Opening saved-session search',
-      'The workspace handed saved-session search to the shell-owned command router.',
-      'read-only',
-    );
-  }
-  if (editor.kind === 'session-delete') {
+  },
+  'session-rename': (_editor, readField) => dispatchCommandEditorSubmission(
+    `/session rename ${quoteSlashCommandArg(readField('name'))}`,
+    'Opening session rename',
+    'The workspace handed current-session rename to the shell-owned command router.',
+    'safe',
+  ),
+  'session-resume': (_editor, readField) => dispatchCommandEditorSubmission(
+    `/session resume ${quoteSlashCommandArg(readField('target'))}`,
+    'Opening session resume',
+    'The workspace handed saved-session resume to the shell-owned command router.',
+    'safe',
+  ),
+  'session-info': (_editor, readField) => dispatchCommandEditorSubmission(
+    `/session info ${quoteSlashCommandArg(readField('target'))}`,
+    'Opening session inspection',
+    'The workspace handed read-only saved-session inspection to the shell-owned command router.',
+    'read-only',
+  ),
+  'session-export-saved': (_editor, readField) => dispatchCommandEditorSubmission(
+    `/session export ${quoteSlashCommandArg(readField('target'))} ${quoteSlashCommandArg(readField('format'))}`,
+    'Opening saved-session export',
+    'The workspace handed saved-session transcript export to the shell-owned command router.',
+    'read-only',
+  ),
+  'session-search': (_editor, readField) => dispatchCommandEditorSubmission(
+    `/session search ${quoteSlashCommandArg(readField('query'))}`,
+    'Opening saved-session search',
+    'The workspace handed saved-session search to the shell-owned command router.',
+    'read-only',
+  ),
+  'session-delete': (editor, readField) => {
     if (!isAffirmative(readField('confirm'))) return unconfirmed(editor, 'Session delete not confirmed. Type yes, then press Enter.');
-    return dispatch(
+    return dispatchCommandEditorSubmission(
       `/session delete ${quoteSlashCommandArg(readField('target'))} --yes`,
       'Opening saved-session delete',
       'The workspace handed confirmed saved-session deletion to the shell-owned command router.',
       'safe',
     );
-  }
-  if (editor.kind === 'session-fork') {
+  },
+  'session-fork': (_editor, readField) => {
     const name = readField('name');
-    return dispatch(
+    return dispatchCommandEditorSubmission(
       name.length > 0 ? `/session fork ${quoteSlashCommandArg(name)}` : '/session fork',
       'Opening session fork',
       'The workspace handed current-session fork to the shell-owned command router.',
       'safe',
     );
-  }
-  if (editor.kind === 'session-graph') {
+  },
+  'session-graph': (_editor, readField) => {
     const sessionId = readField('sessionId');
     const format = readField('format');
     const parts = ['/session', 'graph'];
     if (sessionId.length > 0) parts.push('--session', quoteSlashCommandArg(sessionId));
     if (format.length > 0) parts.push('--format', quoteSlashCommandArg(format));
-    const command = parts.join(' ');
-    return dispatch(
-      command,
+    return dispatchCommandEditorSubmission(
+      parts.join(' '),
       'Opening session graph',
       'The workspace handed read-only session graph inspection to the shell-owned command router.',
       'read-only',
     );
-  }
-  if (editor.kind === 'mode-preset') {
+  },
+  'mode-preset': (editor, readField) => {
     if (!isAffirmative(readField('confirm'))) return unconfirmed(editor, 'Interaction mode change not confirmed. Type yes, then press Enter.');
-    return dispatch(
+    return dispatchCommandEditorSubmission(
       `/mode ${quoteSlashCommandArg(readField('preset'))} --yes`,
       'Opening interaction mode change',
       'The workspace handed a confirmed interaction mode command to the shell-owned command router.',
       'safe',
     );
-  }
-  if (!isAffirmative(readField('confirm'))) return unconfirmed(editor, 'Domain verbosity change not confirmed. Type yes, then press Enter.');
-  return dispatch(
-    `/mode set-domain ${quoteSlashCommandArg(readField('domain'))} ${quoteSlashCommandArg(readField('verbosity'))} --yes`,
-    'Opening domain verbosity change',
-    'The workspace handed a confirmed domain verbosity command to the shell-owned command router.',
-    'safe',
+  },
+  'mode-domain': (editor, readField) => {
+    if (!isAffirmative(readField('confirm'))) return unconfirmed(editor, 'Domain verbosity change not confirmed. Type yes, then press Enter.');
+    return dispatchCommandEditorSubmission(
+      `/mode set-domain ${quoteSlashCommandArg(readField('domain'))} ${quoteSlashCommandArg(readField('verbosity'))} --yes`,
+      'Opening domain verbosity change',
+      'The workspace handed a confirmed domain verbosity command to the shell-owned command router.',
+      'safe',
+    );
+  },
+};
+
+function conversationEventsOrGroups(editor: AgentWorkspaceLocalEditor, readField: AgentWorkspaceFieldReader): AgentWorkspaceCommandEditorSubmission {
+  const subcommand = editor.kind === 'conversation-groups' ? 'groups' : 'events';
+  const eventKind = readField('kind');
+  const command = eventKind.length > 0
+    ? `/conversation ${subcommand} ${quoteSlashCommandArg(eventKind)}`
+    : `/conversation ${subcommand}`;
+  return dispatchCommandEditorSubmission(
+    command,
+    editor.kind === 'conversation-groups' ? 'Opening transcript groups' : 'Opening transcript events',
+    'The workspace handed read-only transcript structure inspection to the shell-owned command router.',
+    'read-only',
+  );
+}
+
+export function buildAgentWorkspaceSessionCommandEditorSubmission(
+  editor: AgentWorkspaceLocalEditor,
+  readField: AgentWorkspaceFieldReader,
+): AgentWorkspaceCommandEditorSubmission {
+  return buildCommandEditorSubmissionFromTable(
+    editor.kind as AgentWorkspaceSessionCommandEditorKind,
+    editor,
+    readField,
+    SESSION_COMMAND_SUBMISSION_HANDLERS,
   );
 }