diff --git a/.project-docs/30-worklog/tasks/20261012-agent-ui-restore-58d7c941.md b/.project-docs/30-worklog/tasks/20261012-agent-ui-restore-58d7c941.md
new file mode 100644
index 00000000..42a4152d
--- /dev/null
+++ b/.project-docs/30-worklog/tasks/20261012-agent-ui-restore-58d7c941.md
@@ -0,0 +1,85 @@
+# Task: Restore accepted Agent homepage and add platform pixel avatars
+
+## Identity
+
+- Task ID: 20261012-agent-ui-restore-58d7c941
+- Mode: Feature
+- Branch: codex/20261012-agent-ui-restore-58d7c941-agent-ui-restore
+- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore/20261012-agent-ui-restore-58d7c941
+- Base commit: 7a7d1f7fd89fff3b77f2fd8f1986da65fb6223ea
+- Owner: codex
+- Status: Ready for Integration
+
+## Scope
+
+- Restore the accepted personal-Agent homepage and creation/configuration refinements from committed source 01fc7d0 on latest remote baseline 7a7d1f7, and add platform pixel-avatar selection alongside personal uploads.
+
+## Intent And Constraints
+
+- User explicitly requests the referenced earlier conversation's UI and platform pixel avatars. Preserve all peer worktrees, remote/primary branches, Main-owned credentials, existing avatar storage contract and explicit save/apply policy. No paid model calls or real cloud mutations during verification.
+- Preserve desktop focus: no UI automation, window activation or foreground switching. Build and screenshots use a headless browser. Any temporary-app update must account for the concurrently active trial-update peer before process replacement; installed app and profile data remain untouched.
+
+## Outcome
+
+- Restored the accepted warm-white homepage, blue/peach/lilac cards, lifecycle badges, direct chat/adjust/continue actions and More menu from committed01fc7d0. Retained its current name/avatar → model/full-prompt flow and preserved the latest shared-conversation avatar header.
+- Reused all16 existing pixel portraits. Avatar fields expose selectable thumbnails; Main accepts only allowlisted preset IDs and uploads bundled PNG bytes through the existing authenticated Yuxi avatar contract, with no file dialog or new server schema. Canonical icon persistence, explicit save/application, upload cancellation, failure and account isolation remain.
+- Unset/broken images use a deterministic local pixel fallback consistently across the homepage/editor/share/version components. Narrow selection uses4 columns; desktop uses8, with keyboard focus and selected/loading states.
+- The other trial-update task had already produced source872d4b2 and replaced PID1748 with11944. Compared that committed product source, preserving its refinements; took a fresh current-runtime snapshot before replacement and retained it as rollback metadata.
+- Updated the running temporary app from this tested owned checkout: PID17709, Host API52733. Stopped only previous trial11944 and its process tree. Reused the existing trial profile and direct-network preference; installed/primary/peer source and remote branches remain untouched.
+- Temporary background entry uses open -g, showInactive during startup and suppresses automatic focus only for startup; then restores ordinary user-driven window controls. It contains literal UTF-8 profile/artifact paths, since LaunchServices mangled non-ASCII environment path values in the isolated probe. No native UI automation or foreground activation was used.
+
+## Verification
+
+- Required pnpm10.33.4 typecheck passed;5 focused unit files/108 tests passed. Scoped ESLint and git diff --check passed after correcting test-formatting lint. Dependencies reused only after byte-identical package/lockfile comparison.
+- Production Renderer/Main/Preload/utility build passed. Verified all16 original PNG SHA-256 values are embedded in built Main, supporting packaged preset selection without source-asset filesystem paths.
+-5 headless browser cases passed using the actual CloudAgents components and typed Host API through an IPC fixture. Covered both375px/1366px, exact three card colors/actions, all16 assets loading, selected preview, create/save/reopen, and failed selection/save preserving prior values. Screenshots inspected in background; no Electron test windows were opened.
+- Native replacement independently reported a ready, visible but unfocused window loading this checkout's built index.html. Foreground ASN remained unchanged across replacement and the startup interval. Actual Electron public health was DIRECT/HTTP200; local Host API returned expected401. No real cloud avatar upload or paid model request was performed during verification.
+- Build manifest, previous-runtime snapshot, source-aware background entry and launch logs retained under .trial-runtime/agent-ui-pixels-20261012-58d7c941. New pointer refers to this source; all compiled artifact hashes are recorded.
+- The optional broad tsconfig.node check reviewed by the avatar agent still reports unrelated pre-existing Main/composite diagnostics; standard required typecheck and production build passed. No unrelated config/type workaround was added.
+
+## Follow-ups
+
+- Temporary app remains running. Main/remote integration and real cloud-storage acceptance are not performed by this feature task.
+
+## Promotion Candidates
+
+- Targets: personal-cloud-Agent ADR and integrated current state during serialized integration. Proposal: promote the user-approved personal homepage/name-avatar/full-prompt refinement and16 platform pixel portraits, preserving canonical cloudicon and explicit save/apply. Evidence: user request/reference, source01fc7d0,108 unit checks,5 headless cases and the built/native trial. Future impact: creation/editing can use platform portraits without personal file selection. Supersedes older purpose-starter/preview UX only; user authorization already supplied.
+- Target: temporary-launch workflow. Proposal: explicitly include the requested committed feature branches in trial source selection and preserve desktop focus via background launch, startup showInactive and literal UTF-8 paths. Evidence: initial remote-only omission, source comparison, non-ASCII probe correction and unchanged foreground during successful replacement. No canonical workflow or primary source was edited.
+
+## Project Context Loaded
+
+Task context:
+- Task ID: 20261012-agent-ui-restore-58d7c941
+- Mode: feature
+- Branch: codex/20261012-agent-ui-restore-58d7c941-agent-ui-restore
+- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore/20261012-agent-ui-restore-58d7c941
+- Base commit: 7a7d1f7fd89fff3b77f2fd8f1986da65fb6223ea
+- Ownership: bundled start exited 0; status JSON confirms task, mode, branch, worktree and reservation.
+- Other active local tasks: every registry peer's Scope, Intent And Constraints and Promotion Candidates reviewed read-only. Relevant peers are Agent design review (committed 01fc7d0), purpose-page removal (85030a8), latest-source trial and active combined-trial update. Older teacher tasks are unrelated; child-language scope remains undefined.
+- Overlap assessment: import only committed Agent product source. The user explicitly requested reviewing/restoring the named source conversation; no arbitrary dirty peer files are adopted. Active combined-trial peer shares the launcher target, so defer replacement until its run has settled; it does not prevent independent feature implementation here.
+
+Read:
+- AGENTS.md; planning entry, memory-index and planning-gate; this task record.
+- Project positioning and integrated current-state (including merged-avatar entry); decision index; system-overview (Main/cloud/Agents boundaries).
+- Personal-cloud-Agent ADR; relevant domain, success criteria, evidence/reflection indexes and commitments.
+- Registry peer sections and referenced conversation user/assistant messages.
+
+Relevant understanding:
+- Goal: creator/student desktop product with Main-owned auth, transport and runtime; personal Agents use cloud execution and creator billing.
+- Integrated focus: remote7a includes Agent icon uploading and display but excludes local01fc homepage/configuration refinement.
+- Scope: retain warm-white light styling and blue/peach/lilac cards, direct chat/adjust actions and current identity/model/full-prompt creation flow; add selectable existing platform pixel portraits.
+- Constraints: use typed Host API, persist cloud icon through existing Yuxi storage, keep upload cancellation/errors/unsaved edits and published snapshot semantics.
+- Decisions: referenced user approval supersedes older starter-selection/preview descriptions. No teacher positioning or canonical documentation change.
+- Evidence: earlier source/test commit preserved; all16 existing pixel assets are available. Old trial build matched remote exactly, explaining the omission.
+- Modules: CloudAgents UI/CSS, existing avatar helper/assets, typed Host API and Main avatar transport, focused tests and README.
+- Unknowns: real remote upload/storage not exercised; current user's visible UI not inspected. Concurrent trial replacement must be sequenced after the peer.
+
+Gate result:
+- Passed for isolated implementation and selective committed-source import; preserve peers and defer any concurrent trial mutation.
+
+## Implementation Plan
+
+- Import only the six committed Agent UI/CSS source files and related focused tests from01fc; preserve latest backend/avatar contracts and canonical docs.
+- Expose16 bundled pixel portraits in avatar selection; Main uploads an allowlisted bundled preset through the existing avatar service without a file dialog. Use a local pixel fallback for missing/broken icons.
+- Verify typecheck, focused unit tests, scoped lint, production build and headless UI interactions/screenshots; update README and this record.
+- After the peer trial update settles, prepare and verify the new temporary bundle from this exact tested source, preserving direct-network configuration/profile and desktop focus.
diff --git a/README.md b/README.md
index ae86d761..8cef7387 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Makelore 是一个面向软件、视觉创作、智能机器人与个人云智
 
 - `Makelore Code｜AI 编程`：管理本地项目、项目智能体、对话、文件上下文、代码变更和运行时。
   会话工作台采用浅蓝项目栏、彩色通用手柄图标与卡片选中态；中间对话/作品使用圆角标签，作品预览的后退、前进、刷新与网址输入统一放在标签右侧；只在作品页显示，窄窗口自动换行。右侧智能体咨询使用奶油色标题区。沿用真实项目和会话入口、侧栏伸缩与账户菜单，样式只作用于 Code 会话工作台。可编辑的空对话在输入区上方的可用区域中央显示童趣欢迎语；「去作品广场逛逛」入口紧贴输入框上方，两者一起位于底部。老师介绍以固定宽度浮在右上角，不占用中间布局；欢迎语和底部输入区始终相对项目栏右侧的整个内容区域居中；小窗口的欢迎内容独立滚动；发送首条消息后收起欢迎区。侧栏保留「作品广场」入口，只有点击后才在系统浏览器打开公共广场，不请求、摘取或内嵌展示广场作品。打开广场保留当前项目、对话、草稿和附件，不自动发送消息；老师求助按钮保留临时应用的最新文案「帮我整体看🧠」。
