diff --git a/.project-docs/30-worklog/tasks/20260928-teacher-reply-cleanup-c8e4a219.md b/.project-docs/30-worklog/tasks/20260928-teacher-reply-cleanup-c8e4a219.md index 844580d8..2871b650 100644 --- a/.project-docs/30-worklog/tasks/20260928-teacher-reply-cleanup-c8e4a219.md +++ b/.project-docs/30-worklog/tasks/20260928-teacher-reply-cleanup-c8e4a219.md @@ -8,7 +8,7 @@ - Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore-teacher-reply-cleanup - Base commit: ae0f72d8fa0089f87b41d272da220e1c1397aec8 - Owner: codex -- Status: Ready for Integration +- Status: In progress ## Scope @@ -79,3 +79,17 @@ - Runtime source/build is 9adab45, Renderer index-Dn2S79es.js loaded from this checkout, document complete and React mounted. Startup guard blocked one show and retained a hidden, unfocused window until user activation. A 12-second NSWorkspace monitor recorded trialFocused=false and unchanged foreground PID 409. Installed production PID 23486 remains untouched. - Preserved the same trial user-data directory. Updated only local trial launch metadata after backing up prior descriptors. No cloud configuration publication, deliberate model request, history seeding or UI activation. This checkout must remain available while the trial uses its build. - Task-aware drift checker now flags the imported peer task record 20260928-agent-refresh-a6d109b3 relative to the original task base. It is a committed dependency imported by the authorized merge, verified byte-for-byte identical to 4f6bda4; no peer document was edited. Record this inherited-source diagnostic rather than claiming the checker passed after merge. Canonical project documents remain untouched. + + +## Empty Composer Hint Follow-up + +- User approved the first proposed interaction: show a lightweight “给我一点提示” action only when the consultation input is empty, hide it when typing and remove the fixed “我也说不清,你带我看看” link below replies. Update the existing trial without desktop focus changes. +- Same-task ownership resumed and verified; rechecked task/entry and peer scopes. The protocol-boundary peer is complete but unmerged and not live in this trial; preserve its separate prompt-policy decisions for its designated integration task, do not change backend policy as part of this UI request. Existing manual refresh is already included. +- Plan: modify only the composer entry and fixed follow-up link, preserve true generated cards/free input/retries, add focused UI and browser checks, build and update trial Renderer while retaining Main and persisted data where possible. No cloud publication or deliberate model test request. + +### Hint Implementation And Verification + +- Replaced the filled “帮我看看” pill with a transparent “给我一点提示” text action in the empty composer. Typing hides it; clearing or whitespace restores it. A fixed minimum action-row height and left flex slot retain the send button’s position. Removed only the client-added “我也说不清,你带我看看” footer; identical text genuinely returned by the Agent still renders and sends as an ordinary generated reply. +- Preserved quick replies, free input, references/drafts, failure/cancel/interruption retries, and one-click request behavior. When an old unconfirmed suggestions payload still says “帮我看看”, retry now reuses the complete original payload and request ID; ordinary questions and already-confirmed requests cannot reuse it. Old guided-help intent remains readable for history compatibility; no backend/cloud policy changed. +- Verification passed: 59 UI unit tests (including five legacy pending-payload cases), 14 headless Chrome layout tests at 319/508px, typecheck, full lint followed by final changed-file lint, and production Renderer/Main/Preload/utility compile. Legacy regressions failed before the compatibility fix and passed afterward. Updated shared Electron E2E assertions but did not launch a native test application. No real model request was made for verification. +- Built with `corepack pnpm run build:vite --emptyOutDir false` so the live Renderer can keep loading its old hashed assets until the deliberate refresh. Saved previous index and bootstrap/launch descriptors locally outside Git; current Main is retained for the pending Renderer update. diff --git a/README.md b/README.md index 9c538755..60ac8676 100644 --- a/README.md +++ b/README.md @@ -174,9 +174,9 @@ Pi 正式包必须继续运行 `pnpm run verify:artifact:pi`、`pnpm run smoke:p - 主动发言采用紧贴小头像的短气泡;只有存在真实主动消息或运营欢迎语时才显示这组浮层,收起消息时头像和气泡一起消失,顶部入口仍保留。长消息在气泡中最多显示三行,点击接回原智能体对话查看全文。不提供“智能体偶尔来看看”开关或本地模拟巡看控制,既有自动跟进与真实消息接收逻辑保留。作品原生预览对整组气泡和头像测量避让,避免图片被原生页面遮住。 - 学生在当前项目创作时,前端每 5 分钟请求一次智能体跟进;窗口隐藏、来源归档、主对话正在执行、智能体正在回复或学生正在智能体栏写草稿时延后。Main 再检查在线启停、来源归属、项目级冷却和已完成文本指纹,未变上下文按下述十五分钟冷却处理。跟进沿用运营模型、已发布 Skills 与当前智能体话题,生成符合所选配置的具体建议或引导;以主动智能体发言持久化,不伪造学生消息。模型调用沿用智能体计费规则。 - 进入项目时,智能体头像旁先显示运营发布的欢迎语气泡,不调用模型、不声称已检查项目;每个账号/项目主动收起后不重复弹出。真实的未读主动建议优先替换欢迎语。主动发言在头像旁直接显示气泡,不抢焦点、不盖住作品;作品区按气泡与原生预览的实际交叠范围避让,已有工具栏高度计入计算,气泡位于独立智能体栏时不额外留白,窗口/分栏尺寸变化和收起气泡时实时归还空间;“和智能体聊聊”接回同一段咨询,“等会儿聊”收起并保留历史。已有未处理气泡时不堆叠新邀请;咨询已展开时也显示气泡,直到学生主动点击查看或收起,期间的其他回复不会吞掉未读邀请。五分钟检查计时在刷新和项目切换后保留;智能体咨询里的新讨论也算进展,即使操作对话没有变化也会继续跟进;上下文完全未变时放缓到十五分钟一次,不永久停止。事件连接丢失时,每十五秒只读同步未完成回复,收到结果后停止轮询,不重复调用模型。失败如实提示,不以本地文案替代模型回复。已接受请求恢复使用原身份,退出账号和来源删除仍沿用 Main 中止边界。 -- 智能体同时支持自由提问与输入框底部的提示词按钮“帮我看看”:学生点击后才结合当前操作对话与咨询历史推荐一个具体切入点,并生成围绕它的快捷回复。点击快捷回复会主动开始讨论;“我也说不清,你带我看看”让智能体从一个具体、容易回答的交流起点带着聊。这些快捷求助保留已有输入草稿,网络结果不确定时复用请求身份,已确认终态的请求不重复执行;解析失败可重新求助,不用固定问题伪装模型结果。服务端下发的推荐问题只填入草稿,由用户确认发送。界面不提供独立示范页面、“记一下”、共识或自动待办,智能体的回复下不再展示“我去试一试”和“复制”按钮,学生通过已有的操作对话/作品入口继续创作。 +- 智能体支持自由提问;输入框为空时,底部显示轻量文字入口“给我一点提示”,输入文字后收起,清空后重现,发送按钮保持原位。只有学生点击才调用模型,结合当前操作对话与咨询历史推荐一个具体切入点,并生成围绕它的快捷回复。点击快捷回复会主动开始讨论;回复下方不再附加固定的二次求助链接。这些快捷求助保留已有输入草稿,网络结果不确定时复用请求身份,已确认终态的请求不重复执行;解析失败可重新求助,不用固定问题伪装模型结果。服务端下发的推荐问题只填入草稿,由用户确认发送。界面不提供独立示范页面、“记一下”、共识或自动待办,智能体的回复下不再展示“我去试一试”和“复制”按钮,学生通过已有的操作对话/作品入口继续创作。 - 老师咨询只展示老师正文和可点击的快捷回复卡片,学生也可在“和老师聊聊”输入框自由输入。点击卡片原样发送该回复,保留当前输入草稿;旧话题的数据不会恢复想法板、结构图、流程图或对照表及其操作。 -- “帮我看看”和引导开口都由老师结合项目推荐一个具体切入点,快捷回复围绕这个切入点帮助学生接话;客户端不要求多个独立话题,也不固定正文长度、选项数量、前缀或表达风格。老师继续依据已配置职责帮助孩子整理想法、理解关系和承接已确认的共识,区分建议与已确认内容。 +- “给我一点提示”由老师结合项目推荐一个具体切入点,快捷回复围绕这个切入点帮助学生接话;客户端不要求多个独立话题,也不固定正文长度、选项数量、前缀或表达风格。老师继续依据已配置职责帮助孩子整理想法、理解关系和承接已确认的共识,区分建议与已确认内容。 - Main 对咨询回复统一使用 `{reply, quickReplies}`,本地读取工具的前言和云端非最终片段不当作最终回答;完整解析后展示正文和卡片,主动进展提醒仍直接展示正文。普通 Markdown、JSON 数据和代码示例保持正文。兼容读取旧 `{intro, questions}` 和带 `tool` 的回复,只提取正文与快捷回复,不恢复或更新组件。资源上限只用于防护,不做旧式字数截断;格式错误保留可读正文及原始回答,原文默认折叠、字面显示,不再次送进模型。 - 咨询正文支持 Markdown 标题、列表、表格、代码围栏、HTTP(S) 链接/图片和数学公式,长代码与表格在栏内横向滚动,不执行 HTML。云端正文维持 string 合同,未知对象不会猜测转成回答。工具活动只从云端主线程的类型化工具事件及 Main 本地读取过程获得,按本次问题/工具调用身份合并名称和状态,跨云端暂停、续接仍只计一次;暂停读取不算失败,状态以实际读取结果或问题终态为准,单独折叠显示;参数、结果原文和内部错误不混入回复,思考内容不作为正文。客户端仅保存自己实际收到的工具状态,不能补回旧历史或断线期间已经过期的事件。 - 云端咨询在 local_context 声明 read_protocol=2;需先部署配套 Yuxi API 和 worker,再升级客户端。云端持久累计读取字节及批次,每轮告知模型剩余额度;预算耗尽后消费最后一批结果,并以 tool_choice=none 要求根据现有证据形成答案和说明缺口。Main 限制实际返回量并拒绝第十三批读取,区分读取达到上限、上下文失效及格式无效。服务端对未声明协议的已安装旧客户端保留原工具参数与六批边界。 diff --git a/src/pages/Chat/TeacherChatPanel.tsx b/src/pages/Chat/TeacherChatPanel.tsx index 4dff3c15..df5465f7 100644 --- a/src/pages/Chat/TeacherChatPanel.tsx +++ b/src/pages/Chat/TeacherChatPanel.tsx @@ -316,11 +316,14 @@ export function TeacherChatPanel({ const previous = pending.current && !current.requests.some((request) => request.id === pending.current?.requestId) ? pending.current : null; + // Copy changes must not create another charge for an uncertain hint request. + const retrySuggestions = action?.intent === 'suggestions' && previous?.intent === 'suggestions'; const input = - previous && - previous.text === question && - (previous.intent ?? 'question') === (action?.intent ?? 'question') && - JSON.stringify(previous.references) === JSON.stringify(questionReferences) + previous && (retrySuggestions || ( + previous.text === question && + (previous.intent ?? 'question') === (action?.intent ?? 'question') && + JSON.stringify(previous.references) === JSON.stringify(questionReferences) + )) ? previous : { requestId: crypto.randomUUID(), text: question, references: questionReferences, @@ -352,8 +355,7 @@ export function TeacherChatPanel({ (request) => request.status === 'preparing' || request.status === 'running' ); const helpUnavailable = busy || !topicEnabled || Boolean(running); - const askForSuggestions = () => void send({ text: '帮我看看', intent: 'suggestions' }); - const askForGuidance = () => void send({ text: '我也说不清,你带我看看', intent: 'guided-help' }); + const askForSuggestions = () => void send({ text: '给我一点提示', intent: 'suggestions' }); const changeText = (next: string) => { setText(next); persistDraft(next, references, pending.current); }; const removeReferences = () => { setReferences([]); persistDraft(text, [], pending.current); }; const questions = definition?.suggested_questions ?? []; @@ -401,9 +403,8 @@ export function TeacherChatPanel({
{request.suggestedQuestions?.map((question, index) => )}
- } - {['failed', 'cancelled', 'interrupted'].includes(request.status) && } + {['failed', 'cancelled', 'interrupted'].includes(request.status) && } : request.response ? :
{['running', 'preparing'].includes(request.status) ? {label}正在想… : ['cancelled', 'interrupted'].includes(request.status) ? '这次先停在这里。想继续时可以再说说。' : ''}
} {request.intent !== 'suggestions' && request.status === 'completed' && Boolean(request.suggestedQuestions?.length) &&
{request.suggestedQuestions?.map((question, index) => )} @@ -443,9 +444,10 @@ export function TeacherChatPanel({