Skip to content

Unify conversation home and product copy for non-IT users - #24

Merged
XYAIStudio merged 3 commits into
mainfrom
cursor/product-coherence-ux-ecb5
Sep 16, 2026
Merged

XYAIStudio merged 3 commits into
mainfrom
cursor/product-coherence-ux-ecb5

Conversation

@XYAIStudio

@XYAIStudio XYAIStudio commented Sep 16, 2026 •

Copy link
Copy Markdown
Owner

Summary

Product-coherence pass for non-IT users. One conversation mental model, locked naming glossary, desktop first-run access to 模型/知识库, and visible Organization receipts.

Rebased onto latest main (ff41f6e2, after #26 → #25 → #27 → #28). Kept #26 native folder picker, #25 knowledge mount-first home, #27 local model runtime, and #28 Organization operational copy. Kept this PR’s unified conversation home and locked glossary in chat/group/experts.

Locked glossary

Term Meaning
员工 / Employees Already assigned to a department (openXYOS staffing).
同事 / Colleagues Same-organization peers — use this in chat / group UX.
专家 / 智能助手 / Experts / smart helpers Helpers not yet placed in a department.

Do not call departmental staff 专家. Do not call unassigned helpers 员工.

Organization produce/pack/import verbs follow #28 (produce 专家; import 员工 → 同事; pack 专家 → 员工). Chat and group pickers say 同事或智能助手.

Target branch

  • Base is main
  • Base is develop

Type of change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation

Seams fixed

Seam What changed
Dual conversation homes Sidebar 对话 opens /projects (工作区「对话」标签). 工作区 opens /projects?view=projects. Bare /chat redirects to that list unless the navigation has chat intent.
Naming Locked glossary above. Chat/group pickers say 同事或智能助手. Organization page keeps #28 verbs.
Personalization #22 tab wrap kept. Empty states say the next step.
Permission gates Desktop local guest can open 模型 and 知识库.
Org receipts Import / pack / loop show 刚才的结果. Timeline uses 是/否. #26 folder picker and #23 landed counts kept.
Models #27 start/deps/scan kept. After install, try to register and point to 对话.
KB #25 mount-first home kept.

Test plan

  • Rebase onto origin/main (ff41f6e2); git merge-tree shows no conflicts
  • CI on this head
  • Desktop WebView2 first-run not run here

Checklist

  • Updated CHANGELOG.md (Unreleased)
  • Do not merge
  • Do not upload or replace Release assets
Open in Web Open in Cursor 

@XYAIStudio
XYAIStudio marked this pull request as ready for review September 16, 2026 04:25
@XYAIStudio

Copy link
Copy Markdown
Owner Author

Ship blocker (executor): CONFLICTING after #23 merge

main advanced with squash-merge of #23 (1dd99b1fb64990bbdb21496c87639c929773f890). PR #24 is mergeable=false / mergeable_state=dirty (behind_by=1).

Conflict files

Need peer rebase (or coordinator resolve) onto main, then re-run CI. Executor will not gh pr merge while CONFLICTING.

@cursor
cursor Bot force-pushed the cursor/product-coherence-ux-ecb5 branch from 71ac8ac to 9cb20b9 Compare September 16, 2026 05:14
@XYAIStudio

Copy link
Copy Markdown
Owner Author

Ship blocker (executor): still CONFLICTING >25 min after #26

main now includes squash-merge of #26 (3ca75481dfbe…, openXYOS NSIS extract + native folder picker). PR #24 remains CONFLICTING/DIRTY (head 9cb20b982d, no rebase since ~05:14Z).

Conflict likely overlaps dashboard/src/locales/{en,zh}.json and dashboard/src/pages/Organization/index.tsx (folder-picker / org copy from #26 vs chat-home / glossary from #24).

Need peer rebase onto current main, then green CI. Executor will not merge while CONFLICTING.

Meanwhile shipped (skipped #24): #26 → #25 → #27 → #28; Windows v0.0.1 refresh building on ff41f6e2 (run 35063158934).

cursoragent and others added 3 commits September 16, 2026 06:22
Sidebar 对话 now opens the workspace conversation list (same store as
项目/任务/对话区). Desktop local guests can reach Models and Knowledge.
Organization import/push shows a landed receipt with 是/否 instead of
true/false. Naming: 专家 vs 员工 vs 专项助手.

Co-authored-by: XYAI Labs <haoboy8@gmail.com>
Co-authored-by: XYAI Labs <haoboy8@gmail.com>
Employees are departmental staff. Colleagues are same-org peers in
chat and group UX. Experts / smart helpers are not yet assigned to
a department. Do not call staff 专家 or unassigned helpers 员工.

Co-authored-by: XYAI Labs <haoboy8@gmail.com>
@cursor
cursor Bot force-pushed the cursor/product-coherence-ux-ecb5 branch from 9cb20b9 to bd06e44 Compare September 16, 2026 06:23
@XYAIStudio
XYAIStudio merged commit 484f970 into main Sep 16, 2026
5 checks passed
@XYAIStudio
XYAIStudio deleted the cursor/product-coherence-ux-ecb5 branch September 16, 2026 06:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants