diff --git a/.project-docs/30-worklog/tasks/20260922-classroom-workspace-7b9e4c21.md b/.project-docs/30-worklog/tasks/20260922-classroom-workspace-7b9e4c21.md new file mode 100644 index 00000000..bfcf213d --- /dev/null +++ b/.project-docs/30-worklog/tasks/20260922-classroom-workspace-7b9e4c21.md @@ -0,0 +1,58 @@ +# Task: Integrate classroom teacher and friend workspace + +## Identity + +- Task ID: 20260922-classroom-workspace-7b9e4c21 +- Mode: Feature +- Branch: codex/classroom-workspace +- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore-classroom +- Base commit: e5d271bc457b4e91e6bda52a28db4a1ecf91d406 +- Owner: codex +- Status: Ready for Integration + +## Scope + +- Integrate the approved quiet project/chat workspace and teacher/friend consultation UI into the latest merged product, then run that combined source in the existing isolated trial app. + +## Intent And Constraints + +- User authorizes integration and future edits in this combined version; latest steering permits subagents, used for bounded backend review and UI regression tests. Teacher guides thinking and methods, friend offers experience feedback, students initiate consultation. No memo/consensus UI. Preserve real Code runtime, project metadata, model/auth/payment controls. Main owns consultation APIs. Original dirty checkout is read-only; its abandoned consensus implementation is not imported. + +## Outcome + +- Integrated the approved prototype layout and exact character assets into the latest repository base: project/conversations on the left, operation/work tabs in the center, optional resizable teacher/friend consultation on the right. Real runtime, account/model controls, project management and native browser preview remain connected. +- Added project-level role-specific consultation routes, topic history and account/project/role draft separation. Each explicit send references the selected operation conversation. No automatic model call on opening, no generated consensus or task list, no automatic insertion into the operation draft. Published teacher configuration remains authoritative; friend derives its model/limits/availability with a separate minimal persona. +- Preserved legacy source-level teacher and admin preview contracts. Fixed source deletion races; affected in-flight project consultation cancels while project history remains. Embedded work preview survives operation/work switching, and yields to overlaid consultations on narrow windows. +- Updated the existing external trial launcher at `/Users/chillishark/Makelore 麦洛/课堂工作区预览/launch.py` to default to this worktree. The original standalone prototype is retained behind `--prototype`; existing isolated trial profile is reused. + +## Verification + +- Final focused regression: 8 files / 101 tests passed across backend, consultation/chat UI, title bar, main layout and sidebar. Browser preview lifecycle/occlusion: 7 tests passed separately (108 total). Coverage includes role/project/account isolation, source validation/switching, idempotency, delete races, explicit-only model requests, drafts, preview preservation, and narrow-overlay handling. +- TypeScript, scoped ESLint, production Vite/Electron build, Git whitespace check and project-document drift gate passed. Existing E2E assertions were adapted to the new routes/layout but the E2E runner was not executed. +- Native trial recompiled and restarted from this checkout. After the user unlocked macOS, verified both role panels, distinct visual treatments, suggestion-only draft filling, teacher draft restoration after role switch, independent friend draft, central work tab, operation draft preservation, and consultation expansion/restoration. Cleared inspection drafts. Real model response was not exercised: trial is signed out and has no selected operation model. Native preview lifecycle and narrow-window occlusion were verified in focused tests, not with a running user work page. + +## Follow-ups + +- Detailed teacher pedagogy and role prompts remain a separate product discussion as requested. Production cloud model replies require a signed-in account and published enabled consultation configuration. + +## Promotion Candidates + +- Target: current-state and teacher consultation architecture/domain documentation. Proposal: recognize the approved single-teacher/single-friend workspace, project-level role history with per-request operation source, and student-owned transfer from reflection to action. Evidence: user instructions, README, route/service/UI implementation and focused tests. Future impact: additional personas can extend the same project consultation pattern without creating operation tools. Semantic conflicts: older teacher ADR describes source-level topics and bringing responses back to the main draft; those remain legacy API/admin behavior, not the student workspace. Human confirmation: already supplied for this implementation and removal of memo/consensus; detailed role prompts still require the later discussion requested by the user. Canonical promotion deferred to an integration task. + +## Project Context Loaded + +- Task ID: 20260922-classroom-workspace-7b9e4c21; mode: feature; branch: codex/classroom-workspace. +- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore-classroom. +- Base: e5d271bc457b4e91e6bda52a28db4a1ecf91d406. Ownership verified; no other active local owner. Original main contains only the previously rejected consensus feature changes; preserved in place. +- Read: memory-index, active task, project-positioning, current-state latest integration, decision-index, system-overview, teacher ADR, relevant business-rules and success-criteria, README and AGENTS. +- Project goal: local creative work through Main-owned Code/Pi and independently billed text consultation. Latest integration adds cloud teacher and project conversations. Positioning and success docs contain template/stale sections; README, actual code, latest teacher ADR and this conversation govern scope. +- User's newer approved role design extends the single teacher UI with a friend and project-level consultation continuity. Detailed teacher pedagogy prompts remain cloud-owned and deferred. Friend uses the same approved model/availability channel with a minimal distinct experience-feedback persona, no tools or fabricated play experience. +- Modules: Code header, sidebar, central preview, consultation panel/API/service/context, focused tests. +- Gate: Passed. + +## Implementation Plan + +1. Reuse teacher request/persistence pipeline for role-separated project consultations, retaining legacy source-scoped and preview contracts. +2. Integrate prototype layout, character entry points, resizable consultation, project drafts, and central real work preview. +3. Verify roles/project isolation, explicit-only submission, draft persistence, source bounds, existing Code behavior; typecheck, focused tests, build and native trial inspection. +4. Point the trial launcher at this combined source for future iterations and document current behavior. diff --git a/README.md b/README.md index dc1d303e..6dc9698e 100644 --- a/README.md +++ b/README.md @@ -152,13 +152,14 @@ Pi 正式包必须继续运行 `pnpm run verify:artifact:pi`、`pnpm run smoke:p - 首次发送会立即生成稳定的乐观用户消息；HTTP 202 只表示本地 Agent 已接收。后续失败不会删除已接受消息，不确定交付不会自动重发；准备失败可在目标 Conversation 上手动恢复。 - 运行中的 Conversation 可把新消息作为 steer 引导当前回答或 follow-up 排到下一轮，并显示队列位置；队列正常在 `agent_settled` 后释放，用户可中止当前运行。若 Pi 已终结但该握手丢失，Main 会在 30 秒宽限后仅探测目标线程：权威 idle 状态会补齐持久化最终回复并 exactly-once 释放 ownership，矛盾状态则显式失败该目标，且不会重放已接受请求。select/confirm/input/editor 交互在输入区上方回答，select 除预设选项外支持自由输入；交互提交或取消后立即从输入区移除，失效请求会就地提示并允许重试或取消。 - 隐藏 Conversation 的红色新消息标记只在出现新的待回答交互，或当前任务进入 completed、failed、aborted 终态时设置；助手流式文字、思考、工具过程和单个工具失败不会提前触发红点。 -- 核心聊天页标题栏左侧只显示 Conversation 名称，必要的中止/恢复入口保留在右侧；不再展示 Pi 空闲/运行副标题。项目列表提供项目设置与会话入口；全局品牌 Logo 在 macOS 贴齐窗口最右边缘，在 Windows 位于窗口控制按钮左侧；Windows 的开发浏览器、中止和恢复按钮使用 Logo 左侧的独立区域。归档、未读、整段 Conversation 分支和编程工具抽屉均不占用标题栏。从已持久化的 user 消息仍可“从这里创建新对话分支”，assistant 消息和未持久化消息不提供该动作；分支只创建新的 Conversation 历史，不表示文件回滚。Pi 的工具调用与浏览器附件继续在对应的对话过程节点中按需展开；分享、待办、全局运行时和 revert/unrevert 不属于该产品界面。 +- 核心聊天页左侧显示品牌、项目及其对话；标题栏显示项目与当前 Conversation，并提供老师、朋友入口和必要的中止/恢复按钮。中央“操作对话／作品”切换真实对话与项目浏览器预览，切换时保留操作草稿。项目设置、归档和会话管理保留在左侧。从已持久化的 user 消息仍可“从这里创建新对话分支”，assistant 消息和未持久化消息不提供该动作；分支只创建新的 Conversation 历史，不表示文件回滚。Pi 的工具调用与浏览器附件继续在对应的对话过程节点中按需展开；分享、待办、全局运行时和 revert/unrevert 不属于该产品界面。 -### 云端编程老师 +### 老师与朋友咨询 -- 主会话标题栏的“问老师”打开右侧独立聊天。老师按运营发布的提示词、文本教学 Skills、模型和原生思考选项回答，并按预算读取当前主会话已完成分支的文本与用户明确引用。Main 直接调用既有计费网关，不创建 Pi worker，不携带工具。 -- 老师话题按当前云端账号、项目和来源会话保存，创建时固定发布版本；每轮发送重新检查启停。关闭面板或切换会话不取消已接受的问题，退出账号会中止。请求先落盘再调用模型，同一请求标识不重复发送，重启后未完成请求标记中断。 -- 回答可复制或追加到主输入框草稿，由用户决定发送；归档来源需先恢复。删除来源会话会停止并删除关联老师记录。运营草稿试聊使用 `niancode://coding-teacher/preview?draft_revision=N` 打开独立示例上下文，不读取学生项目，要求桌面当前账号具有运营权限。 +- 标题栏的“老师／朋友”由学生主动打开右侧咨询栏，可调整宽度、关闭和重新打开。老师引导思考、教方法，朋友分享作品体验中的感受、好奇与困惑。入口与建议问题都不会自动发送；建议只填入咨询草稿。界面不提供“记一下”、共识或自动待办，“我去试一试”只返回操作输入区，由学生自己表达和实施。 +- 老师保留运营发布的提示词、文本教学 Skills、模型和原生思考选项。首期朋友使用同一发布版本的模型、预算与启停配置，采用独立的体验交流提示词，不继承老师 Skills；具体教学方向和角色提示词后续另行讨论。两者均只读取按预算截取的当前操作对话已完成分支文本及明确引用，不运行工具，也不能声称实际看到了画面或试玩过作品。Main 直接调用既有计费网关，不创建 Pi worker。 +- 咨询话题及未发送草稿按当前云端账号、项目与角色分别保存；切换操作对话仍延续该项目下的咨询，每轮发送时绑定当时的操作对话来源。创建话题时固定发布版本，每轮重新检查启停。关闭面板或切换会话不取消已接受的问题，退出账号会中止。请求先落盘再调用模型，同一请求标识不重复发送，重启后未完成请求标记中断。没有操作对话时也可咨询，但无操作文本上下文。 +- 删除操作对话会停止正在使用该来源的回复，保留项目级咨询历史；归档来源需先恢复后才能引用。原有来源会话级老师 API 与存储保持兼容，原路径历史不自动迁移到新项目级咨询栏。运营草稿试聊仍使用 `niancode://coding-teacher/preview?draft_revision=N` 打开独立示例上下文，不读取学生项目，要求桌面当前账号具有运营权限。 ## 运行内核与项目数据 diff --git a/electron/api/routes/coding-teacher.ts b/electron/api/routes/coding-teacher.ts index 2c36d4e9..d6d70bc1 100644 --- a/electron/api/routes/coding-teacher.ts +++ b/electron/api/routes/coding-teacher.ts @@ -23,10 +23,14 @@ export async function handleCodingTeacherRoutes( const preview = url.pathname.match( /^\/api\/coding\/teacher-preview\/topics(?:\/([^/]+))?(?:\/(messages|events|save|requests\/([^/]+)\/cancel))?$/ ); - const config = url.pathname === '/api/coding/teacher/config'; + const projectTopics = url.pathname.match( + /^\/api\/coding\/projects\/([^/]+)\/(teacher|friend)-topics(?:\/([^/]+))?(?:\/(messages|events|save|requests\/([^/]+)\/cancel))?$/ + ); + const role = projectTopics?.[2] === 'friend' || url.pathname === '/api/coding/friend/config' ? 'friend' : 'teacher'; + const config = url.pathname === '/api/coding/teacher/config' || url.pathname === '/api/coding/friend/config'; const draft = url.pathname === '/api/coding/teacher-preview'; const pending = url.pathname === '/api/coding/teacher-preview/pending-link'; - if (!source && !preview && !config && !draft && !pending) return false; + if (!source && !preview && !projectTopics && !config && !draft && !pending) return false; if ((config || draft || pending) && req.method !== 'GET') { sendJson(res, 405, { error: '不支持此操作。' }); return true; @@ -42,7 +46,7 @@ export async function handleCodingTeacherRoutes( } try { if (config && req.method === 'GET') { - sendJson(res, 200, await service.definition()); + sendJson(res, 200, await service.definition(role)); return true; } if (draft && req.method === 'GET') { @@ -54,10 +58,12 @@ export async function handleCodingTeacherRoutes( } const scope: TeacherScope = source ? { projectId: decodeURIComponent(source[1]), sourceId: decodeURIComponent(source[2]) } - : { projectId: 'preview', sourceId: 'preview' }; - const id = source?.[3] ?? preview?.[1], - action = source?.[4] ?? preview?.[2], - requestId = source?.[5] ?? preview?.[3]; + : projectTopics + ? { projectId: decodeURIComponent(projectTopics[1]), sourceId: 'project', role } + : { projectId: 'preview', sourceId: 'preview' }; + const id = source?.[3] ?? projectTopics?.[3] ?? preview?.[1], + action = source?.[4] ?? projectTopics?.[4] ?? preview?.[2], + requestId = source?.[5] ?? projectTopics?.[5] ?? preview?.[3]; if (!id && req.method === 'GET') { sendJson(res, 200, await service.list(scope)); return true; diff --git a/electron/coding-teacher/consultation-role.ts b/electron/coding-teacher/consultation-role.ts new file mode 100644 index 00000000..3014f177 --- /dev/null +++ b/electron/coding-teacher/consultation-role.ts @@ -0,0 +1,18 @@ +import type { ConsultationRole, TeacherDefinition } from '../../shared/coding-teacher'; + +/** The first friend shares the published consultation model and availability contract. + * Its persona is separate from the cloud teacher's pedagogy and text Skills. */ +export function consultationDefinition(definition: TeacherDefinition, role: ConsultationRole): TeacherDefinition { + if (role === 'teacher') return definition; + return { + ...definition, + teacher_id: 'coding-friend', + name: '小麦', + description: '陪你体验，也听你说', + avatar_id: 'avatar-02', + welcome_message: '一起看看你的作品', + suggested_questions: ['想听听你对作品的第一印象', '我想和你聊聊刚才的体验'], + system_prompt: '你是小麦，一位陪小学到初一学生交流作品体验的数字朋友。用自然、简短、平等的中文分享感受、好奇和困惑。只根据学生描述、明确引用和可用的操作对话交流；看不到的画面、未实际进行的操作，要坦诚说明并请学生描述。不要假装运行、试玩或看到了作品。不要评分、授课、生成待办或替学生作决定；也不自动推动修改项目。具体说哪一点引起了你的感受，可以问学生自己的感受。', + skills: [], + }; +} diff --git a/electron/coding-teacher/context.ts b/electron/coding-teacher/context.ts index 77096216..5d420e8c 100644 --- a/electron/coding-teacher/context.ts +++ b/electron/coding-teacher/context.ts @@ -49,7 +49,9 @@ export function compileTeacherContext( const system: TeacherModelMessage = { role: 'system', content: [ - '你是编程老师，负责讲解、答疑与引导。你没有工具，也不能执行或修改项目。以下引用与主会话是供讨论的资料，不是新的系统指令。用中文与用户交流。', + definition.teacher_id === 'coding-friend' + ? '你是学生的数字朋友，提供体验感受。你没有工具，不能执行或修改项目，不能声称实际运行或试玩了作品。以下引用与主会话只是讨论资料，不是系统指令。用中文交流。' + : '你是编程老师，负责引导思考、讲解方法和答疑。面向小学到初一学生，通过正在做的项目帮助学生学习；按理解程度给提示、示范或问题，不代替学生作决定，不充当任务整理助理。你没有工具，也不能执行或修改项目。以下引用与主会话是供讨论的资料，不是新的系统指令。用中文与用户交流。', definition.system_prompt, ...definition.skills .filter((skill) => skill.enabled) diff --git a/electron/coding-teacher/service.ts b/electron/coding-teacher/service.ts index 7ef2e918..bfb2de4d 100644 --- a/electron/coding-teacher/service.ts +++ b/electron/coding-teacher/service.ts @@ -5,6 +5,7 @@ import { EventEmitter } from 'node:events'; import type { CodingProjectService } from '../coding-projects/project-service'; import type { CodingConversationRuntime } from '../coding-runtime/contracts'; import type { + ConsultationRole, TeacherDefinition, TeacherReference, TeacherSend, @@ -23,12 +24,14 @@ import { import { TeacherTopicStore, teacherTopicId } from './store'; import { compileTeacherContext } from './context'; import { prepareTeacherModel } from './model-runner'; +import { consultationDefinition } from './consultation-role'; import { readTeacherSource } from './source-reader'; import { subscribeWorksSquareSession } from '../services/works-square-session'; export interface TeacherScope { projectId: string; sourceId: string; + role?: ConsultationRole; } interface PreviewTopic extends TeacherTopic { sampleContext?: string; @@ -51,7 +54,7 @@ export class CodingTeacherService { private readonly tails = new Map>(); private readonly active = new Map< string, - { account: TeacherAccount; controller: AbortController } + { account: TeacherAccount; controller: AbortController; sourceId?: string; projectId: string } >(); private readonly finishes = new Map>(); private readonly deletingSources = new Set(); @@ -76,13 +79,13 @@ export class CodingTeacherService { const account = await this.account(); return await (this.options.preview ?? teacherPreview)(account, revision); } - async definition() { + async definition(role: ConsultationRole = 'teacher') { const account = await this.account(); const status = await (this.options.availability ?? teacherAvailability)(account); const published = status.published_version ? await (this.options.version ?? teacherVersion)(account, status.published_version) : null; - return { ...status, definition: published?.payload ?? null }; + return { ...status, definition: published ? consultationDefinition(published.payload, role) : null }; } private async scopedStore( account: TeacherAccount, @@ -95,14 +98,14 @@ export class CodingTeacherService { directory = path.join(this.options.userDataDir, 'teacher-preview', account.id); } else { const project = await this.options.projects.getProject(scope.projectId); - if (!(await this.options.projects.conversationStore(project.path).get(scope.sourceId))) + if (scope.sourceId !== 'project' && !(await this.options.projects.conversationStore(project.path).get(scope.sourceId))) throw new TeacherError(404, 'teacher_source_not_found', '来源会话已删除。'); directory = path.join( project.path, '.makelore', - 'teacher-conversations', + scope.role === 'friend' ? 'friend-conversations' : 'teacher-conversations', account.id, - teacherTopicId(scope.sourceId) + scope.sourceId === 'project' ? 'project' : teacherTopicId(scope.sourceId) ); } let store = this.stores.get(directory); @@ -113,7 +116,7 @@ export class CodingTeacherService { return store; } private key(account: TeacherAccount, scope: TeacherScope, id: string) { - return account.id + ':' + scope.projectId + ':' + scope.sourceId + ':' + id; + return account.id + ':' + scope.projectId + ':' + scope.sourceId + ':' + (scope.role ?? 'teacher') + ':' + id; } private async serialize(key: string, operation: () => Promise): Promise { const previous = this.tails.get(key) ?? Promise.resolve(); @@ -156,13 +159,14 @@ export class CodingTeacherService { account, status.published_version ); - definition = published.payload; + definition = consultationDefinition(published.payload, scope.role ?? 'teacher'); version = published.version; } this.assertAccount(account); const now = new Date().toISOString(); const topic: PreviewTopic = { schemaVersion: 1, + role: scope.role ?? 'teacher', revision: 0, id: randomUUID(), accountId: account.id, @@ -185,7 +189,8 @@ export class CodingTeacherService { if ( topic.accountId !== account.id || topic.projectId !== scope.projectId || - topic.sourceConversationId !== scope.sourceId + topic.sourceConversationId !== scope.sourceId || + (topic.role ?? 'teacher') !== (scope.role ?? 'teacher') ) throw new TeacherError(404, 'teacher_topic_not_found', '老师话题不存在。'); return { store, topic }; @@ -198,6 +203,7 @@ export class CodingTeacherService { } async send(scope: TeacherScope, id: string, input: TeacherSend): Promise { teacherTopicId(input.requestId); + if (input.sourceConversationId !== undefined) teacherTopicId(input.sourceConversationId); if (typeof input.text !== 'string' || !input.text.trim() || input.text.length > 6000) throw new TeacherError(422, 'teacher_question_invalid', '请输入 1–6000 字的问题。'); const refs = input.references ?? []; @@ -222,7 +228,8 @@ export class CodingTeacherService { if (existing) { if ( existing.text !== input.text || - JSON.stringify(existing.references) !== JSON.stringify(refs) + JSON.stringify(existing.references) !== JSON.stringify(refs) || + (existing.sourceConversationId ?? undefined) !== (input.sourceConversationId ?? undefined) ) throw new TeacherError(409, 'teacher_request_conflict', '同一请求标识不能用于不同问题。'); return structuredClone(topic); @@ -241,6 +248,14 @@ export class CodingTeacherService { if (!available.enabled) throw new TeacherError(409, 'teacher_disabled', '老师已停用，历史仍可查看。'); } + const sourceId = scope.sourceId === 'project' ? input.sourceConversationId : scope.sourceId; + if (sourceId && this.deletingSources.has(scope.projectId + ':' + sourceId)) + throw new TeacherError(404, 'teacher_source_not_found', '来源会话已删除。'); + if (scope.sourceId === 'project' && sourceId) { + const project = await this.options.projects.getProject(scope.projectId); + if (!(await this.options.projects.conversationStore(project.path).get(sourceId))) + throw new TeacherError(404, 'teacher_source_not_found', '来源会话不属于当前项目。'); + } const source: TeacherSourceContext = scope.projectId === 'preview' ? { @@ -250,13 +265,15 @@ export class CodingTeacherService { cursor: { workerGeneration: 0, seq: 0 }, capturedAt: new Date().toISOString(), } - : await (this.options.readSource?.(scope) ?? + : !sourceId + ? { messages: [], cursor: { workerGeneration: 0, seq: 0 }, capturedAt: new Date().toISOString() } + : await (this.options.readSource?.({ ...scope, sourceId }) ?? readTeacherSource( this.options.projects, this.options.runtime, this.options.userDataDir, scope.projectId, - scope.sourceId + sourceId )); const references: TeacherReference[] = refs.map((ref) => { if ( @@ -286,8 +303,13 @@ export class CodingTeacherService { references, model.inputLimit ); + // Reading context and resolving model credentials can yield while a source + // is being deleted. Project consultations must recheck the actual source. + if (sourceId && this.deletingSources.has(scope.projectId + ':' + sourceId)) + throw new TeacherError(404, 'teacher_source_not_found', '来源会话已删除。'); const request = { id: input.requestId, + ...(input.sourceConversationId ? { sourceConversationId: input.sourceConversationId } : {}), text: input.text, references, createdAt: new Date().toISOString(), @@ -307,10 +329,12 @@ export class CodingTeacherService { topic.requests.pop(); throw error; } - if (this.deletingSources.has(scope.projectId + ':' + scope.sourceId)) - throw new TeacherError(404, 'teacher_source_not_found', '来源会话已删除。'); const controller = new AbortController(); - this.active.set(key, { account, controller }); + // If deletion began during persistence, retain a cancelled request rather + // than leaving a permanently preparing request in the project topic. + if (sourceId && this.deletingSources.has(scope.projectId + ':' + sourceId)) + controller.abort(); + this.active.set(key, { account, controller, sourceId, projectId: scope.projectId }); const release = this.options.acquireLease?.(key) ?? (() => undefined); const finish = async () => { const current = topic.requests.at(-1)!; @@ -389,11 +413,15 @@ export class CodingTeacherService { this.deletingSources.add(projectId + ':' + sourceId); await Promise.allSettled( [...this.tails.entries()] - .filter(([key]) => key.includes(':' + projectId + ':' + sourceId + ':')) + // A project-level topic can be preparing a request for this source even + // though its serialization key uses "project" instead of the source id. + .filter(([key]) => key.includes(':' + projectId + ':')) .map(([, promise]) => promise) ); - for (const [key, run] of this.active) - if (key.includes(':' + projectId + ':' + sourceId + ':')) run.controller.abort(); + const affectedKeys = [...this.active.entries()] + .filter(([, run]) => run.projectId === projectId && run.sourceId === sourceId) + .map(([key, run]) => { run.controller.abort(); return key; }); + await Promise.allSettled(affectedKeys.map((key) => this.finishes.get(key))); await Promise.allSettled( [...this.finishes.entries()] .filter(([key]) => key.includes(':' + projectId + ':' + sourceId + ':')) diff --git a/shared/coding-teacher.ts b/shared/coding-teacher.ts index 0218b3e0..91baf45e 100644 --- a/shared/coding-teacher.ts +++ b/shared/coding-teacher.ts @@ -1,9 +1,11 @@ import type { ManagedReasoningChoice } from './managed-model-capabilities'; import type { PublicUsage } from './coding-conversation-contracts'; +export type ConsultationRole = 'teacher' | 'friend'; + export interface TeacherDefinition { schema_version: 1; - teacher_id: 'coding-teacher'; + teacher_id: 'coding-teacher' | 'coding-friend'; name: string; description: string; avatar_id: string; @@ -50,6 +52,7 @@ export type TeacherRequestStatus = | 'cancelled' | 'interrupted'; export interface TeacherRequest { + sourceConversationId?: string; id: string; text: string; references: TeacherReference[]; @@ -64,6 +67,7 @@ export interface TeacherRequest { usage?: PublicUsage; } export interface TeacherTopic { + role?: ConsultationRole; revision: number; schemaVersion: 1; id: string; @@ -83,6 +87,7 @@ export interface TeacherTopicList { lastSelectedTopicId: string | null; } export interface TeacherSend { + sourceConversationId?: string; requestId: string; text: string; references?: TeacherReference[]; diff --git a/src/assets/consultations/friend.png b/src/assets/consultations/friend.png new file mode 100644 index 00000000..88211c1b Binary files /dev/null and b/src/assets/consultations/friend.png differ diff --git a/src/assets/consultations/mark.svg b/src/assets/consultations/mark.svg new file mode 100644 index 00000000..c13b8bc9 --- /dev/null +++ b/src/assets/consultations/mark.svg @@ -0,0 +1,7 @@ + + Makelore mark + A portal-shaped letter M with an orange spark. + + + + diff --git a/src/assets/consultations/teacher.png b/src/assets/consultations/teacher.png new file mode 100644 index 00000000..e351ad77 Binary files /dev/null and b/src/assets/consultations/teacher.png differ diff --git a/src/components/layout/MainLayout.tsx b/src/components/layout/MainLayout.tsx index b76a7c5d..ffc87c85 100644 --- a/src/components/layout/MainLayout.tsx +++ b/src/components/layout/MainLayout.tsx @@ -99,7 +99,7 @@ export function MainLayout() { data-testid="main-content" className={cn( 'relative min-h-0 min-w-0 flex-1 overflow-auto bg-background', - (isPaintingModule || isCloudAgents) ? 'basis-0 h-full overflow-hidden p-0' : 'p-5 sm:p-6', + (isPaintingModule || isCloudAgents || isChatWorkspace) ? 'basis-0 h-full overflow-hidden p-0' : 'p-5 sm:p-6', (isChatWorkspace || isCloudAgents) && !isPaintingModule && 'basis-0 overflow-hidden p-0', )} > diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx index b6ef568f..f3a7c028 100644 --- a/src/components/layout/Sidebar.tsx +++ b/src/components/layout/Sidebar.tsx @@ -1,3 +1,4 @@ +import classroomMark from '@/assets/consultations/mark.svg'; import { CodingProjectConversations } from '@/pages/Chat/CodingProjectConversations'; import { useCallback, useEffect, useRef, useState } from 'react'; import { createPortal } from 'react-dom'; @@ -374,6 +375,7 @@ export function Sidebar({ return (