@pellux/goodvibes-agent 1.5.5 → 1.5.6

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

@@ -1,4 +1,6 @@
 import type { AgentWorkspaceEditorKind, AgentWorkspaceLocalEditor } from './agent-workspace-types.ts';
+import type { AgentWorkspaceEditorSpec, AgentWorkspaceEditorSpecEntry } from './agent-workspace-command-editor-engine.ts';
+import { createAgentWorkspaceEditorFromTable } from './agent-workspace-command-editor-engine.ts';
 
 export type AgentWorkspaceSessionCommandEditorKind = Extract<
   AgentWorkspaceEditorKind,
@@ -41,201 +43,160 @@ export function isAgentWorkspaceSessionCommandEditorKind(kind: AgentWorkspaceEdi
     || kind === 'mode-domain';
 }
 
-export function createAgentWorkspaceSessionCommandEditor(kind: AgentWorkspaceSessionCommandEditorKind): AgentWorkspaceLocalEditor {
-  if (kind === 'conversation-export') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Export Conversation',
-      selectedFieldIndex: 0,
-      message: 'Export the current conversation to a workspace file. Type yes on the final field to confirm.',
-      fields: [
-        { id: 'format', label: 'Format', value: 'markdown', required: true, multiline: false, hint: 'markdown or text.' },
-        { id: 'path', label: 'Output path', value: './conversation.md', required: true, multiline: false, hint: 'Workspace-relative output path.' },
-        { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /export with --yes.' },
-      ],
-    };
-  }
-  if (kind === 'conversation-events' || kind === 'conversation-groups') {
-    const groups = kind === 'conversation-groups';
-    return {
-      kind,
-      mode: 'create',
-      title: groups ? 'Show Transcript Groups' : 'Show Transcript Events',
-      selectedFieldIndex: 0,
-      message: groups
-        ? 'Inspect grouped transcript structure from the Agent workspace.'
-        : 'Inspect transcript events from the Agent workspace.',
-      fields: [
-        { id: 'kind', label: 'Event kind', value: '', required: false, multiline: false, hint: 'Optional transcript event kind. Blank shows all.' },
-      ],
-    };
-  }
-  if (kind === 'conversation-find') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Find Transcript Text',
-      selectedFieldIndex: 0,
-      message: 'Search the current Agent transcript from the workspace.',
-      fields: [
-        { id: 'query', label: 'Search query', value: '', required: true, multiline: false, hint: 'Text to find in the current transcript.' },
-        { id: 'kind', label: 'Event kind', value: '', required: false, multiline: false, hint: 'Optional transcript event kind.' },
-      ],
-    };
-  }
-  if (kind === 'effort-level') {
-    return {
-      kind,
-      mode: 'update',
-      title: 'Set Reasoning Effort',
-      selectedFieldIndex: 0,
-      message: 'Set the reasoning effort used by normal Agent chat turns when the selected model supports it.',
-      fields: [
-        { id: 'level', label: 'Effort level', value: 'medium', required: true, multiline: false, hint: 'instant, low, medium, or high.' },
-      ],
-    };
-  }
-  if (kind === 'session-save') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Save Session',
-      selectedFieldIndex: 0,
-      message: 'Save the current Agent session under a reviewable name. Type yes on the final field to confirm.',
-      fields: [
-        { id: 'name', label: 'Session name', value: '', required: true, multiline: false, hint: 'Local saved-session name.' },
-        { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /save.' },
-      ],
-    };
-  }
-  if (kind === 'session-load') {
-    return {
-      kind,
-      mode: 'update',
-      title: 'Load Session',
-      selectedFieldIndex: 0,
-      message: 'Load a saved Agent session into the current conversation. Type yes on the final field to confirm.',
-      fields: [
-        { id: 'name', label: 'Session name', value: '', required: true, multiline: false, hint: 'Existing saved-session name from /sessions.' },
-        { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /load.' },
-      ],
-    };
-  }
-  if (kind === 'session-rename') {
-    return {
-      kind,
-      mode: 'update',
-      title: 'Rename Current Session',
-      selectedFieldIndex: 0,
-      message: 'Rename the active Agent session from the workspace.',
-      fields: [
-        { id: 'name', label: 'New session name', value: '', required: true, multiline: false, hint: 'New reviewable name for the current session.' },
-      ],
-    };
-  }
-  if (kind === 'session-resume') {
-    return {
-      kind,
-      mode: 'update',
-      title: 'Resume Saved Session',
-      selectedFieldIndex: 0,
-      message: 'Resume one saved Agent session by id, prefix, or title.',
-      fields: [
-        { id: 'target', label: 'Session id or name', value: '', required: true, multiline: false, hint: 'Use /session list or the Saved sessions action to find ids.' },
-      ],
-    };
-  }
-  if (kind === 'session-info') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Inspect Saved Session',
-      selectedFieldIndex: 0,
-      message: 'Inspect saved session metadata without changing the current conversation.',
-      fields: [
-        { id: 'target', label: 'Session id or name', value: '', required: true, multiline: false, hint: 'Saved session id, prefix, or name.' },
-      ],
-    };
-  }
-  if (kind === 'session-export-saved') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Export Saved Session',
-      selectedFieldIndex: 0,
-      message: 'Print one saved session transcript as markdown or text.',
-      fields: [
-        { id: 'target', label: 'Session id or name', value: '', required: true, multiline: false, hint: 'Use . for the current session, or a saved session id/name.' },
-        { id: 'format', label: 'Format', value: 'markdown', required: true, multiline: false, hint: 'markdown or text.' },
-      ],
-    };
-  }
-  if (kind === 'session-search') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Search Saved Sessions',
-      selectedFieldIndex: 0,
-      message: 'Search saved Agent sessions from the workspace.',
-      fields: [
-        { id: 'query', label: 'Search query', value: '', required: true, multiline: false, hint: 'Keyword or phrase to find in saved sessions.' },
-      ],
-    };
-  }
-  if (kind === 'session-delete') {
-    return {
-      kind,
-      mode: 'delete',
-      title: 'Delete Saved Session',
-      selectedFieldIndex: 0,
-      message: 'Delete one saved Agent session. Type yes on the final field to confirm.',
-      fields: [
-        { id: 'target', label: 'Session id or name', value: '', required: true, multiline: false, hint: 'Saved session id or prefix. The active session cannot be deleted.' },
-        { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /session delete with --yes.' },
-      ],
-    };
-  }
-  if (kind === 'session-fork') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Fork Current Session',
-      selectedFieldIndex: 0,
-      message: 'Fork the current Agent session into a new local saved session.',
-      fields: [
-        { id: 'name', label: 'Fork name', value: '', required: false, multiline: false, hint: 'Optional new session name. Blank uses the default fork name.' },
-      ],
-    };
-  }
-  if (kind === 'session-graph') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Inspect Session Graph',
-      selectedFieldIndex: 0,
-      message: 'Inspect the read-only cross-session graph. Mutating graph actions remain blocked in Agent.',
-      fields: [
-        { id: 'sessionId', label: 'Session id', value: '', required: false, multiline: false, hint: 'Optional session id filter.' },
-        { id: 'format', label: 'Format', value: 'text', required: false, multiline: false, hint: 'text or json.' },
-      ],
-    };
-  }
-  if (kind === 'mode-preset') {
-    return {
-      kind,
-      mode: 'update',
-      title: 'Set Interaction Mode',
-      selectedFieldIndex: 0,
-      message: 'Set the Agent interaction noise level. Type yes on the final field to confirm.',
-      fields: [
-        { id: 'preset', label: 'Preset', value: 'balanced', required: true, multiline: false, hint: 'quiet, balanced, or operator.' },
-        { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /mode <preset> with --yes.' },
-      ],
-    };
-  }
+function conversationEventsOrGroupsSpec(kind: AgentWorkspaceSessionCommandEditorKind): AgentWorkspaceEditorSpec {
+  const groups = kind === 'conversation-groups';
   return {
-    kind,
+    mode: 'create',
+    title: groups ? 'Show Transcript Groups' : 'Show Transcript Events',
+    selectedFieldIndex: 0,
+    message: groups
+      ? 'Inspect grouped transcript structure from the Agent workspace.'
+      : 'Inspect transcript events from the Agent workspace.',
+    fields: [
+      { id: 'kind', label: 'Event kind', value: '', required: false, multiline: false, hint: 'Optional transcript event kind. Blank shows all.' },
+    ],
+  };
+}
+
+const SESSION_COMMAND_EDITOR_SPECS: Readonly<Record<AgentWorkspaceSessionCommandEditorKind, AgentWorkspaceEditorSpecEntry<AgentWorkspaceSessionCommandEditorKind>>> = {
+  'conversation-export': {
+    mode: 'create',
+    title: 'Export Conversation',
+    selectedFieldIndex: 0,
+    message: 'Export the current conversation to a workspace file. Type yes on the final field to confirm.',
+    fields: [
+      { id: 'format', label: 'Format', value: 'markdown', required: true, multiline: false, hint: 'markdown or text.' },
+      { id: 'path', label: 'Output path', value: './conversation.md', required: true, multiline: false, hint: 'Workspace-relative output path.' },
+      { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /export with --yes.' },
+    ],
+  },
+  'conversation-events': conversationEventsOrGroupsSpec,
+  'conversation-groups': conversationEventsOrGroupsSpec,
+  'conversation-find': {
+    mode: 'create',
+    title: 'Find Transcript Text',
+    selectedFieldIndex: 0,
+    message: 'Search the current Agent transcript from the workspace.',
+    fields: [
+      { id: 'query', label: 'Search query', value: '', required: true, multiline: false, hint: 'Text to find in the current transcript.' },
+      { id: 'kind', label: 'Event kind', value: '', required: false, multiline: false, hint: 'Optional transcript event kind.' },
+    ],
+  },
+  'effort-level': {
+    mode: 'update',
+    title: 'Set Reasoning Effort',
+    selectedFieldIndex: 0,
+    message: 'Set the reasoning effort used by normal Agent chat turns when the selected model supports it.',
+    fields: [
+      { id: 'level', label: 'Effort level', value: 'medium', required: true, multiline: false, hint: 'instant, low, medium, or high.' },
+    ],
+  },
+  'session-save': {
+    mode: 'create',
+    title: 'Save Session',
+    selectedFieldIndex: 0,
+    message: 'Save the current Agent session under a reviewable name. Type yes on the final field to confirm.',
+    fields: [
+      { id: 'name', label: 'Session name', value: '', required: true, multiline: false, hint: 'Local saved-session name.' },
+      { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /save.' },
+    ],
+  },
+  'session-load': {
+    mode: 'update',
+    title: 'Load Session',
+    selectedFieldIndex: 0,
+    message: 'Load a saved Agent session into the current conversation. Type yes on the final field to confirm.',
+    fields: [
+      { id: 'name', label: 'Session name', value: '', required: true, multiline: false, hint: 'Existing saved-session name from /sessions.' },
+      { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /load.' },
+    ],
+  },
+  'session-rename': {
+    mode: 'update',
+    title: 'Rename Current Session',
+    selectedFieldIndex: 0,
+    message: 'Rename the active Agent session from the workspace.',
+    fields: [
+      { id: 'name', label: 'New session name', value: '', required: true, multiline: false, hint: 'New reviewable name for the current session.' },
+    ],
+  },
+  'session-resume': {
+    mode: 'update',
+    title: 'Resume Saved Session',
+    selectedFieldIndex: 0,
+    message: 'Resume one saved Agent session by id, prefix, or title.',
+    fields: [
+      { id: 'target', label: 'Session id or name', value: '', required: true, multiline: false, hint: 'Use /session list or the Saved sessions action to find ids.' },
+    ],
+  },
+  'session-info': {
+    mode: 'create',
+    title: 'Inspect Saved Session',
+    selectedFieldIndex: 0,
+    message: 'Inspect saved session metadata without changing the current conversation.',
+    fields: [
+      { id: 'target', label: 'Session id or name', value: '', required: true, multiline: false, hint: 'Saved session id, prefix, or name.' },
+    ],
+  },
+  'session-export-saved': {
+    mode: 'create',
+    title: 'Export Saved Session',
+    selectedFieldIndex: 0,
+    message: 'Print one saved session transcript as markdown or text.',
+    fields: [
+      { id: 'target', label: 'Session id or name', value: '', required: true, multiline: false, hint: 'Use . for the current session, or a saved session id/name.' },
+      { id: 'format', label: 'Format', value: 'markdown', required: true, multiline: false, hint: 'markdown or text.' },
+    ],
+  },
+  'session-search': {
+    mode: 'create',
+    title: 'Search Saved Sessions',
+    selectedFieldIndex: 0,
+    message: 'Search saved Agent sessions from the workspace.',
+    fields: [
+      { id: 'query', label: 'Search query', value: '', required: true, multiline: false, hint: 'Keyword or phrase to find in saved sessions.' },
+    ],
+  },
+  'session-delete': {
+    mode: 'delete',
+    title: 'Delete Saved Session',
+    selectedFieldIndex: 0,
+    message: 'Delete one saved Agent session. Type yes on the final field to confirm.',
+    fields: [
+      { id: 'target', label: 'Session id or name', value: '', required: true, multiline: false, hint: 'Saved session id or prefix. The active session cannot be deleted.' },
+      { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /session delete with --yes.' },
+    ],
+  },
+  'session-fork': {
+    mode: 'create',
+    title: 'Fork Current Session',
+    selectedFieldIndex: 0,
+    message: 'Fork the current Agent session into a new local saved session.',
+    fields: [
+      { id: 'name', label: 'Fork name', value: '', required: false, multiline: false, hint: 'Optional new session name. Blank uses the default fork name.' },
+    ],
+  },
+  'session-graph': {
+    mode: 'create',
+    title: 'Inspect Session Graph',
+    selectedFieldIndex: 0,
+    message: 'Inspect the read-only cross-session graph. Mutating graph actions remain blocked in Agent.',
+    fields: [
+      { id: 'sessionId', label: 'Session id', value: '', required: false, multiline: false, hint: 'Optional session id filter.' },
+      { id: 'format', label: 'Format', value: 'text', required: false, multiline: false, hint: 'text or json.' },
+    ],
+  },
+  'mode-preset': {
+    mode: 'update',
+    title: 'Set Interaction Mode',
+    selectedFieldIndex: 0,
+    message: 'Set the Agent interaction noise level. Type yes on the final field to confirm.',
+    fields: [
+      { id: 'preset', label: 'Preset', value: 'balanced', required: true, multiline: false, hint: 'quiet, balanced, or operator.' },
+      { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /mode <preset> with --yes.' },
+    ],
+  },
+  'mode-domain': {
     mode: 'update',
     title: 'Set Domain Verbosity',
     selectedFieldIndex: 0,
@@ -245,5 +206,9 @@ export function createAgentWorkspaceSessionCommandEditor(kind: AgentWorkspaceSes
       { id: 'verbosity', label: 'Verbosity', value: 'normal', required: true, multiline: false, hint: 'minimal, normal, or verbose.' },
       { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /mode set-domain.' },
     ],
-  };
+  },
+};
+
+export function createAgentWorkspaceSessionCommandEditor(kind: AgentWorkspaceSessionCommandEditorKind): AgentWorkspaceLocalEditor {
+  return createAgentWorkspaceEditorFromTable(kind, SESSION_COMMAND_EDITOR_SPECS);
 }

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

@@ -3,6 +3,7 @@ import type { ConfigKey, ConfigSetting } from '@pellux/goodvibes-sdk/platform/co
 import type { PendingSubscriptionLogin, ProviderSubscription } from '@pellux/goodvibes-sdk/platform/config';
 import { setHarnessSetting } from '../agent/harness-control.ts';
 import { isExternalHostOwnedSettingKey } from '../config/agent-settings-policy.ts';
+import { applyThemeModeSettingChange, THEME_MODE_CONFIG_KEY, THEME_MODE_SYNTHETIC_SETTING } from '../renderer/theme-mode-config.ts';
 import { buildAgentWorkspaceRuntimeSnapshot } from './agent-workspace-snapshot.ts';
 import type { CommandContext } from './command-registry.ts';
 import type {
@@ -325,9 +326,15 @@ function applyTuiSubscriptions(context: CommandContext, parseErrors: string[]):
 }
 
 export function agentWorkspaceSettingSchema(context: CommandContext | null, key: string): ConfigSetting | null {
-  return context?.platform?.configManager
+  const fromSchema = context?.platform?.configManager
     ?.getSchema()
     .find((setting) => setting.key === key) ?? null;
+  if (fromSchema) return fromSchema;
+  // display.themeMode is a TUI-local synthetic setting (W4-R4) that never
+  // joined the SDK ConfigKey schema — the classic settings-modal injects the
+  // same descriptor into its own groups map rather than the schema. Mirror
+  // that fallback here so the workspace surface can discover and cycle it too.
+  return key === THEME_MODE_CONFIG_KEY ? THEME_MODE_SYNTHETIC_SETTING : null;
 }
 
 export function isAgentWorkspaceActionVisible(context: CommandContext | null, action: AgentWorkspaceAction): boolean {
@@ -432,6 +439,38 @@ export async function applyAgentWorkspaceSettingValue(
       },
     };
   }
+  if (String(setting.key) === THEME_MODE_CONFIG_KEY) {
+    try {
+      // display.themeMode is agent-local and never joined the SDK ConfigKey
+      // schema, so setHarnessSetting's schema lookup would reject it. Persist
+      // directly (the same setDynamic round-trip the classic settings-modal
+      // uses for this key), then run the ONE shared apply hook — forced
+      // dark/light flips the active mode now with a full repaint; auto only
+      // re-probes at startup, stated honestly in the returned message.
+      configManager.setDynamic(setting.key as ConfigKey, value);
+      const { message } = applyThemeModeSettingChange(value, () => context?.clearScreen?.());
+      return {
+        status: message,
+        result: {
+          kind: 'refreshed',
+          title: `${setting.key} updated`,
+          detail: message,
+          safety: 'safe',
+        },
+      };
+    } catch (error) {
+      const detail = error instanceof Error ? error.message : String(error);
+      return {
+        status: detail,
+        result: {
+          kind: 'error',
+          title: `${setting.key} update failed`,
+          detail,
+          safety: 'safe',
+        },
+      };
+    }
+  }
   try {
     const result = await setHarnessSetting(configManager, context?.platform?.secretsManager, setting.key, value);
     return {

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

@@ -1,67 +1,33 @@
-import type { AgentWorkspaceActionResult, AgentWorkspaceLocalEditor } from './agent-workspace-types.ts';
+import type { AgentWorkspaceLocalEditor } from './agent-workspace-types.ts';
 import type { AgentWorkspaceSkillBundleCommandEditorKind } from './agent-workspace-skill-bundle-command-editors.ts';
 import { isAgentWorkspaceSkillBundleCommandEditorKind } from './agent-workspace-skill-bundle-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 AgentWorkspaceSkillBundleCommandEditorSubmission =
-  | {
-    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 AgentWorkspaceSkillBundleCommandEditorSubmission = AgentWorkspaceCommandEditorSubmission;
 
 export function isAgentWorkspaceSkillBundleCommandSubmissionKind(kind: string): kind is AgentWorkspaceSkillBundleCommandEditorKind {
   return isAgentWorkspaceSkillBundleCommandEditorKind(kind as AgentWorkspaceSkillBundleCommandEditorKind);
 }
 
-function isAffirmative(value: string): boolean {
-  return /^(y|yes|true)$/i.test(value.trim());
-}
-
-function unconfirmed(editor: AgentWorkspaceLocalEditor, message: string): AgentWorkspaceSkillBundleCommandEditorSubmission {
-  return {
-    kind: 'editor',
-    editor: { ...editor, message },
-    status: message,
-  };
-}
-
-function dispatch(command: string, title: string, detail: string, safety: AgentWorkspaceActionResult['safety']): AgentWorkspaceSkillBundleCommandEditorSubmission {
-  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 buildAgentWorkspaceSkillBundleCommandEditorSubmission(
-  editor: AgentWorkspaceLocalEditor,
-  readField: AgentWorkspaceFieldReader,
-): AgentWorkspaceSkillBundleCommandEditorSubmission {
-  if (editor.kind === 'skill-bundle-search') {
+const SKILL_BUNDLE_COMMAND_SUBMISSION_HANDLERS: Readonly<Record<AgentWorkspaceSkillBundleCommandEditorKind, AgentWorkspaceCommandSubmissionHandler>> = {
+  'skill-bundle-search': (_editor, readField) => {
     const query = readField('query').trim();
     const command = query.length > 0 ? `/skills bundle search ${quoteSlashCommandArg(query)}` : '/skills bundle search';
-    return dispatch(command, 'Opening skill bundle search', 'The workspace handed a read-only skill bundle search command to the shell-owned command router.', 'read-only');
-  }
-  if (editor.kind === 'skill-bundle-show') {
-    return dispatch(
-      `/skills bundle show ${quoteSlashCommandArg(readField('id'))}`,
-      'Opening skill bundle detail',
-      'The workspace handed a read-only skill bundle detail command to the shell-owned command router.',
-      'read-only',
-    );
-  }
-  if (editor.kind === 'skill-bundle-update') {
+    return dispatchCommandEditorSubmission(command, 'Opening skill bundle search', 'The workspace handed a read-only skill bundle search command to the shell-owned command router.', 'read-only');
+  },
+  'skill-bundle-show': (_editor, readField) => dispatchCommandEditorSubmission(
+    `/skills bundle show ${quoteSlashCommandArg(readField('id'))}`,
+    'Opening skill bundle detail',
+    'The workspace handed a read-only skill bundle detail command to the shell-owned command router.',
+    'read-only',
+  ),
+  'skill-bundle-update': (editor, readField) => {
     if (!isAffirmative(readField('confirm'))) return unconfirmed(editor, 'Skill bundle update not confirmed. Type yes, then press Enter.');
     const parts = ['/skills', 'bundle', 'update', quoteSlashCommandArg(readField('id'))];
     const name = readField('name');
@@ -70,32 +36,50 @@ export function buildAgentWorkspaceSkillBundleCommandEditorSubmission(
     if (name.length > 0) parts.push('--name', quoteSlashCommandArg(name));
     if (description.length > 0) parts.push('--description', quoteSlashCommandArg(description));
     if (skills.length > 0) parts.push('--skills', quoteSlashCommandArg(skills));
-    return dispatch(parts.join(' '), 'Opening skill bundle update', 'The workspace handed a confirmed skill bundle update command to the shell-owned command router.', 'safe');
-  }
-  if (editor.kind === 'skill-bundle-enable' || editor.kind === 'skill-bundle-disable' || editor.kind === 'skill-bundle-review') {
-    if (!isAffirmative(readField('confirm'))) return unconfirmed(editor, 'Skill bundle action not confirmed. Type yes, then press Enter.');
-    const verb = editor.kind.replace('skill-bundle-', '');
-    return dispatch(
-      `/skills bundle ${verb} ${quoteSlashCommandArg(readField('id'))}`,
-      `Opening skill bundle ${verb}`,
-      `The workspace handed a confirmed skill bundle ${verb} command to the shell-owned command router.`,
-      'safe',
-    );
-  }
-  if (editor.kind === 'skill-bundle-stale') {
+    return dispatchCommandEditorSubmission(parts.join(' '), 'Opening skill bundle update', 'The workspace handed a confirmed skill bundle update command to the shell-owned command router.', 'safe');
+  },
+  'skill-bundle-enable': (editor, readField) => skillBundleAction(editor, readField),
+  'skill-bundle-disable': (editor, readField) => skillBundleAction(editor, readField),
+  'skill-bundle-review': (editor, readField) => skillBundleAction(editor, readField),
+  'skill-bundle-stale': (editor, readField) => {
     if (!isAffirmative(readField('confirm'))) return unconfirmed(editor, 'Skill bundle stale action not confirmed. Type yes, then press Enter.');
-    return dispatch(
+    return dispatchCommandEditorSubmission(
       `/skills bundle stale ${quoteSlashCommandArg(readField('id'))} ${quoteSlashCommandArg(readField('reason'))}`,
       'Opening skill bundle stale review',
       'The workspace handed a confirmed skill bundle stale command to the shell-owned command router.',
       'safe',
     );
-  }
-  if (!isAffirmative(readField('confirm'))) return unconfirmed(editor, 'Skill bundle delete not confirmed. Type yes, then press Enter.');
-  return dispatch(
-    `/skills bundle delete ${quoteSlashCommandArg(readField('id'))} --yes`,
-    'Opening skill bundle delete',
-    'The workspace handed a confirmed skill bundle delete command to the shell-owned command router.',
+  },
+  'skill-bundle-delete': (editor, readField) => {
+    if (!isAffirmative(readField('confirm'))) return unconfirmed(editor, 'Skill bundle delete not confirmed. Type yes, then press Enter.');
+    return dispatchCommandEditorSubmission(
+      `/skills bundle delete ${quoteSlashCommandArg(readField('id'))} --yes`,
+      'Opening skill bundle delete',
+      'The workspace handed a confirmed skill bundle delete command to the shell-owned command router.',
+      'safe',
+    );
+  },
+};
+
+function skillBundleAction(editor: AgentWorkspaceLocalEditor, readField: AgentWorkspaceFieldReader): AgentWorkspaceCommandEditorSubmission {
+  if (!isAffirmative(readField('confirm'))) return unconfirmed(editor, 'Skill bundle action not confirmed. Type yes, then press Enter.');
+  const verb = editor.kind.replace('skill-bundle-', '');
+  return dispatchCommandEditorSubmission(
+    `/skills bundle ${verb} ${quoteSlashCommandArg(readField('id'))}`,
+    `Opening skill bundle ${verb}`,
+    `The workspace handed a confirmed skill bundle ${verb} command to the shell-owned command router.`,
     'safe',
   );
 }
+
+export function buildAgentWorkspaceSkillBundleCommandEditorSubmission(
+  editor: AgentWorkspaceLocalEditor,
+  readField: AgentWorkspaceFieldReader,
+): AgentWorkspaceCommandEditorSubmission {
+  return buildCommandEditorSubmissionFromTable(
+    editor.kind as AgentWorkspaceSkillBundleCommandEditorKind,
+    editor,
+    readField,
+    SKILL_BUNDLE_COMMAND_SUBMISSION_HANDLERS,
+  );
+}