@pellux/goodvibes-agent 1.5.5 → 1.5.6

package/src/input/agent-workspace-operations-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 AgentWorkspaceOperationsCommandEditorKind = Extract<
   AgentWorkspaceEditorKind,
@@ -45,168 +47,150 @@ export function isAgentWorkspaceOperationsCommandEditorKind(kind: AgentWorkspace
     || kind === 'schedule-receipt';
 }
 
-export function createAgentWorkspaceOperationsCommandEditor(kind: AgentWorkspaceOperationsCommandEditorKind): AgentWorkspaceLocalEditor {
-  if (kind === 'plan-seed') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Seed Planning Goal',
-      selectedFieldIndex: 0,
-      message: 'Seed Agent planning state from a concrete goal. This stays in the main Agent planning flow and does not create coding-role Agent jobs.',
-      fields: [
-        { id: 'goal', label: 'Planning goal', value: '', required: true, multiline: true, hint: 'Describe the goal or operating plan to evaluate. Ctrl-J inserts a new line.' },
-      ],
-    };
-  }
-  if (kind === 'health-repair') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Show Health Repair Guidance',
-      selectedFieldIndex: 0,
-      message: 'Show health repair guidance for one domain. Agent does not manage connected-host hosting or mutate connected-host lifecycle.',
-      fields: [
-        { id: 'domain', label: 'Domain', value: 'settings', required: true, multiline: false, hint: 'settings, auth, accounts, host, remote, mcp, continuity, or maintenance.' },
-      ],
-    };
-  }
-  if (kind === 'approval-review') {
-    return {
-      kind,
-      mode: 'create',
-      title: 'Review Approval Class',
-      selectedFieldIndex: 0,
-      message: 'Review one approval class without approving, denying, or mutating pending requests.',
-      fields: [
-        { id: 'kind', label: 'Approval kind', value: 'shell', required: true, multiline: false, hint: 'shell, file, network, delegate, mcp, remote, hook, or plugin.' },
-      ],
-    };
-  }
-  if (kind === 'approval-approve' || kind === 'approval-deny' || kind === 'approval-cancel') {
-    const verb = kind === 'approval-approve' ? 'Approve' : kind === 'approval-deny' ? 'Deny' : 'Cancel';
-    return {
-      kind,
-      mode: 'update',
-      title: `${verb} Approval`,
-      selectedFieldIndex: 0,
-      message: `${verb} one pending connected-host approval request. This is an explicit operator action and requires typed confirmation.`,
-      fields: [
-        { id: 'approvalId', label: 'Approval id', value: '', required: true, multiline: false, hint: 'Approval request id from the approval list.' },
-        { id: 'note', label: 'Note', value: '', required: false, multiline: true, hint: 'Optional approval note. Ctrl-J inserts a new line.' },
-        { id: 'remember', label: 'Remember', value: '', required: false, multiline: false, hint: 'yes/no when you explicitly want to set the connected-host remember flag; blank leaves it unset.' },
-        { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: `Type yes to run /approval ${kind.replace('approval-', '')} with --yes.` },
-      ],
-    };
-  }
-  if (
-    kind === 'automation-job-run'
-    || kind === 'automation-job-pause'
-    || kind === 'automation-job-resume'
-    || kind === 'automation-run-cancel'
-    || kind === 'automation-run-retry'
-    || kind === 'schedule-run'
-  ) {
-    const job = kind.startsWith('automation-job-');
-    const run = kind.startsWith('automation-run-');
-    const label = job ? 'Job id' : run ? 'Run id' : 'Schedule id';
-    const field = job ? 'jobId' : run ? 'runId' : 'scheduleId';
-    const action = kind === 'automation-job-run'
-      ? 'Run Automation Job'
-      : kind === 'automation-job-pause'
-        ? 'Pause Automation Job'
-        : kind === 'automation-job-resume'
-          ? 'Resume Automation Job'
-          : kind === 'automation-run-cancel'
-            ? 'Cancel Automation Run'
-            : kind === 'automation-run-retry'
-              ? 'Retry Automation Run'
-              : 'Run Schedule';
-    return {
-      kind,
-      mode: 'update',
-      title: action,
-      selectedFieldIndex: 0,
-      message: `${action} through the connected host. This is never automatic and requires typed confirmation.`,
-      fields: [
-        { id: field, label, value: '', required: true, multiline: false, hint: `${label} from the Automation workspace list.` },
-        { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run the confirmed connected-host action with --yes.' },
-      ],
-    };
-  }
-  if (kind === 'schedule-edit') {
-    return {
-      kind,
-      mode: 'update',
-      title: 'Edit Schedule',
-      selectedFieldIndex: 0,
-      message: 'Edit one connected-host schedule name, cadence, or prompt. This requires typed confirmation and never creates a hidden local job.',
-      fields: [
-        { id: 'scheduleId', label: 'Schedule id', value: '', required: true, multiline: false, hint: 'Schedule id from List schedules or the autonomy queue.' },
-        { id: 'scheduleKind', label: 'Schedule type', value: '', required: false, multiline: false, hint: 'Optional. at, every, or cron. Leave blank to keep cadence.' },
-        { id: 'scheduleValue', label: 'Schedule value', value: '', required: false, multiline: false, hint: 'Required with Schedule type. Examples: 0 9 * * *, 7d, or an ISO timestamp.' },
-        { id: 'timezone', label: 'Timezone', value: '', required: false, multiline: false, hint: 'Optional IANA timezone for cron schedules, for example America/Chicago.' },
-        { id: 'scheduleName', label: 'Schedule name', value: '', required: false, multiline: false, hint: 'Optional replacement display name.' },
-        { id: 'task', label: 'Task', value: '', required: false, multiline: true, hint: 'Optional replacement autonomous task. Ctrl-J inserts a new line.' },
-        { id: 'successCriteria', label: 'Success criteria', value: '', required: false, multiline: true, hint: 'Required with Task so scheduled runs know what success means.' },
-        { id: 'prompt', label: 'Exact prompt', value: '', required: false, multiline: true, hint: 'Optional exact prompt replacement. Do not combine with Task.' },
-        { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /schedule edit with --yes.' },
-      ],
-    };
-  }
-  if (kind === 'plan-approve') {
-    return {
-      kind,
-      mode: 'update',
-      title: 'Approve Planning State',
-      selectedFieldIndex: 0,
-      message: 'Approve the current Agent planning state for execution. This changes planning state and requires typed confirmation.',
-      fields: [
-        { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /plan approve with --yes.' },
-      ],
-    };
-  }
-  if (kind === 'plan-override') {
-    return {
-      kind,
-      mode: 'update',
-      title: 'Override Planning Strategy',
-      selectedFieldIndex: 0,
-      message: 'Override the planner strategy through the runtime route. This changes planner state and requires typed confirmation.',
-      fields: [
-        { id: 'strategy', label: 'Strategy', value: 'serial', required: true, multiline: false, hint: 'Planner strategy, such as serial.' },
-        { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /plan override with --yes.' },
-      ],
-    };
-  }
-  if (kind === 'plan-clear') {
-    return {
-      kind,
-      mode: 'delete',
-      title: 'Clear Planning State',
-      selectedFieldIndex: 0,
-      message: 'Clear planner state. This is destructive and requires typed confirmation.',
-      fields: [
-        { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /plan clear with --yes.' },
-      ],
-    };
-  }
-  if (kind === 'routine-receipt' || kind === 'schedule-receipt') {
-    const routine = kind === 'routine-receipt';
-    return {
-      kind,
-      mode: 'create',
-      title: routine ? 'Show Routine Promotion Receipt' : 'Show Schedule Receipt',
-      selectedFieldIndex: 0,
-      message: routine
-        ? 'Show one local routine schedule-promotion receipt without reconciling or mutating connected schedules.'
-        : 'Show one local schedule receipt without reconciling or mutating connected schedules.',
-      fields: [
-        { id: 'receiptId', label: 'Receipt id', value: '', required: true, multiline: false, hint: 'Receipt id from Promotion receipts.' },
-      ],
-    };
-  }
+function approvalActionSpec(kind: AgentWorkspaceOperationsCommandEditorKind): AgentWorkspaceEditorSpec {
+  const verb = kind === 'approval-approve' ? 'Approve' : kind === 'approval-deny' ? 'Deny' : 'Cancel';
+  return {
+    mode: 'update',
+    title: `${verb} Approval`,
+    selectedFieldIndex: 0,
+    message: `${verb} one pending connected-host approval request. This is an explicit operator action and requires typed confirmation.`,
+    fields: [
+      { id: 'approvalId', label: 'Approval id', value: '', required: true, multiline: false, hint: 'Approval request id from the approval list.' },
+      { id: 'note', label: 'Note', value: '', required: false, multiline: true, hint: 'Optional approval note. Ctrl-J inserts a new line.' },
+      { id: 'remember', label: 'Remember', value: '', required: false, multiline: false, hint: 'yes/no when you explicitly want to set the connected-host remember flag; blank leaves it unset.' },
+      { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: `Type yes to run /approval ${kind.replace('approval-', '')} with --yes.` },
+    ],
+  };
+}
+
+function automationActionSpec(kind: AgentWorkspaceOperationsCommandEditorKind): AgentWorkspaceEditorSpec {
+  const job = kind.startsWith('automation-job-');
+  const run = kind.startsWith('automation-run-');
+  const label = job ? 'Job id' : run ? 'Run id' : 'Schedule id';
+  const field = job ? 'jobId' : run ? 'runId' : 'scheduleId';
+  const action = kind === 'automation-job-run'
+    ? 'Run Automation Job'
+    : kind === 'automation-job-pause'
+      ? 'Pause Automation Job'
+      : kind === 'automation-job-resume'
+        ? 'Resume Automation Job'
+        : kind === 'automation-run-cancel'
+          ? 'Cancel Automation Run'
+          : kind === 'automation-run-retry'
+            ? 'Retry Automation Run'
+            : 'Run Schedule';
   return {
-    kind,
+    mode: 'update',
+    title: action,
+    selectedFieldIndex: 0,
+    message: `${action} through the connected host. This is never automatic and requires typed confirmation.`,
+    fields: [
+      { id: field, label, value: '', required: true, multiline: false, hint: `${label} from the Automation workspace list.` },
+      { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run the confirmed connected-host action with --yes.' },
+    ],
+  };
+}
+
+function receiptSpec(kind: AgentWorkspaceOperationsCommandEditorKind): AgentWorkspaceEditorSpec {
+  const routine = kind === 'routine-receipt';
+  return {
+    mode: 'create',
+    title: routine ? 'Show Routine Promotion Receipt' : 'Show Schedule Receipt',
+    selectedFieldIndex: 0,
+    message: routine
+      ? 'Show one local routine schedule-promotion receipt without reconciling or mutating connected schedules.'
+      : 'Show one local schedule receipt without reconciling or mutating connected schedules.',
+    fields: [
+      { id: 'receiptId', label: 'Receipt id', value: '', required: true, multiline: false, hint: 'Receipt id from Promotion receipts.' },
+    ],
+  };
+}
+
+const OPERATIONS_COMMAND_EDITOR_SPECS: Readonly<Record<AgentWorkspaceOperationsCommandEditorKind, AgentWorkspaceEditorSpecEntry<AgentWorkspaceOperationsCommandEditorKind>>> = {
+  'plan-seed': {
+    mode: 'create',
+    title: 'Seed Planning Goal',
+    selectedFieldIndex: 0,
+    message: 'Seed Agent planning state from a concrete goal. This stays in the main Agent planning flow and does not create coding-role Agent jobs.',
+    fields: [
+      { id: 'goal', label: 'Planning goal', value: '', required: true, multiline: true, hint: 'Describe the goal or operating plan to evaluate. Ctrl-J inserts a new line.' },
+    ],
+  },
+  'health-repair': {
+    mode: 'create',
+    title: 'Show Health Repair Guidance',
+    selectedFieldIndex: 0,
+    message: 'Show health repair guidance for one domain. Agent does not manage connected-host hosting or mutate connected-host lifecycle.',
+    fields: [
+      { id: 'domain', label: 'Domain', value: 'settings', required: true, multiline: false, hint: 'settings, auth, accounts, host, remote, mcp, continuity, or maintenance.' },
+    ],
+  },
+  'approval-review': {
+    mode: 'create',
+    title: 'Review Approval Class',
+    selectedFieldIndex: 0,
+    message: 'Review one approval class without approving, denying, or mutating pending requests.',
+    fields: [
+      { id: 'kind', label: 'Approval kind', value: 'shell', required: true, multiline: false, hint: 'shell, file, network, delegate, mcp, remote, hook, or plugin.' },
+    ],
+  },
+  'approval-approve': approvalActionSpec,
+  'approval-deny': approvalActionSpec,
+  'approval-cancel': approvalActionSpec,
+  'automation-job-run': automationActionSpec,
+  'automation-job-pause': automationActionSpec,
+  'automation-job-resume': automationActionSpec,
+  'automation-run-cancel': automationActionSpec,
+  'automation-run-retry': automationActionSpec,
+  'schedule-run': automationActionSpec,
+  'schedule-edit': {
+    mode: 'update',
+    title: 'Edit Schedule',
+    selectedFieldIndex: 0,
+    message: 'Edit one connected-host schedule name, cadence, or prompt. This requires typed confirmation and never creates a hidden local job.',
+    fields: [
+      { id: 'scheduleId', label: 'Schedule id', value: '', required: true, multiline: false, hint: 'Schedule id from List schedules or the autonomy queue.' },
+      { id: 'scheduleKind', label: 'Schedule type', value: '', required: false, multiline: false, hint: 'Optional. at, every, or cron. Leave blank to keep cadence.' },
+      { id: 'scheduleValue', label: 'Schedule value', value: '', required: false, multiline: false, hint: 'Required with Schedule type. Examples: 0 9 * * *, 7d, or an ISO timestamp.' },
+      { id: 'timezone', label: 'Timezone', value: '', required: false, multiline: false, hint: 'Optional IANA timezone for cron schedules, for example America/Chicago.' },
+      { id: 'scheduleName', label: 'Schedule name', value: '', required: false, multiline: false, hint: 'Optional replacement display name.' },
+      { id: 'task', label: 'Task', value: '', required: false, multiline: true, hint: 'Optional replacement autonomous task. Ctrl-J inserts a new line.' },
+      { id: 'successCriteria', label: 'Success criteria', value: '', required: false, multiline: true, hint: 'Required with Task so scheduled runs know what success means.' },
+      { id: 'prompt', label: 'Exact prompt', value: '', required: false, multiline: true, hint: 'Optional exact prompt replacement. Do not combine with Task.' },
+      { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /schedule edit with --yes.' },
+    ],
+  },
+  'plan-approve': {
+    mode: 'update',
+    title: 'Approve Planning State',
+    selectedFieldIndex: 0,
+    message: 'Approve the current Agent planning state for execution. This changes planning state and requires typed confirmation.',
+    fields: [
+      { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /plan approve with --yes.' },
+    ],
+  },
+  'plan-override': {
+    mode: 'update',
+    title: 'Override Planning Strategy',
+    selectedFieldIndex: 0,
+    message: 'Override the planner strategy through the runtime route. This changes planner state and requires typed confirmation.',
+    fields: [
+      { id: 'strategy', label: 'Strategy', value: 'serial', required: true, multiline: false, hint: 'Planner strategy, such as serial.' },
+      { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /plan override with --yes.' },
+    ],
+  },
+  'plan-clear': {
+    mode: 'delete',
+    title: 'Clear Planning State',
+    selectedFieldIndex: 0,
+    message: 'Clear planner state. This is destructive and requires typed confirmation.',
+    fields: [
+      { id: 'confirm', label: 'Confirm', value: '', required: true, multiline: false, hint: 'Type yes to run /plan clear with --yes.' },
+    ],
+  },
+  'routine-receipt': receiptSpec,
+  'schedule-receipt': receiptSpec,
+  'plan-show': {
     mode: 'create',
     title: 'Show Saved Plan',
     selectedFieldIndex: 0,
@@ -214,5 +198,9 @@ export function createAgentWorkspaceOperationsCommandEditor(kind: AgentWorkspace
     fields: [
       { id: 'planId', label: 'Plan id', value: '', required: true, multiline: false, hint: 'Plan id or unique prefix from Saved plans.' },
     ],
-  };
+  },
+};
+
+export function createAgentWorkspaceOperationsCommandEditor(kind: AgentWorkspaceOperationsCommandEditorKind): AgentWorkspaceLocalEditor {
+  return createAgentWorkspaceEditorFromTable(kind, OPERATIONS_COMMAND_EDITOR_SPECS);
 }

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

@@ -1,110 +1,54 @@
-import type { AgentWorkspaceActionResult, AgentWorkspaceEditorKind, AgentWorkspaceLocalEditor } from './agent-workspace-types.ts';
+import type { AgentWorkspaceEditorKind, AgentWorkspaceLocalEditor } from './agent-workspace-types.ts';
 import type { AgentWorkspaceProviderCommandEditorKind } from './agent-workspace-provider-command-editors.ts';
 import { isAgentWorkspaceProviderCommandEditorKind } from './agent-workspace-provider-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 AgentWorkspaceProviderCommandEditorSubmission = AgentWorkspaceCommandEditorSubmission;
 
-export type AgentWorkspaceProviderCommandEditorSubmission =
-  | {
-    readonly kind: 'editor';
-    readonly editor: AgentWorkspaceLocalEditor;
-    readonly status: string;
-    readonly actionResult?: AgentWorkspaceActionResult;
-  }
-  | {
-    readonly kind: 'dispatch';
-    readonly command: string;
-    readonly status: string;
-    readonly actionResult: AgentWorkspaceActionResult;
-  };
-
-function isAffirmative(value: string): boolean {
-  return /^(y|yes|true)$/i.test(value.trim());
-}
-
-function unconfirmed(editor: AgentWorkspaceLocalEditor, label: string): AgentWorkspaceProviderCommandEditorSubmission {
-  return {
-    kind: 'editor',
-    editor: { ...editor, message: `${label} not confirmed. Type yes, then press Enter.` },
-    status: `${label} not confirmed.`,
-  };
+function unconfirmed(editor: AgentWorkspaceLocalEditor, label: string): AgentWorkspaceCommandEditorSubmission {
+  return editorMessageSubmission(editor, `${label} not confirmed. Type yes, then press Enter.`, `${label} not confirmed.`);
 }
 
 export function isAgentWorkspaceProviderCommandSubmissionKind(kind: AgentWorkspaceEditorKind): kind is AgentWorkspaceProviderCommandEditorKind {
   return isAgentWorkspaceProviderCommandEditorKind(kind);
 }
 
-export function buildAgentWorkspaceProviderCommandEditorSubmission(
-  editor: AgentWorkspaceLocalEditor,
-  readField: AgentWorkspaceFieldReader,
-): AgentWorkspaceProviderCommandEditorSubmission {
-  if (editor.kind === 'provider-use') {
+const PROVIDER_COMMAND_SUBMISSION_HANDLERS: Readonly<Record<AgentWorkspaceProviderCommandEditorKind, AgentWorkspaceCommandSubmissionHandler>> = {
+  'provider-use': (_editor, readField) => {
     const model = readField('model');
     const command = [
       '/provider',
       quoteSlashCommandArg(readField('provider')),
       ...(model.length > 0 ? [quoteSlashCommandArg(model)] : []),
     ].join(' ');
-    return {
-      kind: 'dispatch',
-      command,
-      status: 'Opening provider selection.',
-      actionResult: {
-        kind: 'dispatched',
-        title: 'Opening provider selection',
-        detail: 'The workspace handed provider selection to the shell-owned command router.',
-        command,
-        safety: 'safe',
-      },
-    };
-  }
-  if (editor.kind === 'provider-inspect') {
-    const command = `/accounts show ${quoteSlashCommandArg(readField('provider'))}`;
-    return {
-      kind: 'dispatch',
-      command,
-      status: 'Opening provider inspection.',
-      actionResult: {
-        kind: 'dispatched',
-        title: 'Opening provider inspection',
-        detail: 'The workspace handed read-only provider inspection to the shell-owned command router.',
-        command,
-        safety: 'read-only',
-      },
-    };
-  }
-  if (editor.kind === 'provider-routes') {
-    const command = `/accounts routes ${quoteSlashCommandArg(readField('provider'))}`;
-    return {
-      kind: 'dispatch',
-      command,
-      status: 'Opening provider route inspection.',
-      actionResult: {
-        kind: 'dispatched',
-        title: 'Opening provider route inspection',
-        detail: 'The workspace handed read-only provider route inspection to the shell-owned command router.',
-        command,
-        safety: 'read-only',
-      },
-    };
-  }
-  if (editor.kind === 'provider-account-repair') {
-    const command = `/accounts repair ${quoteSlashCommandArg(readField('provider'))}`;
-    return {
-      kind: 'dispatch',
+    return dispatchCommandEditorSubmission(
       command,
-      status: 'Opening provider account repair review.',
-      actionResult: {
-        kind: 'dispatched',
-        title: 'Opening provider account repair review',
-        detail: 'The workspace handed read-only provider account repair guidance to the shell-owned command router.',
-        command,
-        safety: 'read-only',
-      },
-    };
-  }
-  if (editor.kind === 'provider-add') {
+      'Opening provider selection',
+      'The workspace handed provider selection to the shell-owned command router.',
+      'safe',
+    );
+  },
+  'provider-inspect': (_editor, readField) => dispatchCommandEditorSubmission(
+    `/accounts show ${quoteSlashCommandArg(readField('provider'))}`,
+    'Opening provider inspection',
+    'The workspace handed read-only provider inspection to the shell-owned command router.',
+    'read-only',
+  ),
+  'provider-routes': (_editor, readField) => dispatchCommandEditorSubmission(
+    `/accounts routes ${quoteSlashCommandArg(readField('provider'))}`,
+    'Opening provider route inspection',
+    'The workspace handed read-only provider route inspection to the shell-owned command router.',
+    'read-only',
+  ),
+  'provider-account-repair': (_editor, readField) => dispatchCommandEditorSubmission(
+    `/accounts repair ${quoteSlashCommandArg(readField('provider'))}`,
+    'Opening provider account repair review',
+    'The workspace handed read-only provider account repair guidance to the shell-owned command router.',
+    'read-only',
+  ),
+  'provider-add': (editor, readField) => {
     if (!isAffirmative(readField('confirm'))) {
       return unconfirmed(editor, 'Custom provider add');
     }
@@ -122,6 +66,10 @@ export function buildAgentWorkspaceProviderCommandEditorSubmission(
     }
     parts.push('--yes');
     redactedParts.push('--yes');
+    // The dispatched command carries the real key; the actionResult.command shown
+    // in the transcript is redacted. This is the one submission in this domain that
+    // cannot use dispatchCommandEditorSubmission, whose actionResult.command always
+    // matches the dispatched command.
     return {
       kind: 'dispatch',
       command: parts.join(' '),
@@ -134,22 +82,28 @@ export function buildAgentWorkspaceProviderCommandEditorSubmission(
         safety: 'safe',
       },
     };
-  }
+  },
+  'provider-remove': (editor, readField) => {
+    if (!isAffirmative(readField('confirm'))) {
+      return unconfirmed(editor, 'Custom provider removal');
+    }
+    return dispatchCommandEditorSubmission(
+      `/provider remove ${quoteSlashCommandArg(readField('name'))} --yes`,
+      'Opening custom provider removal',
+      'The workspace handed a confirmed custom provider removal command to the shell-owned command router.',
+      'safe',
+    );
+  },
+};
 
-  if (!isAffirmative(readField('confirm'))) {
-    return unconfirmed(editor, 'Custom provider removal');
-  }
-  const command = `/provider remove ${quoteSlashCommandArg(readField('name'))} --yes`;
-  return {
-    kind: 'dispatch',
-    command,
-    status: 'Opening custom provider removal.',
-    actionResult: {
-      kind: 'dispatched',
-      title: 'Opening custom provider removal',
-      detail: 'The workspace handed a confirmed custom provider removal command to the shell-owned command router.',
-      command,
-      safety: 'safe',
-    },
-  };
+export function buildAgentWorkspaceProviderCommandEditorSubmission(
+  editor: AgentWorkspaceLocalEditor,
+  readField: AgentWorkspaceFieldReader,
+): AgentWorkspaceCommandEditorSubmission {
+  return buildCommandEditorSubmissionFromTable(
+    editor.kind as AgentWorkspaceProviderCommandEditorKind,
+    editor,
+    readField,
+    PROVIDER_COMMAND_SUBMISSION_HANDLERS,
+  );
 }