Skip to content

fix(desktop): purge engineering-speak from user-facing copy (detail round 5) #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jackwener merged 1 commit into from
Jul 8, 2026
Merged

fix(desktop): purge engineering-speak from user-facing copy (detail round 5) #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions apps/desktop/src/renderer/derive-turn-lineage-badges.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@

import type { TurnLineageBadge } from '@maka/ui';

/** Strip the `turn-` id prefix before truncating, matching the view-model. */
function shortId(turnId: string): string {
return turnId.replace(/^turn-/, '').slice(0, 6);
}

export interface TurnLineageBadgeInput {
turnId: string;
/** Legacy retry lineage (old data). Falls back behind regenerated. */
Expand All @@ -39,8 +34,8 @@ export function deriveTurnLineageBadges(input: TurnLineageBadgeInput): TurnLinea
if (forwardFrom && input.existsTurn(forwardFrom)) {
badges.push({
id: `forward-regen-${input.turnId}`,
label: `重新生成自 turn ${shortId(forwardFrom)}`,
tooltip: `保留旧回答，重新生成的并行回答`,
label: `重新生成自旧回答`,
tooltip: `这是重新生成的并行回答，点击查看被保留的旧回答`,
targetTurnId: forwardFrom,
direction: 'forward',
});
Expand All @@ -50,8 +45,8 @@ export function deriveTurnLineageBadges(input: TurnLineageBadgeInput): TurnLinea
if (reverseTo && input.existsTurn(reverseTo)) {
badges.push({
id: `reverse-regen-${input.turnId}`,
label: `已重新生成 → turn ${shortId(reverseTo)}`,
tooltip: `跳转到对此回答的重新生成`,
label: `已重新生成 → 新回答`,
tooltip: `点击跳转到重新生成的新回答`,
targetTurnId: reverseTo,
direction: 'reverse',
});
Expand Down
1 change: 1 addition & 0 deletions apps/desktop/src/renderer/settings/about-settings-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ export function AboutSettingsPage() {
title="工作区"
detail="会话、设置和凭据全部留在本地这条路径下。"
value={info.workspacePath}
mono
/>
<SettingRow
title="存储"
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src/renderer/settings/general-settings-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ function GeneralDefaultsCard(props: {
<div className="settingsRow" data-control-width="select">
<div>
<strong>默认模型</strong>
<small>新对话默认使用的具体模型；按连接分组，不显示 OAuth 账号邮箱。</small>
<small>新对话默认使用的模型。</small>
</div>
{/* Shared searchable picker with the composer's model switcher
(ModelPicker in @maka/ui) so the grouped list, provider marks,
Expand Down
Loading