diff --git a/client/src/api/client.ts b/client/src/api/client.ts
index 07fa183..abf4e7a 100644
--- a/client/src/api/client.ts
+++ b/client/src/api/client.ts
@@ -83,7 +83,10 @@ export const snippets = {
       body: JSON.stringify(payload),
     });
   },
-  update(id: string, patch: Partial<Pick<Snippet, 'name' | 'description' | 'code'>>): Promise<Snippet> {
+  update(
+    id: string,
+    patch: Partial<Pick<Snippet, 'name' | 'description' | 'code'>>,
+  ): Promise<Snippet> {
     return request(`/snippets/${id}`, {
       method: 'PATCH',
       body: JSON.stringify(patch),
@@ -184,7 +187,11 @@ export const scenarios = {
   waitForRun(scenarioId: string, runId: string): Promise<ScenarioRunDetail> {
     return request(`/scenarios/${scenarioId}/run/${runId}/wait`, { method: 'POST' });
   },
-  listRuns(scenarioId: string, page = 1, limit = 20): Promise<PaginatedResponse<ScenarioRun & { stepRuns: ScenarioRunStep[] }>> {
+  listRuns(
+    scenarioId: string,
+    page = 1,
+    limit = 20,
+  ): Promise<PaginatedResponse<ScenarioRun & { stepRuns: ScenarioRunStep[] }>> {
     return request(`/scenarios/${scenarioId}/runs?page=${page}&limit=${limit}`);
   },
   exportScenario(id: string): Promise<unknown> {
@@ -201,12 +208,24 @@ export const scenarios = {
 // ── Runs ─────────────────────────────────────────────────────────────────────
 
 export const runs = {
-  listAll(page = 1, limit = 20, status?: string): Promise<PaginatedResponse<ScenarioRun & { stepRuns: ScenarioRunStep[]; scenario: { id: string; name: string } }>> {
+  listAll(
+    page = 1,
+    limit = 20,
+    status?: string,
+  ): Promise<
+    PaginatedResponse<
+      ScenarioRun & { stepRuns: ScenarioRunStep[]; scenario: { id: string; name: string } }
+    >
+  > {
     const q = new URLSearchParams({ page: String(page), limit: String(limit) });
     if (status) q.set('status', status);
     return request(`/scenarios/runs?${q}`);
   },
-  list(scenarioId: string, page = 1, limit = 20): Promise<PaginatedResponse<ScenarioRun & { stepRuns: ScenarioRunStep[] }>> {
+  list(
+    scenarioId: string,
+    page = 1,
+    limit = 20,
+  ): Promise<PaginatedResponse<ScenarioRun & { stepRuns: ScenarioRunStep[] }>> {
     return request(`/scenarios/${scenarioId}/runs?page=${page}&limit=${limit}`);
   },
   get(scenarioId: string, runId: string, q?: string): Promise<ScenarioRunDetail> {
@@ -238,7 +257,6 @@ export const scenarioCredentials = {
 export interface CreateStepPayload {
   title?: string;
   order: number;
-  type: 'login' | 'exec' | 'sign';
   execCode?: string;
   validateCode?: string;
 }
@@ -246,7 +264,6 @@ export interface CreateStepPayload {
 export interface UpdateStepPayload {
   title?: string;
   order?: number;
-  type?: 'login' | 'exec' | 'sign';
   execCode?: string;
   validateCode?: string;
 }
diff --git a/client/src/api/types.ts b/client/src/api/types.ts
index 04f8ff4..f2edcde 100644
--- a/client/src/api/types.ts
+++ b/client/src/api/types.ts
@@ -68,13 +68,10 @@ export interface Session {
 
 // ── Scenarios ─────────────────────────────────────────────────────────────────
 
-export type StepType = 'login' | 'exec' | 'sign';
-
 export interface ScenarioStep {
   id: string;
   scenarioId: string;
   order: number;
-  type: StepType;
   title: string | null;
   sessionName: string | null;
   execCode: string | null;
diff --git a/client/src/lib/hljs.ts b/client/src/lib/hljs.ts
index d8a1cde..e2c4a21 100644
--- a/client/src/lib/hljs.ts
+++ b/client/src/lib/hljs.ts
@@ -6,7 +6,3 @@ hljs.registerLanguage('javascript', javascript);
 hljs.registerLanguage('json', json);
 
 export default hljs;
-
-export function escapeHtml(str: string): string {
-  return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-}
diff --git a/client/src/pages/credential/CredentialDetailPage.tsx b/client/src/pages/credential/CredentialDetailPage.tsx
index 9881c68..09b7033 100644
--- a/client/src/pages/credential/CredentialDetailPage.tsx
+++ b/client/src/pages/credential/CredentialDetailPage.tsx
@@ -6,7 +6,15 @@ import { CodeBlock } from '../../ui';
 import { stringify as yamlStringify } from 'yaml';
 import { credentials } from '../../api';
 import type { Credential } from '../../api';
-import { Breadcrumbs, Button, Card, DescriptionList, Notification, Timestamp, UuidBadge } from '../../ui';
+import {
+  Breadcrumbs,
+  Button,
+  Card,
+  DescriptionList,
+  Notification,
+  Timestamp,
+  UuidBadge,
+} from '../../ui';
 import styles from '../Page.module.css';
 
 export function CredentialDetailPage() {
@@ -95,11 +103,7 @@ export function CredentialDetailPage() {
                 { term: t('credentials.field_id'), detail: <UuidBadge id={credential.id} /> },
                 {
                   term: t('credentials.field_last_used'),
-                  detail: credential.lastUsedAt ? (
-                    <Timestamp value={credential.lastUsedAt} />
-                  ) : (
-                    '—'
-                  ),
+                  detail: credential.lastUsedAt ? <Timestamp value={credential.lastUsedAt} /> : '—',
                 },
                 {
                   term: t('credentials.field_created'),
diff --git a/client/src/pages/credential/CredentialsPage.tsx b/client/src/pages/credential/CredentialsPage.tsx
index 27bb284..72b4f96 100644
--- a/client/src/pages/credential/CredentialsPage.tsx
+++ b/client/src/pages/credential/CredentialsPage.tsx
@@ -5,7 +5,15 @@ import { Settings, Pencil, Trash2, Plus, Download } from 'lucide-react';
 import { parse as yamlParse } from 'yaml';
 import { credentials } from '../../api';
 import type { Credential } from '../../api';
-import { Breadcrumbs, Button, Card, ContextMenu, DescriptionList, Timestamp, UuidBadge } from '../../ui';
+import {
+  Breadcrumbs,
+  Button,
+  Card,
+  ContextMenu,
+  DescriptionList,
+  Timestamp,
+  UuidBadge,
+} from '../../ui';
 import styles from '../Page.module.css';
 
 function CredentialCard({
diff --git a/client/src/pages/environment/EnvironmentsPage.tsx b/client/src/pages/environment/EnvironmentsPage.tsx
index 1f12f7f..ab0e7a6 100644
--- a/client/src/pages/environment/EnvironmentsPage.tsx
+++ b/client/src/pages/environment/EnvironmentsPage.tsx
@@ -4,7 +4,15 @@ import { useTranslation } from 'react-i18next';
 import { Settings, ExternalLink, Pencil, Trash2, Plus } from 'lucide-react';
 import { environments } from '../../api';
 import type { Environment } from '../../api';
-import { Breadcrumbs, Button, Card, ContextMenu, DescriptionList, Timestamp, UuidBadge } from '../../ui';
+import {
+  Breadcrumbs,
+  Button,
+  Card,
+  ContextMenu,
+  DescriptionList,
+  Timestamp,
+  UuidBadge,
+} from '../../ui';
 import styles from '../Page.module.css';
 
 function EnvironmentCard({ env, onDelete }: { env: Environment; onDelete: (id: string) => void }) {
diff --git a/client/src/pages/run/AllRunsPage.tsx b/client/src/pages/run/AllRunsPage.tsx
index d1a5c3a..892c0f3 100644
--- a/client/src/pages/run/AllRunsPage.tsx
+++ b/client/src/pages/run/AllRunsPage.tsx
@@ -3,7 +3,14 @@ import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { runs } from '../../api';
 import type { ScenarioRun, ScenarioRunStep, ScenarioRunStatus } from '../../api';
-import { AutoRefreshIndicator, Badge, Table, Timestamp, UuidBadge, type TableColumn } from '../../ui';
+import {
+  AutoRefreshIndicator,
+  Badge,
+  Table,
+  Timestamp,
+  UuidBadge,
+  type TableColumn,
+} from '../../ui';
 import type { BadgeVariant } from '../../ui';
 import styles from '../Page.module.css';
 
@@ -37,6 +44,7 @@ export function AllRunsPage() {
   const pollRef = useRef<ReturnType<typeof setInterval> | null>(null);
 
   const load = () => {
+    setLoading(true);
     runs
       .listAll()
       .then((res) => {
@@ -48,7 +56,7 @@ export function AllRunsPage() {
   };
 
   useEffect(() => {
-    setLoading(true);
+    // eslint-disable-next-line react-hooks/set-state-in-effect
     load();
     pollRef.current = setInterval(load, 10_000);
     return () => {
@@ -77,9 +85,7 @@ export function AllRunsPage() {
       key: 'status',
       header: t('runs.col_status'),
       width: 110,
-      render: (r) => (
-        <Badge variant={STATUS_VARIANT[r.status]}>{STATUS_LABEL[r.status]}</Badge>
-      ),
+      render: (r) => <Badge variant={STATUS_VARIANT[r.status]}>{STATUS_LABEL[r.status]}</Badge>,
     },
     {
       key: 'steps',
diff --git a/client/src/pages/run/RunDetailPage.tsx b/client/src/pages/run/RunDetailPage.tsx
index 426ca10..b77a241 100644
--- a/client/src/pages/run/RunDetailPage.tsx
+++ b/client/src/pages/run/RunDetailPage.tsx
@@ -58,6 +58,8 @@ const LOG_LEVEL_VARIANT: Record<LogLevel, BadgeVariant> = {
   error: 'error',
 };
 
+const FINAL: ScenarioRunStatus[] = ['pass', 'fail'];
+
 export function RunDetailPage() {
   const { t } = useTranslation();
   const { id, runId } = useParams<{ id: string; runId: string }>();
@@ -76,8 +78,6 @@ export function RunDetailPage() {
   const LOG_PAGE_SIZE = 25;
   const pollRef = useRef<ReturnType<typeof setInterval> | null>(null);
 
-  const FINAL: ScenarioRunStatus[] = ['pass', 'fail'];
-
   const stopPolling = () => {
     if (pollRef.current) {
       clearInterval(pollRef.current);
@@ -97,8 +97,11 @@ export function RunDetailPage() {
 
   useEffect(() => {
     if (!id || !runId || polling) return;
-    runs.get(id, runId, debouncedSearch).then(setRun).catch(() => undefined);
-  }, [debouncedSearch]);
+    runs
+      .get(id, runId, debouncedSearch)
+      .then(setRun)
+      .catch(() => undefined);
+  }, [id, runId, polling, debouncedSearch]);
 
   useEffect(() => {
     if (!id || !runId) return;
@@ -124,8 +127,12 @@ export function RunDetailPage() {
           }, 1000);
         }
       })
-      .catch((err: Error) => { if (!cancelled) setError(err.message); })
-      .finally(() => { if (!cancelled) setLoading(false); });
+      .catch((err: Error) => {
+        if (!cancelled) setError(err.message);
+      })
+      .finally(() => {
+        if (!cancelled) setLoading(false);
+      });
 
     return () => {
       cancelled = true;
diff --git a/client/src/pages/run/RunsPage.tsx b/client/src/pages/run/RunsPage.tsx
index dd3da1d..ca375b8 100644
--- a/client/src/pages/run/RunsPage.tsx
+++ b/client/src/pages/run/RunsPage.tsx
@@ -4,7 +4,16 @@ import { useTranslation } from 'react-i18next';
 import { Play } from 'lucide-react';
 import { scenarios, runs } from '../../api';
 import type { Scenario, ScenarioRun, ScenarioRunStep, ScenarioRunStatus } from '../../api';
-import { AutoRefreshIndicator, Badge, Breadcrumbs, Button, Table, Timestamp, UuidBadge, type TableColumn } from '../../ui';
+import {
+  AutoRefreshIndicator,
+  Badge,
+  Breadcrumbs,
+  Button,
+  Table,
+  Timestamp,
+  UuidBadge,
+  type TableColumn,
+} from '../../ui';
 import type { BadgeVariant } from '../../ui';
 import styles from '../Page.module.css';
 
@@ -50,6 +59,7 @@ export function RunsPage() {
   }, [id]);
 
   useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect
     load();
     pollRef.current = setInterval(load, 10_000);
     return () => {
@@ -68,9 +78,7 @@ export function RunsPage() {
       key: 'status',
       header: t('runs.col_status'),
       width: 100,
-      render: (r) => (
-        <Badge variant={STATUS_VARIANT[r.status]}>{STATUS_LABEL[r.status]}</Badge>
-      ),
+      render: (r) => <Badge variant={STATUS_VARIANT[r.status]}>{STATUS_LABEL[r.status]}</Badge>,
     },
     {
       key: 'steps',
diff --git a/client/src/pages/scenario/CreateStepPage.tsx b/client/src/pages/scenario/CreateStepPage.tsx
index 12971df..c5b06df 100644
--- a/client/src/pages/scenario/CreateStepPage.tsx
+++ b/client/src/pages/scenario/CreateStepPage.tsx
@@ -2,13 +2,11 @@ import { useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { scenarios, steps } from '../../api';
-import type { Scenario, StepType } from '../../api';
+import type { Scenario } from '../../api';
 import type { CreateStepPayload } from '../../api/client';
-import { Breadcrumbs, Button, Card, Input, Select, CodeEditor } from '../../ui';
+import { Breadcrumbs, Button, Card, Input, CodeEditor } from '../../ui';
 import styles from '../Page.module.css';
 
-const STEP_TYPES: StepType[] = ['login', 'exec', 'sign'];
-
 export function CreateStepPage() {
   const { t } = useTranslation();
   const { id } = useParams<{ id: string }>();
@@ -17,7 +15,6 @@ export function CreateStepPage() {
   const [scenario, setScenario] = useState<Scenario | null>(null);
   const [order, setOrder] = useState('0');
   const [title, setTitle] = useState('');
-  const [type, setType] = useState<StepType>('exec');
   const [execCode, setExecCode] = useState('');
   const [validateCode, setValidateCode] = useState('');
   const [errors, setErrors] = useState<Partial<Record<keyof CreateStepPayload, string>>>({});
@@ -26,7 +23,10 @@ export function CreateStepPage() {
 
   useEffect(() => {
     if (!id) return;
-    scenarios.get(id).then(setScenario).catch(() => null);
+    scenarios
+      .get(id)
+      .then(setScenario)
+      .catch(() => null);
   }, [id]);
 
   const validate = (): boolean => {
@@ -45,7 +45,6 @@ export function CreateStepPage() {
       await steps.create(id!, {
         order: Number(order),
         title: title.trim() || undefined,
-        type,
         execCode: execCode.trim() || undefined,
         validateCode: validateCode.trim() || undefined,
       });
@@ -91,32 +90,22 @@ export function CreateStepPage() {
               value={title}
               onChange={(e) => setTitle(e.target.value)}
             />
-            <Select
-              label={t('steps.form_type')}
-              value={type}
-              onChange={(e) => setType(e.target.value as StepType)}
-              options={STEP_TYPES.map((v) => ({ value: v, label: v }))}
-            />
             <div className={styles.formField}>
               <label className={styles.fieldLabel}>{t('steps.form_exec_code')}</label>
-              <textarea
-                className={styles.textarea}
-                rows={6}
+              <CodeEditor
                 value={execCode}
-                onChange={(e) => setExecCode(e.target.value)}
+                onChange={setExecCode}
+                rows={6}
                 placeholder={t('steps.form_exec_code_placeholder')}
-                spellCheck={false}
               />
             </div>
             <div className={styles.formField}>
               <label className={styles.fieldLabel}>{t('steps.form_validate_code')}</label>
-              <textarea
-                className={styles.textarea}
-                rows={6}
+              <CodeEditor
                 value={validateCode}
-                onChange={(e) => setValidateCode(e.target.value)}
+                onChange={setValidateCode}
+                rows={6}
                 placeholder={t('steps.form_validate_code_placeholder')}
-                spellCheck={false}
               />
             </div>
           </div>
diff --git a/client/src/pages/scenario/EditStepPage.tsx b/client/src/pages/scenario/EditStepPage.tsx
index 03a1404..e9af9cd 100644
--- a/client/src/pages/scenario/EditStepPage.tsx
+++ b/client/src/pages/scenario/EditStepPage.tsx
@@ -2,12 +2,10 @@ import { useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { scenarios, steps } from '../../api';
-import type { Scenario, ScenarioStep, StepType } from '../../api';
-import { Breadcrumbs, Button, Card, Input, Select, CodeEditor } from '../../ui';
+import type { Scenario, ScenarioStep } from '../../api';
+import { Breadcrumbs, Button, Card, Input, CodeEditor } from '../../ui';
 import styles from '../Page.module.css';
 
-const STEP_TYPES: StepType[] = ['login', 'exec', 'sign'];
-
 export function EditStepPage() {
   const { t } = useTranslation();
   const { id, stepId } = useParams<{ id: string; stepId: string }>();
@@ -17,7 +15,6 @@ export function EditStepPage() {
   const [step, setStep] = useState<ScenarioStep | null>(null);
   const [order, setOrder] = useState('');
   const [title, setTitle] = useState('');
-  const [type, setType] = useState<StepType>('exec');
   const [execCode, setExecCode] = useState('');
   const [validateCode, setValidateCode] = useState('');
   const [orderError, setOrderError] = useState('');
@@ -33,7 +30,6 @@ export function EditStepPage() {
         setStep(st);
         setOrder(String(st.order));
         setTitle(st.title ?? '');
-        setType(st.type);
         setExecCode(st.execCode ?? '');
         setValidateCode(st.validateCode ?? '');
       })
@@ -59,7 +55,6 @@ export function EditStepPage() {
       await steps.update(id!, stepId!, {
         order: Number(order),
         title: title.trim() || undefined,
-        type,
         execCode: execCode.trim() || undefined,
         validateCode: validateCode.trim() || undefined,
       });
@@ -110,27 +105,13 @@ export function EditStepPage() {
                 value={title}
                 onChange={(e) => setTitle(e.target.value)}
               />
-              <Select
-                label={t('steps.form_type')}
-                value={type}
-                onChange={(e) => setType(e.target.value as StepType)}
-                options={STEP_TYPES.map((v) => ({ value: v, label: v }))}
-              />
               <div className={styles.formField}>
                 <label className={styles.fieldLabel}>{t('steps.form_exec_code')}</label>
-                <CodeEditor
-                  value={execCode}
-                  onChange={setExecCode}
-                  rows={6}
-                />
+                <CodeEditor value={execCode} onChange={setExecCode} rows={6} />
               </div>
               <div className={styles.formField}>
                 <label className={styles.fieldLabel}>{t('steps.form_validate_code')}</label>
-                <CodeEditor
-                  value={validateCode}
-                  onChange={setValidateCode}
-                  rows={6}
-                />
+                <CodeEditor value={validateCode} onChange={setValidateCode} rows={6} />
               </div>
             </div>
 
diff --git a/client/src/pages/scenario/ScenarioDetailPage.tsx b/client/src/pages/scenario/ScenarioDetailPage.tsx
index c0a1202..5612639 100644
--- a/client/src/pages/scenario/ScenarioDetailPage.tsx
+++ b/client/src/pages/scenario/ScenarioDetailPage.tsx
@@ -6,7 +6,6 @@ import { stringify as yamlStringify } from 'yaml';
 import { scenarios, steps, scenarioCredentials, credentials as credentialsApi } from '../../api';
 import type { Scenario, ScenarioStep, ScenarioCredential, Credential } from '../../api';
 import {
-  Badge,
   Breadcrumbs,
   Button,
   Card,
@@ -21,12 +20,6 @@ import {
 } from '../../ui';
 import styles from '../Page.module.css';
 
-const STEP_TYPE_VARIANT: Record<string, 'info' | 'warning' | 'success'> = {
-  login: 'success',
-  exec: 'info',
-  sign: 'warning',
-};
-
 export function ScenarioDetailPage() {
   const { t } = useTranslation();
   const { id } = useParams<{ id: string }>();
@@ -95,8 +88,14 @@ export function ScenarioDetailPage() {
   const handleAddCredential = async (e: React.FormEvent) => {
     e.preventDefault();
     let valid = true;
-    if (!addCredId) { setAddCredError(t('scenarios.cred_form_cred_required')); valid = false; }
-    if (!addAlias.trim()) { setAddAliasError(t('scenarios.cred_form_alias_required')); valid = false; }
+    if (!addCredId) {
+      setAddCredError(t('scenarios.cred_form_cred_required'));
+      valid = false;
+    }
+    if (!addAlias.trim()) {
+      setAddAliasError(t('scenarios.cred_form_alias_required'));
+      valid = false;
+    }
     if (!valid) return;
     setAddCredSaving(true);
     try {
@@ -122,16 +121,13 @@ export function ScenarioDetailPage() {
 
   const stepColumns: TableColumn<ScenarioStep>[] = [
     { key: 'order', header: t('scenarios.step_order'), render: (s) => s.order, width: 60 },
-    {
-      key: 'type',
-      header: t('scenarios.step_type'),
-      width: 90,
-      render: (s) => <Badge variant={STEP_TYPE_VARIANT[s.type] ?? 'neutral'}>{s.type}</Badge>,
-    },
     {
       key: 'title',
       header: t('scenarios.step_title'),
-      render: (s) => s.title ?? <span style={{ color: 'var(--color-text-muted)', fontStyle: 'italic' }}>{'—'}</span>,
+      render: (s) =>
+        s.title ?? (
+          <span style={{ color: 'var(--color-text-muted)', fontStyle: 'italic' }}>{'—'}</span>
+        ),
     },
     {
       key: 'updated',
@@ -315,42 +311,52 @@ export function ScenarioDetailPage() {
 
             {addCredOpen && (
               <div style={{ marginBottom: 'var(--space-4)' }}>
-              <Card className={styles.formCard}>
-                <form onSubmit={handleAddCredential} noValidate>
-                  <div className={styles.formFields}>
-                    <Select
-                      label={t('scenarios.cred_form_cred')}
-                      value={addCredId}
-                      onChange={(e) => { setAddCredId(e.target.value); setAddCredError(''); }}
-                      error={addCredError || undefined}
-                      options={[
-                        { value: '', label: t('scenarios.cred_form_cred_placeholder') },
-                        ...allCredentials.map((c) => ({ value: String(c.id), label: c.name })),
-                      ]}
-                    />
-                    <Input
-                      label={t('scenarios.cred_form_alias')}
-                      placeholder={t('scenarios.cred_form_alias_placeholder')}
-                      value={addAlias}
-                      onChange={(e) => { setAddAlias(e.target.value); setAddAliasError(''); }}
-                      error={addAliasError || undefined}
-                    />
-                  </div>
-                  <div className={styles.formActions}>
-                    <Button
-                      type="button"
-                      variant="secondary"
-                      size="sm"
-                      onClick={() => { setAddCredOpen(false); setAddCredId(''); setAddAlias(''); }}
-                    >
-                      {t('scenarios.cred_action_cancel')}
-                    </Button>
-                    <Button type="submit" size="sm" loading={addCredSaving}>
-                      {t('scenarios.cred_action_save')}
-                    </Button>
-                  </div>
-                </form>
-              </Card>
+                <Card className={styles.formCard}>
+                  <form onSubmit={handleAddCredential} noValidate>
+                    <div className={styles.formFields}>
+                      <Select
+                        label={t('scenarios.cred_form_cred')}
+                        value={addCredId}
+                        onChange={(e) => {
+                          setAddCredId(e.target.value);
+                          setAddCredError('');
+                        }}
+                        error={addCredError || undefined}
+                        options={[
+                          { value: '', label: t('scenarios.cred_form_cred_placeholder') },
+                          ...allCredentials.map((c) => ({ value: String(c.id), label: c.name })),
+                        ]}
+                      />
+                      <Input
+                        label={t('scenarios.cred_form_alias')}
+                        placeholder={t('scenarios.cred_form_alias_placeholder')}
+                        value={addAlias}
+                        onChange={(e) => {
+                          setAddAlias(e.target.value);
+                          setAddAliasError('');
+                        }}
+                        error={addAliasError || undefined}
+                      />
+                    </div>
+                    <div className={styles.formActions}>
+                      <Button
+                        type="button"
+                        variant="secondary"
+                        size="sm"
+                        onClick={() => {
+                          setAddCredOpen(false);
+                          setAddCredId('');
+                          setAddAlias('');
+                        }}
+                      >
+                        {t('scenarios.cred_action_cancel')}
+                      </Button>
+                      <Button type="submit" size="sm" loading={addCredSaving}>
+                        {t('scenarios.cred_action_save')}
+                      </Button>
+                    </div>
+                  </form>
+                </Card>
               </div>
             )}
 
diff --git a/client/src/pages/session/SessionDetailPage.tsx b/client/src/pages/session/SessionDetailPage.tsx
index cb78734..a1db6d5 100644
--- a/client/src/pages/session/SessionDetailPage.tsx
+++ b/client/src/pages/session/SessionDetailPage.tsx
@@ -4,7 +4,16 @@ import { useTranslation } from 'react-i18next';
 import { Trash2 } from 'lucide-react';
 import { sessions } from '../../api';
 import type { Session } from '../../api';
-import { Badge, Breadcrumbs, Button, Card, DescriptionList, Notification, Timestamp, UuidBadge } from '../../ui';
+import {
+  Badge,
+  Breadcrumbs,
+  Button,
+  Card,
+  DescriptionList,
+  Notification,
+  Timestamp,
+  UuidBadge,
+} from '../../ui';
 import styles from '../Page.module.css';
 
 export function SessionDetailPage() {
diff --git a/client/src/pages/session/SessionsPage.tsx b/client/src/pages/session/SessionsPage.tsx
index 96eb748..7a1deb1 100644
--- a/client/src/pages/session/SessionsPage.tsx
+++ b/client/src/pages/session/SessionsPage.tsx
@@ -4,7 +4,15 @@ import { useTranslation } from 'react-i18next';
 import { Trash2 } from 'lucide-react';
 import { sessions } from '../../api';
 import type { Session } from '../../api';
-import { Badge, Breadcrumbs, Button, Table, type TableColumn, Timestamp, UuidBadge } from '../../ui';
+import {
+  Badge,
+  Breadcrumbs,
+  Button,
+  Table,
+  type TableColumn,
+  Timestamp,
+  UuidBadge,
+} from '../../ui';
 import styles from '../Page.module.css';
 
 export function SessionsPage() {
diff --git a/client/src/pages/snippet/EditSnippetPage.tsx b/client/src/pages/snippet/EditSnippetPage.tsx
index d00aaff..2ce52c0 100644
--- a/client/src/pages/snippet/EditSnippetPage.tsx
+++ b/client/src/pages/snippet/EditSnippetPage.tsx
@@ -121,11 +121,7 @@ export function EditSnippetPage() {
               </div>
             </div>
             <div className={styles.formActions}>
-              <Button
-                type="button"
-                variant="secondary"
-                onClick={() => navigate(`/snippets/${id}`)}
-              >
+              <Button type="button" variant="secondary" onClick={() => navigate(`/snippets/${id}`)}>
                 {t('snippets.action_cancel')}
               </Button>
               <Button type="submit" disabled={saving}>
diff --git a/client/src/pages/snippet/SnippetDetailPage.tsx b/client/src/pages/snippet/SnippetDetailPage.tsx
index 92dc8f7..7e86bbd 100644
--- a/client/src/pages/snippet/SnippetDetailPage.tsx
+++ b/client/src/pages/snippet/SnippetDetailPage.tsx
@@ -6,7 +6,15 @@ import { CodeBlock } from '../../ui';
 import { stringify as yamlStringify } from 'yaml';
 import { snippets } from '../../api';
 import type { Snippet } from '../../api';
-import { Breadcrumbs, Button, Card, DescriptionList, Notification, Timestamp, UuidBadge } from '../../ui';
+import {
+  Breadcrumbs,
+  Button,
+  Card,
+  DescriptionList,
+  Notification,
+  Timestamp,
+  UuidBadge,
+} from '../../ui';
 import styles from '../Page.module.css';
 
 export function SnippetDetailPage() {
diff --git a/client/src/pages/snippet/SnippetsPage.tsx b/client/src/pages/snippet/SnippetsPage.tsx
index ab59c55..c94ac0d 100644
--- a/client/src/pages/snippet/SnippetsPage.tsx
+++ b/client/src/pages/snippet/SnippetsPage.tsx
@@ -8,13 +8,7 @@ import type { Snippet } from '../../api';
 import { Breadcrumbs, Button, Card, ContextMenu, Timestamp, UuidBadge } from '../../ui';
 import styles from '../Page.module.css';
 
-function SnippetCard({
-  snippet,
-  onDelete,
-}: {
-  snippet: Snippet;
-  onDelete: (id: string) => void;
-}) {
+function SnippetCard({ snippet, onDelete }: { snippet: Snippet; onDelete: (id: string) => void }) {
   const { t } = useTranslation();
   const navigate = useNavigate();
 
@@ -62,9 +56,7 @@ function SnippetCard({
       footer={footer}
       onClick={() => navigate(`/snippets/${snippet.id}`)}
     >
-      {snippet.description && (
-        <p className={styles.muted}>{snippet.description}</p>
-      )}
+      {snippet.description && <p className={styles.muted}>{snippet.description}</p>}
     </Card>
   );
 }
@@ -148,9 +140,7 @@ export function SnippetsPage() {
           {items.map((s) => (
             <SnippetCard key={s.id} snippet={s} onDelete={handleDelete} />
           ))}
-          {items.length === 0 && (
-            <p className={styles.muted}>{t('snippets.empty')}</p>
-          )}
+          {items.length === 0 && <p className={styles.muted}>{t('snippets.empty')}</p>}
           <AddSnippetCard />
         </div>
       )}
diff --git a/client/src/ui/AutoRefreshIndicator/AutoRefreshIndicator.tsx b/client/src/ui/AutoRefreshIndicator/AutoRefreshIndicator.tsx
index 9bc2bff..c2a771d 100644
--- a/client/src/ui/AutoRefreshIndicator/AutoRefreshIndicator.tsx
+++ b/client/src/ui/AutoRefreshIndicator/AutoRefreshIndicator.tsx
@@ -6,7 +6,11 @@ export interface AutoRefreshIndicatorProps {
   label?: string;
 }
 
-export function AutoRefreshIndicator({ active, pulseKey, label = 'Live' }: AutoRefreshIndicatorProps) {
+export function AutoRefreshIndicator({
+  active,
+  pulseKey,
+  label = 'Live',
+}: AutoRefreshIndicatorProps) {
   return (
     <div
       className={[styles.root, active ? styles.active : styles.inactive].join(' ')}
@@ -15,9 +19,7 @@ export function AutoRefreshIndicator({ active, pulseKey, label = 'Live' }: AutoR
       aria-live="polite"
     >
       <span className={styles.dot}>
-        {pulseKey !== undefined && pulseKey > 0 && (
-          <span key={pulseKey} className={styles.ring} />
-        )}
+        {pulseKey !== undefined && pulseKey > 0 && <span key={pulseKey} className={styles.ring} />}
       </span>
       <span className={styles.label}>{label}</span>
     </div>
diff --git a/client/src/ui/CodeBlock/CodeBlock.tsx b/client/src/ui/CodeBlock/CodeBlock.tsx
index 45157e0..47b9d4d 100644
--- a/client/src/ui/CodeBlock/CodeBlock.tsx
+++ b/client/src/ui/CodeBlock/CodeBlock.tsx
@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import hljs, { escapeHtml } from '../../lib/hljs';
+import hljs from '../../lib/hljs';
 import styles from './CodeBlock.module.css';
 
 export interface CodeBlockProps {
diff --git a/client/src/ui/CodeEditor/CodeEditor.tsx b/client/src/ui/CodeEditor/CodeEditor.tsx
index e9e7610..c9e2cce 100644
--- a/client/src/ui/CodeEditor/CodeEditor.tsx
+++ b/client/src/ui/CodeEditor/CodeEditor.tsx
@@ -12,13 +12,13 @@ export interface CodeEditorProps {
 
 function useMonacoTheme() {
   const [theme, setTheme] = useState(() =>
-    document.documentElement.getAttribute('data-theme') === 'dark' ? 'vs-dark' : 'vs-light'
+    document.documentElement.getAttribute('data-theme') === 'dark' ? 'vs-dark' : 'vs-light',
   );
 
   useEffect(() => {
     const observer = new MutationObserver(() => {
       setTheme(
-        document.documentElement.getAttribute('data-theme') === 'dark' ? 'vs-dark' : 'vs-light'
+        document.documentElement.getAttribute('data-theme') === 'dark' ? 'vs-dark' : 'vs-light',
       );
     });
     observer.observe(document.documentElement, {
@@ -49,11 +49,7 @@ export function CodeEditor({
 
   return (
     <div
-      className={[
-        styles.wrapper,
-        focused ? styles.focused : '',
-        error ? styles.hasError : '',
-      ]
+      className={[styles.wrapper, focused ? styles.focused : '', error ? styles.hasError : '']
         .filter(Boolean)
         .join(' ')}
       style={{ height }}
diff --git a/client/src/ui/Textarea/Textarea.tsx b/client/src/ui/Textarea/Textarea.tsx
index 8f17343..613fc95 100644
--- a/client/src/ui/Textarea/Textarea.tsx
+++ b/client/src/ui/Textarea/Textarea.tsx
@@ -1,8 +1,10 @@
 import React, { useId } from 'react';
 import styles from './Textarea.module.css';
 
-export interface TextareaProps
-  extends Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'id'> {
+export interface TextareaProps extends Omit<
+  React.TextareaHTMLAttributes<HTMLTextAreaElement>,
+  'id'
+> {
   label?: string;
   hint?: string;
   error?: string;
diff --git a/client/vite.config.ts b/client/vite.config.ts
index 2435427..bb875d9 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -13,7 +13,8 @@ export default defineConfig({
   server: {
     proxy: {
       '/environments': 'http://localhost:13000',
-      '/credentials': 'http://localhost:13000',      '/snippets': 'http://localhost:13000',      '/snippets': 'http://localhost:13000',
+      '/credentials': 'http://localhost:13000',
+      '/snippets': 'http://localhost:13000',
       '/sessions': 'http://localhost:13000',
       '/scenarios': 'http://localhost:13000',
       '/keys': 'http://localhost:13000',
diff --git a/server/src/code-executor/code-executor.service.ts b/server/src/code-executor/code-executor.service.ts
index aba5522..3fdef76 100644
--- a/server/src/code-executor/code-executor.service.ts
+++ b/server/src/code-executor/code-executor.service.ts
@@ -65,7 +65,7 @@ export class CodeExecutorService {
     const snippetMap: Record<string, string> = snippets ?? {};
 
     // pageHelpers is referenced by runSnippet, so we declare it as a var first.
-    // eslint-disable-next-line prefer-const
+     
     let pageHelpers: Record<string, unknown>;
 
     const fakeConsole = {
@@ -109,7 +109,10 @@ export class CodeExecutorService {
          *
          * Example: await helpers.runSnippet('clickLoginButton', '#submit')
          */
-        runSnippet: async (name: string, ...args: unknown[]): Promise<unknown> => {
+        runSnippet: async (
+          name: string,
+          ...args: unknown[]
+        ): Promise<unknown> => {
           const snippetCode = snippetMap[name];
           if (snippetCode == null) {
             throw new Error(`Snippet "${name}" not found`);
@@ -136,7 +139,13 @@ export class CodeExecutorService {
         `return (async (page, context, helpers) => { ${code} })(page, context, helpers)`,
       );
       this.logger.debug("Executing user code");
-      const execResult = await fn(page, context, pageHelpers, fakeConsole, result);
+      const execResult = await fn(
+        page,
+        context,
+        pageHelpers,
+        fakeConsole,
+        result,
+      );
       return { result: execResult };
     } catch (err) {
       throw new InternalServerErrorException(
diff --git a/server/src/credential/credential.service.ts b/server/src/credential/credential.service.ts
index 4ddbe50..eed9798 100644
--- a/server/src/credential/credential.service.ts
+++ b/server/src/credential/credential.service.ts
@@ -10,7 +10,12 @@ import {
   PaginatedResult,
 } from "../common/dto/pagination.dto";
 
-export type CredentialOrderBy = "id" | "name" | "lastUsedAt" | "createdAt" | "updatedAt";
+export type CredentialOrderBy =
+  | "id"
+  | "name"
+  | "lastUsedAt"
+  | "createdAt"
+  | "updatedAt";
 
 @Injectable()
 export class CredentialService {
@@ -44,7 +49,10 @@ export class CredentialService {
     return credential;
   }
 
-  async update(id: string, dto: UpdateCredentialDto): Promise<CredentialEntity> {
+  async update(
+    id: string,
+    dto: UpdateCredentialDto,
+  ): Promise<CredentialEntity> {
     const credential = await this.findOne(id);
     Object.assign(credential, dto);
     return this.repo.save(credential);
@@ -56,7 +64,12 @@ export class CredentialService {
   }
 
   exportCredential(credential: CredentialEntity): CredentialExportDto {
-    return { kind: "credential", id: credential.id, name: credential.name, data: credential.data };
+    return {
+      kind: "credential",
+      id: credential.id,
+      name: credential.name,
+      data: credential.data,
+    };
   }
 
   async importCredential(dto: CredentialExportDto): Promise<CredentialEntity> {
@@ -67,7 +80,11 @@ export class CredentialService {
         return this.repo.save(existing);
       }
       return this.repo.save(
-        this.repo.create({ id: dto.id, name: dto.name, data: dto.data ?? null }),
+        this.repo.create({
+          id: dto.id,
+          name: dto.name,
+          data: dto.data ?? null,
+        }),
       );
     }
     return this.repo.save(
diff --git a/server/src/credential/dto/credential-export.dto.ts b/server/src/credential/dto/credential-export.dto.ts
index 8d96231..16c1940 100644
--- a/server/src/credential/dto/credential-export.dto.ts
+++ b/server/src/credential/dto/credential-export.dto.ts
@@ -1,5 +1,11 @@
 import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
-import { IsIn, IsNotEmpty, IsOptional, IsString, IsUUID } from "class-validator";
+import {
+  IsIn,
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+  IsUUID,
+} from "class-validator";
 
 export class CredentialExportDto {
   @ApiPropertyOptional()
diff --git a/server/src/scenario/dto/add-scenario-credential.dto.ts b/server/src/scenario/dto/add-scenario-credential.dto.ts
index cfb7cb6..8ce1b9f 100644
--- a/server/src/scenario/dto/add-scenario-credential.dto.ts
+++ b/server/src/scenario/dto/add-scenario-credential.dto.ts
@@ -4,7 +4,7 @@ import { IsNotEmpty, IsString, IsUUID } from "class-validator";
 export class AddScenarioCredentialDto {
   @ApiProperty({ example: "uuid-here" })
   @IsUUID()
-  credentialId: string
+  credentialId: string;
   @ApiProperty({ example: "api_key" })
   @IsString()
   @IsNotEmpty()
diff --git a/server/src/scenario/dto/create-scenario-step.dto.ts b/server/src/scenario/dto/create-scenario-step.dto.ts
index c575e13..b7f0f41 100644
--- a/server/src/scenario/dto/create-scenario-step.dto.ts
+++ b/server/src/scenario/dto/create-scenario-step.dto.ts
@@ -1,13 +1,5 @@
 import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
-import {
-  IsIn,
-  IsInt,
-  IsNotEmpty,
-  IsOptional,
-  IsString,
-  Min,
-} from "class-validator";
-import { StepType } from "../scenario-step.entity";
+import { IsInt, IsNotEmpty, IsOptional, IsString, Min } from "class-validator";
 
 export class CreateScenarioStepDto {
   @ApiPropertyOptional({ example: "Check login page title" })
@@ -20,12 +12,9 @@ export class CreateScenarioStepDto {
   @Min(0)
   order: number;
 
-  @ApiProperty({ enum: ["login", "exec", "sign"], example: "exec" })
-  @IsIn(["login", "exec", "sign"])
-  type: StepType;
-
   @ApiPropertyOptional({
-    description: "Session name (deprecated — browser is created automatically per run).",
+    description:
+      "Session name (deprecated — browser is created automatically per run).",
     example: "my-session",
   })
   @IsOptional()
diff --git a/server/src/scenario/dto/scenario-export.dto.ts b/server/src/scenario/dto/scenario-export.dto.ts
index 4b99f8d..90b7e80 100644
--- a/server/src/scenario/dto/scenario-export.dto.ts
+++ b/server/src/scenario/dto/scenario-export.dto.ts
@@ -2,7 +2,6 @@ import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import {
   IsArray,
-  IsIn,
   IsInt,
   IsNotEmpty,
   IsOptional,
@@ -11,7 +10,6 @@ import {
   Min,
   ValidateNested,
 } from "class-validator";
-import { StepType } from "../scenario-step.entity";
 
 export class ScenarioStepExportDto {
   @ApiProperty()
@@ -19,10 +17,6 @@ export class ScenarioStepExportDto {
   @Min(0)
   order: number;
 
-  @ApiProperty({ enum: ["login", "exec", "sign"] })
-  @IsIn(["login", "exec", "sign"])
-  type: StepType;
-
   @ApiPropertyOptional()
   @IsOptional()
   @IsString()
diff --git a/server/src/scenario/dto/update-scenario-step.dto.ts b/server/src/scenario/dto/update-scenario-step.dto.ts
index a8ad1d4..cddb843 100644
--- a/server/src/scenario/dto/update-scenario-step.dto.ts
+++ b/server/src/scenario/dto/update-scenario-step.dto.ts
@@ -1,13 +1,5 @@
 import { ApiPropertyOptional } from "@nestjs/swagger";
-import {
-  IsIn,
-  IsInt,
-  IsNotEmpty,
-  IsOptional,
-  IsString,
-  Min,
-} from "class-validator";
-import { StepType } from "../scenario-step.entity";
+import { IsInt, IsNotEmpty, IsOptional, IsString, Min } from "class-validator";
 
 export class UpdateScenarioStepDto {
   @ApiPropertyOptional({ example: "Check login page title" })
@@ -21,11 +13,6 @@ export class UpdateScenarioStepDto {
   @Min(0)
   order?: number;
 
-  @ApiPropertyOptional({ enum: ["login", "exec", "sign"] })
-  @IsOptional()
-  @IsIn(["login", "exec", "sign"])
-  type?: StepType;
-
   @ApiPropertyOptional()
   @IsOptional()
   @IsString()
diff --git a/server/src/scenario/scenario-scheduler.service.ts b/server/src/scenario/scenario-scheduler.service.ts
index d8aaa36..ddbedb2 100644
--- a/server/src/scenario/scenario-scheduler.service.ts
+++ b/server/src/scenario/scenario-scheduler.service.ts
@@ -12,11 +12,8 @@ import { ScenarioRunStepEntity } from "./scenario-run-step.entity";
 import { ScenarioRunLogEntity } from "./scenario-run-log.entity";
 import { ScenarioStepEntity } from "./scenario-step.entity";
 import type { ScriptLogger } from "../code-executor/code-executor.service";
-import { AuthService } from "../auth/auth.service";
 import { CodeExecutorService } from "../code-executor/code-executor.service";
 import { ScenarioService } from "./scenario.service";
-import { EnvironmentService } from "../environment/environment.service";
-import type { EnvironmentUrls } from "../environment/environment.entity";
 import { SnippetService } from "../snippet/snippet.service";
 
 interface ValidateResult {
@@ -37,8 +34,6 @@ export class ScenarioSchedulerService {
   private readonly runBrowsers = new Map<string, BrowserHandle>();
   // Cache credential maps per run (built once when a run starts)
   private readonly runCredentials = new Map<string, Record<string, unknown>>();
-  // Cache environment URLs per run (resolved from the first login step)
-  private readonly runEnvironments = new Map<string, EnvironmentUrls>();
   // Cache snippet code map per run (built once when a run starts)
   private readonly runSnippets = new Map<string, Record<string, string>>();
 
@@ -49,10 +44,8 @@ export class ScenarioSchedulerService {
     private readonly runStepRepo: Repository<ScenarioRunStepEntity>,
     @InjectRepository(ScenarioRunLogEntity)
     private readonly runLogRepo: Repository<ScenarioRunLogEntity>,
-    private readonly authService: AuthService,
     private readonly codeExecutor: CodeExecutorService,
     private readonly scenarioService: ScenarioService,
-    private readonly environmentService: EnvironmentService,
     private readonly snippetService: SnippetService,
   ) {}
 
@@ -92,30 +85,6 @@ export class ScenarioSchedulerService {
     };
   }
 
-  /**
-   * Finds the first login step for a scenario and returns the environment URLs
-   * for the environment named in that step's execCode. Returns null if there is
-   * no login step or the environment cannot be found.
-   */
-  private async resolveRunEnvironment(
-    scenarioId: string,
-  ): Promise<EnvironmentUrls | null> {
-    try {
-      const scenario = await this.scenarioService.findOne(scenarioId);
-      const loginStep = scenario.steps.find((s) => s.type === "login");
-      if (!loginStep?.execCode) return null;
-      const params = JSON.parse(loginStep.execCode) as {
-        environmentName?: string;
-      };
-      if (!params.environmentName) return null;
-      const { data } = await this.environmentService.findAll({});
-      const env = data.find((e) => e.name === params.environmentName);
-      return env?.urls ?? null;
-    } catch {
-      return null;
-    }
-  }
-
   // ── Job: pick up pending runs and process each to completion ─────────────
 
   @Interval(1000)
@@ -130,15 +99,12 @@ export class ScenarioSchedulerService {
       // Pre-load credential map for the scenario
       const credMap = await this.scenarioService
         .buildCredentialMap(run.scenarioId)
-        .catch(() => ({} as Record<string, unknown>));
+        .catch(() => ({}) as Record<string, unknown>);
       this.runCredentials.set(run.id, credMap);
-      // Resolve environment from the first login step (best-effort)
-      const envUrls = await this.resolveRunEnvironment(run.scenarioId);
-      if (envUrls) this.runEnvironments.set(run.id, envUrls);
       // Pre-load snippet map
       const snippetMap = await this.snippetService
         .buildSnippetMap()
-        .catch(() => ({} as Record<string, string>));
+        .catch(() => ({}) as Record<string, string>);
       this.runSnippets.set(run.id, snippetMap);
       const traceId = crypto.randomUUID();
       void traceStorage.run({ traceId }, () =>
@@ -176,7 +142,6 @@ export class ScenarioSchedulerService {
     } finally {
       this.activeRuns.delete(runId);
       this.runCredentials.delete(runId);
-      this.runEnvironments.delete(runId);
       this.runSnippets.delete(runId);
     }
   }
@@ -191,13 +156,45 @@ export class ScenarioSchedulerService {
     );
 
     try {
-      if (step.type === "login") {
-        await this.executeLoginStep(stepRun, step);
-      } else if (step.type === "sign") {
-        await this.executeSignStep(stepRun, step);
-      } else {
-        await this.executeExecStep(stepRun, step);
+      if (!step.execCode) throw new Error("step has no execCode");
+      this.codeExecutor.validate(step.execCode);
+      const { page, context } = await this.getOrCreateBrowserHandle(
+        stepRun.runId,
+      );
+      const getStepOutput = this.makeGetStepOutput(stepRun);
+      const creds = this.runCredentials.get(stepRun.runId);
+      const snips = this.runSnippets.get(stepRun.runId);
+      const { result: execOutput } = await this.codeExecutor.execute(
+        page,
+        context,
+        step.execCode,
+        this.stepLogger(stepRun.id, stepRun.runId),
+        getStepOutput,
+        creds,
+        undefined,
+        snips,
+      );
+
+      if (step.validateCode) {
+        this.codeExecutor.validate(step.validateCode);
+        const { result } = await this.codeExecutor.execute(
+          page,
+          context,
+          step.validateCode,
+          this.stepLogger(stepRun.id, stepRun.runId),
+          getStepOutput,
+          creds,
+          undefined,
+          snips,
+          execOutput,
+        );
+        const vr = this.parseValidateResult(result);
+        if (!vr.success) throw new Error(vr.description ?? "Validation failed");
+        await this.passStepRun(stepRun, vr.description ?? null, execOutput);
+        return;
       }
+
+      await this.passStepRun(stepRun, null, execOutput);
     } catch (err) {
       const msg = (err as Error).message ?? String(err);
       this.logger.error(`StepRun #${stepRun.id} threw: ${msg}`);
@@ -207,7 +204,9 @@ export class ScenarioSchedulerService {
 
   // ── Shared browser per run ─────────────────────────────────────────────────
 
-  private async getOrCreateBrowserHandle(runId: string): Promise<BrowserHandle> {
+  private async getOrCreateBrowserHandle(
+    runId: string,
+  ): Promise<BrowserHandle> {
     const existing = this.runBrowsers.get(runId);
     if (existing) return existing;
 
@@ -238,154 +237,6 @@ export class ScenarioSchedulerService {
     }
   }
 
-  // ── Login step ─────────────────────────────────────────────────────────────
-
-  private async executeLoginStep(
-    stepRun: ScenarioRunStepEntity,
-    step: ScenarioStepEntity,
-  ): Promise<void> {
-    // execCode must be a JSON object: { "keyId": "...", "environmentName": "..." }
-    let params: { keyId: string; environmentName: string };
-    try {
-      params = JSON.parse(step.execCode ?? "{}");
-    } catch {
-      throw new Error(
-        "login step execCode must be valid JSON with keyId and environmentName",
-      );
-    }
-    if (!params.keyId || !params.environmentName) {
-      throw new Error(
-        "login step execCode must include keyId and environmentName",
-      );
-    }
-
-    const loginResult = await this.authService.login(
-      params.keyId,
-      params.environmentName,
-      step.sessionName ?? undefined,
-    );
-    this.logger.log(
-      `StepRun #${stepRun.id}: login OK, session=${loginResult.sessionName}`,
-    );
-
-    if (step.validateCode) {
-      const { page, context } = await this.getOrCreateBrowserHandle(
-        stepRun.runId,
-      );
-      this.codeExecutor.validate(step.validateCode);
-      const { result } = await this.codeExecutor.execute(
-        page,
-        context,
-        step.validateCode,
-        this.stepLogger(stepRun.id, stepRun.runId),
-        this.makeGetStepOutput(stepRun),
-        this.runCredentials.get(stepRun.runId),
-        this.runEnvironments.get(stepRun.runId),
-        this.runSnippets.get(stepRun.runId),
-        null,
-      );
-      const vr = this.parseValidateResult(result);
-      if (!vr.success) throw new Error(vr.description ?? "Validation failed");
-      await this.passStepRun(stepRun, vr.description ?? null);
-      return;
-    }
-
-    await this.passStepRun(stepRun, null);
-  }
-
-  // ── Exec step ──────────────────────────────────────────────────────────────
-
-  private async executeExecStep(
-    stepRun: ScenarioRunStepEntity,
-    step: ScenarioStepEntity,
-  ): Promise<void> {
-    if (!step.execCode) throw new Error("exec step has no execCode");
-
-    this.codeExecutor.validate(step.execCode);
-    const { page, context } = await this.getOrCreateBrowserHandle(
-      stepRun.runId,
-    );
-    const getStepOutput = this.makeGetStepOutput(stepRun);
-    const creds = this.runCredentials.get(stepRun.runId);
-    const env = this.runEnvironments.get(stepRun.runId);
-    const snips = this.runSnippets.get(stepRun.runId);
-    const { result: execOutput } = await this.codeExecutor.execute(
-      page,
-      context,
-      step.execCode,
-      this.stepLogger(stepRun.id, stepRun.runId),
-      getStepOutput,
-      creds,
-      env,
-      snips,
-    );
-    this.logger.log(`StepRun #${stepRun.id}: exec OK`);
-
-    if (step.validateCode) {
-      this.codeExecutor.validate(step.validateCode);
-      const { result } = await this.codeExecutor.execute(
-        page,
-        context,
-        step.validateCode,
-        this.stepLogger(stepRun.id, stepRun.runId),
-        getStepOutput,
-        creds,
-        env,
-        snips,
-        execOutput,
-      );
-      const vr = this.parseValidateResult(result);
-      if (!vr.success) throw new Error(vr.description ?? "Validation failed");
-      await this.passStepRun(stepRun, vr.description ?? null, execOutput);
-      return;
-    }
-
-    await this.passStepRun(stepRun, null, execOutput);
-  }
-
-  // ── Sign step ──────────────────────────────────────────────────────────────
-
-  private async executeSignStep(
-    stepRun: ScenarioRunStepEntity,
-    step: ScenarioStepEntity,
-  ): Promise<void> {
-    // execCode must be a JSON object: { "keyId": "..." }
-    let params: { keyId: string };
-    try {
-      params = JSON.parse(step.execCode ?? "{}");
-    } catch {
-      throw new Error("sign step execCode must be valid JSON with keyId");
-    }
-    if (!params.keyId) throw new Error("sign step execCode must include keyId");
-
-    const { page, context } = await this.getOrCreateBrowserHandle(
-      stepRun.runId,
-    );
-    await this.authService.signWithKey(params.keyId, page);
-    this.logger.log(`StepRun #${stepRun.id}: sign OK`);
-
-    if (step.validateCode) {
-      this.codeExecutor.validate(step.validateCode);
-      const { result } = await this.codeExecutor.execute(
-        page,
-        context,
-        step.validateCode,
-        this.stepLogger(stepRun.id, stepRun.runId),
-        this.makeGetStepOutput(stepRun),
-        this.runCredentials.get(stepRun.runId),
-        this.runEnvironments.get(stepRun.runId),
-        this.runSnippets.get(stepRun.runId),
-        null,
-      );
-      const vr = this.parseValidateResult(result);
-      if (!vr.success) throw new Error(vr.description ?? "Validation failed");
-      await this.passStepRun(stepRun, vr.description ?? null);
-      return;
-    }
-
-    await this.passStepRun(stepRun, null);
-  }
-
   // ── Validation helper ──────────────────────────────────────────────────────
 
   private parseValidateResult(raw: unknown): ValidateResult {
diff --git a/server/src/scenario/scenario-step.entity.ts b/server/src/scenario/scenario-step.entity.ts
index 57d9a27..cd9de41 100644
--- a/server/src/scenario/scenario-step.entity.ts
+++ b/server/src/scenario/scenario-step.entity.ts
@@ -9,8 +9,6 @@ import {
 } from "typeorm";
 import { ScenarioEntity } from "./scenario.entity";
 
-export type StepType = "login" | "exec" | "sign";
-
 @Entity("scenario_steps")
 export class ScenarioStepEntity {
   @PrimaryGeneratedColumn("uuid")
@@ -28,9 +26,6 @@ export class ScenarioStepEntity {
   @Column({ default: 0 })
   order: number;
 
-  @Column({ type: "text" })
-  type: StepType;
-
   @Column({ type: "text", nullable: true })
   title: string | null;
 
diff --git a/server/src/scenario/scenario.controller.ts b/server/src/scenario/scenario.controller.ts
index 29e96b0..111517c 100644
--- a/server/src/scenario/scenario.controller.ts
+++ b/server/src/scenario/scenario.controller.ts
@@ -51,7 +51,9 @@ export class ScenarioController {
   }
 
   @Get("runs")
-  @ApiOperation({ summary: "List runs across all scenarios (paginated, filterable by status)" })
+  @ApiOperation({
+    summary: "List runs across all scenarios (paginated, filterable by status)",
+  })
   @ApiResponse({ status: 200 })
   findAllRuns(@Query() query: RunsQueryDto) {
     return this.scenarioService.findAllRuns(query);
@@ -155,7 +157,10 @@ export class ScenarioController {
   @ApiOperation({ summary: "Add a credential to a scenario with an alias" })
   @ApiResponse({ status: 201, description: "Credential added" })
   @ApiResponse({ status: 404, description: "Scenario or credential not found" })
-  @ApiResponse({ status: 409, description: "Alias already used in this scenario" })
+  @ApiResponse({
+    status: 409,
+    description: "Alias already used in this scenario",
+  })
   addScenarioCredential(
     @Param("id", ParseUUIDPipe) id: string,
     @Body() dto: AddScenarioCredentialDto,
@@ -167,7 +172,10 @@ export class ScenarioController {
   @HttpCode(204)
   @ApiOperation({ summary: "Remove a credential from a scenario" })
   @ApiResponse({ status: 204 })
-  @ApiResponse({ status: 404, description: "Scenario or credential assignment not found" })
+  @ApiResponse({
+    status: 404,
+    description: "Scenario or credential assignment not found",
+  })
   removeScenarioCredential(
     @Param("id", ParseUUIDPipe) id: string,
     @Param("scCredId", ParseUUIDPipe) scCredId: string,
diff --git a/server/src/scenario/scenario.service.ts b/server/src/scenario/scenario.service.ts
index 09e2319..842aad7 100644
--- a/server/src/scenario/scenario.service.ts
+++ b/server/src/scenario/scenario.service.ts
@@ -1,4 +1,8 @@
-import { ConflictException, Injectable, NotFoundException } from "@nestjs/common";
+import {
+  ConflictException,
+  Injectable,
+  NotFoundException,
+} from "@nestjs/common";
 import { InjectRepository } from "@nestjs/typeorm";
 import { Like, Repository } from "typeorm";
 import { ScenarioEntity } from "./scenario.entity";
@@ -66,7 +70,11 @@ export class ScenarioService {
   async findOne(id: string): Promise<ScenarioEntity> {
     const scenario = await this.scenarioRepo.findOne({
       where: { id },
-      relations: ["steps", "scenarioCredentials", "scenarioCredentials.credential"],
+      relations: [
+        "steps",
+        "scenarioCredentials",
+        "scenarioCredentials.credential",
+      ],
       order: { steps: { order: "ASC" } },
     });
     if (!scenario) throw new NotFoundException(`Scenario ${id} not found`);
@@ -187,7 +195,9 @@ export class ScenarioService {
    * Builds a map of alias → parsed credential data for use in code execution.
    * Returns null values for credentials with no data.
    */
-  async buildCredentialMap(scenarioId: string): Promise<Record<string, unknown>> {
+  async buildCredentialMap(
+    scenarioId: string,
+  ): Promise<Record<string, unknown>> {
     const scs = await this.findScenarioCredentials(scenarioId);
     const map: Record<string, unknown> = {};
     for (const sc of scs) {
@@ -227,7 +237,9 @@ export class ScenarioService {
 
   async findAllRuns(
     query: RunsQueryDto,
-  ): Promise<PaginatedResult<ScenarioRunEntity & { scenario: ScenarioEntity }>> {
+  ): Promise<
+    PaginatedResult<ScenarioRunEntity & { scenario: ScenarioEntity }>
+  > {
     const page = query.page ?? 1;
     const limit = query.limit ?? 20;
     const where: Record<string, unknown> = {};
diff --git a/server/src/snippet/dto/create-snippet.dto.ts b/server/src/snippet/dto/create-snippet.dto.ts
index fbb5531..a9c7ca9 100644
--- a/server/src/snippet/dto/create-snippet.dto.ts
+++ b/server/src/snippet/dto/create-snippet.dto.ts
@@ -7,12 +7,16 @@ export class CreateSnippetDto {
   @IsNotEmpty()
   name: string;
 
-  @ApiPropertyOptional({ example: "Clicks the login button and waits for navigation" })
+  @ApiPropertyOptional({
+    example: "Clicks the login button and waits for navigation",
+  })
   @IsOptional()
   @IsString()
   description?: string;
 
-  @ApiProperty({ example: "await page.click('#login-btn');\nawait page.waitForNavigation();" })
+  @ApiProperty({
+    example: "await page.click('#login-btn');\nawait page.waitForNavigation();",
+  })
   @IsString()
   @IsNotEmpty()
   code: string;
diff --git a/server/src/snippet/dto/snippet-export.dto.ts b/server/src/snippet/dto/snippet-export.dto.ts
index 621aea6..5f1e94b 100644
--- a/server/src/snippet/dto/snippet-export.dto.ts
+++ b/server/src/snippet/dto/snippet-export.dto.ts
@@ -1,5 +1,11 @@
 import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
-import { IsIn, IsNotEmpty, IsOptional, IsString, IsUUID } from "class-validator";
+import {
+  IsIn,
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+  IsUUID,
+} from "class-validator";
 
 export class SnippetExportDto {
   @ApiPropertyOptional()
diff --git a/server/src/snippet/snippet.service.ts b/server/src/snippet/snippet.service.ts
index 4e56bc2..86d0a03 100644
--- a/server/src/snippet/snippet.service.ts
+++ b/server/src/snippet/snippet.service.ts
@@ -58,7 +58,8 @@ export class SnippetService {
     const snippet = await this.findOne(id);
     if (dto.name && dto.name !== snippet.name) {
       const conflict = await this.repo.findOneBy({ name: dto.name });
-      if (conflict) throw new ConflictException(`Snippet "${dto.name}" already exists`);
+      if (conflict)
+        throw new ConflictException(`Snippet "${dto.name}" already exists`);
     }
     Object.assign(snippet, dto);
     return this.repo.save(snippet);