diff --git a/console/src/routes/channels-catalog.ts b/console/src/routes/channels-catalog.ts
index 22333297..fc8af1a2 100644
--- a/console/src/routes/channels-catalog.ts
+++ b/console/src/routes/channels-catalog.ts
@@ -32,21 +32,21 @@ function countKeys(value: Record<string, unknown>): number {
 }
 
 export function countDiscordGuilds(config: AdminConfig): number {
-  return countKeys(config.discord.guilds);
+  return countKeys(config.discord?.guilds ?? {});
 }
 
 export function countDiscordOverrides(config: AdminConfig): number {
-  return Object.values(config.discord.guilds).reduce((total, guild) => {
+  return Object.values(config.discord?.guilds ?? {}).reduce((total, guild) => {
     return total + countKeys(guild.channels);
   }, 0);
 }
 
 export function countTeams(config: AdminConfig): number {
-  return countKeys(config.msteams.teams);
+  return countKeys(config.msteams?.teams ?? {});
 }
 
 export function countTeamsOverrides(config: AdminConfig): number {
-  return Object.values(config.msteams.teams).reduce((total, team) => {
+  return Object.values(config.msteams?.teams ?? {}).reduce((total, team) => {
     return total + countKeys(team.channels);
   }, 0);
 }
@@ -61,8 +61,9 @@ function describeDiscord(
 ): ChannelCatalogItem {
   const guildCount = countDiscordGuilds(config);
   const overrideCount = countDiscordOverrides(config);
-  const enabled =
-    config.discord.commandsOnly || config.discord.groupPolicy !== 'disabled';
+  const enabled = config.discord
+    ? config.discord.commandsOnly || config.discord.groupPolicy !== 'disabled'
+    : false;
   const tokenConfigured = options.discordTokenConfigured === true;
   const active = enabled && tokenConfigured;
   const configured =
@@ -76,7 +77,9 @@ function describeDiscord(
   return {
     kind: 'discord',
     label: 'Discord',
-    summary: `${pluralize(guildCount, 'guild default')} · ${pluralize(overrideCount, 'explicit override')}`,
+    summary: config.discord
+      ? `${pluralize(guildCount, 'guild default')} · ${pluralize(overrideCount, 'explicit override')}`
+      : 'Not configured',
     statusTone,
     statusLabel:
       statusTone === 'active'
@@ -92,12 +95,13 @@ function describeWhatsApp(
   options: ChannelCatalogOptions,
 ): ChannelCatalogItem {
   const linked = options.whatsappLinked === true;
-  const enabled =
-    config.whatsapp.dmPolicy !== 'disabled' ||
-    config.whatsapp.groupPolicy !== 'disabled';
+  const enabled = config.whatsapp
+    ? config.whatsapp.dmPolicy !== 'disabled' ||
+      config.whatsapp.groupPolicy !== 'disabled'
+    : false;
   const summary = linked
     ? enabled
-      ? `Linked device · groups ${config.whatsapp.groupPolicy}`
+      ? `Linked device · groups ${config.whatsapp?.groupPolicy}`
       : 'Linked device available but transport is off'
     : enabled
       ? 'Link device to enable WhatsApp'
@@ -124,15 +128,16 @@ function describeTelegram(
 ): ChannelCatalogItem {
   const tokenConfigured = options.telegramTokenConfigured === true;
   const inboundEnabled =
-    config.telegram.dmPolicy !== 'disabled' ||
-    config.telegram.groupPolicy !== 'disabled';
-  const active = config.telegram.enabled && tokenConfigured && inboundEnabled;
+    config.telegram?.dmPolicy !== 'disabled' ||
+    config.telegram?.groupPolicy !== 'disabled';
+  const active =
+    (config.telegram?.enabled ?? false) && tokenConfigured && inboundEnabled;
   const configured =
     active ||
-    config.telegram.enabled ||
+    (config.telegram?.enabled ?? false) ||
     tokenConfigured ||
-    config.telegram.allowFrom.length > 0 ||
-    config.telegram.groupAllowFrom.length > 0;
+    (config.telegram?.allowFrom?.length ?? 0) > 0 ||
+    (config.telegram?.groupAllowFrom?.length ?? 0) > 0;
   const statusTone = active
     ? 'active'
     : configured
@@ -142,7 +147,9 @@ function describeTelegram(
   return {
     kind: 'telegram',
     label: 'Telegram',
-    summary: `DM ${config.telegram.dmPolicy} · groups ${config.telegram.groupPolicy}`,
+    summary: config.telegram
+      ? `DM ${config.telegram.dmPolicy} · groups ${config.telegram.groupPolicy}`
+      : 'Not configured',
     statusTone,
     statusLabel:
       statusTone === 'active'
@@ -160,14 +167,16 @@ function describeSlack(
   const botTokenConfigured = options.slackBotTokenConfigured === true;
   const appTokenConfigured = options.slackAppTokenConfigured === true;
   const active =
-    config.slack.enabled && botTokenConfigured && appTokenConfigured;
+    (config.slack?.enabled ?? false) &&
+    botTokenConfigured &&
+    appTokenConfigured;
   const configured =
     active ||
-    config.slack.enabled ||
+    (config.slack?.enabled ?? false) ||
     botTokenConfigured ||
     appTokenConfigured ||
-    config.slack.allowFrom.length > 0 ||
-    config.slack.groupAllowFrom.length > 0;
+    (config.slack?.allowFrom?.length ?? 0) > 0 ||
+    (config.slack?.groupAllowFrom?.length ?? 0) > 0;
   const statusTone = active
     ? 'active'
     : configured
@@ -177,7 +186,9 @@ function describeSlack(
   return {
     kind: 'slack',
     label: 'Slack',
-    summary: `DM ${config.slack.dmPolicy} · channels ${config.slack.groupPolicy}`,
+    summary: config.slack
+      ? `DM ${config.slack.dmPolicy} · channels ${config.slack.groupPolicy}`
+      : 'Not configured',
     statusTone,
     statusLabel:
       statusTone === 'active'
@@ -194,17 +205,17 @@ function describeEmail(
 ): ChannelCatalogItem {
   const passwordConfigured = options.emailPasswordConfigured === true;
   const active =
-    config.email.enabled &&
+    (config.email?.enabled ?? false) &&
     passwordConfigured &&
-    !!config.email.address &&
-    !!config.email.imapHost &&
-    !!config.email.smtpHost;
+    !!config.email?.address &&
+    !!config.email?.imapHost &&
+    !!config.email?.smtpHost;
   const configured =
     active ||
-    !!config.email.address ||
-    !!config.email.imapHost ||
-    !!config.email.smtpHost ||
-    config.email.allowFrom.length > 0;
+    !!config.email?.address ||
+    !!config.email?.imapHost ||
+    !!config.email?.smtpHost ||
+    (config.email?.allowFrom?.length ?? 0) > 0;
   const statusTone = active
     ? 'active'
     : configured
@@ -214,7 +225,7 @@ function describeEmail(
   return {
     kind: 'email',
     label: 'Email',
-    summary: config.email.address || 'No mailbox address configured yet',
+    summary: config.email?.address || 'No mailbox address configured yet',
     statusTone,
     statusLabel:
       statusTone === 'active'
@@ -229,14 +240,14 @@ function describeMSTeams(config: AdminConfig): ChannelCatalogItem {
   const teamCount = countTeams(config);
   const overrideCount = countTeamsOverrides(config);
   const active =
-    config.msteams.enabled &&
-    !!config.msteams.appId &&
-    !!config.msteams.tenantId;
+    (config.msteams?.enabled ?? false) &&
+    !!config.msteams?.appId &&
+    !!config.msteams?.tenantId;
   const configured =
     active ||
-    config.msteams.enabled ||
-    !!config.msteams.appId ||
-    !!config.msteams.tenantId ||
+    (config.msteams?.enabled ?? false) ||
+    !!config.msteams?.appId ||
+    !!config.msteams?.tenantId ||
     teamCount > 0 ||
     overrideCount > 0;
   const statusTone = active
@@ -248,7 +259,9 @@ function describeMSTeams(config: AdminConfig): ChannelCatalogItem {
   return {
     kind: 'msteams',
     label: 'Microsoft Teams',
-    summary: `${pluralize(teamCount, 'team default')} · ${pluralize(overrideCount, 'channel override')}`,
+    summary: config.msteams
+      ? `${pluralize(teamCount, 'team default')} · ${pluralize(overrideCount, 'channel override')}`
+      : 'Not configured',
     statusTone,
     statusLabel:
       statusTone === 'active'
@@ -263,22 +276,24 @@ function describeIMessage(
   config: AdminConfig,
   options: ChannelCatalogOptions,
 ): ChannelCatalogItem {
-  const isRemote = config.imessage.backend === 'bluebubbles';
+  const isRemote = config.imessage?.backend === 'bluebubbles';
   const passwordConfigured = options.imessagePasswordConfigured === true;
   const active = isRemote
-    ? config.imessage.enabled &&
+    ? (config.imessage?.enabled ?? false) &&
       passwordConfigured &&
-      !!config.imessage.serverUrl &&
-      !!config.imessage.webhookPath
-    : config.imessage.enabled &&
-      !!config.imessage.cliPath &&
-      !!config.imessage.dbPath;
+      !!config.imessage?.serverUrl &&
+      !!config.imessage?.webhookPath
+    : (config.imessage?.enabled ?? false) &&
+      !!config.imessage?.cliPath &&
+      !!config.imessage?.dbPath;
   const statusTone = active ? 'active' : 'available';
 
   return {
     kind: 'imessage',
     label: 'iMessage',
-    summary: `${isRemote ? 'Remote' : 'Local'} backend · DM ${config.imessage.dmPolicy}`,
+    summary: config.imessage
+      ? `${isRemote ? 'Remote' : 'Local'} backend · DM ${config.imessage.dmPolicy}`
+      : 'Not configured',
     statusTone,
     statusLabel: statusTone === 'active' ? 'active' : 'available',
   };
diff --git a/console/src/routes/jobs.tsx b/console/src/routes/jobs.tsx
index 56b7a60d..b9117dd8 100644
--- a/console/src/routes/jobs.tsx
+++ b/console/src/routes/jobs.tsx
@@ -730,6 +730,14 @@ export function JobsPage() {
         </p>
       ) : null}
 
+      {allItems.length === 0 ? (
+        <div className="page-empty">
+          <p>Jobs are async tasks created by the agent or triggered manually.</p>
+          <a className="primary-button" href="/admin/scheduler">
+            New Job
+          </a>
+        </div>
+      ) : (
       <section
         className={
           selectedItem ? 'jobs-board-layout has-detail' : 'jobs-board-layout'
@@ -862,6 +870,7 @@ export function JobsPage() {
           />
         ) : null}
       </section>
+      )}
     </div>
   );
 }
diff --git a/console/src/routes/mcp.tsx b/console/src/routes/mcp.tsx
index 058febfc..90bc420a 100644
--- a/console/src/routes/mcp.tsx
+++ b/console/src/routes/mcp.tsx
@@ -101,6 +101,13 @@ export function McpPage() {
   const toast = useToast();
   const [selectedName, setSelectedName] = useState<string | null>(null);
   const [draft, setDraft] = useState<McpDraft>(createDraft());
+  const [showEditor, setShowEditor] = useState(false);
+
+  const openNewServer = () => {
+    setSelectedName(null);
+    setDraft(createDraft());
+    setShowEditor(true);
+  };
 
   const mcpQuery = useQuery({
     queryKey: ['mcp', auth.token],
@@ -129,6 +136,7 @@ export function McpPage() {
       queryClient.setQueryData(['mcp', auth.token], payload);
       setSelectedName(null);
       setDraft(createDraft());
+      setShowEditor(false);
       toast.success('MCP server deleted.');
     },
     onError: (error) => {
@@ -154,226 +162,262 @@ export function McpPage() {
       <PageHeader
         title="MCP"
         actions={
+          mcpQuery.data?.servers.length ? (
+            <button
+              className="ghost-button"
+              type="button"
+              onClick={openNewServer}
+            >
+              New server
+            </button>
+          ) : null
+        }
+      />
+
+      {!mcpQuery.isLoading &&
+      !mcpQuery.isError &&
+      !mcpQuery.data?.servers.length &&
+      !showEditor ? (
+        <div className="page-empty">
+          <p>
+            MCP servers let the agent call external tools over the Model Context
+            Protocol.
+          </p>
           <button
-            className="ghost-button"
+            className="primary-button"
             type="button"
-            onClick={() => {
-              setSelectedName(null);
-              setDraft(createDraft());
-            }}
+            onClick={openNewServer}
           >
-            New server
+            Add your first server
           </button>
-        }
-      />
-
-      <div className="two-column-grid">
-        <Panel
-          title="Servers"
-          subtitle={`${mcpQuery.data?.servers.length || 0} configured server${mcpQuery.data?.servers.length === 1 ? '' : 's'}`}
-        >
-          {mcpQuery.isLoading ? (
-            <div className="empty-state">Loading MCP servers...</div>
-          ) : mcpQuery.data?.servers.length ? (
-            <div className="list-stack selectable-list">
-              {mcpQuery.data.servers.map((server) => (
+        </div>
+      ) : (
+        <div className="two-column-grid">
+          <Panel
+            title="Servers"
+            subtitle={`${mcpQuery.data?.servers.length || 0} configured server${mcpQuery.data?.servers.length === 1 ? '' : 's'}`}
+          >
+            {mcpQuery.isLoading ? (
+              <div className="empty-state">Loading MCP servers...</div>
+            ) : mcpQuery.data?.servers.length ? (
+              <div className="list-stack selectable-list">
+                {mcpQuery.data.servers.map((server) => (
+                  <button
+                    key={server.name}
+                    className={
+                      server.name === selectedName
+                        ? 'selectable-row active'
+                        : 'selectable-row'
+                    }
+                    type="button"
+                    onClick={() => {
+                      setSelectedName(server.name);
+                      setShowEditor(true);
+                    }}
+                  >
+                    <div>
+                      <strong>{server.name}</strong>
+                      <small>{server.summary}</small>
+                    </div>
+                    <BooleanPill
+                      value={server.enabled}
+                      trueLabel="active"
+                      falseLabel="inactive"
+                    />
+                  </button>
+                ))}
+              </div>
+            ) : (
+              <div className="empty-state-cta">
+                <p>
+                  MCP servers let the agent call external tools over the Model
+                  Context Protocol.
+                </p>
                 <button
-                  key={server.name}
-                  className={
-                    server.name === selectedName
-                      ? 'selectable-row active'
-                      : 'selectable-row'
-                  }
+                  className="primary-button"
                   type="button"
-                  onClick={() => setSelectedName(server.name)}
+                  onClick={openNewServer}
                 >
-                  <div>
-                    <strong>{server.name}</strong>
-                    <small>{server.summary}</small>
-                  </div>
-                  <BooleanPill
-                    value={server.enabled}
-                    trueLabel="active"
-                    falseLabel="inactive"
-                  />
+                  Add your first server
                 </button>
-              ))}
-            </div>
-          ) : (
-            <div className="empty-state">
-              No MCP servers are configured yet.
-            </div>
-          )}
-        </Panel>
-
-        <Panel title="Server editor" accent="warm">
-          <div className="stack-form">
-            <div className="field-grid">
-              <label className="field">
-                <span>Name</span>
-                <input
-                  value={draft.name}
-                  onChange={(event) =>
-                    setDraft((current) => ({
-                      ...current,
-                      name: event.target.value,
-                    }))
-                  }
-                  placeholder="github"
-                />
-              </label>
-              <label className="field">
-                <span>Transport</span>
-                <select
-                  value={draft.transport}
-                  onChange={(event) =>
-                    setDraft((current) => ({
-                      ...current,
-                      transport: event.target.value as McpDraft['transport'],
-                    }))
-                  }
-                >
-                  <option value="stdio">stdio</option>
-                  <option value="http">http</option>
-                  <option value="sse">sse</option>
-                </select>
-              </label>
-            </div>
-
-            <BooleanField
-              label="Server state"
-              value={draft.enabled}
-              trueLabel="on"
-              falseLabel="off"
-              onChange={(enabled) =>
-                setDraft((current) => ({
-                  ...current,
-                  enabled,
-                }))
-              }
-            />
+              </div>
+            )}
+          </Panel>
 
-            {draft.transport === 'stdio' ? (
-              <>
-                <label className="field">
-                  <span>Command</span>
-                  <input
-                    value={draft.command}
-                    onChange={(event) =>
-                      setDraft((current) => ({
-                        ...current,
-                        command: event.target.value,
-                      }))
-                    }
-                    placeholder="docker"
-                  />
-                </label>
+          {showEditor ? (
+            <Panel title="Server editor" accent="warm">
+              <div className="stack-form">
                 <div className="field-grid">
                   <label className="field">
-                    <span>Arguments</span>
-                    <textarea
-                      rows={4}
-                      value={draft.args}
+                    <span>Name</span>
+                    <input
+                      value={draft.name}
                       onChange={(event) =>
                         setDraft((current) => ({
                           ...current,
-                          args: event.target.value,
+                          name: event.target.value,
                         }))
                       }
-                      placeholder="One argument per line"
+                      placeholder="github"
                     />
                   </label>
                   <label className="field">
-                    <span>Working directory</span>
-                    <input
-                      value={draft.cwd}
+                    <span>Transport</span>
+                    <select
+                      value={draft.transport}
                       onChange={(event) =>
                         setDraft((current) => ({
                           ...current,
-                          cwd: event.target.value,
+                          transport: event.target
+                            .value as McpDraft['transport'],
                         }))
                       }
-                      placeholder="/workspace"
-                    />
+                    >
+                      <option value="stdio">stdio</option>
+                      <option value="http">http</option>
+                      <option value="sse">sse</option>
+                    </select>
                   </label>
                 </div>
-                <label className="field">
-                  <span>Environment JSON</span>
-                  <textarea
-                    rows={5}
-                    value={draft.envJson}
-                    onChange={(event) =>
-                      setDraft((current) => ({
-                        ...current,
-                        envJson: event.target.value,
-                      }))
-                    }
-                    placeholder='{"GITHUB_TOKEN":"..."}'
-                  />
-                </label>
-              </>
-            ) : (
-              <>
-                <label className="field">
-                  <span>URL</span>
-                  <input
-                    value={draft.url}
-                    onChange={(event) =>
-                      setDraft((current) => ({
-                        ...current,
-                        url: event.target.value,
-                      }))
-                    }
-                    placeholder="https://example.test/mcp"
-                  />
-                </label>
-                <label className="field">
-                  <span>Headers JSON</span>
-                  <textarea
-                    rows={5}
-                    value={draft.headersJson}
-                    onChange={(event) =>
-                      setDraft((current) => ({
-                        ...current,
-                        headersJson: event.target.value,
-                      }))
-                    }
-                    placeholder='{"Authorization":"Bearer ..."}'
-                  />
-                </label>
-              </>
-            )}
 
-            <div className="button-row">
-              <button
-                className="primary-button"
-                type="button"
-                disabled={saveMutation.isPending}
-                onClick={() => saveMutation.mutate()}
-              >
-                {saveMutation.isPending ? 'Saving...' : 'Save server'}
-              </button>
-              {selectedServer ? (
-                <button
-                  className="danger-button"
-                  type="button"
-                  disabled={deleteMutation.isPending}
-                  onClick={() => deleteMutation.mutate()}
-                >
-                  {deleteMutation.isPending ? 'Deleting...' : 'Delete server'}
-                </button>
-              ) : null}
-            </div>
+                <BooleanField
+                  label="Server state"
+                  value={draft.enabled}
+                  trueLabel="on"
+                  falseLabel="off"
+                  onChange={(enabled) =>
+                    setDraft((current) => ({
+                      ...current,
+                      enabled,
+                    }))
+                  }
+                />
+
+                {draft.transport === 'stdio' ? (
+                  <>
+                    <label className="field">
+                      <span>Command</span>
+                      <input
+                        value={draft.command}
+                        onChange={(event) =>
+                          setDraft((current) => ({
+                            ...current,
+                            command: event.target.value,
+                          }))
+                        }
+                        placeholder="docker"
+                      />
+                    </label>
+                    <div className="field-grid">
+                      <label className="field">
+                        <span>Arguments</span>
+                        <textarea
+                          rows={4}
+                          value={draft.args}
+                          onChange={(event) =>
+                            setDraft((current) => ({
+                              ...current,
+                              args: event.target.value,
+                            }))
+                          }
+                          placeholder="One argument per line"
+                        />
+                      </label>
+                      <label className="field">
+                        <span>Working directory</span>
+                        <input
+                          value={draft.cwd}
+                          onChange={(event) =>
+                            setDraft((current) => ({
+                              ...current,
+                              cwd: event.target.value,
+                            }))
+                          }
+                          placeholder="/workspace"
+                        />
+                      </label>
+                    </div>
+                    <label className="field">
+                      <span>Environment JSON</span>
+                      <textarea
+                        rows={5}
+                        value={draft.envJson}
+                        onChange={(event) =>
+                          setDraft((current) => ({
+                            ...current,
+                            envJson: event.target.value,
+                          }))
+                        }
+                        placeholder='{"GITHUB_TOKEN":"..."}'
+                      />
+                    </label>
+                  </>
+                ) : (
+                  <>
+                    <label className="field">
+                      <span>URL</span>
+                      <input
+                        value={draft.url}
+                        onChange={(event) =>
+                          setDraft((current) => ({
+                            ...current,
+                            url: event.target.value,
+                          }))
+                        }
+                        placeholder="https://example.test/mcp"
+                      />
+                    </label>
+                    <label className="field">
+                      <span>Headers JSON</span>
+                      <textarea
+                        rows={5}
+                        value={draft.headersJson}
+                        onChange={(event) =>
+                          setDraft((current) => ({
+                            ...current,
+                            headersJson: event.target.value,
+                          }))
+                        }
+                        placeholder='{"Authorization":"Bearer ..."}'
+                      />
+                    </label>
+                  </>
+                )}
 
-            {selectedServer ? (
-              <div className="summary-block">
-                <span>Summary</span>
-                <p>{selectedServer.summary}</p>
+                <div className="button-row">
+                  <button
+                    className="primary-button"
+                    type="button"
+                    disabled={saveMutation.isPending}
+                    onClick={() => saveMutation.mutate()}
+                  >
+                    {saveMutation.isPending ? 'Saving...' : 'Save server'}
+                  </button>
+                  {selectedServer ? (
+                    <button
+                      className="danger-button"
+                      type="button"
+                      disabled={deleteMutation.isPending}
+                      onClick={() => deleteMutation.mutate()}
+                    >
+                      {deleteMutation.isPending
+                        ? 'Deleting...'
+                        : 'Delete server'}
+                    </button>
+                  ) : null}
+                </div>
+
+                {selectedServer ? (
+                  <div className="summary-block">
+                    <span>Summary</span>
+                    <p>{selectedServer.summary}</p>
+                  </div>
+                ) : null}
               </div>
-            ) : null}
-          </div>
-        </Panel>
-      </div>
+            </Panel>
+          ) : null}
+        </div>
+      )}
     </div>
   );
 }
diff --git a/console/src/routes/plugins.tsx b/console/src/routes/plugins.tsx
index 41ece876..224d14b8 100644
--- a/console/src/routes/plugins.tsx
+++ b/console/src/routes/plugins.tsx
@@ -152,6 +152,21 @@ export function PluginsPage() {
         >
           {pluginsQuery.isLoading ? (
             <div className="empty-state">Loading plugins...</div>
+          ) : pluginsQuery.data?.plugins.length === 0 ? (
+            <div className="empty-state-cta">
+              <p>
+                Plugins extend HybridClaw with custom commands, tools, and
+                hooks.
+              </p>
+              <a
+                className="ghost-button"
+                href="https://www.hybridclaw.io/docs/extensibility/plugins"
+                target="_blank"
+                rel="noreferrer"
+              >
+                Plugin documentation
+              </a>
+            </div>
           ) : plugins.length === 0 ? (
             <div className="empty-state">No plugins match this filter.</div>
           ) : (
diff --git a/console/src/routes/scheduler.tsx b/console/src/routes/scheduler.tsx
index cbcb79d6..81188a2c 100644
--- a/console/src/routes/scheduler.tsx
+++ b/console/src/routes/scheduler.tsx
@@ -1018,11 +1018,13 @@ export function SchedulerPage() {
   const toast = useToast();
   const queryClient = useQueryClient();
   const [selectedId, setSelectedId] = useState<string | null>(() => {
-    const requestedId =
-      new URLSearchParams(window.location.search).get('jobId') || '';
-    return requestedId.trim() || null;
+    const requestedId = new URLSearchParams(window.location.search).get('jobId')?.trim() ?? '';
+    return requestedId || null;
   });
   const [draft, setDraft] = useState<SchedulerDraft>(createDraft());
+  const [showEditor, setShowEditor] = useState<boolean>(() => {
+    return Boolean(new URLSearchParams(window.location.search).get('jobId')?.trim());
+  });
 
   const schedulerQuery = useQuery({
     queryKey: ['scheduler', auth.token],
@@ -1149,6 +1151,12 @@ export function SchedulerPage() {
     window.history.replaceState({}, '', currentUrl.toString());
   }, [selectedId]);
 
+  const openNewJob = () => {
+    setSelectedId(null);
+    setDraft(createDraft());
+    setShowEditor(true);
+  };
+
   return (
     <div className="page-stack">
       <PageHeader
@@ -1157,10 +1165,7 @@ export function SchedulerPage() {
           <button
             className="ghost-button"
             type="button"
-            onClick={() => {
-              setSelectedId(null);
-              setDraft(createDraft());
-            }}
+            onClick={openNewJob}
           >
             New job
           </button>
@@ -1185,7 +1190,10 @@ export function SchedulerPage() {
                       : 'selectable-row'
                   }
                   type="button"
-                  onClick={() => setSelectedId(job.id)}
+                  onClick={() => {
+                    setSelectedId(job.id);
+                    setShowEditor(true);
+                  }}
                 >
                   <div>
                     <strong>{job.name}</strong>
@@ -1203,54 +1211,69 @@ export function SchedulerPage() {
               ))}
             </div>
           ) : (
-            <div className="empty-state">No scheduled work yet.</div>
+            <div className="empty-state-cta">
+              <p>
+                Scheduled jobs let you run agent tasks automatically on a cron
+                schedule.
+              </p>
+              <button
+                className="primary-button"
+                type="button"
+                onClick={openNewJob}
+              >
+                New job
+              </button>
+            </div>
           )}
         </Panel>
 
-        {isTaskJob(selectedJob) ? (
-          <SchedulerTaskDetail
-            job={selectedJob}
-            pausePending={pauseMutation.isPending}
-            deletePending={deleteMutation.isPending}
-            onPauseToggle={() =>
-              pauseMutation.mutate(selectedJob.disabled ? 'resume' : 'pause')
-            }
-            onDelete={() => deleteMutation.mutate()}
-          />
-        ) : (
-          <SchedulerJobEditor
-            draft={draft}
-            selectedJob={selectedConfigJob}
-            channelOptions={channelOptions}
-            targetControl={targetControl}
-            savePending={saveMutation.isPending}
-            pausePending={pauseMutation.isPending}
-            deletePending={deleteMutation.isPending}
-            onDraftChange={(update) => setDraft((current) => update(current))}
-            onSave={() => {
-              const nextDraft = prepareDraftForSave(
-                applyResolvedTarget(draft, targetControl),
-              );
-              setDraft(nextDraft);
-              saveMutation.mutate(nextDraft);
-            }}
-            onCancel={() => {
-              if (selectedConfigJob) {
-                setDraft(createDraft(selectedConfigJob));
-                return;
+        {showEditor ? (
+          isTaskJob(selectedJob) ? (
+            <SchedulerTaskDetail
+              job={selectedJob}
+              pausePending={pauseMutation.isPending}
+              deletePending={deleteMutation.isPending}
+              onPauseToggle={() =>
+                pauseMutation.mutate(selectedJob.disabled ? 'resume' : 'pause')
               }
-              setSelectedId(null);
-              setDraft(createDraft());
-              window.location.href = '/admin/jobs';
-            }}
-            onPauseToggle={() =>
-              pauseMutation.mutate(
-                selectedConfigJob?.disabled ? 'resume' : 'pause',
-              )
-            }
-            onDelete={() => deleteMutation.mutate()}
-          />
-        )}
+              onDelete={() => deleteMutation.mutate()}
+            />
+          ) : (
+            <SchedulerJobEditor
+              draft={draft}
+              selectedJob={selectedConfigJob}
+              channelOptions={channelOptions}
+              targetControl={targetControl}
+              savePending={saveMutation.isPending}
+              pausePending={pauseMutation.isPending}
+              deletePending={deleteMutation.isPending}
+              onDraftChange={(update) => setDraft((current) => update(current))}
+              onSave={() => {
+                const nextDraft = prepareDraftForSave(
+                  applyResolvedTarget(draft, targetControl),
+                );
+                setDraft(nextDraft);
+                saveMutation.mutate(nextDraft);
+              }}
+              onCancel={() => {
+                if (selectedConfigJob) {
+                  setDraft(createDraft(selectedConfigJob));
+                  return;
+                }
+                setSelectedId(null);
+                setDraft(createDraft());
+                setShowEditor(false);
+                window.location.href = '/admin/jobs';
+              }}
+              onPauseToggle={() =>
+                pauseMutation.mutate(
+                  selectedConfigJob?.disabled ? 'resume' : 'pause',
+                )
+              }
+              onDelete={() => deleteMutation.mutate()}
+            />
+          )
+        ) : null}
       </div>
     </div>
   );
diff --git a/console/src/styles.css b/console/src/styles.css
index 98345d09..4d004398 100644
--- a/console/src/styles.css
+++ b/console/src/styles.css
@@ -1882,6 +1882,39 @@ th {
   background: var(--jobs-empty);
 }
 
+.page-empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 16px;
+  padding: 64px 24px;
+  text-align: center;
+  color: var(--muted-foreground);
+}
+
+.page-empty p {
+  margin: 0;
+  max-width: 300px;
+}
+
+.empty-state-cta {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 12px;
+  padding: 32px 24px;
+  text-align: center;
+  color: var(--muted-foreground);
+  border-radius: var(--radius-md);
+  border: 1px solid var(--line);
+  background: var(--panel-muted);
+}
+
+.empty-state-cta p {
+  margin: 0;
+  max-width: 280px;
+}
+
 .jobs-card {
   display: grid;
   gap: 8px;