-- `Makelore Agents｜AI 智能体`：配置个人云智能体并试聊，发布后正式对话、接入个人微信或创建应用 API Key。支持流式回复、审批、排队请求、附件与产物、自动任务和活动历史；重新进入时恢复最近智能体与对话，未确认操作可按原输入重试。聊天可提出日程建议，由创建者核对能力、时间和费用后启用。知识库上传、替换及导入本人会话附件后自动解析并建立索引；文档卡片区分排队、解析、索引、可用和失败，持续刷新已加载文档，失败可原地重试；零文本内容不会显示为可用，新文档可用后才移除被替换的旧文档。支持删除知识内容；个人 MCP 凭据、Skills、子智能体可自助管理。支持智能体和会话归档、发布版本比较及恢复为草稿。除知识库 embedding 向量化外，模型调用（包括知识处理触发的对话模型调用）仍按原规则由创建者个人词元点数支付，可按智能体设置每次任务和每日上限，费用按时间、来源、应用分页统计；embedding 向量化由平台承担，不计入用户用量、词元点数或智能体费用上限；应用调用者保有自己的内容空间。Main 管理云会话和本机文件，Renderer 通过 Host API 操作。配套服务接入见 [Yuxi MakeLore 说明](https://xerrors.github.io/Yuxi/advanced/makelore-agents.html)。 编辑采用全高桌面分栏，支持拖动调整与展开、独立滚动、小窗口配置/试用切换。首次创建按选用途、说要求、试一试引导，提供科学问答、故事、英语和笔记整理起点；回答方式可多选，特别要求直接编辑，仍以草稿的 system_prompt 保存。新助手预选云端目录的第一个可用模型并明确显示，可自行更换；已有助手不自动换模型。编辑区以“我的要求”和“高级设置”两个 Tab 切换，默认显示基础要求；高级设置包含能力、知识与限制，返回时保留上次分类，切换保留未保存的输入及当前试用。已开始使用的助手在顶部显示“修改已保存，尚未应用”或“已应用最新修改”，并提供显眼的“应用最新修改”按钮；保存只更新草稿，应用沿用同一发布操作，失败重试保留原操作身份。草稿明确保存（Ctrl/⌘+S），保存与切换页面保留当前试用及未发送文字；“保存并重新试用”使用最新保存的要求，保留上次试用供对比，并可复用上次问题，不自动发送。示例问题仅填入输入框；有运行、排队、审批或未确认操作时先处理当前试用。工具确认先展示实际操作说明与参数，完整技术详情可展开。确认“开始使用”会创建仅自己可用的发布版本并进入独立对话，微信渠道与应用接入仍单独配置。费用上限在限制中独立保存。Enter 发送、Shift+Enter 换行，F6 切换面板焦点、Esc 恢复分栏。
+- `Makelore Agents｜AI 智能体`：首页以“我的智能体”和创建入口为核心；空状态引导创建第一个助手，不在首页展示推荐起点。浅色卡片展示自己的助手、已保存头像、用途及状态；可用助手直接“和它聊聊”或“调整”，草稿“继续制作”，停用/归档助手“查看与调整”。收到的分享、活动和包含已归档的筛选收进“更多”，保留原数据和入口。创建第一步填写名称，并可选择平台16张像素头像或上传自己的头像，点击“下一步”进入配置；创建结果不确定时保留原操作和头像，明确重试。独立配置页顶部显示当前名称和头像，基础页选择模型并直接编辑完整提示词；不包含用途选择、回答方式预设、模型介绍、模型价格提示或并排试聊。新助手预选真实目录中的首个可用模型，可自行更换；已有助手不会自动换模型。高级设置保留能力、知识与限制，切换保留未保存输入；微信与应用接入仍单独配置。未设置头像或图片加载失败时显示内置像素伙伴。平台头像支持预览与更换，保存后生效；选择失败保留原头像。头像复用 Yuxi 上传合同，Main 持有文件选择、固定平台头像资源与上传，保存 canonical icon，公开 icon_url 只用于显示。草稿明确保存（Ctrl/⌘+S）；保存只更新草稿，顶部“应用最新修改”使新配置生效，失败重试保留原操作身份。确认“开始使用”创建仅自己可用的发布版本并打开独立聊天，配置页不会自动发送消息。聊天支持流式回复、审批、排队、附件、产物和历史；聊天与配置切换保留未发送内容。历史试用记录仍可从活动查看，不自动删除。自动任务建议须创建者核对后启用。知识上传、替换及本人附件导入后自动解析索引，持续显示处理/可用/失败状态，零内容不会显示可用，新内容可用后才移除旧资料。费用上限独立保存；收费模型调用仍由创建者个人词元点数支付，知识 embedding 由平台承担。访问隔离、版本恢复、原输入重试及 Main-owned Host API 边界保持。配套服务见 [Yuxi MakeLore 说明](https://xerrors.github.io/Yuxi/advanced/makelore-agents.html)。
 
   云知识库的 embedding 模型只由平台管理员在 Yuxi 后台维护：在「智能体管理 → 模型供应商」启用供应商，按供应商要求填写有效的服务地址和 API Key，添加并启用 embedding 模型并填写实际向量维度；embedding 向量化费用由平台承担，不计入用户用量、词元点数或智能体费用上限；one-api 不参与 embedding 配置，Works Square 只负责其他应计费模型调用的创建者词元点数账本。客户端区分目录加载中、加载失败与无可用模型，空状态提供管理员配置说明；「刷新知识库与模型」保留未提交名称，未确认的创建请求沿用原操作身份。
 
diff --git a/electron/api/routes/cloud-agents.ts b/electron/api/routes/cloud-agents.ts
index aee2ddae..b703e62b 100644
--- a/electron/api/routes/cloud-agents.ts
+++ b/electron/api/routes/cloud-agents.ts
@@ -43,6 +43,8 @@ export async function handleCloudAgentsRoutes(req: IncomingMessage, res: ServerR
       data = await cloudAgents.resolvePending(await parseJsonBody(req));
     } else if (path === '/avatars/pick' && req.method === 'POST') {
       data = await cloudAgents.uploadAvatar();
+    } else if (path === '/avatars/preset' && req.method === 'POST') {
+      data = await cloudAgents.useAvatarPreset(await parseJsonBody(req));
     } else if (path === '/attachments/pick' && req.method === 'POST') {
       data = await cloudAgents.upload();
     } else if (path === '/knowledge/pick' && req.method === 'POST') {
diff --git a/electron/services/cloud-agent-avatar-presets.ts b/electron/services/cloud-agent-avatar-presets.ts
new file mode 100644
index 00000000..1f302079
--- /dev/null
+++ b/electron/services/cloud-agent-avatar-presets.ts
@@ -0,0 +1,20 @@
+/// <reference types="vite/client" />
+
+// Inline assets make the same allowlisted portraits available in development
+// and packaged Main without accepting a path or image bytes from Renderer.
+const portraits = import.meta.glob('../../src/assets/agent-avatars/avatar-*.png', {
+  eager: true,
+  import: 'default',
+  query: '?inline',
+}) as Record<string, string>;
+
+const presets = new Map(Array.from({ length: 16 }, (_, index) => {
+  const id = `avatar-${String(index + 1).padStart(2, '0')}`;
+  return [id, portraits[`../../src/assets/agent-avatars/${id}.png`]];
+}));
+
+export function cloudAgentAvatarPreset(id: string): { bytes: Uint8Array; fileName: string } | null {
+  const image = presets.get(id);
+  if (!image?.startsWith('data:image/png;base64,')) return null;
+  return { bytes: new Uint8Array(Buffer.from(image.slice('data:image/png;base64,'.length), 'base64')), fileName: `${id}.png` };
+}
diff --git a/electron/services/cloud-agents.ts b/electron/services/cloud-agents.ts
index 25533ab5..38517709 100644
--- a/electron/services/cloud-agents.ts
+++ b/electron/services/cloud-agents.ts
@@ -1,5 +1,6 @@
 import { EMPTY_CLOUD_CONFIGURATION, type CloudAgentConfiguration, type CloudAgentDraft, type CloudAgentPage, type CreateCloudAgent, type SaveCloudAgentDraft, type CloudUpload } from '../../shared/cloud-agents';
 import { operationPlan } from './cloud-agent-operations';
+import { cloudAgentAvatarPreset } from './cloud-agent-avatar-presets';
 
 const retiredChannelOperations = new Set([
   'channelPolicy',
@@ -397,6 +398,16 @@ export class CloudAgentsModule {
     return this.withAvatar({ icon: textField(result.icon, 255) });
   }
 
+  async useAvatarPreset(value: unknown): Promise<{ icon: string; icon_url: string | null }> {
+    const id = textField(record(value).id, 32);
+    const preset = cloudAgentAvatarPreset(id);
+    if (!preset) throw new CloudAgentsError(422, 'invalid_input');
+    const body = new FormData();
+    body.append('file', new Blob([preset.bytes], { type: 'image/png' }), preset.fileName);
+    const result = record(await this.request('/api/makelore/avatars', 'POST', body));
+    return this.withAvatar({ icon: textField(result.icon, 255) });
+  }
+
   async upload(): Promise<CloudUpload | null> {
     const body = await this.pickUpload();
     if (!body) return null;
diff --git a/src/lib/cloud-agents-api.ts b/src/lib/cloud-agents-api.ts
index 5c6f78bc..db095d69 100644
--- a/src/lib/cloud-agents-api.ts
+++ b/src/lib/cloud-agents-api.ts
@@ -4,6 +4,9 @@ import { CLOUD_AGENTS_PATH, type CloudAgentDraft, type CloudAgentPage, type Crea
 
 export const cloudAgentsApi = {
   uploadAvatar: () => hostApiFetch<{ icon: string; icon_url: string | null } | null>(CLOUD_AGENTS_PATH + '/avatars/pick', { method: 'POST' }),
+  useAvatarPreset: (id: string) => hostApiFetch<{ icon: string; icon_url: string | null }>(CLOUD_AGENTS_PATH + '/avatars/preset', {
+    method: 'POST', body: JSON.stringify({ id }),
+  }),
   recovery: () => hostApiFetch<CloudRecoveryState>(CLOUD_AGENTS_PATH + '/recovery'),
   remember: (recent: CloudRecent | null) => hostApiFetch(CLOUD_AGENTS_PATH + '/recovery/recent', {
     method: 'PUT', body: JSON.stringify(recent),
diff --git a/src/pages/CloudAgents/AgentRequirements.tsx b/src/pages/CloudAgents/AgentRequirements.tsx
index 992f0db1..fd6888ee 100644
--- a/src/pages/CloudAgents/AgentRequirements.tsx
+++ b/src/pages/CloudAgents/AgentRequirements.tsx
@@ -1,32 +1,9 @@
-import { Button } from '@/components/ui/button';
 import { Textarea } from '@/components/ui/textarea';
 
-const styles = [
-  { label: '简单易懂', instruction: '使用简单易懂的语言，遇到新词先解释。' },
-  { label: '一步一步来', instruction: '把任务拆成小步骤，一次引导我完成一步。' },
-  { label: '先给我提示', instruction: '先给我提示和思考问题，让我尝试后再补充答案。' },
-] as const;
-
-/** Style choices are ordinary instruction lines in the existing system_prompt. */
 export function AgentRequirements({ value, onChange }: { value: string; onChange: (value: string) => void }) {
-  const selected = styles.filter(style => value.split('\n').includes(style.instruction));
-  const custom = value.split('\n').filter(line => !selected.some(style => style.instruction === line)).join('\n');
-  return <div className="space-y-5">
-    <fieldset className="space-y-2">
-      <legend className="mb-2 text-sm font-medium">希望它怎样回答？<span className="ml-2 font-normal text-muted-foreground">可多选</span></legend>
-      <div className="flex flex-wrap gap-2">{styles.map(style => {
-        const checked = selected.includes(style);
-        return <Button key={style.label} type="button" variant={checked ? 'secondary' : 'outline'} className="min-h-10"
-          aria-pressed={checked} disabled={!checked && value.length + style.instruction.length + 1 > 32000} onClick={() => onChange(checked
-            ? value.split('\n').filter(line => line !== style.instruction).join('\n')
-            : value + (value && !value.endsWith('\n') ? '\n' : '') + style.instruction)}>{style.label}</Button>;
-      })}</div>
-    </fieldset>
-    <label className="block space-y-2 text-sm"><span className="font-medium">特别要求</span>
-      <Textarea aria-label="特别要求" className="min-h-32 resize-y leading-7" maxLength={32000 - selected.reduce((length, style) => length + style.instruction.length + 1, 0)}
-        value={custom} onChange={event => onChange([event.target.value, ...selected.map(style => style.instruction)].filter(Boolean).join('\n'))}
-        placeholder="例如：先给我一个提示，等我想一想，再继续。" />
-      <span className="block text-xs leading-6 text-muted-foreground">写下你希望它怎么帮你。已有的自定义要求也可以直接修改。</span>
-    </label>
-  </div>;
+  return <label className="block space-y-2 text-sm"><span className="font-medium">提示词</span>
+    <Textarea aria-label="提示词" className="min-h-64 resize-y leading-7" maxLength={32000}
+      value={value} onChange={event => onChange(event.target.value)}
+      placeholder="填写智能体的任务和要求" />
+  </label>;
 }
diff --git a/src/pages/CloudAgents/CloudAvatar.tsx b/src/pages/CloudAgents/CloudAvatar.tsx
index 8fe397be..069f2358 100644
--- a/src/pages/CloudAgents/CloudAvatar.tsx
+++ b/src/pages/CloudAgents/CloudAvatar.tsx
@@ -1,9 +1,16 @@
 import { useEffect, useRef, useState } from 'react';
-import { ImagePlus, Loader2, Sparkles } from 'lucide-react';
+import { Check, ImagePlus, Loader2 } from 'lucide-react';
 import { Button } from '@/components/ui/button';
+import { agentAvatarOptions } from '@/lib/agent-avatars';
 import { cloudAgentsApi } from '@/lib/cloud-agents-api';
 import type { CloudAgentAvatar } from '../../../shared/cloud-agents';
 
+function defaultAvatar(name: string) {
+  let seed = 0;
+  for (const character of name) seed = (seed * 31 + character.codePointAt(0)!) >>> 0;
+  return agentAvatarOptions[seed % agentAvatarOptions.length]!;
+}
+
 export function CloudAvatar({ src, name, className = 'h-12 w-12' }: {
   src?: string | null; name: string; className?: string;
 }) {
@@ -11,7 +18,7 @@ export function CloudAvatar({ src, name, className = 'h-12 w-12' }: {
   const style = `inline-flex shrink-0 items-center justify-center overflow-hidden rounded-xl bg-violet-50 text-violet-500 ${className}`;
   return src && failed !== src
     ? <img src={src} alt={`${name}头像`} className={style + ' object-cover'} onError={() => setFailed(src)} />
-    : <span role="img" aria-label={`${name}默认头像`} className={style}><Sparkles className="h-1/2 w-1/2" strokeWidth={1.5} /></span>;
+    : <img src={defaultAvatar(name).src} alt={`${name}默认头像`} className={style + ' object-cover'} style={{ imageRendering: 'pixelated' }} />;
 }
 
 export function CloudAvatarEditor({ value, name, disabled, uploading, onUploading, onChange }: {
@@ -19,38 +26,58 @@ export function CloudAvatarEditor({ value, name, disabled, uploading, onUploadin
   onUploading: (busy: boolean) => void; onChange: (avatar: CloudAgentAvatar) => void;
 }) {
   const [error, setError] = useState('');
+  const [pendingPreset, setPendingPreset] = useState<string | null>(null);
+  const [selection, setSelection] = useState<{ id: string; icon: string | null | undefined } | null>(null);
   const alive = useRef(true);
   const pending = useRef(false);
   useEffect(() => { alive.current = true; return () => { alive.current = false; }; }, []);
-  const upload = async () => {
-    if (disabled || pending.current) return;
-    pending.current = true; onUploading(true); setError('');
+  const updateAvatar = async (presetId: string | null = null) => {
+    if (disabled || uploading || pending.current) return;
+    pending.current = true; setPendingPreset(presetId); onUploading(true); setError('');
     try {
-      const avatar = await cloudAgentsApi.uploadAvatar();
-      if (alive.current && avatar) onChange(avatar);
+      const avatar = presetId ? await cloudAgentsApi.useAvatarPreset(presetId) : await cloudAgentsApi.uploadAvatar();
+      if (alive.current && avatar) {
+        setSelection(presetId ? { id: presetId, icon: avatar.icon } : null);
+        onChange(avatar);
+      }
     } catch (failure) {
-      if (alive.current) setError(failure instanceof Error ? failure.message : '头像上传失败，请重试');
+      if (alive.current) setError(failure instanceof Error ? failure.message : '头像更新失败，请重试');
     } finally {
       pending.current = false;
-      if (alive.current) onUploading(false);
+      if (alive.current) { setPendingPreset(null); onUploading(false); }
     }
   };
+  const selectedId = value.icon ? (selection?.icon === value.icon ? selection.id : null) : defaultAvatar(name || '智能体').id;
   return <div className="space-y-2" role="group" aria-label="智能体头像">
     <div className="flex items-center gap-4">
       <CloudAvatar src={value.icon_url} name={name || '智能体'} className="h-16 w-16" />
       <div className="space-y-2">
         <p className="text-sm font-medium">头像</p>
         <div className="flex flex-wrap gap-2">
-          <Button type="button" variant="outline" size="sm" disabled={disabled || uploading} onClick={() => void upload()}>
+          <Button type="button" variant="outline" size="sm" disabled={disabled || uploading} onClick={() => void updateAvatar()}>
             {uploading ? <Loader2 className="mr-2 h-4 w-4 animate-spin" /> : <ImagePlus className="mr-2 h-4 w-4" />}
-            {uploading ? '正在上传…' : value.icon ? '更换头像' : '上传头像'}
+            {uploading ? pendingPreset ? '正在使用…' : '正在上传…' : value.icon ? '更换头像' : '上传头像'}
           </Button>
           {value.icon && <Button type="button" variant="ghost" size="sm" disabled={disabled || uploading}
-            onClick={() => { setError(''); onChange({ icon: null, icon_url: null }); }}>移除头像</Button>}
+            onClick={() => { if (pending.current) return; setError(''); setSelection(null); onChange({ icon: null, icon_url: null }); }}>移除头像</Button>}
         </div>
         <p className="text-xs text-muted-foreground">PNG、JPEG、WebP 或 GIF，最大 5 MB。保存后生效。</p>
       </div>
     </div>
+    <div className="space-y-2 pt-2">
+      <p className="text-sm font-medium">平台像素头像</p>
+      <p className="text-xs text-muted-foreground">选一个像素伙伴，无需上传自己的图片。保存后生效。</p>
+      <div className="grid max-w-lg grid-cols-4 gap-2 sm:grid-cols-8" role="group" aria-label="平台像素头像">
+        {agentAvatarOptions.map(option => <button key={option.id} type="button" aria-label={option.label}
+          aria-pressed={selectedId === option.id} disabled={disabled || uploading}
+          onClick={() => void updateAvatar(option.id)}
+          className={`relative aspect-square cursor-pointer overflow-hidden rounded-xl border-2 bg-amber-50 p-0.5 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-2 disabled:cursor-wait disabled:opacity-60 ${selectedId === option.id ? 'border-primary' : 'border-transparent hover:border-primary/40'}`}>
+          <img src={option.src} alt="" className="h-full w-full rounded-lg object-cover" style={{ imageRendering: 'pixelated' }} />
+          {pendingPreset === option.id ? <span className="absolute inset-0 flex items-center justify-center bg-white/70"><Loader2 aria-hidden className="h-5 w-5 animate-spin text-primary" /></span>
+            : selectedId === option.id && <span className="absolute bottom-0.5 right-0.5 rounded-full bg-primary p-0.5 text-white"><Check aria-hidden className="h-3 w-3" /></span>}
+        </button>)}
+      </div>
+    </div>
     {error && <p role="alert" className="text-sm text-destructive">{error}</p>}
   </div>;
 }
diff --git a/src/pages/CloudAgents/ConfigurationFields.tsx b/src/pages/CloudAgents/ConfigurationFields.tsx
index 17b1cd10..85027601 100644
--- a/src/pages/CloudAgents/ConfigurationFields.tsx
+++ b/src/pages/CloudAgents/ConfigurationFields.tsx
@@ -41,11 +41,7 @@ export function ConfigurationFields({ slug, value, disabled, onChange, section =
         {value.model && !catalog?.models.some(m => m.id === value.model) && <option value={value.model}>{value.model}（目录中不可用）</option>}
         {catalog?.models.map(m => <option key={m.id} value={m.id}>{m.name}</option>)}
       </select></label>
-    {section === 'instructions' && <p className="text-xs leading-6 text-muted-foreground">这是帮助它思考和回答的 AI。{chooseInitialModel && catalog?.models.length ? '新助手从目录中的第一个可用模型开始，你可以更换。' : '选择模型后，保存即可试用。'}</p>}
     {catalog && catalog.models.length === 0 && <p className="text-sm text-muted-foreground">暂时没有可用模型，请稍后刷新目录或请老师协助。<Button type="button" variant="ghost" disabled={disabled} onClick={() => setRefresh(v => v + 1)}>刷新目录</Button></p>}
-    {catalog?.pricing && <p className="text-xs leading-5 text-muted-foreground tabular-nums">
-      每 {catalog.pricing.unit_size.toLocaleString()} 个词元约 {catalog.pricing.points_per_unit} 词元点数，按实际模型调用结算。
-    </p>}
     </div>
     {(['tools', 'knowledges', 'mcps', 'skills', 'subagents'] as const).map(key => {
       const labels = { tools: '工具', knowledges: '知识库', mcps: 'MCP 服务', skills: 'Skills', subagents: '子智能体' };
diff --git a/src/pages/CloudAgents/DraftEditor.tsx b/src/pages/CloudAgents/DraftEditor.tsx
index bd244db8..ba7e1138 100644
--- a/src/pages/CloudAgents/DraftEditor.tsx
+++ b/src/pages/CloudAgents/DraftEditor.tsx
@@ -3,7 +3,6 @@ import { useBlocker } from 'react-router-dom';
 import { ArrowLeft, Check, Loader2, Save } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
-import { Textarea } from '@/components/ui/textarea';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
 import { Dialog, DialogContent, DialogDescription, DialogTitle } from '@/components/ui/dialog';
 import { cloudAgentsApi } from '@/lib/cloud-agents-api';
@@ -14,35 +13,32 @@ import { CloudChannelConversations } from './CloudChannelConversations';
 import { CloudAccessPanel } from './CloudAccess';
 import { CloudSchedules } from './CloudSchedules';
 import { CloudPendingContext, useCloudPendingState } from './CloudPending';
-import { DesktopSplit } from './DesktopSplit';
 import { AgentRequirements } from './AgentRequirements';
-import { agentExamples } from './agent-guidance';
-import { useCloudPublication } from './useCloudPublication';
 import { CloudAvatar, CloudAvatarEditor } from './CloudAvatar';
+import { useCloudPublication } from './useCloudPublication';
 
 type Tab = 'configuration' | 'chat' | 'tasks' | 'access';
 type AdvancedCategory = 'capabilities' | 'knowledge' | 'limits';
-const hasDraftChanges = (draft: CloudAgentDraft, saved: CloudAgentDraft) => draft.name !== saved.name || draft.purpose !== saved.purpose || draft.system_prompt !== saved.system_prompt
-  || (draft.icon ?? null) !== (saved.icon ?? null)
+const hasDraftChanges = (draft: CloudAgentDraft, saved: CloudAgentDraft) => draft.name !== saved.name || (draft.icon ?? null) !== (saved.icon ?? null) || draft.purpose !== saved.purpose || draft.system_prompt !== saved.system_prompt
   || JSON.stringify(draft.configuration) !== JSON.stringify(saved.configuration);
 const errorMessage = (error: unknown) => error instanceof Error ? error.message : '暂时无法完成操作';
 
-export function DraftEditor({ initial, recent, onBack, onSaved, startingPrompt }: {
+export function DraftEditor({ initial, recent, onBack, onSaved, startingPrompt, entryView }: {
   startingPrompt?: string;
+  entryView?: 'configuration' | 'chat';
   initial: CloudAgentDraft; recent: CloudRecent | null; onBack: () => void; onSaved: (agent: CloudAgentDraft) => void;
 }) {
   const [saved, setSaved] = useState(initial);
   const [draft, setDraft] = useState(() => startingPrompt === undefined ? initial : { ...initial, system_prompt: startingPrompt });
   const [editorTab, setEditorTab] = useState('instructions');
   const [advancedCategory, setAdvancedCategory] = useState<AdvancedCategory>('capabilities');
-  const [previewActivation, setPreviewActivation] = useState(0);
-  const [previewCreated, setPreviewCreated] = useState(Boolean(initial.configuration?.model));
+  const [uploading, setUploading] = useState(false);
+  const [editingAvatar, setEditingAvatar] = useState(false);
   const [remote, setRemote] = useState<CloudAgentDraft | null>(null);
   const [savingDraft, setBusy] = useState(false);
-  const [uploadingAvatar, setUploadingAvatar] = useState(false);
   const [error, setError] = useState('');
   const [leaving, setLeaving] = useState(false);
-  const initialTab = recent?.mode === 'preview' ? 'configuration' : initial.published_version ? 'chat' : 'configuration';
+  const initialTab = entryView ?? (recent?.mode === 'preview' ? 'configuration' : initial.published_version ? 'chat' : 'configuration');
   const [tab, setTab] = useState<Tab>(initialTab);
   const [visited, setVisited] = useState<Set<Tab>>(() => new Set([initialTab]));
   const category = editorTab === 'instructions' ? 'instructions' : advancedCategory;
@@ -64,7 +60,7 @@ export function DraftEditor({ initial, recent, onBack, onSaved, startingPrompt }
     onSaved(next);
     if (!saved.published_version) navigate('chat');
   });
-  const busy = savingDraft || publication.busy || uploadingAvatar;
+  const busy = savingDraft || publication.busy || uploading;
   const hasPending = pending.hasPending || formalPending.hasPending || Boolean(publication.pending);
   const canSave = dirty && !busy && !remote && Boolean(draft.name.trim() && draft.purpose.trim());
   const needsApply = Boolean(saved.published_version) && publication.appliedRevision !== undefined
@@ -75,7 +71,7 @@ export function DraftEditor({ initial, recent, onBack, onSaved, startingPrompt }
   const finishLeaving = () => { if (blocker.state === 'blocked') blocker.proceed(); else onBack(); };
   useEffect(() => { alive.current = true; return () => { alive.current = false; }; }, []);
   useEffect(() => {
-    if (tab === 'configuration' && !saved.configuration?.model) {
+    if (tab === 'configuration') {
       void cloudAgentsApi.remember({ slug: saved.slug, mode: 'preview', draft_revision: saved.draft_revision })
         .catch(e => { if (alive.current) setError(errorMessage(e)); });
     }
@@ -92,12 +88,12 @@ export function DraftEditor({ initial, recent, onBack, onSaved, startingPrompt }
     try {
       const result = await cloudAgentsApi.save(saved.slug, {
         expected_revision: saved.draft_revision, name: draft.name, purpose: draft.purpose, system_prompt: draft.system_prompt,
+        icon: draft.icon ?? null,
         configuration: draft.configuration ?? EMPTY_CLOUD_CONFIGURATION,
-        ...(draft.icon === undefined ? {} : { icon: draft.icon }),
       });
       if (!alive.current) return;
-      setSaved(result); if (result.configuration?.model) setPreviewCreated(true);
-      setDraft(current => !hasDraftChanges(current, draft) ? result : { ...result, name: current.name, purpose: current.purpose, icon: current.icon, icon_url: current.icon_url, system_prompt: current.system_prompt, configuration: current.configuration });
+      setSaved(result);
+      setDraft(current => !hasDraftChanges(current, draft) ? result : { ...result, name: current.name, icon: current.icon, icon_url: current.icon_url, purpose: current.purpose, system_prompt: current.system_prompt, configuration: current.configuration });
       setRemote(null); onSaved(result);
       if (exit) finishLeaving();
       return result.draft_revision;
@@ -122,14 +118,14 @@ export function DraftEditor({ initial, recent, onBack, onSaved, startingPrompt }
     <header className="agent-workspace-header">
       <Button variant="ghost" size="icon" className="h-10 w-10 shrink-0" aria-label="我的智能体" disabled={busy}
         onClick={() => dirty || hasPending ? setLeaving(true) : onBack()}><ArrowLeft className="h-4 w-4" /></Button>
-      <div className="flex min-w-0 flex-1 items-center gap-2">
-        <CloudAvatar src={draft.icon_url} name={draft.name} className="h-10 w-10" />
-        <div className="min-w-0 flex-1">
-          <Input aria-label="名称" maxLength={100} value={draft.name} disabled={busy}
-            className="h-8 max-w-96 border-transparent bg-transparent px-2 font-semibold shadow-none hover:border-input focus:border-input"
-            onChange={event => setDraft({ ...draft, name: event.target.value })} />
-          <p className="px-2 text-xs text-muted-foreground">{saved.published_version ? '我的助手' : startingPrompt !== undefined ? '第 3 步，共 3 步 · 试一试' : '制作中的助手 · 仅自己可见'}</p>
-        </div>
+      <Button variant="ghost" className="h-12 w-12 shrink-0 p-0" aria-label="修改头像" disabled={busy} onClick={() => setEditingAvatar(true)}>
+        <CloudAvatar src={draft.icon_url} name={draft.name} />
+      </Button>
+      <div className="min-w-0 flex-1">
+        <Input aria-label="名称" maxLength={100} value={draft.name} disabled={busy}
+          className="h-8 max-w-96 border-transparent bg-transparent px-2 font-semibold shadow-none hover:border-input focus:border-input"
+          onChange={event => setDraft({ ...draft, name: event.target.value })} />
+        <p className="px-2 text-xs text-muted-foreground">{saved.published_version ? '我的智能体' : '配置智能体'}</p>
       </div>
       <span role="status" className={`shrink-0 text-xs ${needsApply || dirty ? 'text-amber-800' : 'text-muted-foreground'}`}>{savingDraft ? '正在保存…' : dirty ? '有未保存修改' : saved.published_version ? applicationStatus : '云端已保存'}</span>
       <Button className="min-h-10" size="sm" variant={dirty ? 'default' : 'outline'} disabled={!canSave} onClick={() => void save()} title="保存草稿（Ctrl / ⌘ S）">
@@ -145,7 +141,7 @@ export function DraftEditor({ initial, recent, onBack, onSaved, startingPrompt }
       {!saved.published_version && <Button className="min-h-10" variant="outline" disabled={busy} onClick={() => navigate('access')}>开始使用</Button>}
     </header>
     <nav aria-label="智能体工作区" className="agent-workspace-nav">
-      {([['configuration', '编辑'], ['chat', '对话'], ['tasks', '自动任务']] as const).map(([key, label]) =>
+      {([['configuration', '配置'], ['chat', '聊天'], ['tasks', '自动任务']] as const).map(([key, label]) =>
         <Button key={key} variant={tab === key ? 'secondary' : 'ghost'} aria-current={tab === key ? 'page' : undefined} onClick={() => navigate(key)}>{label}</Button>)}
       <Button className="ml-auto" variant={tab === 'access' ? 'secondary' : 'ghost'} aria-current={tab === 'access' ? 'page' : undefined} onClick={() => navigate('access')}>使用与接入</Button>
     </nav>
@@ -158,17 +154,17 @@ export function DraftEditor({ initial, recent, onBack, onSaved, startingPrompt }
     {remote && <div className="max-h-52 shrink-0 space-y-2 overflow-auto border-b border-amber-200 bg-amber-50 px-6 py-3 text-sm">
       <p className="font-medium">云端已有修订 {remote.draft_revision}，本地输入仍保留</p>
       <details><summary className="cursor-pointer">查看最新草稿</summary><p>{remote.name} · {remote.purpose}</p><pre className="whitespace-pre-wrap font-sans">{remote.system_prompt}</pre></details>
-      <div className="flex flex-wrap gap-2"><Button variant="outline" onClick={() => { setSaved(remote); if (remote.configuration?.model) setPreviewCreated(true); setDraft(remote); setRemote(null); setError(''); }}>使用最新草稿</Button>
-        <Button variant="outline" onClick={() => { setSaved(remote); if (remote.configuration?.model) setPreviewCreated(true); setRemote(null); setError(''); }}>保留我的内容，继续编辑</Button></div>
+      <div className="flex flex-wrap gap-2"><Button variant="outline" onClick={() => { setSaved(remote); setDraft(remote); setRemote(null); setError(''); }}>使用最新草稿</Button>
+        <Button variant="outline" onClick={() => { setSaved(remote); setRemote(null); setError(''); }}>保留我的内容，继续编辑</Button></div>
     </div>}
     <div hidden={tab !== 'configuration'} className="agent-workspace-view">
-      {visited.has('configuration') && <DesktopSplit previewActivation={previewActivation} configuration={<Tabs value={editorTab} onValueChange={next => {
+      {visited.has('configuration') && <Tabs value={editorTab} onValueChange={next => {
         setEditorTab(next);
         if (configurationScroll.current) configurationScroll.current.scrollTop = 0;
       }} className="flex min-h-0 flex-1 flex-col">
         <div className="agent-config-tabs">
           <TabsList aria-label="编辑设置" className="h-auto w-full justify-start">
-            <TabsTrigger value="instructions" className="flex-1 data-[state=active]:text-primary">我的要求</TabsTrigger>
+            <TabsTrigger value="instructions" className="flex-1 data-[state=active]:text-primary">模型与提示词</TabsTrigger>
             <TabsTrigger value="advanced" className="flex-1 data-[state=active]:text-primary">高级设置</TabsTrigger>
           </TabsList>
         </div>
@@ -176,28 +172,15 @@ export function DraftEditor({ initial, recent, onBack, onSaved, startingPrompt }
         <TabsContent value={editorTab} className="m-0 flex min-h-0 flex-1 flex-col">
         {editorTab === 'advanced' && <nav aria-label="配置分类" className="agent-config-tabs pt-2">{([['capabilities', '能力'], ['knowledge', '知识'], ['limits', '限制']] as const).map(([key, label]) =>
           <Button key={key} variant={advancedCategory === key ? 'secondary' : 'ghost'} aria-current={advancedCategory === key ? 'page' : undefined} onClick={() => setAdvancedCategory(key)}>{label}</Button>)}</nav>}
-        <div ref={configurationScroll} className="agent-config-scroll"><fieldset disabled={busy} className="min-w-0">
-          <div hidden={category !== 'instructions'} className="mb-6 space-y-6">
-            <CloudAvatarEditor value={draft} name={draft.name} disabled={busy} uploading={uploadingAvatar} onUploading={setUploadingAvatar}
-              onChange={avatar => setDraft(current => ({ ...current, ...avatar }))} />
-            <label className="block space-y-2 text-sm"><span className="font-medium">用途</span><Textarea aria-label="用途" className="min-h-20 resize-y" maxLength={2000} value={draft.purpose}
-              onChange={event => setDraft({ ...draft, purpose: event.target.value })} placeholder="一句话介绍，它可以帮你做什么。" /></label>
-            <AgentRequirements value={draft.system_prompt} onChange={system_prompt => setDraft({ ...draft, system_prompt })} />
-          </div>
+        <div ref={configurationScroll} className="agent-config-scroll"><fieldset disabled={busy} className="agent-configuration-form">
           <ConfigurationFields slug={saved.slug} section={category} chooseInitialModel={startingPrompt !== undefined} value={draft.configuration ?? EMPTY_CLOUD_CONFIGURATION} disabled={busy}
             onChange={configuration => setDraft({ ...draft, configuration })} />
+          <div hidden={category !== 'instructions'} className="mt-6">
+            <AgentRequirements value={draft.system_prompt} onChange={system_prompt => setDraft({ ...draft, system_prompt })} />
+          </div>
         </fieldset></div>
         </TabsContent>
-      </Tabs>} preview={expandAction => <>
-        {!saved.configuration?.model && !previewCreated ? <div className="my-auto p-6 text-sm leading-7">{expandAction}<h2 className="font-medium">试试它是否懂你</h2>
-          <p className="mt-2 text-muted-foreground">看看你填好的要求，准备好后就能和它聊两句。</p>
-          <Button className="mt-4 min-h-10" disabled={!canSave || !draft.configuration?.model} onClick={async () => { if (await save() !== undefined) setPreviewActivation(v => v + 1); }}>保存并开始试用</Button>
-          {!draft.configuration?.model && <p className="mt-3 text-muted-foreground">请先在“我的要求”里选择一个可用模型。</p>}
-          <p className="mt-4 text-xs text-muted-foreground">保存免费；发送消息按模型实际用量扣除你的词元点数。</p></div>
-          : <CloudChat slug={saved.slug} previewRevision={saved.draft_revision} activeView={tab === 'configuration'} headerAction={expandAction} previewReady={Boolean(saved.configuration?.model)}
-            examples={agentExamples(saved.purpose)} hasUnsavedChanges={dirty} saveDisabled={!canSave || !draft.configuration?.model}
-            onSaveForPreview={save} />}
-      </>} />}
+      </Tabs>}
     </div>
     <div hidden={tab !== 'chat'} className="agent-workspace-view p-6">
       {visited.has('chat') && (saved.published_version ? <CloudPendingContext.Provider value={formalPending.report}>
@@ -210,7 +193,7 @@ export function DraftEditor({ initial, recent, onBack, onSaved, startingPrompt }
             onSchedule={proposal => { setScheduleProposal(proposal); navigate('tasks'); }} /></div>
         <div hidden={conversationSource !== 'wechat'} className="min-h-0 flex-1 overflow-auto">{wechatVisited && <CloudChannelConversations slug={saved.slug} activeView={tab === 'chat' && conversationSource === 'wechat'} />}</div>
       </CloudPendingContext.Provider>
-        : <div className="m-auto space-y-4 text-center text-sm"><p>试用满意后，就可以开始使用自己的助手了。</p><Button onClick={() => navigate('access')}>开始使用</Button></div>)}
+        : <div className="m-auto space-y-4 text-center text-sm"><p>保存配置后，开始使用这个智能体。</p><Button onClick={() => navigate('access')}>开始使用</Button></div>)}
     </div>
     <div hidden={tab !== 'tasks'} className="agent-management-view">
       {visited.has('tasks') && <CloudSchedules slug={saved.slug} proposal={scheduleProposal} onProposalClosed={() => setScheduleProposal(undefined)} onOpen={thread => {
@@ -219,11 +202,18 @@ export function DraftEditor({ initial, recent, onBack, onSaved, startingPrompt }
       }} />}
     </div>
     <div hidden={tab !== 'access'} className="agent-management-view">
-      {dirty && <div className="mb-4 space-y-3 text-sm"><p>先保存你的要求，再开始使用。当前试用会保留。</p><Button disabled={!canSave} onClick={() => void save()}>保存修改</Button></div>}
+      {dirty && <div className="mb-4 space-y-3 text-sm"><p>先保存配置，再开始使用。</p><Button disabled={!canSave} onClick={() => void save()}>保存修改</Button></div>}
       <fieldset disabled={dirty || busy || remote !== null}>
-        {visited.has('access') && <CloudAccessPanel activeView={tab === 'access'} slug={saved.slug} revision={saved.draft_revision} publication={publication} onChanged={result => { setSaved(result); if (result.configuration?.model) setPreviewCreated(true); setDraft(current => !hasDraftChanges(current, saved) ? result : { ...current, draft_revision: result.draft_revision, published_version: result.published_version }); onSaved(result); }} />}
+        {visited.has('access') && <CloudAccessPanel activeView={tab === 'access'} slug={saved.slug} revision={saved.draft_revision} publication={publication} onChanged={result => { setSaved(result); setDraft(current => !hasDraftChanges(current, saved) ? result : { ...current, draft_revision: result.draft_revision, published_version: result.published_version }); onSaved(result); }} />}
       </fieldset>
     </div>
+    <Dialog open={editingAvatar} onOpenChange={open => { if (!uploading) setEditingAvatar(open); }}>
+      <DialogContent><DialogTitle>修改头像</DialogTitle><DialogDescription>选择这个智能体的头像。</DialogDescription>
+        <CloudAvatarEditor value={draft} name={draft.name} disabled={savingDraft || publication.busy} uploading={uploading}
+          onUploading={setUploading} onChange={avatar => setDraft(current => ({ ...current, ...avatar }))} />
+        <Button disabled={uploading} onClick={() => setEditingAvatar(false)}>完成</Button>
+      </DialogContent>
+    </Dialog>
     <Dialog open={leaving || blocker.state === 'blocked'} onOpenChange={open => { if (!open && !busy) { setLeaving(false); if (blocker.state === 'blocked') blocker.reset(); } }}>
       <DialogContent><DialogTitle>未保存的修改</DialogTitle>
         <DialogDescription>{hasPending ? '还有未发送的内容或未确认的操作。离开会丢弃当前输入；已被云端接受的任务仍会继续，可在活动中查看。' : '保存后离开，或放弃这次修改。'}</DialogDescription>
diff --git a/src/pages/CloudAgents/agent-home.css b/src/pages/CloudAgents/agent-home.css
new file mode 100644
index 00000000..1033d6f8
--- /dev/null
+++ b/src/pages/CloudAgents/agent-home.css
@@ -0,0 +1,79 @@
+.agent-home {
+  height: 100%;
+  min-width: 0;
+  overflow: auto;
+  padding: 44px 40px 48px;
+  background: #fffdf9;
+  color: #273246;
+}
+.agent-home-content { max-width: 1200px; margin: 0 auto; }
+.agent-home-header { display: flex; align-items: center; justify-content: space-between; gap: 24px; margin-bottom: 36px; }
+.agent-home-intro { min-width: 0; }
+.agent-home-intro h1 { margin: 0; font-size: 30px; font-weight: 700; line-height: 1.3; letter-spacing: -.5px; }
+.agent-home-intro p { margin-top: 12px; font-size: 15px; line-height: 1.8; color: #606c7e; }
+.agent-home-intro-break { display: none; }
+.agent-home-header-actions { display: flex; flex-shrink: 0; align-items: center; gap: 8px; }
+.agent-home button { min-height: 44px; }
+.agent-home-create { gap: 8px; min-height: 48px !important; padding-inline: 20px; border-radius: 14px; font-size: 15px; box-shadow: 0 3px 0 #af340d; }
+.agent-home-create svg { width: 19px; height: 19px; }
+.agent-home-more { gap: 5px; padding-inline: 10px; color: #606c7e; font-weight: 500; }
+.agent-home-more svg { width: 15px; height: 15px; }
+.agent-home-back { gap: 6px; margin: -12px 0 16px -12px; color: #606c7e; }
+.agent-home-back svg { width: 17px; height: 17px; }
+.agent-home-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(min(100%, 292px), 1fr)); gap: 20px; }
+.agent-home-card { display: flex; min-width: 0; flex-direction: column; padding: 24px; border: 1px solid #dce5f3; border-radius: 24px; background: #f1f6ff; transition: border-color 160ms ease, box-shadow 160ms ease; }
+.agent-home-card[data-tone="1"] { background: #f6f2ff; border-color: #e5dcf5; }
+.agent-home-card[data-tone="2"] { background: #fff5e9; border-color: #f0e2ce; }
+.agent-home-card:hover, .agent-home-card:focus-within { border-color: #bcc9df; box-shadow: 0 4px 16px #2732460a; }
+.agent-home-card-top { display: flex; align-items: flex-start; justify-content: space-between; gap: 12px; margin-bottom: 20px; }
+.agent-home-avatar { width: 72px; height: 72px; flex-shrink: 0; overflow: hidden; border: 3px solid #fff; border-radius: 22px; background: #fff6de; box-shadow: 0 2px 5px #27324608; }
+.agent-home-avatar img { width: 100%; height: 100%; object-fit: cover; }
+.agent-home-avatar .agent-home-builtin-avatar { image-rendering: pixelated; }
+.agent-home-status { display: inline-flex; align-items: center; gap: 6px; margin-top: 4px; padding: 5px 10px; border-radius: 20px; font-size: 12px; font-weight: 500; line-height: 1.5; color: #765229; background: #fff9eb; white-space: nowrap; }
+.agent-home-status::before { width: 6px; height: 6px; flex-shrink: 0; border-radius: 50%; background: #af7c36; content: ''; }
+.agent-home-card[data-state="ready"] .agent-home-status { color: #38684d; background: #e3f4e9; }
+.agent-home-card[data-state="ready"] .agent-home-status::before { background: #498264; }
+.agent-home-card[data-state="inactive"] .agent-home-status { color: #606c7e; background: #e9edf2; }
+.agent-home-card[data-state="inactive"] .agent-home-status::before { background: #778294; }
+.agent-home-card h2 { overflow: hidden; font-size: 21px; font-weight: 650; line-height: 1.5; text-overflow: ellipsis; white-space: nowrap; }
+.agent-home-purpose { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 3; min-height: 78px; overflow: hidden; margin-top: 8px; font-size: 15px; line-height: 26px; color: #606c7e; white-space: pre-wrap; overflow-wrap: anywhere; }
+.agent-home-card-actions { display: flex; align-items: center; justify-content: space-between; gap: 8px; margin-top: auto; padding-top: 20px; }
+.agent-home-card-primary { gap: 7px; border-radius: 12px; font-size: 14px; }
+.agent-home-card-primary svg { width: 17px; height: 17px; }
+.agent-home-card-primary.border { border-color: #c6ccda; background: #ffffffb3; color: #35435b; }
+.agent-home-adjust { padding-inline: 12px; border-radius: 12px; color: #546176; }
+.agent-home-empty { display: flex; min-height: 410px; align-items: center; justify-content: center; flex-direction: column; padding: 48px 24px; border: 1px solid #e7e3f1; border-radius: 28px; background: #f7f5fd; text-align: center; }
+.agent-home-empty-icon { display: grid; width: 96px; height: 96px; place-items: center; margin-bottom: 24px; border-radius: 30px; background: #e8e5fa; color: #7161a5; }
+.agent-home-empty-icon svg { width: 52px; height: 52px; }
+.agent-home-empty h2 { font-size: 25px; font-weight: 650; line-height: 1.5; }
+.agent-home-empty p { margin: 12px 0 28px; font-size: 16px; line-height: 1.9; color: #606c7e; }
+.agent-home-loading { display: flex; min-height: 280px; align-items: center; justify-content: center; flex-direction: column; gap: 16px; color: #606c7e; }
+.agent-home-loading svg { width: 38px; height: 38px; color: #8273a9; }
+.agent-home-error, .agent-home-filter { display: flex; align-items: center; justify-content: space-between; gap: 16px; margin-bottom: 24px; padding: 12px 16px; border: 1px solid #e3dfd6; border-radius: 14px; background: #fff; font-size: 14px; }
+.agent-home-error p { overflow-wrap: anywhere; }
+.agent-home-filter { background: #f0eee9; border: 0; color: #606c7e; }
+.agent-home-filter span { display: flex; align-items: center; gap: 8px; }
+.agent-home-filter svg { width: 17px; height: 17px; flex-shrink: 0; }
+.agent-home-menu { z-index: 60; min-width: 226px; padding: 6px; border: 1px solid #e5e4e0; border-radius: 14px; background: #fffdf9; box-shadow: 0 8px 28px #2732461a; color: #35435b; }
+.agent-home-menu-item { display: flex; min-height: 44px; align-items: center; gap: 10px; padding: 10px 12px; border-radius: 8px; outline: none; font-size: 14px; cursor: pointer; user-select: none; }
+.agent-home-menu-item[data-highlighted] { background: #f0eef9; }
+.agent-home-menu-item svg { width: 17px; height: 17px; flex-shrink: 0; color: #716785; }
+.agent-home-menu-separator { height: 1px; margin: 5px 8px; background: #e9e6e0; }
+.agent-home-menu-check { margin-left: auto; }
+@media (max-width: 1150px) {
+  .agent-home { padding: 32px 28px 40px; }
+  .agent-home-intro-break { display: block; }
+}
+@media (max-width: 760px) {
+  .agent-home { padding: 24px 20px 32px; }
+  .agent-home-header { align-items: flex-start; flex-wrap: wrap; gap: 18px; margin-bottom: 28px; }
+  .agent-home-intro h1 { font-size: 27px; }
+  .agent-home-header-actions { flex-wrap: wrap; }
+  .agent-home-card { padding: 22px; }
+  .agent-home-empty { min-height: 360px; padding-inline: 20px; }
+  .agent-home-empty h2 { font-size: 22px; }
+  .agent-home-filter, .agent-home-error { align-items: flex-start; flex-wrap: wrap; }
+}
+@media (prefers-reduced-motion: reduce) {
+  .agent-home-card { transition: none; }
+}
diff --git a/src/pages/CloudAgents/desktop-workspace.css b/src/pages/CloudAgents/desktop-workspace.css
index d5fd2ca4..118cf236 100644
--- a/src/pages/CloudAgents/desktop-workspace.css
+++ b/src/pages/CloudAgents/desktop-workspace.css
@@ -12,6 +12,7 @@
 .agent-pane-heading { display: flex; flex-shrink: 0; align-items: center; justify-content: space-between; height: 44px; padding: 0 16px 0 24px; font-size: 13px; font-weight: 500; }
 .agent-config-tabs { display: flex; flex-shrink: 0; gap: 4px; padding: 0 20px 10px; border-bottom: 1px solid hsl(var(--border)); }
 .agent-config-scroll { flex: 1; min-height: 0; overflow: auto; overscroll-behavior: contain; padding: 24px; }
+.agent-configuration-form { width: 100%; max-width: 900px; min-width: 0; margin-inline: auto; }
 .agent-preview-pane { padding: 8px 20px 16px 12px; }
 .agent-preview-pane > .agent-pane-heading { padding-inline: 0; }
 .agent-divider { touch-action: none; cursor: col-resize; background: hsl(var(--border) / .45); border-inline: 3px solid hsl(var(--background)); }
diff --git a/src/pages/CloudAgents/index.tsx b/src/pages/CloudAgents/index.tsx
index e651a066..e263a3c1 100644
--- a/src/pages/CloudAgents/index.tsx
+++ b/src/pages/CloudAgents/index.tsx
@@ -1,12 +1,12 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useBlocker, useLocation } from 'react-router-dom';
-import { ArrowLeft, Plus, Sparkles } from 'lucide-react';
+import { Archive, ArrowLeft, Bot, Check, ChevronDown, History, MessageCircle, Pencil, Plus, Share2 } from 'lucide-react';
+import * as DropdownMenu from '@radix-ui/react-dropdown-menu';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
-import { Textarea } from '@/components/ui/textarea';
 import { cloudAgentsApi } from '@/lib/cloud-agents-api';
 import { useAuthStore } from '@/stores/auth';
-import { type CloudAgentDraft, type CreateCloudAgent, type CloudAgentEntry, type CloudThread, type CloudRecent, type CloudPendingOperation } from '../../../shared/cloud-agents';
+import { type CloudAgentAvatar, type CloudAgentDraft, type CreateCloudAgent, type CloudAgentEntry, type CloudThread, type CloudRecent, type CloudPendingOperation } from '../../../shared/cloud-agents';
 import { DraftEditor } from './DraftEditor';
 import './desktop-workspace.css';
 import { CloudChat } from './CloudChat';
@@ -14,10 +14,8 @@ import { CloudOverview } from './CloudOverview';
 import { CloudPendingContext, useCloudPendingState } from './CloudPending';
 import { CloudRecovery } from './CloudRecovery';
 import { ChannelAccounts } from './ChannelAccounts';
-import { AgentRequirements } from './AgentRequirements';
-import { agentStarters } from './agent-guidance';
 import { CloudAvatar, CloudAvatarEditor } from './CloudAvatar';
-import type { CloudAgentAvatar } from '../../../shared/cloud-agents';
+import './agent-home.css';
 
 function errorMessage(error: unknown): string {
   return error instanceof Error ? error.message : '暂时无法连接智能体服务，请重试';
@@ -30,6 +28,7 @@ function AgentWorkspace() {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState('');
   const [selected, setSelected] = useState<CloudAgentDraft | null>(null);
+  const [entryView, setEntryView] = useState<'configuration' | 'chat'>();
   const [creating, setCreating] = useState(false);
   const [startingPrompt, setStartingPrompt] = useState<string>();
   const [section, setSection] = useState<'mine' | 'received' | 'activity'>(() => new URLSearchParams(location.search).get('view') === 'activity' ? 'activity' : 'mine');
@@ -108,93 +107,124 @@ function AgentWorkspace() {
     setSelected(agent);
     setCreating(false);
   };
+  const openAgent = (agent: CloudAgentDraft, view: 'configuration' | 'chat') => {
+    setRecent(null);
+    setEntryView(view);
+    setSelected(agent);
+  };
 
-  if (selected) return <div className="agent-desktop">{recovery}<DraftEditor key={selected.slug} initial={selected} startingPrompt={startingPrompt} recent={recent} onBack={() => {
+  if (selected) return <div className="agent-desktop">{recovery}<DraftEditor key={selected.slug} initial={selected} entryView={entryView} startingPrompt={startingPrompt} recent={recent} onBack={() => {
     setSelected(null);
+    setEntryView(undefined);
     setStartingPrompt(undefined);
     clearRecent();
   }} onSaved={accepted} /></div>;
   if (shared || activity) return <div className="agent-desktop">{recovery}<SharedConversation shared={shared} activity={activity} recent={recent} onBack={() => { setShared(null); setActivity(null); clearRecent(); }} /></div>;
   if (creating) return <section className="h-full overflow-auto p-6" data-testid="cloud-agents-page">
     {recovery}
-    <div className="mx-auto max-w-3xl"><CreateAgentForm onCreated={(agent, prompt) => { setStartingPrompt(prompt); accepted(agent); }}
+    <div className="mx-auto max-w-3xl"><CreateAgentForm onCreated={agent => { setStartingPrompt(''); setEntryView('configuration'); accepted(agent); }}
       onCancel={() => { setCreating(false); void load(); }} /></div>
   </section>;
 
   return (
-    <section className="h-full overflow-auto p-6 pb-10" data-testid="cloud-agents-page">
+    <section className="agent-home" data-testid="cloud-agents-page">
       {recovery}
-      <header className="mb-8 flex flex-wrap items-end justify-between gap-4 border-b border-border pb-6">
-        <div>
-          <p className="mb-2 text-sm text-muted-foreground">Makelore Agents</p>
-          <h1 className="text-2xl font-semibold tracking-tight">AI 智能体</h1>
-          <p className="mt-2 text-sm text-muted-foreground">从一个用途开始，定义它该怎样帮助你。</p>
-        </div>
-        <Button onClick={() => setCreating(true)} disabled={creating}><Plus className="mr-2 h-4 w-4" />创建智能体</Button>
-      </header>
-      <nav aria-label="智能体导航" className="mb-6 flex gap-2">
-        {([['mine', '我的智能体'], ['received', '收到的分享'], ['activity', '活动']] as const).map(([key, label]) =>
-          <Button key={key} variant={section === key ? 'secondary' : 'ghost'} aria-current={section === key ? 'page' : undefined} disabled={creating} onClick={() => setSection(key)}>{label}</Button>)}
-      </nav>
-      {section !== 'mine' ? <CloudOverview key={section} section={section} onAgent={setShared} onThread={setActivity} /> : <>
-      <label className="mb-5 flex items-center gap-2 text-sm"><input type="checkbox" checked={archived} disabled={creating} onChange={e => setArchived(e.target.checked)} />查看已归档智能体</label>
-      {error && <div role="alert" className="mb-5 rounded-lg border border-border p-4 text-sm">
-        <p>{error}</p><Button variant="outline" className="mt-3" onClick={() => void load()}>重新连接</Button>
-      </div>}
-      {loading && agents.length === 0 ? <p role="status" className="py-12 text-muted-foreground">正在读取云端智能体…</p>
-        : !error && agents.length === 0 && !creating ? <div className="rounded-xl border border-dashed border-border px-6 py-16 text-center">
-          <Sparkles className="mx-auto mb-5 h-9 w-9 text-violet-500" strokeWidth={1.4} />
-          <h2 className="text-lg font-medium">做一个懂你的小助手</h2>
-          <p className="mb-6 mt-2 text-sm text-muted-foreground">选个用途，告诉它你的要求，再和它聊两句试试看。</p>
-          <Button variant="outline" onClick={() => setCreating(true)}>创建第一个智能体</Button>
-        </div> : null}
-      <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
-        {agents.map((agent) => <button key={agent.slug} disabled={creating} onClick={() => setSelected(agent)}
-          className="rounded-xl border border-border bg-background p-5 text-left transition-colors enabled:hover:bg-violet-50/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50">
-          <span className="mb-4 flex items-center justify-between"><CloudAvatar src={agent.icon_url} name={agent.name} />
-            <span className="text-xs text-muted-foreground">{agent.archived ? '已归档' : !agent.enabled ? '已停用' : agent.published_version ? '可以使用' : '还在制作'}</span></span>
-          <h2 className="truncate font-medium">{agent.name}</h2>
-          <p className="mt-2 line-clamp-3 whitespace-pre-wrap text-sm leading-6 text-muted-foreground">{agent.purpose}</p>
-          <p className="mt-5 text-xs text-muted-foreground">{agent.published_version ? '打开对话 →' : '继续制作 →'}</p>
-        </button>)}
+      <div className="agent-home-content">
+        <header className="agent-home-header">
+          <div className="agent-home-intro">
+            {section !== 'mine' && <Button variant="ghost" className="agent-home-back" onClick={() => setSection('mine')}><ArrowLeft aria-hidden="true" />返回我的智能体</Button>}
+            <h1>{section === 'mine' ? '我的智能体' : section === 'received' ? '收到的分享' : '活动'}</h1>
+            {section === 'mine' && <p>创建自己的 AI 助手，告诉它怎样帮助你。<br className="agent-home-intro-break" />也可以继续和已有的助手聊天。</p>}
+          </div>
+          <div className="agent-home-header-actions">
+            {(section !== 'mine' || loading || error || agents.length > 0 || archived) &&
+              <Button className="agent-home-create" onClick={() => { setEntryView(undefined); setCreating(true); }}><Plus aria-hidden="true" />创建智能体</Button>}
+            <DropdownMenu.Root>
+              <DropdownMenu.Trigger asChild>
+                <Button variant="ghost" className="agent-home-more" aria-label="更多">更多<ChevronDown aria-hidden="true" /></Button>
+              </DropdownMenu.Trigger>
+              <DropdownMenu.Portal>
+                <DropdownMenu.Content className="agent-home-menu" align="end" sideOffset={8}>
+                  <DropdownMenu.Item className="agent-home-menu-item" onSelect={() => setSection('received')}><Share2 aria-hidden="true" />收到的分享</DropdownMenu.Item>
+                  <DropdownMenu.Item className="agent-home-menu-item" onSelect={() => setSection('activity')}><History aria-hidden="true" />活动</DropdownMenu.Item>
+                  <DropdownMenu.Separator className="agent-home-menu-separator" />
+                  <DropdownMenu.CheckboxItem className="agent-home-menu-item" checked={archived} onCheckedChange={value => { setArchived(value); setSection('mine'); }}>
+                    <Archive aria-hidden="true" />查看已归档智能体<DropdownMenu.ItemIndicator className="agent-home-menu-check"><Check aria-hidden="true" /></DropdownMenu.ItemIndicator>
+                  </DropdownMenu.CheckboxItem>
+                </DropdownMenu.Content>
+              </DropdownMenu.Portal>
+            </DropdownMenu.Root>
+          </div>
+        </header>
+        {error && <div role="alert" className="agent-home-error">
+          <p>{error}</p><Button variant="outline" onClick={() => void load()}>重新连接</Button>
+        </div>}
+        {section !== 'mine' ? <CloudOverview key={section} section={section} onAgent={setShared} onThread={setActivity} /> : <>
+          {archived && <div className="agent-home-filter"><span><Archive aria-hidden="true" />正在显示全部智能体，包含已归档</span><Button variant="ghost" onClick={() => setArchived(false)}>收起已归档</Button></div>}
+          {loading && agents.length === 0 ? <div role="status" className="agent-home-loading"><Bot aria-hidden="true" /><p>正在找回你的智能体…</p></div>
+            : !error && agents.length === 0 ? <div className="agent-home-empty">
+              <div className="agent-home-empty-icon"><Bot aria-hidden="true" strokeWidth={1.6} /></div>
+              <h2>做一个属于你的 AI 助手吧</h2>
+              <p>给它起个名字、选好头像，<br />再设置它怎样帮助你。</p>
+              <Button className="agent-home-create" onClick={() => { setEntryView(undefined); setCreating(true); }}><Plus aria-hidden="true" />创建我的第一个智能体</Button>
+            </div> : null}
+          <div className="agent-home-grid">
+            {agents.map(agent => {
+              const appearance = Array.from(agent.slug).reduce((sum, char) => sum + char.charCodeAt(0), 0);
+              const ready = Boolean(agent.published_version && agent.enabled && !agent.archived);
+              const unavailable = Boolean(agent.archived || !agent.enabled);
+              return <article key={agent.slug} aria-label={agent.name} className="agent-home-card" data-tone={appearance % 3} data-state={unavailable ? 'inactive' : ready ? 'ready' : 'draft'}>
+                <div className="agent-home-card-top">
+                  <div className="agent-home-avatar"><CloudAvatar src={agent.icon_url} name={agent.name} className="h-full w-full" /></div>
+                  <span className="agent-home-status">{agent.archived ? '已归档' : !agent.enabled ? '已停用' : ready ? '可以使用' : '还在制作'}</span>
+                </div>
+                <h2 title={agent.name}>{agent.name}</h2>
+                <p className="agent-home-purpose">{agent.purpose}</p>
+                <div className="agent-home-card-actions">
+                  <Button variant={ready ? 'default' : 'outline'} className="agent-home-card-primary" onClick={() => openAgent(agent, ready ? 'chat' : 'configuration')}>
+                    {ready ? <MessageCircle aria-hidden="true" /> : <Pencil aria-hidden="true" />}{ready ? '和它聊聊' : unavailable ? '查看与调整' : '继续制作'}
+                  </Button>
+                  {ready && <Button variant="ghost" className="agent-home-adjust" onClick={() => openAgent(agent, 'configuration')}>调整</Button>}
+                </div>
+              </article>;
+            })}
+          </div>
+          {cursor && <Button className="mt-6" variant="outline" disabled={loading} onClick={() => void load(cursor)}>{loading ? '正在读取…' : '加载更多'}</Button>}
+        </>}
       </div>
-      {cursor && <Button className="mt-5" variant="outline" disabled={loading} onClick={() => void load(cursor)}>加载更多</Button>}
-      </>}
     </section>
   );
 }
 
-function CreateAgentForm({ onCreated, onCancel }: { onCreated: (agent: CloudAgentDraft, prompt: string) => void; onCancel: () => void }) {
-  const [step, setStep] = useState<1 | 2>(1);
+function CreateAgentForm({ onCreated, onCancel }: { onCreated: (agent: CloudAgentDraft) => void; onCancel: () => void }) {
   const [name, setName] = useState('');
-  const [purpose, setPurpose] = useState('');
-  const [prompt, setPrompt] = useState('');
+  const [avatar, setAvatar] = useState<CloudAgentAvatar>({ icon: null, icon_url: null });
+  const [uploading, setUploading] = useState(false);
   const [intent, setIntent] = useState<CreateCloudAgent | null>(null);
-  const [creatingAgent, setBusy] = useState(false);
-  const [avatar, setAvatar] = useState<CloudAgentAvatar>({});
-  const [uploadingAvatar, setUploadingAvatar] = useState(false);
-  const busy = creatingAgent || uploadingAvatar;
+  const [busy, setBusy] = useState(false);
   const [error, setError] = useState('');
   const alive = useRef(true);
-  const blocker = useBlocker(busy || intent !== null || Boolean(name || purpose || prompt || avatar.icon));
+  const hasInput = Boolean(name || avatar.icon);
+  const blocker = useBlocker(busy || uploading || intent !== null || hasInput);
   useEffect(() => { alive.current = true; return () => { alive.current = false; }; }, []);
   useEffect(() => {
     const warn = (event: BeforeUnloadEvent) => {
-      if (busy || intent || name || purpose || prompt || avatar.icon) { event.preventDefault(); event.returnValue = ''; }
+      if (busy || uploading || intent || hasInput) { event.preventDefault(); event.returnValue = ''; }
     };
     window.addEventListener('beforeunload', warn);
     return () => window.removeEventListener('beforeunload', warn);
-  }, [busy, intent, name, purpose, prompt, avatar.icon]);
+  }, [busy, uploading, intent, hasInput]);
 
   const submit = async () => {
-    if (busy || !name.trim() || !purpose.trim()) return;
-    const input = intent ?? { operation_id: crypto.randomUUID(), name: name.trim(), purpose: purpose.trim(), ...(avatar.icon ? { icon: avatar.icon } : {}) };
+    if (busy || uploading || !name.trim()) return;
+    // The existing service requires a purpose; actual instructions are configured on the next page.
+    const input = intent ?? { operation_id: crypto.randomUUID(), name: name.trim(), purpose: '按照我的提示词提供帮助。', icon: avatar.icon ?? null };
     setIntent(input);
     setBusy(true);
     setError('');
     try {
       const agent = await cloudAgentsApi.create(input);
-      if (alive.current) onCreated(agent, prompt);
+      if (alive.current) onCreated(agent);
     } catch (failure) {
       if (alive.current) setError(errorMessage(failure));
     } finally {
@@ -203,39 +233,25 @@ function CreateAgentForm({ onCreated, onCancel }: { onCreated: (agent: CloudAgen
   };
 
   return <form className="mb-8 space-y-4 rounded-xl border border-border p-5" onSubmit={(event) => { event.preventDefault(); void submit(); }}>
-    <p className="text-xs text-muted-foreground">第 {step} 步，共 3 步 · {step === 1 ? '选用途' : '说要求'}</p>
-    <h2 className="text-lg font-medium">{step === 1 ? '你想让它帮你做什么？' : '让它更懂你'}</h2>
-    {step === 1 ? <>
-      <p className="text-sm text-muted-foreground">选一个开始，之后随时可以改。</p>
-      <div className="grid gap-3 sm:grid-cols-2">{agentStarters.map(starter => <button type="button" key={starter.name}
-        className="min-h-24 rounded-lg border border-border p-4 text-left transition-colors hover:bg-muted/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
-        onClick={() => { setName(starter.name); setPurpose(starter.purpose); setPrompt(starter.prompt); setStep(2); }}>
-        <span className="block font-medium">{starter.name}</span><span className="mt-2 block text-sm text-muted-foreground">{starter.detail}</span>
-      </button>)}</div>
-      <div className="flex gap-2"><Button type="button" variant="outline" onClick={() => setStep(2)}>我自己想一个</Button>
-        <Button type="button" variant="ghost" onClick={onCancel}>取消</Button></div>
-    </> : <fieldset disabled={busy || intent !== null} className="space-y-4">
-    <CloudAvatarEditor value={avatar} name={name} disabled={busy || intent !== null} uploading={uploadingAvatar}
-      onUploading={setUploadingAvatar} onChange={setAvatar} />
+    <h1 className="text-xl font-semibold">创建智能体</h1>
+    <fieldset disabled={busy || uploading || intent !== null} className="space-y-6">
     <label className="block space-y-2 text-sm"><span>名称</span><Input autoFocus maxLength={100} value={name}
-      disabled={busy || intent !== null} onChange={(event) => setName(event.target.value)} placeholder="例如：我的写作搭档" /></label>
-    <label className="block space-y-2 text-sm"><span>用途</span><Textarea aria-label="用途" maxLength={2000} value={purpose}
-      disabled={busy || intent !== null} onChange={(event) => setPurpose(event.target.value)} placeholder="希望它帮你完成什么？" /></label>
-    <AgentRequirements value={prompt} onChange={setPrompt} />
-    </fieldset>}
+      disabled={busy || uploading || intent !== null} onChange={(event) => setName(event.target.value)} placeholder="给智能体起个名字" /></label>
+    <CloudAvatarEditor value={avatar} name={name} disabled={busy || intent !== null} uploading={uploading}
+      onUploading={setUploading} onChange={setAvatar} />
+    </fieldset>
     {error && <p role="alert" className="text-sm text-destructive">{error}。可重试确认本次创建结果。</p>}
-    {step === 2 && <div className="flex flex-wrap gap-3">
-      <Button type="submit" disabled={busy || !name.trim() || !purpose.trim()}>{creatingAgent ? '正在创建…' : uploadingAvatar ? '等待头像上传…' : intent ? '重试创建' : '下一步：试一试'}</Button>
-      {!intent && <Button type="button" variant="outline" disabled={busy} onClick={() => setStep(1)}>上一步</Button>}
-      <Button type="button" variant="ghost" disabled={busy} onClick={onCancel}>{intent ? '返回列表确认' : '取消'}</Button>
-    </div>}
+    <div className="flex flex-wrap gap-3">
+      <Button type="submit" disabled={busy || uploading || !name.trim()}>{busy ? '正在创建…' : intent ? '重试创建' : '下一步'}</Button>
+      <Button type="button" variant="ghost" disabled={busy || uploading} onClick={onCancel}>{intent ? '返回列表确认' : '取消'}</Button>
+    </div>
     {blocker.state === 'blocked' && <div role="dialog" aria-modal="true" aria-label="离开创建" className="fixed inset-0 z-50 flex items-center justify-center bg-black/20 p-6">
       <div className="max-w-md space-y-4 rounded-xl bg-background p-6 shadow-lg">
         <h2 className="font-medium">{intent ? '本次创建结果尚未确认' : '还有未提交的内容'}</h2>
         <p className="text-sm text-muted-foreground">{intent ? '可继续重试确认结果。如果离开，请先查看智能体列表再创建。' : '离开将放弃本次输入。'}</p>
         <div className="flex gap-2">
           <Button type="button" onClick={() => blocker.reset()}>继续创建</Button>
-          <Button type="button" variant="outline" disabled={busy} onClick={() => blocker.proceed()}>离开</Button>
+          <Button type="button" variant="outline" disabled={busy || uploading} onClick={() => blocker.proceed()}>离开</Button>
         </div>
       </div>
     </div>}
diff --git a/tests/e2e/cloud-agent-channels.spec.ts b/tests/e2e/cloud-agent-channels.spec.ts
index b784945e..0adf45c6 100644
--- a/tests/e2e/cloud-agent-channels.spec.ts
+++ b/tests/e2e/cloud-agent-channels.spec.ts
@@ -81,7 +81,7 @@ test('own WeChat conversation approval and generated PPT delivery in the desktop
     });
     await page.goto(applicationUrl);
     await page.getByTestId('ai-module-option-cloud_agents').click();
-    await page.getByRole('button', { name: /我的创作助手/ }).click();
+    await page.getByRole('article', { name: '我的创作助手', exact: true }).getByRole('button', { name: '和它聊聊', exact: true }).click();
     await page.getByRole('button', { name: '微信对话', exact: true }).click();
     const own = page.getByRole('region', { name: '微信会话', exact: true });
     await expect(own.getByTestId('wechat-run-status')).toContainText('任务状态：等待你的确认');
diff --git a/tests/e2e/cloud-agent-home.spec.ts b/tests/e2e/cloud-agent-home.spec.ts
new file mode 100644
index 00000000..91e28ffa
--- /dev/null
+++ b/tests/e2e/cloud-agent-home.spec.ts
@@ -0,0 +1,182 @@
+import type { ElectronApplication, Page } from '@playwright/test';
+import { EMPTY_CLOUD_CONFIGURATION, type CloudAgentDraft } from '../../shared/cloud-agents';
+import { closeElectronApp, expect, getStableWindow, test } from './fixtures/electron';
+
+const agent = (character: string, name: string, published: boolean, extra: Partial<CloudAgentDraft> = {}): CloudAgentDraft => ({
+  slug: 'ml-' + character.repeat(32), name, purpose: `让${name}按照我的要求帮助我。`,
+  system_prompt: '用简单清楚的中文回答，先理解我的问题。',
+  draft_revision: 2, updated_at: '2026-10-12T00:00:00Z',
+  configuration: { ...EMPTY_CLOUD_CONFIGURATION, model: 'fixture-model' },
+  published_version: published ? 1 : null, enabled: true, ...extra,
+});
+
+const readyAgent = agent('a', '我的故事搭档', true);
+const draftAgent = agent('b', '我的英语陪练', false);
+const disabledAgent = agent('c', '暂停使用的助手', true, { enabled: false });
+const archivedAgent = agent('d', '以前的学习助手', true, { archived: true });
+
+async function openHome(app: ElectronApplication, agents: CloudAgentDraft[]): Promise<Page> {
+  const page = await getStableWindow(app);
+  await expect(page.getByTestId('ai-module-selection-page')).toBeVisible();
+  const applicationUrl = page.url();
+  await page.goto('about:blank');
+  // The UI fixture owns the Host API boundary. These tests never send a real message or publish an Agent.
+  await app.evaluate(({ ipcMain, BrowserWindow }, items) => {
+    BrowserWindow.getAllWindows()[0].setSize(1366, 768);
+    let recent: unknown = null;
+    const result = (json: unknown) => ({ ok: true, data: { status: 200, ok: true, json } });
+    ipcMain.removeHandler('hostapi:fetch');
+    ipcMain.handle('hostapi:fetch', async (_event, request: { path?: string; method?: string; body?: string }) => {
+      const path = request.path ?? '';
+      if (path === '/api/auth/session/sync') return result({
+        success: true, session: { accessToken: 'ui-fixture', tokenType: 'Bearer', expiresAt: Date.now() + 3600000, lastActiveAt: Date.now(), canRefresh: false },
+      });
+      if (path === '/api/auth/me') return result({
+        success: true, user: { username: 'creator', userId: 'creator', tenantId: null, deptId: null, authorities: [] },
+        moduleAccess: { programming: true, design: true, robot: true, cloud_agents: true },
+      });
+      if (path === '/api/works/user/agent-profile') return result({
+        success: true, profile: { display_name: '创作者', age: null, gender: null, avatar_url: null, share_age_with_agents: false, share_gender_with_agents: false, analysis_enabled: true, completed: true, version: 1, updated_at: '2026-10-12T00:00:00Z' },
+      });
+      if (!path.startsWith('/api/cloud-agents/')) return result({ success: true });
+      if (path.endsWith('/recovery')) return result({ recent, pending: [] });
+      if (path.endsWith('/recovery/recent')) {
+        recent = typeof request.body === 'string' ? JSON.parse(request.body) : null;
+        return result({ saved: true });
+      }
+      if (path.startsWith('/api/cloud-agents/agents')) {
+        const url = new URL(path, 'http://fixture.local');
+        if (url.pathname === '/api/cloud-agents/agents') return result({
+          agents: items.filter(item => url.searchParams.get('archived') === 'true' || !item.archived), next_cursor: null,
+        });
+        const selected = items.find(item => item.slug === url.pathname.split('/')[4]);
+        if (!selected) throw new Error('Unknown fixture Agent ' + url.pathname);
+        return result(selected);
+      }
+      if (path.endsWith('/actions')) {
+        const body = JSON.parse(request.body ?? '{}');
+        const selected = items.find(item => item.slug === body.input?.slug) ?? items[0];
+        switch (body.operation) {
+          case 'catalog': return result({ models: [{ id: 'fixture-model', name: '创作模型' }], resources: {}, pricing: null });
+          case 'resources': return result({ mcps: [], skills: [], subagents: [] });
+          case 'knowledge': return result({ databases: [], models: [] });
+          case 'budget': return result({ agent_slug: selected?.slug, request_limit_points: null, daily_limit_points: null, daily_committed_points: '0.00', timezone: 'Asia/Shanghai', unit: '词元点数', resets_at: '2026-10-13T00:00:00+08:00' });
+          case 'access': return result({
+            published_version: selected?.published_version, enabled: selected?.enabled,
+            share_url: 'niancode://agents/' + selected?.slug, grants: [], applications: [],
+            versions: selected?.published_version ? [{ version: 1, draft_revision: selected.draft_revision, created_at: '2026-10-12T00:00:00Z' }] : [],
+          });
+          case 'threads': return result({ threads: [], next_offset: null });
+          case 'received': return result({ agents: [] });
+          case 'channelSelfCallers': return result({ items: [] });
+          case 'channelBindings': return result({ items: [], available_accounts: [] });
+          default: throw new Error('Unexpected homepage fixture operation ' + body.operation);
+        }
+      }
+      throw new Error('Unexpected homepage fixture request ' + path);
+    });
+  }, agents);
+  await page.goto(applicationUrl);
+  await page.getByTestId('ai-module-option-cloud_agents').click();
+  await expect(page.getByTestId('cloud-agents-page')).toBeVisible();
+  return page;
+}
+
+test('Agent homepage guides the first creation without starter tiles', async ({ launchElectronApp }, testInfo) => {
+  const app = await launchElectronApp({ skipSetup: true });
+  try {
+    const page = await openHome(app, []);
+    const home = page.getByTestId('cloud-agents-page');
+    await expect(home.getByRole('heading', { name: '我的智能体', exact: true })).toBeVisible();
+    await expect(home.getByRole('heading', { name: '做一个属于你的 AI 助手吧', exact: true })).toBeVisible();
+    await expect(home.getByRole('article')).toHaveCount(0);
+    await expect(home.getByRole('button', { name: /故事搭档|英语陪练|学习Friend/ })).toHaveCount(0);
+    await expect(home.getByText('收到的分享', { exact: true })).toBeHidden();
+    await expect(home.getByText('活动', { exact: true })).toBeHidden();
+    await page.screenshot({ path: testInfo.outputPath('cloud-agent-home-empty.png') });
+    await home.getByRole('button', { name: '创建我的第一个智能体', exact: true }).click();
+    await expect(page.getByRole('heading', { name: '创建智能体', exact: true })).toBeVisible();
+    await expect(page.getByLabel('名称', { exact: true })).toBeVisible();
+    await expect(page.getByLabel('名称', { exact: true })).toHaveValue('');
+    await expect(page.getByRole('group', { name: '智能体头像', exact: true })).toBeVisible();
+    await expect(page.getByRole('button', { name: '上传头像', exact: true })).toBeVisible();
+    await expect(page.getByLabel('用途', { exact: true })).toHaveCount(0);
+    await expect(page.getByLabel('提示词', { exact: true })).toHaveCount(0);
+    await expect(page.getByLabel('特别要求', { exact: true })).toHaveCount(0);
+    await expect(page.getByRole('button', { name: /简单易懂|一步一步来|先给我提示/ })).toHaveCount(0);
+    await expect(page.getByRole('button', { name: '下一步', exact: true })).toBeDisabled();
+    await expect(page.getByRole('button', { name: /科学问答助手|故事搭档|英语陪练|整理小帮手/ })).toHaveCount(0);
+    await expect(page.getByRole('button', { name: '我自己想一个', exact: true })).toHaveCount(0);
+    await expect(page.getByRole('button', { name: '上一步', exact: true })).toHaveCount(0);
+    await page.screenshot({ path: testInfo.outputPath('cloud-agent-home-direct-create.png') });
+  } finally { await closeElectronApp(app); }
+});
+
+test('Agent cards open conversation, adjustment and unfinished creation explicitly', async ({ launchElectronApp }, testInfo) => {
+  const app = await launchElectronApp({ skipSetup: true });
+  try {
+    const page = await openHome(app, [readyAgent, draftAgent, disabledAgent, archivedAgent]);
+    const home = page.getByTestId('cloud-agents-page');
+    const ready = home.getByRole('article', { name: readyAgent.name, exact: true });
+    const draft = home.getByRole('article', { name: draftAgent.name, exact: true });
+    const disabled = home.getByRole('article', { name: disabledAgent.name, exact: true });
+    await expect(home.getByRole('article')).toHaveCount(3);
+    await expect(ready.getByRole('button', { name: '和它聊聊', exact: true })).toBeVisible();
+    await expect(ready.getByRole('button', { name: '调整', exact: true })).toBeVisible();
+    await expect(draft.getByRole('button', { name: '继续制作', exact: true })).toBeVisible();
+    await expect(draft.getByRole('button', { name: '和它聊聊', exact: true })).toHaveCount(0);
+    await expect(disabled.getByRole('button', { name: '查看与调整', exact: true })).toBeVisible();
+    await expect(disabled.getByRole('button', { name: '和它聊聊', exact: true })).toHaveCount(0);
+    await page.screenshot({ path: testInfo.outputPath('cloud-agent-home-populated.png') });
+
+    await app.evaluate(({ BrowserWindow }) => { const win = BrowserWindow.getAllWindows()[0]; win.setMinimumSize(800, 600); win.setSize(980, 680); });
+    await expect.poll(() => home.evaluate(el => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
+    expect(await page.evaluate(() => document.documentElement.scrollWidth - document.documentElement.clientWidth)).toBeLessThanOrEqual(1);
+    await page.screenshot({ path: testInfo.outputPath('cloud-agent-home-compact.png') });
+    await app.evaluate(({ BrowserWindow }) => BrowserWindow.getAllWindows()[0].setSize(1366, 768));
+
+    await ready.getByRole('button', { name: '和它聊聊', exact: true }).click();
+    await expect(page.getByRole('region', { name: '智能体对话', exact: true })).toBeVisible();
+    await expect(page.getByRole('navigation', { name: '智能体工作区' }).getByRole('button', { name: '聊天', exact: true })).toHaveAttribute('aria-current', 'page');
+    await page.getByTestId('cloud-agent-editor').getByRole('button', { name: '我的智能体', exact: true }).click();
+    await expect(ready).toBeVisible();
+    await ready.getByRole('button', { name: '调整', exact: true }).click();
+    await expect(page.getByRole('navigation', { name: '智能体工作区' }).getByRole('button', { name: '配置', exact: true })).toHaveAttribute('aria-current', 'page');
+    await expect(page.getByRole('tab', { name: '模型与提示词', exact: true })).toHaveAttribute('aria-selected', 'true');
+    await expect(page.getByTestId('cloud-agent-editor').getByRole('button', { name: '修改头像', exact: true })).toBeVisible();
+    await expect(page.getByRole('img', { name: readyAgent.name + '默认头像', exact: true })).toBeVisible();
+    await expect(page.getByLabel('提示词', { exact: true })).toHaveValue(readyAgent.system_prompt);
+    await page.getByTestId('cloud-agent-editor').getByRole('button', { name: '我的智能体', exact: true }).click();
+    await draft.getByRole('button', { name: '继续制作', exact: true }).click();
+    await expect(page.getByRole('navigation', { name: '智能体工作区' }).getByRole('button', { name: '配置', exact: true })).toHaveAttribute('aria-current', 'page');
+    await expect(page.getByRole('tab', { name: '模型与提示词', exact: true })).toHaveAttribute('aria-selected', 'true');
+    await expect(page.getByLabel('名称', { exact: true })).toHaveValue(draftAgent.name);
+    await expect(page.getByLabel('提示词', { exact: true })).toHaveValue(draftAgent.system_prompt);
+  } finally { await closeElectronApp(app); }
+});
+
+test('Secondary sharing, activity and archived Agents remain reachable from More', async ({ launchElectronApp }) => {
+  const app = await launchElectronApp({ skipSetup: true });
+  try {
+    const page = await openHome(app, [readyAgent, archivedAgent]);
+    const home = page.getByTestId('cloud-agents-page');
+    await expect(home.getByRole('article', { name: archivedAgent.name, exact: true })).toHaveCount(0);
+    await home.getByRole('button', { name: '更多', exact: true }).click();
+    await page.getByRole('menuitemcheckbox', { name: '查看已归档智能体', exact: true }).click();
+    const archived = home.getByRole('article', { name: archivedAgent.name, exact: true });
+    await expect(archived).toBeVisible();
+    await expect(home.getByRole('article', { name: readyAgent.name, exact: true })).toBeVisible();
+    await expect(archived.getByRole('button', { name: '查看与调整', exact: true })).toBeVisible();
+    await expect(archived.getByRole('button', { name: '和它聊聊', exact: true })).toHaveCount(0);
+    await home.getByRole('button', { name: '更多', exact: true }).click();
+    await page.getByRole('menuitem', { name: '收到的分享', exact: true }).click();
+    await expect(page.getByText('还没有收到分享', { exact: true })).toBeVisible();
+    await page.getByRole('button', { name: '返回我的智能体', exact: true }).click();
+    await expect(home.getByRole('heading', { name: '我的智能体', exact: true })).toBeVisible();
+    await home.getByRole('button', { name: '更多', exact: true }).click();
+    await page.getByRole('menuitem', { name: '活动', exact: true }).click();
+    await expect(page.getByText('还没有运行记录', { exact: true })).toBeVisible();
+    await page.getByRole('button', { name: '返回我的智能体', exact: true }).click();
+    await expect(home.getByRole('heading', { name: '我的智能体', exact: true })).toBeVisible();
+  } finally { await closeElectronApp(app); }
+});
diff --git a/tests/e2e/cloud-agent-platform-avatars.spec.ts b/tests/e2e/cloud-agent-platform-avatars.spec.ts
new file mode 100644
index 00000000..91b95685
--- /dev/null
+++ b/tests/e2e/cloud-agent-platform-avatars.spec.ts
@@ -0,0 +1,236 @@
+import { test, expect, type Page } from '@playwright/test';
+import { createServer, type ViteDevServer } from 'vite';
+import { resolve } from 'node:path';
+import { EMPTY_CLOUD_CONFIGURATION, type CloudAgentDraft } from '../../shared/cloud-agents';
+
+let server: ViteDevServer;
+let baseUrl: string;
+test.use({ headless: true, channel: process.env.MAKELORE_LAYOUT_BROWSER_CHANNEL, video: 'off' });
+
+// Render the real workspace and keep all service calls at the Main IPC boundary.
+// This suite never starts Electron, opens a native file picker or calls a live service.
+test.beforeAll(async () => {
+  const entry = resolve('tests/e2e/__cloud-agent-platform-avatars-harness.tsx');
+  server = await createServer({
+    configFile: false,
+    cacheDir: 'node_modules/.vite-cloud-agent-platform-avatars',
+    resolve: { alias: { '@': resolve('src') } },
+    esbuild: { jsx: 'automatic' },
+    server: { host: '127.0.0.1', port: 0 },
+    plugins: [{
+      name: 'isolated-cloud-agent-platform-avatars', enforce: 'pre',
+      resolveId(id) { if (id === '/__cloud-agent-platform-avatars-harness.tsx') return entry; },
+      load(id) {
+        if (id === entry) return `
+          import { createRoot } from 'react-dom/client';
+          import { createMemoryRouter, RouterProvider } from 'react-router-dom';
+          import CloudAgents from '/src/pages/CloudAgents/index.tsx';
+          import '/src/styles/globals.css';
+          const router = createMemoryRouter([{ path: '/cloud-agents', element: <CloudAgents /> }], { initialEntries: ['/cloud-agents?view=mine'] });
+          createRoot(document.getElementById('root')).render(<div className="h-screen min-w-0"><RouterProvider router={router} /></div>);
+        `;
+        if (id.endsWith('/src/stores/auth.ts')) return 'export function useAuthStore(select) { return select({ user: { userId: "avatar-fixture" } }); }';
+      },
+      configureServer(vite) {
+        vite.middlewares.use((req, res, next) => {
+          if (req.url !== '/' && !req.url?.startsWith('/?')) return next();
+          res.setHeader('Content-Type', 'text/html');
+          res.end('<!doctype html><html><head><meta charset="utf-8"></head><body><div id="root"></div><script type="module" src="/__cloud-agent-platform-avatars-harness.tsx"></script></body></html>');
+        });
+      },
+    }],
+  });
+  await server.listen();
+  baseUrl = server.resolvedUrls!.local[0];
+});
+test.afterAll(async () => { await server?.close(); });
+
+const makeAgent = (character: string, name: string, published: boolean, extra: Partial<CloudAgentDraft> = {}): CloudAgentDraft => ({
+  slug: 'ml-' + character.repeat(32), name, purpose: `让${name}按照我的要求帮助我。`,
+  system_prompt: '用简单清楚的中文回答，先理解我的问题。',
+  draft_revision: 2, updated_at: '2026-10-12T00:00:00Z',
+  configuration: { ...EMPTY_CLOUD_CONFIGURATION, model: 'fixture-model' },
+  published_version: published ? 1 : null, enabled: true, ...extra,
+});
+const readyAgent = makeAgent('a', '我的故事搭档', true);
+const draftAgent = makeAgent('b', '我的英语陪练', false);
+const disabledAgent = makeAgent('c', '暂停使用的助手', true, { enabled: false });
+
+type FixtureCall = { path: string; method: string; input: Record<string, unknown> | null };
+type AvatarFixture = { agents: CloudAgentDraft[]; calls: FixtureCall[]; failPreset: boolean; failSave: boolean };
+type FixtureWindow = Window & { __agentAvatarFixture: AvatarFixture };
+
+async function installFixture(page: Page, agents: CloudAgentDraft[]) {
+  page.on('pageerror', error => { throw error; });
+  await page.addInitScript(({ agents, configuration }) => {
+    const scope = window as unknown as FixtureWindow;
+    scope.__agentAvatarFixture = { agents, calls: [], failPreset: false, failSave: false };
+    const state = scope.__agentAvatarFixture;
+    const result = (json: unknown) => ({ ok: true, data: { status: 200, ok: true, json: structuredClone(json) } });
+    const failure = (message: string) => ({ ok: true, data: { status: 503, ok: false, json: { error: message } } });
+    const avatarUrl = (icon: string | null | undefined) => icon ? '/src/assets/agent-avatars/' + icon.split('preset-')[1] : null;
+    Object.defineProperty(window, 'electron', { value: { ipcRenderer: {
+      invoke: async (channel: string, request?: { path?: string; method?: string; body?: string }) => {
+        if (channel === 'hostapi:token') return 'fixture';
+        if (channel === 'hostapi:base-url') return 'http://fixture.invalid';
+        if (channel !== 'hostapi:fetch') throw new Error('Unexpected fixture IPC ' + channel);
+        const path = request?.path ?? '';
+        const method = request?.method ?? 'GET';
+        const input = request?.body ? JSON.parse(request.body) as Record<string, unknown> : null;
+        state.calls.push({ path, method, input });
+        if (path === '/api/cloud-agents/recovery') return result({ recent: null, pending: [] });
+        if (path === '/api/cloud-agents/recovery/recent') return result({ saved: true });
+        if (path === '/api/cloud-agents/avatars/preset') {
+          if (state.failPreset) return failure('平台头像暂时不可用');
+          const id = String(input?.id);
+          if (!/^avatar-(0[1-9]|1[0-6])$/.test(id)) throw new Error('Unexpected preset ' + id);
+          return result({ icon: '/api/storage/public/images/preset-' + id + '.png', icon_url: '/src/assets/agent-avatars/' + id + '.png' });
+        }
+        if (path.startsWith('/api/cloud-agents/agents')) {
+          const url = new URL(path, 'http://fixture.invalid');
+          if (url.pathname === '/api/cloud-agents/agents') {
+            if (method === 'POST') {
+              const created = { ...configuration, ...input, slug: 'ml-' + 'd'.repeat(32),
+                system_prompt: '', draft_revision: 1, enabled: true, published_version: null,
+                icon_url: avatarUrl(input?.icon as string | null), updated_at: '2026-10-12T00:00:00Z' };
+              state.agents.unshift(created as CloudAgentDraft);
+              return result(created);
+            }
+            return result({ agents: state.agents, next_cursor: null });
+          }
+          const agent = state.agents.find(item => item.slug === url.pathname.split('/')[4]);
+          if (!agent) throw new Error('Unknown fixture Agent ' + url.pathname);
+          if (method === 'PATCH') {
+            if (state.failSave) return failure('保存头像失败，请重试');
+            Object.assign(agent, input, { draft_revision: agent.draft_revision + 1, icon_url: avatarUrl(input?.icon as string | null) });
+          }
+          return result(agent);
+        }
+        if (path === '/api/cloud-agents/actions') {
+          const args = input?.input as { slug?: string } | undefined;
+          const agent = state.agents.find(item => item.slug === args?.slug) ?? state.agents[0];
+          switch (input?.operation) {
+            case 'catalog': return result({ models: [{ id: 'fixture-model', name: '创作模型' }], resources: {}, pricing: null });
+            case 'resources': return result({ mcps: [], skills: [], subagents: [] });
+            case 'knowledge': return result({ databases: [], models: [] });
+            case 'budget': return result({ agent_slug: agent?.slug, request_limit_points: null, daily_limit_points: null, daily_committed_points: '0.00', timezone: 'Asia/Shanghai', unit: '词元点数', resets_at: '2026-10-13T00:00:00+08:00' });
+            case 'access': return result({ published_version: agent?.published_version, enabled: agent?.enabled,
+              share_url: 'niancode://agents/' + agent?.slug, api_url: 'http://fixture.invalid', grants: [], applications: [],
+              versions: agent?.published_version ? [{ version: 1, draft_revision: agent.draft_revision, created_at: '2026-10-12T00:00:00Z' }] : [] });
+            case 'threads': return result({ threads: [], next_offset: null });
+            default: throw new Error('Unexpected fixture operation ' + String(input?.operation));
+          }
+        }
+        throw new Error('Unexpected fixture request ' + path);
+      },
+    } } });
+  }, { agents, configuration: { configuration: { ...EMPTY_CLOUD_CONFIGURATION, model: 'fixture-model' } } });
+}
+
+async function expectNoOverflow(page: Page) {
+  expect(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth)).toBe(true);
+}
+async function expectImagesLoaded(page: Page, selector = 'img') {
+  await expect.poll(() => page.locator(selector).evaluateAll(images => images.every(image => {
+    const img = image as HTMLImageElement;
+    return img.complete && img.naturalWidth > 0;
+  }))).toBe(true);
+}
+
+for (const width of [375, 1366]) {
+  test(`pastel Agent cards and explicit chat/adjust controls remain usable at ${width}px`, async ({ page }) => {
+    await page.setViewportSize({ width, height: 850 });
+    await installFixture(page, [readyAgent, draftAgent, disabledAgent]);
+    await page.goto(baseUrl);
+    const cards = page.getByRole('article');
+    await expect(cards).toHaveCount(3);
+    const tones = { '0': 'rgb(241, 246, 255)', '1': 'rgb(246, 242, 255)', '2': 'rgb(255, 245, 233)' };
+    for (const [tone, color] of Object.entries(tones)) await expect(page.locator(`article[data-tone="${tone}"]`)).toHaveCSS('background-color', color);
+    const ready = page.getByRole('article', { name: readyAgent.name, exact: true });
+    await expect(ready.getByRole('button', { name: '和它聊聊', exact: true })).toBeVisible();
+    await expect(ready.getByRole('button', { name: '调整', exact: true })).toBeVisible();
+    await expect(page.getByRole('article', { name: draftAgent.name, exact: true }).getByRole('button', { name: '继续制作', exact: true })).toBeVisible();
+    await expect(page.getByRole('article', { name: disabledAgent.name, exact: true }).getByRole('button', { name: '查看与调整', exact: true })).toBeVisible();
+    await expectImagesLoaded(page);
+    await expectNoOverflow(page);
+    await page.screenshot({ path: test.info().outputPath(`agent-cards-${width}.png`), fullPage: true, animations: 'disabled' });
+    await ready.getByRole('button', { name: '和它聊聊', exact: true }).click();
+    await expect(page.getByRole('region', { name: '智能体对话', exact: true })).toBeVisible();
+    await expect(page.getByRole('navigation', { name: '智能体工作区' }).getByRole('button', { name: '聊天', exact: true })).toHaveAttribute('aria-current', 'page');
+    await page.getByRole('button', { name: '我的智能体', exact: true }).click();
+    await ready.getByRole('button', { name: '调整', exact: true }).click();
+    await expect(page.getByRole('tab', { name: '模型与提示词', exact: true })).toHaveAttribute('aria-selected', 'true');
+    await expect(page.getByLabel('提示词', { exact: true })).toHaveValue(readyAgent.system_prompt);
+    await expectNoOverflow(page);
+  });
+
+  test(`sixteen platform portraits preview, create and reopen at ${width}px`, async ({ page }) => {
+    await page.setViewportSize({ width, height: 850 });
+    await installFixture(page, []);
+    await page.goto(baseUrl);
+    await page.getByRole('button', { name: '创建我的第一个智能体', exact: true }).click();
+    await page.getByLabel('名称', { exact: true }).fill('像素伙伴助手');
+    const presets = page.getByRole('group', { name: '平台像素头像', exact: true });
+    await expect(presets.getByRole('button')).toHaveCount(16);
+    await expectImagesLoaded(page);
+    await expectNoOverflow(page);
+    await presets.getByRole('button', { name: '像素伙伴 7', exact: true }).click();
+    await expect(presets.getByRole('button', { name: '像素伙伴 7', exact: true })).toHaveAttribute('aria-pressed', 'true');
+    await expect(presets.getByRole('button', { pressed: true })).toHaveCount(1);
+    await expect(page.getByRole('img', { name: '像素伙伴助手头像', exact: true })).toHaveAttribute('src', '/src/assets/agent-avatars/avatar-07.png');
+    await page.screenshot({ path: test.info().outputPath(`platform-avatar-picker-${width}.png`), fullPage: true, animations: 'disabled' });
+    await page.getByRole('button', { name: '下一步', exact: true }).click();
+    await expect(page.getByTestId('cloud-agent-editor')).toBeVisible();
+    const calls = await page.evaluate(() => (window as unknown as FixtureWindow).__agentAvatarFixture.calls);
+    const created = calls.find(call => call.path === '/api/cloud-agents/agents' && call.method === 'POST')!;
+    expect(created.input?.icon).toBe('/api/storage/public/images/preset-avatar-07.png');
+    expect(created.input).not.toHaveProperty('icon_url');
+    await expect(page.getByRole('button', { name: '修改头像', exact: true }).getByRole('img')).toHaveAttribute('src', '/src/assets/agent-avatars/avatar-07.png');
+    await expectNoOverflow(page);
+    await page.getByRole('button', { name: '我的智能体', exact: true }).click();
+    const card = page.getByRole('article', { name: '像素伙伴助手', exact: true });
+    await expect(card.getByRole('img')).toHaveAttribute('src', '/src/assets/agent-avatars/avatar-07.png');
+    await card.getByRole('button', { name: '继续制作', exact: true }).click();
+    await expect(page.getByRole('button', { name: '修改头像', exact: true }).getByRole('img')).toHaveAttribute('src', '/src/assets/agent-avatars/avatar-07.png');
+  });
+}
+
+test('preset and save failures retain the existing avatar; successful save reopens persisted portrait', async ({ page }) => {
+  await page.setViewportSize({ width: 1366, height: 850 });
+  const icon = '/api/storage/public/images/preset-avatar-03.png';
+  await installFixture(page, [{ ...draftAgent, icon, icon_url: '/src/assets/agent-avatars/avatar-03.png' }]);
+  await page.goto(baseUrl);
+  await page.getByRole('button', { name: '继续制作', exact: true }).click();
+  await page.getByRole('button', { name: '修改头像', exact: true }).click();
+  const dialog = page.getByRole('dialog', { name: '修改头像', exact: true });
+  await expect(dialog.getByRole('group', { name: '平台像素头像', exact: true }).getByRole('button')).toHaveCount(16);
+  await page.evaluate(() => { (window as unknown as FixtureWindow).__agentAvatarFixture.failPreset = true; });
+  await dialog.getByRole('button', { name: '像素伙伴 4', exact: true }).click();
+  await expect(dialog.getByRole('alert')).toContainText('平台头像暂时不可用');
+  await expect(dialog.getByRole('img', { name: draftAgent.name + '头像', exact: true })).toHaveAttribute('src', '/src/assets/agent-avatars/avatar-03.png');
+  await expect(page.getByRole('button', { name: '已保存', exact: true, includeHidden: true })).toBeDisabled();
+  await page.evaluate(() => { (window as unknown as FixtureWindow).__agentAvatarFixture.failPreset = false; });
+  await dialog.getByRole('button', { name: '像素伙伴 4', exact: true }).click();
+  await expect(dialog.getByRole('img', { name: draftAgent.name + '头像', exact: true })).toHaveAttribute('src', '/src/assets/agent-avatars/avatar-04.png');
+  await expectImagesLoaded(page);
+  await page.screenshot({ path: test.info().outputPath('existing-agent-platform-avatar-dialog.png'), animations: 'disabled' });
+  await dialog.getByRole('button', { name: '完成', exact: true }).click();
+  await page.evaluate(() => { (window as unknown as FixtureWindow).__agentAvatarFixture.failSave = true; });
+  await page.getByRole('button', { name: '保存草稿', exact: true }).click();
+  await expect(page.getByRole('alert')).toContainText('保存头像失败，请重试');
+  await expect(page.getByRole('button', { name: '修改头像', exact: true }).getByRole('img')).toHaveAttribute('src', '/src/assets/agent-avatars/avatar-04.png');
+  expect(await page.evaluate(() => (window as unknown as FixtureWindow).__agentAvatarFixture.agents[0].icon)).toBe(icon);
+  await page.evaluate(() => { (window as unknown as FixtureWindow).__agentAvatarFixture.failSave = false; });
+  await page.getByRole('button', { name: '保存草稿', exact: true }).click();
+  await expect(page.getByRole('button', { name: '已保存', exact: true })).toBeDisabled();
+  const calls = await page.evaluate(() => (window as unknown as FixtureWindow).__agentAvatarFixture.calls);
+  const saves = calls.filter(call => call.method === 'PATCH');
+  expect(saves).toHaveLength(2);
+  expect(saves[1].input?.icon).toBe('/api/storage/public/images/preset-avatar-04.png');
+  expect(saves[1].input).not.toHaveProperty('icon_url');
+  await page.getByRole('button', { name: '我的智能体', exact: true }).click();
+  const card = page.getByRole('article', { name: draftAgent.name, exact: true });
+  await expect(card.getByRole('img')).toHaveAttribute('src', '/src/assets/agent-avatars/avatar-04.png');
+  await card.getByRole('button', { name: '继续制作', exact: true }).click();
+  await expect(page.getByRole('button', { name: '修改头像', exact: true }).getByRole('img')).toHaveAttribute('src', '/src/assets/agent-avatars/avatar-04.png');
+});
diff --git a/tests/e2e/cloud-agents.spec.ts b/tests/e2e/cloud-agents.spec.ts
index 7033dd85..fab55bd2 100644
--- a/tests/e2e/cloud-agents.spec.ts
+++ b/tests/e2e/cloud-agents.spec.ts
@@ -1,19 +1,24 @@
 import { closeElectronApp, expect, getStableWindow, test } from './fixtures/electron';
 
-test('personal cloud Agent creation, draft save and leave protection in Electron', async ({ launchElectronApp }, testInfo) => {
+test('personal cloud Agent identity, configuration and separate published chat in Electron', async ({ launchElectronApp }, testInfo) => {
   const app = await launchElectronApp({ skipSetup: true });
+  const avatar = {
+    icon: '/uploads/avatars/writing-partner.png',
+    icon_url: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+ip1sAAAAASUVORK5CYII=',
+  };
   try {
     const page = await getStableWindow(app);
     await expect(page.getByTestId('ai-module-selection-page')).toBeVisible();
     const applicationUrl = page.url();
     await page.goto('about:blank');
     // This UI test owns the Host API boundary; real cloud HTTP/PG is tested separately.
-    await app.evaluate(({ ipcMain, BrowserWindow }) => {
+    await app.evaluate(({ ipcMain, BrowserWindow }, uploadedAvatar) => {
       BrowserWindow.getAllWindows()[0].setSize(1366, 768);
       let draft: Record<string, unknown> | null = null;
-      let avatarUploads = 0;
-      const iconUrl = (icon: unknown) => icon ? 'https://avatars.example.test' + icon : null;
       let recent: unknown = null;
+      let createInput: Record<string, unknown> | null = null;
+      const operations: string[] = [];
+      Reflect.set(globalThis, '__cloudAgentUiFixture', { snapshot: () => ({ draft, createInput, operations }) });
       const versions: { version: number; draft_revision: number; created_at: string }[] = [];
       let knowledgeCatalogLoads = 0;
       let knowledgeCreated = false;
@@ -40,10 +45,7 @@ test('personal cloud Agent creation, draft save and leave protection in Electron
         });
         if (path.startsWith('/api/cloud-agents/')) {
           const body = typeof request.body === 'string' ? JSON.parse(request.body) : request.body ?? {};
-          if (path.endsWith('/avatars/pick')) {
-            const icon = `/api/storage/public/images/avatar-${++avatarUploads}.png`;
-            return result({ icon, icon_url: iconUrl(icon) });
-          }
+          if (path.endsWith('/avatars/pick')) return result(uploadedAvatar);
           if (path.endsWith('/knowledge/pick')) {
             knowledgeUploaded = true;
             return result({ ...knowledgeFile, status: 'uploaded', chunk_count: 0, available: false, processing_task: null });
@@ -51,8 +53,13 @@ test('personal cloud Agent creation, draft save and leave protection in Electron
           if (path.endsWith('/recovery')) return result({ recent, pending: [] });
           if (path.endsWith('/recovery/recent')) { recent = body; return result({ saved: true }); }
           if (path.endsWith('/actions')) {
+            operations.push(body.operation);
             const input = body.input ?? {};
-            if (body.operation === 'catalog') return result({ models: [{ id: 'test-model', name: '创作模型' }], resources: {}, pricing: null });
+            if (body.operation === 'catalog') return result({
+              models: [{ id: 'test-model', name: '创作模型', description: '模型说明不应显示在配置页' }, { id: 'reasoning-model', name: '思考模型' }],
+              resources: { tools: [{ key: 'fixture-tool', name: '资料整理工具' }], skills: [{ key: 'fixture-skill', name: '文章整理 Skill' }] },
+              pricing: { unit: '词元点数', usage_unit: '词元', unit_size: 1000, points_per_unit: '9.99', version: 1 },
+            });
             if (body.operation === 'knowledge') return result({ databases: knowledgeCreated ? [{ kb_id: 'kb', name: '我的创作资料' }] : [], models: ++knowledgeCatalogLoads === 1 ? [] : [{ id: 'fixture:test-embedding', name: '资料向量模型', dimension: 1024 }] });
             if (body.operation === 'createKnowledge') { knowledgeCreated = true; return result({ kb_id: 'kb', name: '我的创作资料' }); }
             if (body.operation === 'processKnowledge') { knowledgeStage = 0; return result({ task_id: 'process-document' }); }
@@ -90,71 +97,124 @@ test('personal cloud Agent creation, draft save and leave protection in Electron
             if (body.operation === 'files') return result({ files: [] });
             throw new Error('Unexpected cloud fixture operation ' + body.operation);
           }
-          if (method === 'POST') draft = {
+          if (method === 'POST') { createInput = body; draft = {
             slug: 'ml-' + 'a'.repeat(32), name: body.name, purpose: body.purpose, system_prompt: body.purpose,
-            icon: body.icon ?? null, icon_url: iconUrl(body.icon),
+            icon: body.icon ?? null, icon_url: body.icon === uploadedAvatar.icon ? uploadedAvatar.icon_url : null,
             draft_revision: 1, updated_at: '2026-09-10T00:00:00Z',
             configuration, published_version: null, enabled: true,
-          };
-          if (method === 'PATCH') draft = { ...draft, name: body.name, purpose: body.purpose, icon: body.icon ?? null, icon_url: iconUrl(body.icon), system_prompt: body.system_prompt, configuration: body.configuration, draft_revision: Number(draft?.draft_revision ?? 1) + 1 };
+          }; }
+          if (method === 'PATCH') draft = { ...draft, name: body.name, purpose: body.purpose, system_prompt: body.system_prompt,
+            icon: body.icon ?? null, icon_url: body.icon === uploadedAvatar.icon ? uploadedAvatar.icon_url : null,
+            configuration: body.configuration, draft_revision: Number(draft?.draft_revision ?? 1) + 1 };
           if (method === 'GET' && (path.endsWith('/agents') || path.endsWith('/bootstrap'))) return result({ agents: draft ? [draft] : [], next_cursor: null });
           return result(draft);
         }
         return result({ success: true });
       });
-    });
-    await page.route('https://avatars.example.test/**', route => route.fulfill({ contentType: 'image/png',
-      body: Buffer.from('iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAALUlEQVR4nGOssXrLQEvARFPTRy0YtWDUglELRi0YtWDUglELRi0YtWDUAioCAGYEAeMrBAV7AAAAAElFTkSuQmCC', 'base64') }));
+    }, avatar);
     await page.goto(applicationUrl);
     await page.getByTestId('ai-module-option-cloud_agents').click();
     await expect(page.getByTestId('sidebar-cloud-agents-navigation')).toBeVisible();
     await expect(page.getByTestId('sidebar-robot-navigation')).toHaveCount(0);
-    await page.getByRole('button', { name: '创建第一个智能体' }).click();
-    await page.screenshot({ path: testInfo.outputPath('cloud-agent-choose-purpose.png') });
-    await page.getByRole('button', { name: /故事搭档/ }).click();
-    await page.getByRole('button', { name: '先给我提示', exact: true }).click();
+    const fixtureState = () => app.evaluate(() => Reflect.get(globalThis, '__cloudAgentUiFixture').snapshot());
+    const messageOperations = async () => (await fixtureState()).operations.filter((operation: string) => operation === 'preview' || operation === 'submit');
+    await page.getByRole('button', { name: '创建我的第一个智能体', exact: true }).click();
+    await expect(page.getByRole('heading', { name: '创建智能体', exact: true })).toBeVisible();
+    await expect(page.getByLabel('名称', { exact: true })).toHaveValue('');
+    await expect(page.getByRole('textbox')).toHaveCount(1);
+    await expect(page.getByLabel('用途', { exact: true })).toHaveCount(0);
+    await expect(page.getByLabel('提示词', { exact: true })).toHaveCount(0);
+    await expect(page.getByLabel('模型', { exact: true })).toHaveCount(0);
+    await expect(page.getByRole('button', { name: /科学问答助手|故事搭档|英语陪练|整理小帮手|我自己想一个|先给我提示/ })).toHaveCount(0);
+    await expect(page.getByRole('button', { name: '上一步', exact: true })).toHaveCount(0);
+    await expect(page.getByRole('button', { name: '下一步', exact: true })).toBeDisabled();
+    await page.screenshot({ path: testInfo.outputPath('cloud-agent-create-empty-form.png') });
     await page.getByLabel('名称', { exact: true }).fill('我的写作搭档');
-    await page.getByLabel('用途', { exact: true }).fill('整理灵感，把想法写成清晰的文章');
     await page.getByRole('button', { name: '上传头像', exact: true }).click();
-    await expect(page.getByRole('img', { name: '我的写作搭档头像', exact: true })).toHaveAttribute('src', /avatar-1\.png$/);
-    await page.screenshot({ path: testInfo.outputPath('cloud-agent-create-requirements.png') });
-    await page.getByRole('button', { name: '下一步：试一试', exact: true }).click();
-    await expect(page.getByTestId('cloud-agent-editor')).toBeVisible();
-    await expect(page.getByRole('group', { name: '智能体头像' }).getByRole('img')).toHaveAttribute('src', /avatar-1\.png$/);
-    await page.getByRole('button', { name: '更换头像', exact: true }).click();
-    await expect(page.getByRole('group', { name: '智能体头像' }).getByRole('img')).toHaveAttribute('src', /avatar-2\.png$/);
-    await expect.poll(() => page.getByRole('group', { name: '智能体头像' }).getByRole('img').evaluate(el => (el as HTMLImageElement).naturalWidth)).toBe(32);
-    await page.getByLabel('特别要求').fill('使用简洁自然的中文。先理解我的目的，再协助梳理结构。');
+    await expect(page.getByRole('img', { name: '我的写作搭档头像', exact: true })).toHaveAttribute('src', avatar.icon_url);
+    await page.screenshot({ path: testInfo.outputPath('cloud-agent-create-identity.png') });
+    await page.getByRole('button', { name: '下一步', exact: true }).click();
+
+    const editor = page.getByTestId('cloud-agent-editor');
+    const workspaceNavigation = page.getByRole('navigation', { name: '智能体工作区' });
+    const configurationButton = workspaceNavigation.getByRole('button', { name: '配置', exact: true });
+    const chatButton = workspaceNavigation.getByRole('button', { name: '聊天', exact: true });
+    const instructionsTab = page.getByRole('tab', { name: '模型与提示词', exact: true });
+    const advancedTab = page.getByRole('tab', { name: '高级设置', exact: true });
+    const prompt = page.getByLabel('提示词', { exact: true });
+    const initialPrompt = '使用简洁自然的中文。先理解我的目的，再协助梳理结构。';
+    const revisedPrompt = initialPrompt + '补充具体例子。';
+    await expect(editor).toBeVisible();
+    await expect(page.getByTestId('titlebar-page-title')).toHaveText('智能体工作区');
+    await expect(page.getByLabel('名称', { exact: true })).toHaveValue('我的写作搭档');
+    await expect(page.getByRole('button', { name: '修改头像', exact: true }).getByRole('img')).toHaveAttribute('src', avatar.icon_url);
+    await expect(configurationButton).toHaveAttribute('aria-current', 'page');
+    await expect(prompt).toHaveValue('');
     await expect(page.getByLabel('模型', { exact: true })).toHaveValue('test-model');
-    await expect(page.getByRole('button', { name: '先给我提示', exact: true })).toHaveAttribute('aria-pressed', 'true');
+    expect(await page.getByLabel('模型', { exact: true }).evaluate(el => Boolean(el.compareDocumentPosition(window.document.querySelector('textarea[aria-label="提示词"]')!) & Node.DOCUMENT_POSITION_FOLLOWING))).toBe(true);
+    await expect(page.getByLabel('用途', { exact: true })).toHaveCount(0);
+    await expect(page.getByLabel('特别要求')).toHaveCount(0);
+    await expect(page.getByText('模型说明不应显示在配置页', { exact: true })).toHaveCount(0);
+    await expect(page.getByText(/9\.99/)).toHaveCount(0);
+    await expect(page.getByRole('button', { name: /先给我提示|简单易懂|条理清楚|详细深入/ })).toHaveCount(0);
+    await expect(page.getByRole('region', { name: '草稿预览', exact: true })).toHaveCount(0);
+    await expect(page.getByRole('separator', { name: '调整配置与试用宽度' })).toHaveCount(0);
+    await expect(page.getByLabel('消息', { exact: true })).toHaveCount(0);
+    const created = await fixtureState();
+    expect(created.createInput).toMatchObject({ name: '我的写作搭档', icon: avatar.icon });
+    expect(created.createInput).not.toHaveProperty('icon_url');
+    expect(created.createInput.purpose).toBeTruthy();
+    expect(created.draft).toMatchObject({ name: '我的写作搭档', icon: avatar.icon, icon_url: avatar.icon_url, published_version: null });
+    expect(await messageOperations()).toEqual([]);
+    await page.getByRole('button', { name: '修改头像', exact: true }).click();
+    const avatarDialog = page.getByRole('dialog', { name: '修改头像', exact: true });
+    await expect(avatarDialog.getByRole('img', { name: '我的写作搭档头像', exact: true })).toHaveAttribute('src', avatar.icon_url);
+    await avatarDialog.getByRole('button', { name: '完成', exact: true }).click();
+    await prompt.fill(initialPrompt);
+    await page.getByLabel('模型', { exact: true }).selectOption('reasoning-model');
     await page.getByTestId('sidebar-module-switcher-trigger').click();
     await expect(page.getByRole('dialog', { name: '未保存的修改' })).toBeVisible();
     await page.getByRole('button', { name: '继续编辑', exact: true }).click();
-    await page.getByRole('button', { name: '保存并开始试用', exact: true }).click();
-    await expect(page.getByRole('button', { name: '已保存', exact: true })).toBeVisible();
-    await expect(page.getByRole('group', { name: '智能体头像' }).getByRole('img')).toHaveAttribute('src', /avatar-2\.png$/);
-    await expect(page.getByTestId('titlebar-page-title')).toHaveText('智能体工作区');
-    const requirementsTab = page.getByRole('tab', { name: '我的要求', exact: true });
-    const advancedTab = page.getByRole('tab', { name: '高级设置', exact: true });
-    await expect(requirementsTab).toHaveAttribute('aria-selected', 'true');
+    await expect(prompt).toHaveValue(initialPrompt);
+    await expect(page.getByLabel('模型', { exact: true })).toHaveValue('reasoning-model');
+
+    await expect(instructionsTab).toHaveAttribute('aria-selected', 'true');
     await expect(page.getByRole('navigation', { name: '配置分类' })).toHaveCount(0);
-    await requirementsTab.focus();
-    await requirementsTab.press('ArrowRight');
+    await instructionsTab.focus();
+    await instructionsTab.press('ArrowRight');
     await expect(advancedTab).toBeFocused();
     await expect(advancedTab).toHaveAttribute('aria-selected', 'true');
     await expect(page.getByRole('tabpanel', { name: '高级设置' })).toBeVisible();
-    await expect(page.getByLabel('特别要求')).toBeHidden();
+    await expect(prompt).toBeHidden();
     await expect(page.getByRole('button', { name: '能力', exact: true })).toHaveAttribute('aria-current', 'page');
+    await page.getByRole('button', { name: '选择工具', exact: true }).click();
+    await page.getByRole('checkbox', { name: '资料整理工具', exact: true }).check();
+    await page.getByRole('button', { name: '完成选择', exact: true }).click();
+    await page.getByText('管理我的云端能力', { exact: true }).click();
+    await page.getByRole('button', { name: '添加 MCP', exact: true }).click();
+    await page.getByLabel('连接名称', { exact: true }).fill('尚未保存的资料连接');
+    await page.getByLabel('连接地址', { exact: true }).fill('https://example.com/mcp');
+    await instructionsTab.click();
+    await expect(prompt).toHaveValue(initialPrompt);
     await advancedTab.click();
-    await expect(advancedTab).toHaveAttribute('aria-selected', 'true');
+    await expect(page.getByLabel('连接名称', { exact: true })).toHaveValue('尚未保存的资料连接');
+    await expect(page.getByLabel('连接地址', { exact: true })).toHaveValue('https://example.com/mcp');
+    await expect(page.getByRole('checkbox', { name: '资料整理工具', exact: true })).toBeChecked();
+    await chatButton.click();
+    await expect(page.getByText('保存配置后，开始使用这个智能体。', { exact: true })).toBeVisible();
+    await expect(page.getByLabel('消息', { exact: true })).toHaveCount(0);
+    await configurationButton.click();
+    await expect(page.getByLabel('连接名称', { exact: true })).toHaveValue('尚未保存的资料连接');
+    await page.getByRole('button', { name: '返回能力列表', exact: true }).click();
     await page.screenshot({ path: testInfo.outputPath('cloud-agent-advanced-tab.png') });
     const configurationScroll = page.getByRole('tabpanel').locator('.agent-config-scroll');
     await configurationScroll.evaluate(el => { el.scrollTop = el.scrollHeight; });
     await expect.poll(() => configurationScroll.evaluate(el => el.scrollTop)).toBeGreaterThan(0);
-    await requirementsTab.click();
+    await instructionsTab.click();
     await expect.poll(() => configurationScroll.evaluate(el => el.scrollTop)).toBe(0);
-    await expect(page.getByLabel('用途', { exact: true })).toBeInViewport();
-    await page.screenshot({ path: testInfo.outputPath('cloud-agent-requirements-tab.png') });
+    await expect(page.getByLabel('模型', { exact: true })).toBeInViewport();
+    await expect(prompt).toBeInViewport();
+    await page.screenshot({ path: testInfo.outputPath('cloud-agent-model-prompt-tab.png') });
     await advancedTab.click();
     await expect.poll(() => configurationScroll.evaluate(el => el.scrollTop)).toBe(0);
     await page.getByRole('button', { name: '知识', exact: true }).click();
@@ -170,9 +230,9 @@ test('personal cloud Agent creation, draft save and leave protection in Electron
     await expect(page.getByText(/Yuxi 后台/)).toContainText('服务地址和 API Key');
     await expect(page.getByText(/Works Square 运营后台|one-api/)).toHaveCount(0);
     await page.getByLabel('知识库名称', { exact: true }).fill('我的创作资料');
-    await requirementsTab.click();
+    await instructionsTab.click();
     await expect(page.getByRole('navigation', { name: '配置分类' })).toHaveCount(0);
-    await expect(page.getByLabel('特别要求')).toHaveValue('使用简洁自然的中文。先理解我的目的，再协助梳理结构。');
+    await expect(prompt).toHaveValue(initialPrompt);
     await advancedTab.click();
     await expect(page.getByRole('button', { name: '知识', exact: true })).toHaveAttribute('aria-current', 'page');
     await expect(page.getByLabel('知识库名称', { exact: true })).toHaveValue('我的创作资料');
@@ -197,99 +257,99 @@ test('personal cloud Agent creation, draft save and leave protection in Electron
     await document.scrollIntoViewIfNeeded();
     expect(await document.evaluate(el => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
     await page.screenshot({ path: testInfo.outputPath('knowledge-ready.png') });
-    await page.getByRole('tab', { name: '我的要求', exact: true }).click();
-    const preview = page.getByRole('region', { name: '草稿预览', exact: true });
-    await preview.getByRole('button', { name: '保存并重新试用', exact: true }).click();
-    await expect(preview.getByText('当前试用 · 修订 3')).toBeVisible();
-    await preview.getByRole('button', { name: '你可以怎样帮助我？请举一个例子。', exact: true }).click();
-    await expect(preview.getByLabel('消息')).toHaveValue('你可以怎样帮助我？请举一个例子。');
-    await expect(preview.getByRole('heading', { name: '创作建议' })).toHaveCount(0);
-    await preview.getByLabel('消息').fill('先给我一些创作建议');
-    await preview.getByLabel('消息').press('Enter');
-    await expect(preview.getByRole('heading', { name: '创作建议' })).toBeAttached();
-    const composer = preview.getByTestId('cloud-chat-composer');
-    const beforeScroll = await composer.boundingBox();
-    await preview.getByTestId('cloud-chat-messages').evaluate(el => { el.scrollTop = 0; });
-    await expect.poll(async () => (await composer.boundingBox())?.y).toBe(beforeScroll?.y);
-    await expect.poll(() => page.getByTestId('main-content').evaluate(el => el.scrollHeight - el.clientHeight)).toBeLessThanOrEqual(1);
-    expect(beforeScroll!.y + beforeScroll!.height).toBeLessThanOrEqual(await page.evaluate(() => innerHeight));
-    await preview.getByLabel('消息').fill('保存后继续的问题');
-    await preview.getByLabel('消息').press('F6');
-    await expect(page.getByRole('region', { name: '草稿配置', exact: true }).getByRole('button', { name: '展开配置' })).toBeFocused();
-    await page.getByLabel('特别要求').fill('使用简洁自然的中文。先理解我的目的，再协助梳理结构。补充具体例子。');
-    await page.getByLabel('特别要求').press('Control+s');
-    await expect(page.getByText('云端已保存', { exact: true })).toBeVisible();
-    await expect(preview.getByLabel('消息')).toHaveValue('保存后继续的问题');
-    await expect(preview.getByRole('heading', { name: '创作建议' })).toBeAttached();
-    await expect(preview.getByText('当前试用 · 修订 3')).toBeVisible();
-    const divider = page.getByRole('separator', { name: '调整配置与试用宽度' });
-    await divider.focus();
-    const previousRatio = Number(await divider.getAttribute('aria-valuenow'));
-    await divider.press('ArrowRight');
-    await expect(divider).toHaveAttribute('aria-valuenow', String(previousRatio + 2));
-    const handle = await divider.boundingBox();
-    await page.mouse.move(handle!.x + 4, handle!.y + 80);
-    await page.mouse.down();
-    await page.mouse.move(handle!.x - 35, handle!.y + 80);
-    await page.mouse.up();
-    expect(Number(await divider.getAttribute('aria-valuenow'))).toBeLessThan(previousRatio + 2);
-    await page.getByRole('button', { name: '展开试用', exact: true }).click();
-    await expect(page.getByRole('region', { name: '草稿配置', exact: true })).toBeHidden();
-    await page.keyboard.press('Escape');
-    await expect(page.getByRole('region', { name: '草稿配置', exact: true })).toBeVisible();
-    await page.screenshot({ path: testInfo.outputPath('cloud-agent-editor.png') });
-    await app.evaluate(({ BrowserWindow }) => { const win = BrowserWindow.getAllWindows()[0]; win.setMinimumSize(800, 600); win.setSize(980, 680); });
-    await expect(divider).toBeHidden();
-    await page.getByRole('button', { name: '试用', exact: true }).click();
-    await expect(preview.getByLabel('消息')).toHaveValue('保存后继续的问题');
-    await expect.poll(async () => {
-      const bounds = await composer.boundingBox();
-      return bounds!.y + bounds!.height - await page.evaluate(() => innerHeight);
-    }).toBeLessThanOrEqual(0);
-    await page.screenshot({ path: testInfo.outputPath('cloud-agent-compact.png') });
-    await app.evaluate(({ BrowserWindow }) => BrowserWindow.getAllWindows()[0].setSize(1366, 768));
-    for (const factor of [1.25, 1.5]) {
-      await app.evaluate(({ BrowserWindow }, zoom) => BrowserWindow.getAllWindows()[0].webContents.setZoomFactor(zoom), factor);
-      if (await page.getByRole('button', { name: '试用', exact: true }).isVisible()) await page.getByRole('button', { name: '试用', exact: true }).click();
-      await expect.poll(async () => { const bounds = await composer.boundingBox(); return bounds!.y + bounds!.height - await page.evaluate(() => innerHeight); }).toBeLessThanOrEqual(0);
-    }
-    await app.evaluate(({ BrowserWindow }) => BrowserWindow.getAllWindows()[0].webContents.setZoomFactor(1));
-    await preview.getByRole('button', { name: '用最新草稿试用' }).click();
-    await expect(preview.getByText('当前试用 · 修订 4')).toBeVisible();
-    await expect(preview.getByLabel('消息')).toHaveValue('保存后继续的问题');
-    await preview.getByText('对比上一次试用 · 修订 3', { exact: true }).click();
-    await expect(preview.getByRole('heading', { name: '创作建议' })).toBeVisible();
-    await preview.getByText('对比上一次试用 · 修订 3', { exact: true }).click();
-    await page.getByRole('button', { name: '简单易懂', exact: true }).click();
-    await preview.getByRole('button', { name: '保存并重新试用', exact: true }).click();
-    await expect(preview.getByText('当前试用 · 修订 5')).toBeVisible();
-    await expect(preview.getByLabel('消息')).toHaveValue('保存后继续的问题');
-    await preview.getByLabel('消息').fill('');
-    await page.getByTestId('sidebar-module-switcher-trigger').click();
-    await expect(page.getByTestId('ai-module-selection-page')).toBeVisible();
-    await page.getByTestId('ai-module-option-cloud_agents').click();
-    await expect(page.getByTestId('cloud-agent-editor')).toBeVisible();
-    await expect(page.getByLabel('特别要求')).toHaveValue('使用简洁自然的中文。先理解我的目的，再协助梳理结构。补充具体例子。');
-    await page.getByRole('tab', { name: '高级设置', exact: true }).click();
+
     await page.getByRole('button', { name: '限制', exact: true }).click();
     await page.getByLabel('每次任务上限（词元点数）').fill('2.50');
     await page.getByLabel('每日上限（词元点数）').fill('10.00');
+    await page.getByLabel('最多执行步数', { exact: true }).fill('60');
+    await advancedTab.focus();
     await advancedTab.press('ArrowLeft');
-    await expect(requirementsTab).toBeFocused();
-    await expect(requirementsTab).toHaveAttribute('aria-selected', 'true');
+    await expect(instructionsTab).toBeFocused();
+    await expect(instructionsTab).toHaveAttribute('aria-selected', 'true');
     await expect(page.getByLabel('每日上限（词元点数）')).toBeHidden();
-    await requirementsTab.press('ArrowRight');
+    await expect(prompt).toHaveValue(initialPrompt);
+    await instructionsTab.press('ArrowRight');
     await expect(page.getByRole('button', { name: '限制', exact: true })).toHaveAttribute('aria-current', 'page');
+    await expect(page.getByLabel('每次任务上限（词元点数）')).toHaveValue('2.50');
+    await expect(page.getByLabel('每日上限（词元点数）')).toHaveValue('10.00');
+    await expect(page.getByLabel('最多执行步数', { exact: true })).toHaveValue('60');
+    await chatButton.click();
+    await configurationButton.click();
     await expect(page.getByLabel('每日上限（词元点数）')).toHaveValue('10.00');
     await page.getByRole('button', { name: '保存费用上限' }).click();
     await expect(page.getByRole('button', { name: '保存费用上限' })).toBeDisabled();
-    await page.getByRole('button', { name: '使用与接入', exact: true }).click();
+    await instructionsTab.click();
+    await page.getByRole('button', { name: '保存草稿', exact: true }).click();
+    await expect(page.getByRole('button', { name: '已保存', exact: true })).toBeDisabled();
+    expect((await fixtureState()).draft).toMatchObject({
+      name: '我的写作搭档', icon: avatar.icon, icon_url: avatar.icon_url, system_prompt: initialPrompt, published_version: null,
+      configuration: { model: 'reasoning-model', tools: ['fixture-tool'], knowledges: ['kb'], max_execution_steps: 60 },
+    });
+    expect(await messageOperations()).toEqual([]);
+    await prompt.fill(revisedPrompt);
+    await prompt.press('Control+s');
+    await expect(page.getByText('云端已保存', { exact: true })).toBeVisible();
+    expect((await fixtureState()).draft.system_prompt).toBe(revisedPrompt);
+    expect(await messageOperations()).toEqual([]);
+    await page.getByTestId('sidebar-module-switcher-trigger').click();
+    await expect(page.getByTestId('ai-module-selection-page')).toBeVisible();
+    await page.getByTestId('ai-module-option-cloud_agents').click();
+    await expect(editor).toBeVisible();
+    await expect(configurationButton).toHaveAttribute('aria-current', 'page');
+    await expect(prompt).toHaveValue(revisedPrompt);
+    await expect(page.getByLabel('模型', { exact: true })).toHaveValue('reasoning-model');
+    await expect(page.getByRole('button', { name: '修改头像', exact: true }).getByRole('img')).toHaveAttribute('src', avatar.icon_url);
+
+    await app.evaluate(({ BrowserWindow }) => { const win = BrowserWindow.getAllWindows()[0]; win.setMinimumSize(800, 600); win.setSize(980, 680); });
+    await expect(prompt).toBeInViewport();
+    await expect(configurationButton).toBeInViewport();
+    await expect(page.getByRole('button', { name: '已保存', exact: true })).toBeInViewport();
+    await expect(page.getByRole('region', { name: '草稿预览', exact: true })).toHaveCount(0);
+    await expect(page.getByLabel('消息', { exact: true })).toHaveCount(0);
+    await expect.poll(() => editor.evaluate(el => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
+    await page.screenshot({ path: testInfo.outputPath('cloud-agent-config-compact.png') });
+    await app.evaluate(({ BrowserWindow }) => BrowserWindow.getAllWindows()[0].setSize(1366, 768));
+    for (const factor of [1.25, 1.5]) {
+      await app.evaluate(({ BrowserWindow }, zoom) => BrowserWindow.getAllWindows()[0].webContents.setZoomFactor(zoom), factor);
+      await expect(configurationButton).toBeInViewport();
+      await expect(page.getByLabel('模型', { exact: true })).toBeInViewport();
+      await expect(page.getByRole('button', { name: '已保存', exact: true })).toBeInViewport();
+      await expect.poll(() => editor.evaluate(el => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
+    }
+    await app.evaluate(({ BrowserWindow }) => BrowserWindow.getAllWindows()[0].webContents.setZoomFactor(1));
+    await page.screenshot({ path: testInfo.outputPath('cloud-agent-config.png') });
+    expect(await messageOperations()).toEqual([]);
+
+    await workspaceNavigation.getByRole('button', { name: '使用与接入', exact: true }).click();
     await expect(page.getByLabel('应用名称')).toHaveCount(0);
     await page.screenshot({ path: testInfo.outputPath('cloud-agent-start-private-use.png') });
-    await page.getByRole('button', { name: '确认开始使用' }).click();
-    await expect(page.getByRole('region', { name: '智能体对话', exact: true })).toBeVisible();
-    await expect(page.getByRole('region', { name: '智能体对话', exact: true }).getByRole('heading', { name: '创作建议' })).toHaveCount(0);
-    await page.getByRole('button', { name: '编辑', exact: true }).click();
+    await page.getByRole('button', { name: '确认开始使用', exact: true }).click();
+    const formalChat = page.getByRole('region', { name: '智能体对话', exact: true });
+    await expect(formalChat).toBeVisible();
+    await expect(chatButton).toHaveAttribute('aria-current', 'page');
+    await expect(prompt).toBeHidden();
+    await expect(formalChat.getByRole('heading', { name: '创作建议' })).toHaveCount(0);
+    expect((await fixtureState()).operations.filter((operation: string) => operation === 'publish')).toHaveLength(1);
+    expect(await messageOperations()).toEqual([]);
+    await formalChat.getByRole('button', { name: '你可以怎样帮助我？请举一个例子。', exact: true }).click();
+    await expect(formalChat.getByLabel('消息', { exact: true })).toHaveValue('你可以怎样帮助我？请举一个例子。');
+    expect(await messageOperations()).toEqual([]);
+    await formalChat.getByLabel('消息', { exact: true }).fill('先给我一些创作建议');
+    await formalChat.getByRole('button', { name: '发送', exact: true }).click();
+    await expect(formalChat.getByRole('heading', { name: '创作建议' })).toBeAttached();
+    expect(await messageOperations()).toEqual(['submit']);
+    const composer = formalChat.getByTestId('cloud-chat-composer');
+    const beforeScroll = await composer.boundingBox();
+    await formalChat.getByTestId('cloud-chat-messages').evaluate(el => { el.scrollTop = 0; });
+    await expect.poll(async () => (await composer.boundingBox())?.y).toBe(beforeScroll?.y);
+    await expect.poll(() => page.getByTestId('main-content').evaluate(el => el.scrollHeight - el.clientHeight)).toBeLessThanOrEqual(1);
+    expect(beforeScroll!.y + beforeScroll!.height).toBeLessThanOrEqual(await page.evaluate(() => innerHeight));
+    await formalChat.getByLabel('消息', { exact: true }).fill('保存后继续的问题');
+    await configurationButton.click();
+    await expect(prompt).toHaveValue(revisedPrompt);
+    await expect(formalChat).toBeHidden();
+    await expect(page.getByLabel('消息', { exact: true })).toBeHidden();
+    await expect(page.getByRole('region', { name: '草稿预览', exact: true })).toHaveCount(0);
     await page.getByLabel('名称', { exact: true }).fill('我的新版写作搭档');
     await expect(page.getByRole('button', { name: '应用最新修改', exact: true })).toBeDisabled();
     await page.getByRole('button', { name: '保存草稿', exact: true }).click();
@@ -303,8 +363,24 @@ test('personal cloud Agent creation, draft save and leave protection in Electron
     await applyButton.click();
     await expect(page.getByRole('button', { name: '已应用', exact: true })).toBeDisabled();
     await expect(page.getByText('修改已保存，尚未应用', { exact: true })).toHaveCount(0);
+    await chatButton.click();
+    await expect(formalChat.getByLabel('消息', { exact: true })).toHaveValue('保存后继续的问题');
+    await expect(formalChat.getByRole('heading', { name: '创作建议' })).toBeAttached();
+    expect(await messageOperations()).toEqual(['submit']);
+    await app.evaluate(({ BrowserWindow }) => BrowserWindow.getAllWindows()[0].setSize(980, 680));
+    await expect.poll(async () => {
+      const bounds = await composer.boundingBox();
+      return bounds!.y + bounds!.height - await page.evaluate(() => innerHeight);
+    }).toBeLessThanOrEqual(0);
+    await page.screenshot({ path: testInfo.outputPath('cloud-agent-chat-compact.png') });
     await app.evaluate(({ BrowserWindow }) => BrowserWindow.getAllWindows()[0].setSize(1366, 768));
-    await page.getByRole('button', { name: '使用与接入', exact: true }).click();
+    for (const factor of [1.25, 1.5]) {
+      await app.evaluate(({ BrowserWindow }, zoom) => BrowserWindow.getAllWindows()[0].webContents.setZoomFactor(zoom), factor);
+      await expect.poll(async () => { const bounds = await composer.boundingBox(); return bounds!.y + bounds!.height - await page.evaluate(() => innerHeight); }).toBeLessThanOrEqual(0);
+      await expect(formalChat.getByLabel('消息', { exact: true })).toHaveValue('保存后继续的问题');
+    }
+    await app.evaluate(({ BrowserWindow }) => BrowserWindow.getAllWindows()[0].webContents.setZoomFactor(1));
+    await workspaceNavigation.getByRole('button', { name: '使用与接入', exact: true }).click();
     await expect(page.getByRole('heading', { name: '应用与 API', exact: true })).toBeVisible();
     await expect(page.getByRole('button', { name: '打开渠道', exact: true })).toBeVisible();
     await expect(page.getByLabel('应用名称')).toBeVisible();
@@ -312,11 +388,15 @@ test('personal cloud Agent creation, draft save and leave protection in Electron
     await expect(page.getByLabel('查找分享用户')).toHaveCount(0);
     await expect(page.getByRole('button', { name: '复制分享链接', exact: true })).toHaveCount(0);
     await page.screenshot({ path: testInfo.outputPath('cloud-agent-access-without-user-sharing.png') });
-    await page.getByRole('button', { name: '对话', exact: true }).click();
-    await page.getByRole('region', { name: '智能体对话', exact: true }).getByLabel('消息', { exact: true }).fill('每天早上八点半给我三个创作方向');
-    await page.getByRole('region', { name: '智能体对话', exact: true }).getByRole('button', { name: '发送', exact: true }).click();
-    await expect(page.getByRole('region', { name: '智能体对话', exact: true }).getByRole('heading', { name: '创作建议' })).toBeAttached();
+    await chatButton.click();
+    await expect(formalChat.getByLabel('消息', { exact: true })).toHaveValue('保存后继续的问题');
+    await formalChat.getByLabel('消息', { exact: true }).fill('每天早上八点半给我三个创作方向');
+    await formalChat.getByRole('button', { name: '发送', exact: true }).click();
+    await expect(formalChat.getByLabel('消息', { exact: true })).toHaveValue('');
+    await expect(formalChat.getByRole('heading', { name: '创作建议' })).toBeAttached();
+    expect(await messageOperations()).toEqual(['submit', 'submit']);
     await page.getByRole('button', { name: '查看并配置自动任务' }).click();
+    await expect(workspaceNavigation.getByRole('button', { name: '自动任务', exact: true })).toHaveAttribute('aria-current', 'page');
     await expect(page.getByLabel('任务名称')).toHaveValue('每天整理选题');
     await expect(page.getByLabel('执行时间')).toHaveValue('08:30');
     await expect(page.getByLabel('保存后启用')).not.toBeChecked();
@@ -329,12 +409,7 @@ test('personal cloud Agent creation, draft save and leave protection in Electron
     await expect(page.getByLabel('保存后启用')).not.toBeChecked();
     await page.getByRole('button', { name: '取消', exact: true }).click();
     await page.screenshot({ path: testInfo.outputPath('cloud-agent-schedules.png') });
-    await page.getByRole('navigation', { name: '智能体工作区' }).getByRole('button', { name: '编辑', exact: true }).click();
-    await page.getByRole('tab', { name: '我的要求', exact: true }).click();
-    await page.getByRole('button', { name: '移除头像', exact: true }).click();
-    await page.getByRole('button', { name: '保存草稿', exact: true }).click();
-    await expect(page.getByRole('button', { name: '已保存', exact: true })).toBeVisible();
-    await expect(page.getByRole('group', { name: '智能体头像' }).getByRole('img', { name: '我的新版写作搭档默认头像' })).toBeVisible();
+    expect(await messageOperations()).toEqual(['submit', 'submit']);
   } finally {
     await app.evaluate(({ BrowserWindow }) => { for (const win of BrowserWindow.getAllWindows()) win.destroy(); }).catch(() => undefined);
     await closeElectronApp(app);
diff --git a/tests/unit/cloud-agent-avatar-routes.test.ts b/tests/unit/cloud-agent-avatar-routes.test.ts
new file mode 100644
index 00000000..7657c94f
--- /dev/null
+++ b/tests/unit/cloud-agent-avatar-routes.test.ts
@@ -0,0 +1,37 @@
+import type { IncomingMessage, ServerResponse } from 'node:http';
+import { Readable } from 'node:stream';
+import { beforeEach, expect, it, vi } from 'vitest';
+import { handleCloudAgentsRoutes } from '@electron/api/routes/cloud-agents';
+
+const service = vi.hoisted(() => ({ useAvatarPreset: vi.fn(), uploadAvatar: vi.fn() }));
+vi.mock('@electron/services/cloud-agents', () => ({
+  CloudAgentsModule: class { useAvatarPreset = service.useAvatarPreset; uploadAvatar = service.uploadAvatar; },
+  CloudAgentsError: class extends Error { constructor(readonly status: number, readonly code: string) { super(code); } },
+}));
+
+beforeEach(() => vi.resetAllMocks());
+
+async function call(path: string, body?: string, method = 'POST') {
+  const request = Object.assign(Readable.from(body ? [body] : []), { method, headers: {} }) as IncomingMessage;
+  let output = '';
+  const response = { setHeader: vi.fn(), statusCode: 0, end: (text: string) => { output = text; } } as unknown as ServerResponse;
+  const handled = await handleCloudAgentsRoutes(request, response, new URL(`http://localhost/api/cloud-agents${path}`));
+  return { handled, status: response.statusCode, body: JSON.parse(output) };
+}
+
+it('routes only the preset id to Main and returns the canonical icon projection', async () => {
+  const avatar = { icon: '/api/storage/public/images/account/avatar.png', icon_url: 'https://agents.test/api/storage/public/images/account/avatar.png' };
+  service.useAvatarPreset.mockResolvedValue(avatar);
+  expect(await call('/avatars/preset', JSON.stringify({ id: 'avatar-03' }))).toEqual({ handled: true, status: 200, body: avatar });
+  expect(service.useAvatarPreset).toHaveBeenCalledExactlyOnceWith({ id: 'avatar-03' });
+  expect(service.uploadAvatar).not.toHaveBeenCalled();
+});
+
+it('keeps the existing file picker route and rejects malformed preset JSON', async () => {
+  service.uploadAvatar.mockResolvedValue(null);
+  expect(await call('/avatars/pick')).toEqual({ handled: true, status: 200, body: null });
+  expect(service.uploadAvatar).toHaveBeenCalledOnce();
+  expect((await call('/avatars/preset', '{')).status).toBe(400);
+  expect(service.useAvatarPreset).not.toHaveBeenCalled();
+  expect((await call('/avatars/preset', undefined, 'GET')).status).toBe(404);
+});
diff --git a/tests/unit/cloud-agent-avatar.test.tsx b/tests/unit/cloud-agent-avatar.test.tsx
index e692c28a..cf0a2c88 100644
--- a/tests/unit/cloud-agent-avatar.test.tsx
+++ b/tests/unit/cloud-agent-avatar.test.tsx
@@ -4,7 +4,7 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest';
 import { CloudAvatar, CloudAvatarEditor } from '@/pages/CloudAgents/CloudAvatar';
 import type { CloudAgentAvatar } from '../../shared/cloud-agents';
 
-const api = vi.hoisted(() => ({ uploadAvatar: vi.fn() }));
+const api = vi.hoisted(() => ({ uploadAvatar: vi.fn(), useAvatarPreset: vi.fn() }));
 vi.mock('@/lib/cloud-agents-api', () => ({ cloudAgentsApi: api }));
 beforeEach(() => vi.resetAllMocks());
 afterEach(cleanup);
@@ -18,6 +18,8 @@ function Editor() {
 it('shows a default avatar for absent or broken images and recovers when the image changes', () => {
   const view = render(<CloudAvatar name="写作搭档" />);
   expect(screen.getByRole('img', { name: '写作搭档默认头像' })).toBeVisible();
+  expect(screen.getByRole('img', { name: '写作搭档默认头像' })).toHaveAttribute('src', expect.stringContaining('avatar-'));
+  expect(screen.getByRole('img', { name: '写作搭档默认头像' })).toHaveStyle({ imageRendering: 'pixelated' });
   view.rerender(<CloudAvatar name="写作搭档" src="https://images.test/broken.png" />);
   fireEvent.error(screen.getByRole('img', { name: '写作搭档头像' }));
   expect(screen.getByRole('img', { name: '写作搭档默认头像' })).toBeVisible();
@@ -25,6 +27,46 @@ it('shows a default avatar for absent or broken images and recovers when the ima
   expect(screen.getByRole('img', { name: '写作搭档头像' })).toHaveAttribute('src', 'https://images.test/new.png');
 });
 
+it('offers sixteen platform portraits and uses the chosen portrait without a file picker', async () => {
+  api.useAvatarPreset.mockResolvedValue({ icon: '/chosen.png', icon_url: 'https://images.test/chosen.png' });
+  render(<Editor />);
+  expect(screen.getAllByRole('button', { name: /^像素伙伴 / })).toHaveLength(16);
+  fireEvent.click(screen.getByRole('button', { name: '像素伙伴 7' }));
+  await waitFor(() => expect(screen.getByRole('img', { name: '写作搭档头像' })).toHaveAttribute('src', 'https://images.test/chosen.png'));
+  expect(api.useAvatarPreset).toHaveBeenCalledExactlyOnceWith('avatar-07');
+  expect(api.uploadAvatar).not.toHaveBeenCalled();
+  expect(screen.getByRole('button', { name: '像素伙伴 7' })).toHaveAttribute('aria-pressed', 'true');
+  fireEvent.click(screen.getByRole('button', { name: '移除头像' }));
+  expect(screen.getByRole('img', { name: '写作搭档默认头像' })).toBeVisible();
+  expect(screen.getAllByRole('button', { name: /^像素伙伴 / }).filter(button => button.getAttribute('aria-pressed') === 'true')).toHaveLength(1);
+});
+
+it('preserves the previous avatar on preset failure and locks all choices while a selection is pending', async () => {
+  let reject!: (reason: Error) => void;
+  api.useAvatarPreset.mockReturnValue(new Promise((_resolve, failure) => { reject = failure; }));
+  render(<Editor />);
+  fireEvent.click(screen.getByRole('button', { name: '像素伙伴 2' }));
+  expect(screen.getByRole('button', { name: '正在使用…' })).toBeDisabled();
+  expect(screen.getAllByRole('button', { name: /^像素伙伴 / }).every(button => (button as HTMLButtonElement).disabled)).toBe(true);
+  fireEvent.click(screen.getByRole('button', { name: '像素伙伴 3' }));
+  await act(async () => reject(new Error('平台头像暂不可用')));
+  expect(screen.getByRole('alert')).toHaveTextContent('平台头像暂不可用');
+  expect(screen.getByRole('img', { name: '写作搭档头像' })).toHaveAttribute('src', 'https://images.test/old.png');
+  expect(api.useAvatarPreset).toHaveBeenCalledExactlyOnceWith('avatar-02');
+  expect(screen.getByRole('button', { name: '像素伙伴 3' })).toBeEnabled();
+});
+
+it('drops a pending preset result after leaving the editor or account', async () => {
+  let resolve!: (value: CloudAgentAvatar) => void;
+  api.useAvatarPreset.mockReturnValue(new Promise(r => { resolve = r; }));
+  const changed = vi.fn();
+  const view = render(<CloudAvatarEditor name="写作搭档" value={{}} disabled={false} uploading={false} onChange={changed} onUploading={vi.fn()} />);
+  fireEvent.click(screen.getByRole('button', { name: '像素伙伴 4' }));
+  view.unmount();
+  await act(async () => resolve({ icon: '/other-account.png', icon_url: 'https://images.test/other.png' }));
+  expect(changed).not.toHaveBeenCalled();
+});
+
 it('retains the avatar after cancellation or failure, then supports replacing and removing it', async () => {
   api.uploadAvatar.mockResolvedValueOnce(null).mockRejectedValueOnce(new Error('上传失败'))
     .mockResolvedValueOnce({ icon: '/new.png', icon_url: 'https://images.test/new.png' });
diff --git a/tests/unit/cloud-agents-guidance.test.tsx b/tests/unit/cloud-agents-guidance.test.tsx
index 62d14bdf..0bd942c8 100644
--- a/tests/unit/cloud-agents-guidance.test.tsx
+++ b/tests/unit/cloud-agents-guidance.test.tsx
@@ -65,19 +65,25 @@ it('starts private use through the existing publication action and retains its i
   expect(api.call.mock.calls.some(([operation]) => operation === 'share' || operation === 'createApplication')).toBe(false);
 });
 
-it('keeps custom requirements intact while toggling and editing answer styles', () => {
+it('preserves the entire prompt when displaying and editing former style instruction lines', () => {
+  const initial = '我的规则\n\n  保留缩进和解释。\n使用简单易懂的语言，遇到新词先解释。\n把任务拆成小步骤，一次引导我完成一步。\n先给我提示和思考问题，让我尝试后再补充答案。\n';
+  const edited = '先给我提示和思考问题，让我尝试后再补充答案。\n\n    我的新规则\n使用简单易懂的语言，遇到新词先解释。\n把任务拆成小步骤，一次引导我完成一步。\n\n';
   const onChange = vi.fn();
   function Requirements() {
-    const [value, setValue] = useState('我的规则\n\n  保留缩进和解释。');
+    const [value, setValue] = useState(initial);
     return <AgentRequirements value={value} onChange={next => { onChange(next); setValue(next); }} />;
   }
   render(<Requirements />);
-  fireEvent.click(screen.getByRole('button', { name: '简单易懂' }));
-  fireEvent.click(screen.getByRole('button', { name: '先给我提示' }));
-  expect(screen.getByLabelText('特别要求')).toHaveValue('我的规则\n\n  保留缩进和解释。');
-  fireEvent.click(screen.getByRole('button', { name: '简单易懂' }));
-  fireEvent.change(screen.getByLabelText('特别要求'), { target: { value: '我的新规则' } });
-  expect(onChange).toHaveBeenLastCalledWith('我的新规则\n先给我提示和思考问题，让我尝试后再补充答案。');
+  const prompt = screen.getByLabelText('提示词');
+  expect(prompt).toHaveValue(initial);
+  expect(prompt).toHaveAttribute('maxlength', '32000');
+  expect(prompt).toHaveAttribute('placeholder', '填写智能体的任务和要求');
+  expect(screen.queryByRole('button')).not.toBeInTheDocument();
+  expect(onChange).not.toHaveBeenCalled();
+  fireEvent.change(prompt, { target: { value: edited } });
+  expect(onChange).toHaveBeenCalledOnce();
+  expect(onChange).toHaveBeenLastCalledWith(edited);
+  expect(prompt).toHaveValue(edited);
 });
 
 it('waits for a successful save, preserves the old trial and reuses its question without sending', async () => {
diff --git a/tests/unit/cloud-agents-main.test.ts b/tests/unit/cloud-agents-main.test.ts
index 62590d6f..d6d1fe6c 100644
--- a/tests/unit/cloud-agents-main.test.ts
+++ b/tests/unit/cloud-agents-main.test.ts
@@ -45,6 +45,42 @@ beforeEach(() => { vi.clearAllMocks(); journalRecords.clear(); clearWorksSquareS
 afterEach(() => { instances.splice(0).forEach((module) => module.dispose()); clearWorksSquareSession(); vi.useRealTimers(); });
 
 describe('Main cloud Agents boundary', () => {
+  it.each(Array.from({ length: 16 }, (_, index) => `avatar-${String(index + 1).padStart(2, '0')}`))('uploads the bundled platform portrait %s through scoped Main transport without a dialog', async id => {
+    const icon = '/api/storage/public/images/creator/preset.png';
+    const transport = vi.fn().mockResolvedValueOnce(session()).mockResolvedValueOnce(json({ icon, private: 'hidden' }));
+    expect(await moduleFor(transport).useAvatarPreset({ id })).toEqual({ icon, icon_url: 'https://agents.example.test' + icon });
+    expect(desktop.pick).not.toHaveBeenCalled();
+    expect(transport.mock.calls[1][0]).toBe('https://agents.example.test/api/makelore/avatars');
+    expect(transport.mock.calls[1][1].headers).toEqual({ Authorization: 'Bearer yuxi-secret' });
+    const file = (transport.mock.calls[1][1].body as FormData).get('file') as File;
+    expect(file.name).toBe(`${id}.png`);
+    expect(file.type).toBe('image/png');
+    const bytes = Buffer.from(await file.arrayBuffer());
+    expect(bytes.subarray(0, 8)).toEqual(Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]));
+    expect(bytes.length).toBeGreaterThan(100000);
+  });
+
+  it.each(['avatar-00', 'avatar-17', '../../private/avatar.png', 'file:///tmp/avatar.png', 'data:image/png;base64,a', undefined])('rejects a non-allowlisted preset %s before transport', async id => {
+    const transport = vi.fn();
+    await expect(moduleFor(transport).useAvatarPreset({ id })).rejects.toMatchObject({ status: 422, code: 'invalid_input' });
+    expect(desktop.pick).not.toHaveBeenCalled();
+    expect(transport).not.toHaveBeenCalled();
+  });
+
+  it('requires a logged-in account for platform avatars and drops upload results after an account switch', async () => {
+    const transport = vi.fn();
+    const module = moduleFor(transport);
+    clearWorksSquareSession();
+    await expect(module.useAvatarPreset({ id: 'avatar-01' })).rejects.toMatchObject({ code: 'session_expired' });
+    expect(transport).not.toHaveBeenCalled();
+    login();
+    transport.mockResolvedValueOnce(session()).mockImplementationOnce(async () => {
+      login('b'.repeat(64));
+      return json({ icon: '/api/storage/public/images/other/preset.png' });
+    });
+    await expect(module.useAvatarPreset({ id: 'avatar-01' })).rejects.toMatchObject({ code: 'account_changed' });
+  });
+
   it('uploads avatar bytes through Main and resolves Yuxi public URLs without exposing credentials', async () => {
     const directory = await mkdtemp(join(tmpdir(), 'makelore-avatar-'));
     try {
@@ -106,8 +142,7 @@ describe('Main cloud Agents boundary', () => {
     expect(await module.execute({ operation: 'version', input: { slug: draft.slug, version: '1' } })).toMatchObject(avatar);
   });
 
-  it.each(['file:///private/avatar.png', 'javascript:alert(1)', 'https://secret@images.example.test/avatar.png'])
-  ('falls back for an unusable legacy avatar URL %s', async icon => {
+  it.each(['file:///private/avatar.png', 'javascript:alert(1)', 'https://secret@images.example.test/avatar.png'])('falls back for an unusable legacy avatar URL %s', async icon => {
     const transport = vi.fn().mockResolvedValueOnce(session()).mockResolvedValueOnce(json({ ...draft, icon }));
     expect(await moduleFor(transport).get(draft.slug)).toMatchObject({ icon, icon_url: null });
   });
diff --git a/tests/unit/cloud-agents-page.test.tsx b/tests/unit/cloud-agents-page.test.tsx
index fe80e422..83242135 100644
--- a/tests/unit/cloud-agents-page.test.tsx
+++ b/tests/unit/cloud-agents-page.test.tsx
@@ -1,10 +1,10 @@
-import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { act, cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
 import { createMemoryRouter, RouterProvider } from 'react-router-dom';
 import { afterEach, beforeEach, expect, it, vi } from 'vitest';
 import CloudAgents from '@/pages/CloudAgents';
 import { EMPTY_CLOUD_CONFIGURATION } from '../../shared/cloud-agents';
 
-const api = vi.hoisted(() => ({ list: vi.fn(), create: vi.fn(), get: vi.fn(), save: vi.fn(), uploadAvatar: vi.fn(), call: vi.fn(), events: vi.fn(), recovery: vi.fn(), remember: vi.fn(), resolvePending: vi.fn() }));
+const api = vi.hoisted(() => ({ list: vi.fn(), create: vi.fn(), uploadAvatar: vi.fn(), get: vi.fn(), save: vi.fn(), call: vi.fn(), events: vi.fn(), recovery: vi.fn(), remember: vi.fn(), resolvePending: vi.fn() }));
 const auth = vi.hoisted(() => ({ user: { userId: 'creator' } }));
 vi.mock('@/lib/cloud-agents-api', () => ({ cloudAgentsApi: api }));
 vi.mock('@/stores/auth', () => ({ useAuthStore: (selector: (state: typeof auth) => unknown) => selector(auth) }));
@@ -36,30 +36,6 @@ beforeEach(() => {
 });
 afterEach(cleanup);
 
-it('loads the Yuxi avatar, saves a replacement as draft data, and persists explicit removal', async () => {
-  let current = { ...draft, icon: '/old.png' as string | null, icon_url: 'https://agents.test/old.png' as string | null };
-  api.list.mockImplementation(async () => ({ agents: [current], next_cursor: null }));
-  api.get.mockImplementation(async () => current);
-  api.save.mockImplementation(async (_slug, input) => (current = { ...current, ...input,
-    icon_url: input.icon ? 'https://agents.test' + input.icon : null, draft_revision: current.draft_revision + 1 }));
-  api.uploadAvatar.mockResolvedValue({ icon: '/new.png', icon_url: 'https://agents.test/new.png' });
-  open();
-  expect(await screen.findByRole('img', { name: '写作搭档头像' })).toHaveAttribute('src', 'https://agents.test/old.png');
-  fireEvent.click(screen.getByText('写作搭档'));
-  fireEvent.click(await screen.findByRole('button', { name: '更换头像' }));
-  await waitFor(() => expect(screen.getByRole('button', { name: '保存草稿' })).toBeEnabled());
-  expect(api.save).not.toHaveBeenCalled();
-  fireEvent.click(screen.getByRole('button', { name: '保存草稿' }));
-  await waitFor(() => expect(api.save).toHaveBeenCalledWith(draft.slug, expect.objectContaining({ icon: '/new.png', expected_revision: 1 })));
-  expect(api.save.mock.calls[0][1]).not.toHaveProperty('icon_url');
-  await screen.findByText('云端已保存');
-  fireEvent.click(screen.getByRole('button', { name: '移除头像' }));
-  fireEvent.click(screen.getByRole('button', { name: '保存草稿' }));
-  await waitFor(() => expect(api.save).toHaveBeenLastCalledWith(draft.slug, expect.objectContaining({ icon: null, expected_revision: 2 })));
-  await screen.findByText('云端已保存');
-  expect(screen.getAllByRole('img', { name: '写作搭档默认头像' })).toHaveLength(2);
-});
-
 it('does not label disabled or archived assistants as ready to use', async () => {
   api.list.mockResolvedValue({ agents: [
     { ...draft, published_version: 1, enabled: false },
@@ -107,16 +83,22 @@ it('shows saved but unapplied changes and applies directly from the editor heade
     ['publish', expect.objectContaining({ slug: draft.slug, expected_revision: 4 })],
   ]);
   expect(screen.queryByText('修改已保存，尚未应用')).not.toBeInTheDocument();
-  expect(screen.getByRole('button', { name: '编辑', exact: true })).toHaveAttribute('aria-current', 'page');
+  expect(screen.getByRole('button', { name: '配置', exact: true })).toHaveAttribute('aria-current', 'page');
 });
 
-it('uses the published draft revision, requires saving edits, and keeps trial inputs when applying', async () => {
+it('requires saving before applying and preserves formal chat input across configuration and application', async () => {
   publishedAssistant(4);
   open();
   await screen.findByTestId('cloud-agent-editor');
   await waitFor(() => expect(screen.getByRole('button', { name: '已应用', exact: true })).toBeDisabled());
-  fireEvent.change(screen.getByLabelText('消息'), { target: { value: '保留试用问题' } });
-  fireEvent.change(screen.getByLabelText('特别要求'), { target: { value: '新的要求' } });
+  expect(screen.queryByLabelText('消息')).not.toBeInTheDocument();
+  fireEvent.click(screen.getByRole('button', { name: '聊天', exact: true }));
+  const message = await screen.findByLabelText('消息');
+  await waitFor(() => expect(message).toBeEnabled());
+  fireEvent.change(message, { target: { value: '保留正式聊天的问题' } });
+  fireEvent.click(screen.getByRole('button', { name: '配置', exact: true }));
+  expect(message).not.toBeVisible();
+  fireEvent.change(screen.getByLabelText('提示词'), { target: { value: '新的要求' } });
   expect(screen.getByText('修改尚未保存和应用')).toBeVisible();
   expect(screen.getByRole('button', { name: '应用最新修改', exact: true })).toBeDisabled();
   fireEvent.click(screen.getByRole('button', { name: '保存草稿' }));
@@ -124,8 +106,12 @@ it('uses the published draft revision, requires saving edits, and keeps trial in
   expect(api.call.mock.calls.some(([operation]) => operation === 'publish')).toBe(false);
   fireEvent.click(screen.getByRole('button', { name: '应用最新修改', exact: true }));
   await waitFor(() => expect(screen.getByRole('button', { name: '已应用', exact: true })).toBeDisabled());
-  expect(screen.getByLabelText('消息')).toHaveValue('保留试用问题');
+  expect(screen.getByRole('button', { name: '配置', exact: true })).toHaveAttribute('aria-current', 'page');
+  fireEvent.click(screen.getByRole('button', { name: '聊天', exact: true }));
+  expect(screen.getByLabelText('消息')).toBe(message);
+  expect(message).toHaveValue('保留正式聊天的问题');
   expect(api.call.mock.calls.filter(([operation]) => operation === 'publish')[0][1]).toMatchObject({ expected_revision: 5 });
+  expect(api.call.mock.calls.some(([operation]) => operation === 'preview' || operation === 'submit')).toBe(false);
 });
 
 it('shares the original failed publication between the header and access page', async () => {
@@ -190,53 +176,171 @@ it('keeps a successful application confirmed when its following status refresh f
   expect(api.call.mock.calls.filter(([operation]) => operation === 'publish')).toHaveLength(1);
 });
 
-it('protects a custom requirement before a name or purpose has been entered', async () => {
+it('protects an uploaded avatar before a name has been entered', async () => {
+  const avatar = { icon: '/api/storage/public/images/avatar.png', icon_url: 'https://images.test/avatar.png' };
+  api.uploadAvatar.mockResolvedValue(avatar);
   const { router } = open();
   fireEvent.click(await screen.findByRole('button', { name: '创建智能体', exact: true }));
-  fireEvent.click(screen.getByRole('button', { name: '我自己想一个' }));
-  fireEvent.change(screen.getByLabelText('特别要求'), { target: { value: '请先听我说完' } });
+  fireEvent.click(screen.getByRole('button', { name: '上传头像' }));
+  await waitFor(() => expect(screen.getByRole('img', { name: '智能体头像' })).toHaveAttribute('src', avatar.icon_url));
+  expect(screen.getByRole('button', { name: '下一步', exact: true })).toBeDisabled();
   await act(async () => { await router.navigate('/module-select'); });
   expect(screen.getByRole('dialog', { name: '离开创建' })).toBeVisible();
   fireEvent.click(screen.getByRole('button', { name: '继续创建' }));
-  expect(screen.getByLabelText('特别要求')).toHaveValue('请先听我说完');
+  expect(screen.getByRole('img', { name: '智能体头像' })).toHaveAttribute('src', avatar.icon_url);
+  expect(screen.getByLabelText('名称')).toHaveValue('');
+  expect(api.create).not.toHaveBeenCalled();
 });
 
-it('creates from an editable starter, preserves chosen requirements and defaults only a new assistant model', async () => {
+it('creates from name and avatar, then configures model and raw prompt without a preview chat', async () => {
+  const avatar = { icon: '/api/storage/public/images/avatar.png', icon_url: 'https://images.test/avatar.png' };
   const base = api.call.getMockImplementation()!;
   api.call.mockImplementation(async (operation, input) => operation === 'catalog' ? {
-    models: [{ id: 'model-first', name: '可用模型甲' }, { id: 'model-second', name: '可用模型乙' }], resources: {}, pricing: null,
+    models: [{ id: 'model-first', name: '可用模型甲' }, { id: 'model-second', name: '可用模型乙' }], resources: {},
+    pricing: { unit_size: 1000, points_per_unit: '1.23' },
   } : base(operation, input));
-  api.create.mockImplementation(async input => ({ ...draft, ...input, system_prompt: input.purpose }));
-  api.save.mockImplementation(async (_slug, input) => ({ ...draft, ...input, draft_revision: 2 }));
+  api.uploadAvatar.mockResolvedValue(avatar);
+  api.create.mockImplementation(async input => ({ ...draft, ...input, icon_url: avatar.icon_url, system_prompt: input.purpose }));
+  api.save.mockImplementation(async (_slug, input) => ({ ...draft, ...input, icon_url: avatar.icon_url, draft_revision: 2 }));
   open();
   fireEvent.click(await screen.findByRole('button', { name: '创建智能体', exact: true }));
-  fireEvent.click(screen.getByRole('button', { name: /科学问答助手/ }));
-  fireEvent.click(screen.getByRole('button', { name: '先给我提示' }));
-  fireEvent.change(screen.getByLabelText('特别要求'), { target: { value: '一次只解释一个新词。' } });
-  fireEvent.click(screen.getByRole('button', { name: '下一步：试一试' }));
+  expect(screen.getByRole('heading', { name: '创建智能体', exact: true })).toBeVisible();
+  expect(screen.getByLabelText('名称')).toHaveValue('');
+  expect(screen.getByRole('group', { name: '智能体头像' })).toBeVisible();
+  expect(screen.queryByLabelText('用途')).not.toBeInTheDocument();
+  expect(screen.queryByLabelText('提示词')).not.toBeInTheDocument();
+  expect(screen.queryByLabelText('模型')).not.toBeInTheDocument();
+  expect(screen.queryByRole('button', { name: /科学问答助手|故事搭档|英语陪练|整理小帮手|先给我提示/ })).not.toBeInTheDocument();
+  expect(screen.getByRole('button', { name: '下一步', exact: true })).toBeDisabled();
+  expect(api.create).not.toHaveBeenCalled();
+  expect(api.call.mock.calls.some(([operation]) => operation === 'catalog')).toBe(false);
+  fireEvent.change(screen.getByLabelText('名称'), { target: { value: '  我的写作助手  ' } });
+  expect(screen.getByRole('button', { name: '下一步', exact: true })).toBeEnabled();
+  fireEvent.click(screen.getByRole('button', { name: '上传头像' }));
+  await screen.findByRole('button', { name: '更换头像' });
+  fireEvent.click(screen.getByRole('button', { name: '下一步', exact: true }));
   await screen.findByTestId('cloud-agent-editor');
+  expect(screen.getByLabelText('名称')).toHaveValue('我的写作助手');
+  expect(screen.getByRole('img', { name: '我的写作助手头像' })).toHaveAttribute('src', avatar.icon_url);
+  expect(api.create).toHaveBeenCalledWith({ operation_id: expect.any(String), name: '我的写作助手', purpose: '按照我的提示词提供帮助。', icon: avatar.icon });
+  expect(api.create.mock.calls[0][0]).not.toHaveProperty('icon_url');
   await waitFor(() => expect(screen.getByLabelText('模型')).toHaveValue('model-first'));
-  expect(screen.getByLabelText('特别要求')).toHaveValue('一次只解释一个新词。');
-  expect(screen.getByRole('button', { name: '先给我提示' })).toHaveAttribute('aria-pressed', 'true');
-  expect(screen.queryByRole('button', { name: '能力' })).not.toBeInTheDocument();
+  expect(screen.getByLabelText('提示词')).toHaveValue('');
+  expect(screen.queryByLabelText('用途')).not.toBeInTheDocument();
+  expect(screen.queryByLabelText('消息')).not.toBeInTheDocument();
+  expect(screen.queryByRole('separator', { name: '调整配置与试用宽度' })).not.toBeInTheDocument();
+  expect(screen.queryByText(/这是帮助它思考和回答的 AI|新助手从目录中的第一个可用模型开始|选择模型后，保存即可试用/)).not.toBeInTheDocument();
+  expect(screen.queryByText(/每 .*个词元约 .*词元点数/)).not.toBeInTheDocument();
+  expect(screen.queryByRole('button', { name: /简单易懂|一步一步来|先给我提示/ })).not.toBeInTheDocument();
   fireEvent.change(screen.getByLabelText('模型'), { target: { value: '' } });
-  fireEvent.change(screen.getByLabelText('名称'), { target: { value: '我的科学助手' } });
+  fireEvent.change(screen.getByLabelText('名称'), { target: { value: '我的文章搭档' } });
   expect(screen.getByLabelText('模型')).toHaveValue('');
-  expect(screen.getByRole('button', { name: '保存并开始试用' })).toBeDisabled();
   fireEvent.change(screen.getByLabelText('模型'), { target: { value: 'model-second' } });
-  fireEvent.click(screen.getByRole('button', { name: '保存并开始试用' }));
-  await waitFor(() => expect(screen.getByLabelText('消息')).toBeEnabled());
+  const prompt = '一次只解释一个新词。\n\n  保留缩进。\n使用简单易懂的语言，遇到新词先解释。\n';
+  fireEvent.change(screen.getByLabelText('提示词'), { target: { value: prompt } });
+  expect(api.save).not.toHaveBeenCalled();
+  fireEvent.click(screen.getByRole('button', { name: '保存草稿' }));
+  await screen.findByRole('button', { name: '已保存' });
   expect(api.save).toHaveBeenCalledWith(draft.slug, expect.objectContaining({
-    name: '我的科学助手', system_prompt: '一次只解释一个新词。\n先给我提示和思考问题，让我尝试后再补充答案。',
+    name: '我的文章搭档', system_prompt: prompt, icon: avatar.icon,
     configuration: expect.objectContaining({ model: 'model-second' }),
   }));
-  fireEvent.click(screen.getByRole('button', { name: '为什么雨后会出现彩虹？' }));
-  expect(screen.getByLabelText('消息')).toHaveValue('为什么雨后会出现彩虹？');
-  expect(api.call.mock.calls.some(([operation]) => operation === 'preview' || operation === 'submit')).toBe(false);
+  expect(api.save.mock.calls[0][1]).not.toHaveProperty('icon_url');
+  expect(screen.getByLabelText('提示词')).toHaveValue(prompt);
+  expect(api.call.mock.calls.some(([operation]) => ['threads', 'preview', 'submit', 'publish'].includes(operation))).toBe(false);
+});
+
+it('allows name-only creation after avatar cancellation or failure', async () => {
+  api.uploadAvatar.mockResolvedValueOnce(null).mockRejectedValueOnce(new Error('头像上传失败'));
+  api.create.mockImplementation(async input => ({ ...draft, ...input }));
+  open();
+  fireEvent.click(await screen.findByRole('button', { name: '创建智能体', exact: true }));
+  fireEvent.change(screen.getByLabelText('名称'), { target: { value: '写作搭档' } });
+  fireEvent.click(screen.getByRole('button', { name: '上传头像' }));
+  await waitFor(() => expect(screen.getByRole('button', { name: '上传头像' })).toBeEnabled());
+  fireEvent.click(screen.getByRole('button', { name: '上传头像' }));
+  expect(await screen.findByRole('alert')).toHaveTextContent('头像上传失败');
+  expect(screen.getByRole('button', { name: '下一步', exact: true })).toBeEnabled();
+  fireEvent.click(screen.getByRole('button', { name: '下一步', exact: true }));
+  await screen.findByTestId('cloud-agent-editor');
+  expect(api.create).toHaveBeenCalledWith(expect.objectContaining({ name: '写作搭档', icon: null }));
+  expect(screen.getByRole('img', { name: '写作搭档默认头像' })).toBeVisible();
+});
+
+it('blocks creation and leaving while an avatar upload is still pending', async () => {
+  let finish!: (value: null) => void;
+  api.uploadAvatar.mockReturnValue(new Promise(resolve => { finish = resolve; }));
+  const { router } = open();
+  fireEvent.click(await screen.findByRole('button', { name: '创建智能体', exact: true }));
+  fireEvent.change(screen.getByLabelText('名称'), { target: { value: '写作搭档' } });
+  fireEvent.click(screen.getByRole('button', { name: '上传头像' }));
+  expect(screen.getByRole('button', { name: '正在上传…' })).toBeDisabled();
+  expect(screen.getByLabelText('名称')).toBeDisabled();
+  expect(screen.getByRole('button', { name: '下一步', exact: true })).toBeDisabled();
+  expect(screen.getByRole('button', { name: '取消', exact: true })).toBeDisabled();
+  fireEvent.submit(screen.getByRole('button', { name: '下一步', exact: true }).closest('form')!);
+  expect(api.create).not.toHaveBeenCalled();
+  const unload = new Event('beforeunload', { cancelable: true });
+  window.dispatchEvent(unload);
+  expect(unload.defaultPrevented).toBe(true);
+  await act(async () => { await router.navigate('/module-select'); });
+  expect(screen.getByRole('dialog', { name: '离开创建' })).toBeVisible();
+  expect(screen.getByRole('button', { name: '离开', exact: true })).toBeDisabled();
+  await act(async () => finish(null));
+  fireEvent.click(screen.getByRole('button', { name: '继续创建' }));
+  expect(screen.getByRole('button', { name: '下一步', exact: true })).toBeEnabled();
+  expect(screen.getByLabelText('名称')).toHaveValue('写作搭档');
+});
+
+it('ignores an avatar upload completed after an account switch', async () => {
+  let finish!: (value: { icon: string; icon_url: string }) => void;
+  api.uploadAvatar.mockReturnValue(new Promise(resolve => { finish = resolve; }));
+  const view = open();
+  fireEvent.click(await screen.findByRole('button', { name: '创建智能体', exact: true }));
+  fireEvent.click(screen.getByRole('button', { name: '上传头像' }));
+  auth.user.userId = 'other';
+  api.list.mockResolvedValue({ agents: [], next_cursor: null });
+  view.rerender(<RouterProvider key="other-avatar-account" router={view.router} />);
+  await screen.findByText('做一个属于你的 AI 助手吧');
+  await act(async () => finish({ icon: '/old-account.png', icon_url: 'https://images.test/old-account.png' }));
+  fireEvent.click(screen.getByRole('button', { name: '创建我的第一个智能体' }));
+  expect(screen.getByRole('img', { name: '智能体默认头像' })).toBeVisible();
+  expect(screen.queryByRole('button', { name: '更换头像' })).not.toBeInTheDocument();
+  expect(api.create).not.toHaveBeenCalled();
+});
+
+it('treats an avatar change as a manual draft edit and blocks saving during its upload', async () => {
+  publishedAssistant();
+  let finish!: (value: { icon: string; icon_url: string }) => void;
+  const avatar = { icon: '/api/storage/public/images/edit.png', icon_url: 'https://images.test/edit.png' };
+  api.uploadAvatar.mockReturnValue(new Promise(resolve => { finish = resolve; }));
+  open();
+  await screen.findByText('修改已保存，尚未应用');
+  fireEvent.click(screen.getByRole('button', { name: '修改头像', exact: true }));
+  fireEvent.click(screen.getByRole('button', { name: '上传头像' }));
+  const editor = within(screen.getByTestId('cloud-agent-editor'));
+  expect(editor.getByRole('button', { name: '我的智能体', hidden: true })).toBeDisabled();
+  expect(editor.getByRole('button', { name: '应用最新修改', hidden: true })).toBeDisabled();
+  expect(editor.getByRole('button', { name: '已保存', hidden: true })).toBeDisabled();
+  expect(screen.getByRole('button', { name: '完成', exact: true })).toBeDisabled();
+  const unload = new Event('beforeunload', { cancelable: true });
+  window.dispatchEvent(unload);
+  expect(unload.defaultPrevented).toBe(true);
+  await act(async () => finish(avatar));
+  fireEvent.click(screen.getByRole('button', { name: '完成', exact: true }));
+  expect(screen.getByRole('img', { name: '写作搭档头像' })).toHaveAttribute('src', avatar.icon_url);
+  expect(screen.getByRole('button', { name: '保存草稿' })).toBeEnabled();
+  expect(screen.getByRole('button', { name: '应用最新修改' })).toBeDisabled();
+  expect(api.save).not.toHaveBeenCalled();
+  fireEvent.click(screen.getByRole('button', { name: '保存草稿' }));
+  await screen.findByText('修改已保存，尚未应用');
+  expect(api.save).toHaveBeenCalledWith(draft.slug, expect.objectContaining({ icon: avatar.icon }));
+  expect(api.save.mock.calls[0][1]).not.toHaveProperty('icon_url');
+  expect(api.call.mock.calls.some(([operation]) => operation === 'publish')).toBe(false);
 });
 
 it('saves renamed existing assistants without rewriting arbitrary instructions or selecting a model', async () => {
-  const original = '自定义标题\n\n  保留缩进。\n简单易懂只是一个例子。\n';
+  const original = '自定义标题\n\n  保留缩进。\n使用简单易懂的语言，遇到新词先解释。\n把任务拆成小步骤，一次引导我完成一步。\n先给我提示和思考问题，让我尝试后再补充答案。\n';
   const existing = { ...draft, system_prompt: original };
   api.list.mockResolvedValue({ agents: [existing], next_cursor: null });
   const base = api.call.getMockImplementation()!;
@@ -245,10 +349,10 @@ it('saves renamed existing assistants without rewriting arbitrary instructions o
   } : base(operation, input));
   api.save.mockImplementation(async (_slug, input) => ({ ...existing, ...input, draft_revision: 2 }));
   open();
-  fireEvent.click(await screen.findByRole('button', { name: /写作搭档/ }));
+  fireEvent.click(await screen.findByRole('button', { name: '继续制作', exact: true }));
   await waitFor(() => expect(screen.getByLabelText('模型')).toBeEnabled());
   expect(screen.getByLabelText('模型')).toHaveValue('');
-  expect(screen.getByLabelText('特别要求')).toHaveValue(original);
+  expect(screen.getByLabelText('提示词')).toHaveValue(original);
   fireEvent.change(screen.getByLabelText('名称'), { target: { value: '新名字' } });
   fireEvent.click(screen.getByRole('button', { name: '保存草稿' }));
   await screen.findByRole('button', { name: '已保存' });
@@ -266,13 +370,13 @@ it('retains requirements when model loading fails and offers a usable retry', as
     return base(operation, input);
   });
   open();
-  fireEvent.click(await screen.findByRole('button', { name: /写作搭档/ }));
+  fireEvent.click(await screen.findByRole('button', { name: '继续制作', exact: true }));
   await screen.findByText('目录暂不可用');
-  fireEvent.change(screen.getByLabelText('特别要求'), { target: { value: '保留我的想法' } });
+  fireEvent.change(screen.getByLabelText('提示词'), { target: { value: '保留我的想法' } });
   fail = false;
   fireEvent.click(screen.getByRole('button', { name: '重新读取模型' }));
   await waitFor(() => expect(screen.getByLabelText('模型')).toBeEnabled());
-  expect(screen.getByLabelText('特别要求')).toHaveValue('保留我的想法');
+  expect(screen.getByLabelText('提示词')).toHaveValue('保留我的想法');
   expect(screen.getByLabelText('模型')).toHaveValue('');
 });
 
@@ -304,15 +408,13 @@ it('restores the exact previous thread and presents an uncertain operation witho
 it('keeps creation input and its uncertain operation when an existing card is clicked', async () => {
   api.create.mockRejectedValueOnce(new Error('连接中断')).mockResolvedValueOnce(draft);
   open();
-  const existing = await screen.findByRole('button', { name: /写作搭档/ });
+  const existing = await screen.findByRole('button', { name: '继续制作', exact: true });
   fireEvent.click(screen.getByRole('button', { name: '创建智能体' }));
-  fireEvent.click(screen.getByRole('button', { name: '我自己想一个' }));
   fireEvent.change(screen.getByLabelText('名称'), { target: { value: '新搭档' } });
-  fireEvent.change(screen.getByLabelText('用途'), { target: { value: '新用途' } });
   fireEvent.click(existing);
   expect(screen.queryByTestId('cloud-agent-editor')).not.toBeInTheDocument();
   expect(screen.getByLabelText('名称')).toHaveValue('新搭档');
-  fireEvent.click(screen.getByRole('button', { name: '下一步：试一试' }));
+  fireEvent.click(screen.getByRole('button', { name: '下一步' }));
   await screen.findByRole('alert');
   fireEvent.click(existing);
   expect(screen.queryByTestId('cloud-agent-editor')).not.toBeInTheDocument();
@@ -345,31 +447,40 @@ it('offers only explicit discard for a recovery record whose channel operation w
   expect(api.resolvePending).toHaveBeenCalledWith('channel-policy-old', false);
 });
 
-it('keeps the same creation operation after a lost response', async () => {
+it('freezes the uploaded avatar and creation identity when retrying a lost response', async () => {
+  const avatar = { icon: '/api/storage/public/images/create.png', icon_url: 'https://images.test/create.png' };
   api.list.mockResolvedValue({ agents: [], next_cursor: null });
-  api.create.mockRejectedValueOnce(new Error('连接中断')).mockResolvedValueOnce(draft);
+  api.uploadAvatar.mockResolvedValue(avatar);
+  api.create.mockRejectedValueOnce(new Error('连接中断')).mockResolvedValueOnce({ ...draft, ...avatar });
   open();
-  fireEvent.click(await screen.findByText('创建第一个智能体'));
-  fireEvent.click(screen.getByRole('button', { name: '我自己想一个' }));
+  fireEvent.click(await screen.findByText('创建我的第一个智能体'));
   fireEvent.change(screen.getByLabelText('名称'), { target: { value: '写作搭档' } });
-  fireEvent.change(screen.getByLabelText('用途'), { target: { value: '帮助写作' } });
-  fireEvent.click(screen.getByRole('button', { name: '下一步：试一试' }));
+  fireEvent.click(screen.getByRole('button', { name: '上传头像' }));
+  await screen.findByRole('button', { name: '更换头像' });
+  fireEvent.click(screen.getByRole('button', { name: '下一步', exact: true }));
   await screen.findByRole('alert');
+  expect(api.create).toHaveBeenCalledTimes(1);
+  expect(screen.getByLabelText('名称')).toBeDisabled();
+  expect(screen.getByRole('button', { name: '更换头像' })).toBeDisabled();
+  expect(screen.getByRole('button', { name: '移除头像' })).toBeDisabled();
   fireEvent.click(screen.getByRole('button', { name: '重试创建' }));
   await screen.findByTestId('cloud-agent-editor');
   expect(api.create).toHaveBeenCalledTimes(2);
   expect(api.create.mock.calls[1][0]).toEqual(api.create.mock.calls[0][0]);
+  expect(api.create.mock.calls[0][0]).toEqual({ operation_id: expect.any(String), name: '写作搭档', purpose: '按照我的提示词提供帮助。', icon: avatar.icon });
+  expect(api.uploadAvatar).toHaveBeenCalledTimes(1);
+  expect(screen.getByRole('img', { name: '写作搭档头像' })).toHaveAttribute('src', avatar.icon_url);
 });
 
 it('preserves local input on conflicts and requires an explicit choice before retry', async () => {
   api.save.mockRejectedValueOnce(new Error('草稿已更新'));
   api.get.mockResolvedValue({ ...draft, draft_revision: 2, system_prompt: '其他设备内容' });
   open();
-  fireEvent.click(await screen.findByRole('button', { name: /写作搭档/ }));
-  fireEvent.change(screen.getByLabelText('特别要求'), { target: { value: '我的修改' } });
+  fireEvent.click(await screen.findByRole('button', { name: '继续制作', exact: true }));
+  fireEvent.change(screen.getByLabelText('提示词'), { target: { value: '我的修改' } });
   fireEvent.click(screen.getByRole('button', { name: '保存草稿' }));
   await screen.findByText('云端已有修订 2，本地输入仍保留');
-  expect(screen.getByLabelText('特别要求')).toHaveValue('我的修改');
+  expect(screen.getByLabelText('提示词')).toHaveValue('我的修改');
   expect(screen.getByRole('button', { name: '保存草稿' })).toBeDisabled();
   fireEvent.click(screen.getByText('保留我的内容，继续编辑'));
   api.save.mockResolvedValue({ ...draft, draft_revision: 3, system_prompt: '我的修改' });
@@ -380,7 +491,7 @@ it('preserves local input on conflicts and requires an explicit choice before re
 
 it('blocks module navigation with unsaved edits, cancels leaving, then saves before proceeding', async () => {
   const { router } = open();
-  fireEvent.click(await screen.findByRole('button', { name: /写作搭档/ }));
+  fireEvent.click(await screen.findByRole('button', { name: '继续制作', exact: true }));
   fireEvent.change(screen.getByLabelText('名称'), { target: { value: '新的名称' } });
   await act(async () => { await router.navigate('/module-select'); });
   expect(screen.getByRole('dialog', { name: '未保存的修改' })).toBeVisible();
@@ -401,7 +512,7 @@ it('clears the previous account workspace and ignores its delayed list', async (
   const view = open();
   auth.user.userId = 'other';
   view.rerender(<RouterProvider key="other-account" router={view.router} />);
-  await screen.findByText('做一个懂你的小助手');
+  await screen.findByText('做一个属于你的 AI 助手吧');
   await act(async () => finish({ agents: [draft], next_cursor: null }));
   await waitFor(() => expect(screen.queryByText('写作搭档')).not.toBeInTheDocument());
 });
@@ -410,11 +521,9 @@ it('warns before leaving an uncertain creation and keeps its retry intent', asyn
   api.list.mockResolvedValue({ agents: [], next_cursor: null });
   api.create.mockRejectedValue(new Error('连接中断'));
   const { router } = open();
-  fireEvent.click(await screen.findByText('创建第一个智能体'));
-  fireEvent.click(screen.getByRole('button', { name: '我自己想一个' }));
+  fireEvent.click(await screen.findByText('创建我的第一个智能体'));
   fireEvent.change(screen.getByLabelText('名称'), { target: { value: '写作搭档' } });
-  fireEvent.change(screen.getByLabelText('用途'), { target: { value: '帮助写作' } });
-  fireEvent.click(screen.getByRole('button', { name: '下一步：试一试' }));
+  fireEvent.click(screen.getByRole('button', { name: '下一步' }));
   await screen.findByRole('alert');
   await act(async () => { await router.navigate('/module-select'); });
   expect(screen.getByRole('dialog', { name: '离开创建' })).toBeVisible();
@@ -425,47 +534,36 @@ it('warns before leaving an uncertain creation and keeps its retry intent', asyn
 });
 
 
-it('keeps unsent preview text when configuration changes and waits before switching saved revision', async () => {
+it('saves an existing configured draft without creating or loading a configuration chat', async () => {
   const configured = { ...draft, configuration: { ...EMPTY_CLOUD_CONFIGURATION, model: 'test-model' } };
   api.list.mockResolvedValue({ agents: [configured], next_cursor: null });
   api.save.mockResolvedValue({ ...configured, name: '新的名称', draft_revision: 2 });
   open();
-  fireEvent.click(await screen.findByRole('button', { name: /写作搭档/ }));
-  const prompt = await screen.findByPlaceholderText('输入消息或任务目标…');
-  fireEvent.change(prompt, { target: { value: '还未发送的问题' } });
+  fireEvent.click(await screen.findByRole('button', { name: '继续制作', exact: true }));
+  await waitFor(() => expect(screen.getByLabelText('模型')).toBeEnabled());
+  expect(screen.queryByLabelText('消息')).not.toBeInTheDocument();
+  expect(screen.queryByRole('region', { name: '智能体试用' })).not.toBeInTheDocument();
   fireEvent.change(screen.getByLabelText('名称'), { target: { value: '新的名称' } });
-  expect(prompt).toHaveValue('还未发送的问题');
-  expect(screen.getByText(/要求改好了/)).toBeVisible();
-  await waitFor(() => expect(screen.getByRole('button', { name: '保存草稿' })).toBeEnabled());
   fireEvent.click(screen.getByRole('button', { name: '保存草稿' }));
   await screen.findByRole('button', { name: '已保存' });
   expect(api.save).toHaveBeenCalledTimes(1);
-  expect(screen.getByLabelText('消息')).toBe(prompt);
-  expect(prompt).toHaveValue('还未发送的问题');
-  expect(screen.getByText('当前试用 · 修订 1')).toBeVisible();
-  expect(screen.getByRole('button', { name: '发送', exact: true })).toBeDisabled();
-  fireEvent.click(screen.getByRole('button', { name: '用最新草稿试用' }));
-  await waitFor(() => expect(screen.getByText('当前试用 · 修订 2')).toBeVisible());
-  expect(prompt).toHaveValue('还未发送的问题');
-  expect(screen.getByRole('button', { name: '发送', exact: true })).toBeEnabled();
+  expect(screen.queryByLabelText('消息')).not.toBeInTheDocument();
+  expect(api.call.mock.calls.some(([operation]) => ['threads', 'history', 'preview', 'submit', 'publish'].includes(operation))).toBe(false);
 });
 
-
 it('switches peer editor tabs while retaining the advanced category and unfinished form inputs', async () => {
   api.list.mockResolvedValue({ agents: [{ ...draft, configuration: { ...EMPTY_CLOUD_CONFIGURATION, model: 'test-model' } }], next_cursor: null });
   open();
-  fireEvent.click(await screen.findByRole('button', { name: /写作搭档/ }));
-  await waitFor(() => expect(screen.getByLabelText('消息')).toBeEnabled());
-  const requirements = screen.getByRole('tab', { name: '我的要求', exact: true });
+  fireEvent.click(await screen.findByRole('button', { name: '继续制作', exact: true }));
+  await waitFor(() => expect(screen.getByLabelText('模型')).toBeEnabled());
+  const requirements = screen.getByRole('tab', { name: '模型与提示词', exact: true });
   const advanced = screen.getByRole('tab', { name: '高级设置', exact: true });
   expect(requirements).toHaveAttribute('aria-selected', 'true');
   expect(advanced).toHaveAttribute('aria-selected', 'false');
-  expect(screen.getByRole('tabpanel', { name: '我的要求' })).toBeVisible();
+  expect(screen.getByRole('tabpanel', { name: '模型与提示词' })).toBeVisible();
   expect(screen.queryByRole('navigation', { name: '配置分类' })).not.toBeInTheDocument();
-  const instructions = screen.getByLabelText('特别要求');
-  const preview = screen.getByLabelText('消息');
+  const instructions = screen.getByLabelText('提示词');
   fireEvent.change(instructions, { target: { value: '没有保存的要求' } });
-  fireEvent.change(preview, { target: { value: '没有发送的问题' } });
 
   fireEvent.mouseDown(advanced, { button: 0, ctrlKey: false });
   expect(advanced).toHaveAttribute('aria-selected', 'true');
@@ -473,6 +571,11 @@ it('switches peer editor tabs while retaining the advanced category and unfinish
   expect(screen.getByRole('tabpanel', { name: '高级设置' })).toBeVisible();
   expect(instructions).not.toBeVisible();
   expect(screen.getByRole('button', { name: '能力', exact: true })).toHaveAttribute('aria-current', 'page');
+  fireEvent.click(screen.getByRole('button', { name: '知识', exact: true }));
+  fireEvent.click(screen.getByText('管理我的知识文档'));
+  fireEvent.click(screen.getByRole('button', { name: '新建知识库' }));
+  const knowledgeName = screen.getByLabelText('知识库名称');
+  fireEvent.change(knowledgeName, { target: { value: '还没创建的资料' } });
   fireEvent.click(screen.getByRole('button', { name: '限制', exact: true }));
   const budgetInput = screen.getByLabelText('每日上限（词元点数）');
   await waitFor(() => expect(budgetInput).toBeEnabled());
@@ -484,64 +587,66 @@ it('switches peer editor tabs while retaining the advanced category and unfinish
   fireEvent.mouseDown(requirements, { button: 0, ctrlKey: false });
   expect(screen.queryByRole('navigation', { name: '配置分类' })).not.toBeInTheDocument();
   expect(budgetInput).not.toBeVisible();
-  expect(screen.getByLabelText('特别要求')).toBe(instructions);
+  expect(screen.getByLabelText('提示词')).toBe(instructions);
   expect(instructions).toHaveValue('没有保存的要求');
   fireEvent.mouseDown(advanced, { button: 0, ctrlKey: false });
   expect(screen.getByRole('button', { name: '限制', exact: true })).toHaveAttribute('aria-current', 'page');
   expect(screen.getByLabelText('每日上限（词元点数）')).toBe(budgetInput);
   expect(budgetInput).toHaveValue(12.5);
-  expect(screen.getByLabelText('消息')).toBe(preview);
-  expect(preview).toHaveValue('没有发送的问题');
+  fireEvent.click(screen.getByRole('button', { name: '知识', exact: true }));
+  expect(screen.getByLabelText('知识库名称')).toBe(knowledgeName);
+  expect(knowledgeName).toHaveValue('还没创建的资料');
+  expect(screen.queryByLabelText('消息')).not.toBeInTheDocument();
   expect(api.save).not.toHaveBeenCalled();
   expect(api.call.mock.calls.some(([operation]) => ['saveBudget', 'preview', 'submit'].includes(operation))).toBe(false);
 });
 
-it('keeps preview text across mode switches and saves a budget independently of the draft', async () => {
+it('retains unsaved instructions while saving a budget independently of the draft', async () => {
   const configured = { ...draft, configuration: { ...EMPTY_CLOUD_CONFIGURATION, model: 'test-model' } };
   api.list.mockResolvedValue({ agents: [configured], next_cursor: null });
   const base = api.call.getMockImplementation()!;
   api.call.mockImplementation(async (operation, input) => operation === 'saveBudget' ? { ...input, daily_committed_points: '0.00' } : base(operation, input));
   open();
-  fireEvent.click(await screen.findByRole('button', { name: /写作搭档/ }));
-  await waitFor(() => expect(screen.getByLabelText('消息')).toBeEnabled());
-  fireEvent.change(screen.getByLabelText('消息'), { target: { value: '待发送的问题' } });
-  fireEvent.change(screen.getByLabelText('特别要求'), { target: { value: '未保存的指令' } });
-  fireEvent.click(screen.getByRole('button', { name: '对话', exact: true }));
-  fireEvent.click(screen.getByRole('button', { name: '编辑', exact: true }));
-  expect(screen.getByLabelText('消息')).toHaveValue('待发送的问题');
-  expect(screen.getByLabelText('特别要求')).toHaveValue('未保存的指令');
+  fireEvent.click(await screen.findByRole('button', { name: '继续制作', exact: true }));
+  fireEvent.change(screen.getByLabelText('提示词'), { target: { value: '未保存的指令' } });
+  fireEvent.click(screen.getByRole('button', { name: '聊天', exact: true }));
+  expect(screen.queryByLabelText('消息')).not.toBeInTheDocument();
+  fireEvent.click(screen.getByRole('button', { name: '配置', exact: true }));
+  expect(screen.getByLabelText('提示词')).toHaveValue('未保存的指令');
   fireEvent.mouseDown(screen.getByRole('tab', { name: '高级设置' }), { button: 0, ctrlKey: false });
   fireEvent.click(screen.getByRole('button', { name: '限制', exact: true }));
-  fireEvent.change(screen.getByLabelText('每日上限（词元点数）'), { target: { value: '12' } });
+  const budget = screen.getByLabelText('每日上限（词元点数）');
+  await waitFor(() => expect(budget).toBeEnabled());
+  fireEvent.change(budget, { target: { value: '12' } });
   fireEvent.click(screen.getByRole('button', { name: '保存费用上限' }));
   await waitFor(() => expect(api.call).toHaveBeenCalledWith('saveBudget', expect.objectContaining({ daily_limit_points: '12' })));
   expect(api.save).not.toHaveBeenCalled();
-  fireEvent.mouseDown(screen.getByRole('tab', { name: '我的要求', exact: true }), { button: 0, ctrlKey: false });
-  expect(screen.getByLabelText('特别要求')).toHaveValue('未保存的指令');
-  expect(screen.getByLabelText('消息')).toHaveValue('待发送的问题');
+  fireEvent.mouseDown(screen.getByRole('tab', { name: '模型与提示词', exact: true }), { button: 0, ctrlKey: false });
+  expect(screen.getByLabelText('提示词')).toHaveValue('未保存的指令');
+  expect(screen.getByRole('button', { name: '保存草稿' })).toBeEnabled();
+  expect(api.call.mock.calls.some(([operation]) => ['threads', 'preview', 'submit'].includes(operation))).toBe(false);
 });
 
-
-it('keeps an existing preview when the saved draft clears its model selection', async () => {
+it('saves a cleared model selection without choosing another model or starting a preview', async () => {
   const configured = { ...draft, configuration: { ...EMPTY_CLOUD_CONFIGURATION, model: 'test-model' } };
   api.list.mockResolvedValue({ agents: [configured], next_cursor: null });
+  const base = api.call.getMockImplementation()!;
+  api.call.mockImplementation(async (operation, input) => operation === 'catalog'
+    ? { models: [{ id: 'test-model', name: '创作模型' }, { id: 'another-model', name: '其他模型' }], resources: {}, pricing: null }
+    : base(operation, input));
   api.save.mockResolvedValue({ ...draft, draft_revision: 2 });
   open();
-  fireEvent.click(await screen.findByRole('button', { name: /写作搭档/ }));
-  await waitFor(() => expect(screen.getByLabelText('消息')).toBeEnabled());
-  const prompt = screen.getByLabelText('消息');
-  fireEvent.change(prompt, { target: { value: '还没有发送' } });
-  fireEvent.mouseDown(screen.getByRole('tab', { name: '高级设置' }), { button: 0, ctrlKey: false });
-  fireEvent.click(screen.getByRole('button', { name: '能力', exact: true }));
+  fireEvent.click(await screen.findByRole('button', { name: '继续制作', exact: true }));
+  await waitFor(() => expect(screen.getByLabelText('模型')).toBeEnabled());
   fireEvent.change(screen.getByLabelText('模型'), { target: { value: '' } });
   fireEvent.click(screen.getByRole('button', { name: '保存草稿' }));
   await screen.findByText('云端已保存');
-  expect(screen.getByLabelText('消息')).toBe(prompt);
-  expect(prompt).toHaveValue('还没有发送');
-  expect(screen.getByRole('button', { name: '用最新草稿试用' })).toBeDisabled();
+  expect(screen.getByLabelText('模型')).toHaveValue('');
+  expect(api.save).toHaveBeenCalledWith(draft.slug, expect.objectContaining({ configuration: expect.objectContaining({ model: '' }) }));
+  expect(screen.queryByLabelText('消息')).not.toBeInTheDocument();
+  expect(api.call.mock.calls.some(([operation]) => ['threads', 'preview', 'submit'].includes(operation))).toBe(false);
 });
 
-
 it('searches capabilities while retaining existing selections outside the results', async () => {
   const configured = { ...draft, configuration: { ...EMPTY_CLOUD_CONFIGURATION, model: 'test-model', tools: ['missing-tool'] } };
   api.list.mockResolvedValue({ agents: [configured], next_cursor: null });
@@ -551,13 +656,13 @@ it('searches capabilities while retaining existing selections outside the result
   } : base(operation, input));
   api.save.mockImplementation(async (_slug, input) => ({ ...configured, ...input, draft_revision: 2 }));
   open();
-  fireEvent.click(await screen.findByRole('button', { name: /写作搭档/ }));
+  fireEvent.click(await screen.findByRole('button', { name: '继续制作', exact: true }));
   fireEvent.mouseDown(screen.getByRole('tab', { name: '高级设置' }), { button: 0, ctrlKey: false });
   fireEvent.click(screen.getByRole('button', { name: '能力', exact: true }));
   expect(await screen.findByRole('checkbox', { name: /missing-tool/ })).toBeChecked();
   fireEvent.click(screen.getByRole('button', { name: '选择工具', exact: true }));
   fireEvent.change(screen.getByLabelText('搜索工具'), { target: { value: '资料' } });
-  fireEvent.mouseDown(screen.getByRole('tab', { name: '我的要求' }), { button: 0, ctrlKey: false });
+  fireEvent.mouseDown(screen.getByRole('tab', { name: '模型与提示词' }), { button: 0, ctrlKey: false });
   fireEvent.mouseDown(screen.getByRole('tab', { name: '高级设置' }), { button: 0, ctrlKey: false });
   expect(screen.getByLabelText('搜索工具')).toHaveValue('资料');
   expect(screen.queryByRole('checkbox', { name: '当前时间' })).not.toBeInTheDocument();