Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(session): 长耗时换算为小时和天并始终保留分钟 (#5439)

Chris Zhangd2e3da04f295
diff --git a/apps/desktop/src/renderer/__tests__/runningStatusBarSuppression.test.tsx b/apps/desktop/src/renderer/__tests__/runningStatusBarSuppression.test.tsx
index b96c18e824..0857964e55 100644
--- a/apps/desktop/src/renderer/__tests__/runningStatusBarSuppression.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/runningStatusBarSuppression.test.tsx
@@ -5,6 +5,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
import { cleanup, fireEvent, render, screen } from '@testing-library/react';
import ts from 'typescript';
import { afterEach, expect, it, vi } from 'vitest';
+import { formatSessionDuration } from '@/lib/sessionDurationFormat';
import {
RunningTokenRatePopover,
useRunningTokenRateHistory,
@@ -61,6 +62,7 @@ const deps = {
formatRecentOutputTokenRate,
formatRunningTokenCount,
resolveRunningUsageMeta,
+ formatSessionDuration,
};
const RunningStatusBar = new Function(
'deps',
diff --git a/apps/desktop/src/renderer/components/chat/AgentTaskCard.tsx b/apps/desktop/src/renderer/components/chat/AgentTaskCard.tsx
index c4e9937533..bc07add404 100644
--- a/apps/desktop/src/renderer/components/chat/AgentTaskCard.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentTaskCard.tsx
@@ -1,3 +1,5 @@
+import type { TFunction } from 'i18next';
+import { formatSessionDuration } from '@/lib/sessionDurationFormat';
import { Fragment, useEffect, useMemo, useCallback, useState } from 'react';
import {
AlertCircle,
@@ -111,14 +113,10 @@ function detailText(...values: Array<string | undefined>): string | undefined {
return undefined;
}
-function formatDuration(ms: number | undefined): string | undefined {
+function formatDuration(ms: number | undefined, t?: TFunction): string | undefined {
if (typeof ms !== 'number' || !Number.isFinite(ms) || ms < 0) return undefined;
if (ms < 1000) return `${ms}ms`;
- const seconds = Math.round(ms / 1000);
- if (seconds < 60) return `${seconds}s`;
- const minutes = Math.floor(seconds / 60);
- const rest = seconds % 60;
- return rest > 0 ? `${minutes}m ${rest}s` : `${minutes}m`;
+ return formatSessionDuration(ms, t);
}
function statusIcon(status: AgentTaskUpdate['status']) {
@@ -342,6 +340,7 @@ export function AgentTaskCard({
?? (startedAtMs !== undefined && endedAtMs !== undefined && endedAtMs >= startedAtMs
? endedAtMs - startedAtMs
: undefined),
+ t,
);
const bashCommand = isBash ? readInputString(toolCall?.toolInput, ['command']) : undefined;
const providerLabel = isWorkflow
diff --git a/apps/desktop/src/renderer/components/chat/AgentTaskLiveDetails.tsx b/apps/desktop/src/renderer/components/chat/AgentTaskLiveDetails.tsx
index 5dfb112e2d..3668c26906 100644
--- a/apps/desktop/src/renderer/components/chat/AgentTaskLiveDetails.tsx
+++ b/apps/desktop/src/renderer/components/chat/AgentTaskLiveDetails.tsx
@@ -1,3 +1,5 @@
+import type { TFunction } from 'i18next';
+import { formatSessionDuration } from '@/lib/sessionDurationFormat';
import { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
@@ -11,19 +13,13 @@ const OUTPUT_TAIL_POLL_MS = 2000;
/** 展开区最多显示的输出行数。 */
export const OUTPUT_TAIL_MAX_LINES = 12;
-/**
- * 运行时长(ms)→ 紧凑展示,始终显示秒:`9s` / `5m 09s` / `2h 05m 09s`。
- * 秒(及小时档的分)补零两位,避免每秒 tick 时宽度抖动。
- */
-export function formatTaskElapsed(ms: number): string {
- const total = Math.max(0, Math.floor(ms / 1000));
- const s = total % 60;
- const m = Math.floor(total / 60) % 60;
- const h = Math.floor(total / 3600);
- const ss = String(s).padStart(2, '0');
- if (h > 0) return `${h}h ${String(m).padStart(2, '0')}m ${ss}s`;
- if (m > 0) return `${m}m ${ss}s`;
- return `${s}s`;
+/** 运行时长折算小时、天后保留分钟,低位补零以保持计时宽度稳定。 */
+export function formatTaskElapsed(ms: number, t?: TFunction): string {
+ return formatSessionDuration(Math.floor(ms / 1000) * 1000, t, {
+ minimumSeconds: 0,
+ alwaysShowRemainder: true,
+ padRemainder: true,
+ });
}
export function parseTaskTimestamp(value: string | undefined): number | undefined {
@@ -53,7 +49,7 @@ export function RunningElapsed({ startedAtMs }: { startedAtMs: number }) {
const now = useNowTicker(true);
return (
<span data-agent-task-elapsed="running" className="tabular-nums">
- {t('chat.agentTask.runningFor', { duration: formatTaskElapsed(now - startedAtMs) })}
+ {t('chat.agentTask.runningFor', { duration: formatTaskElapsed(now - startedAtMs, t) })}
</span>
);
}
@@ -174,7 +170,7 @@ export function BackgroundCommandDetails({
? t('chat.agentTask.noOutputYet')
: t('chat.agentTask.recentOutput', {
// 读取端算的 ageMs + 本机收到之后经过的时间:两段各自同一时钟,不跨设备相减。
- time: formatTaskElapsed(tail.ageMs + Math.max(0, now - snapshot.receivedAtMs)),
+ time: formatTaskElapsed(tail.ageMs + Math.max(0, now - snapshot.receivedAtMs), t),
})}
</p>
{lines.length > 0 && (
diff --git a/apps/desktop/src/renderer/components/chat/SystemCard.tsx b/apps/desktop/src/renderer/components/chat/SystemCard.tsx
index 99c3253819..07690226be 100644
--- a/apps/desktop/src/renderer/components/chat/SystemCard.tsx
+++ b/apps/desktop/src/renderer/components/chat/SystemCard.tsx
@@ -1,3 +1,4 @@
+import { formatCompactionDuration, formatSessionDuration, formatShellDuration } from '@/lib/sessionDurationFormat';
import { Button } from '@/components/ui/button';
import { BotSessionTaskResultCard } from '@/features/bots/BotSessionTaskResultCard';
/**
@@ -770,7 +771,9 @@ function CompactBoundaryCard({ data }: { data?: Record<string, unknown> }) {
// post_tokens / duration_ms fields.
const stats: string[] = [];
if (saved > 0) stats.push(t('chat.systemCard.compact.savedTokens', { tokens: fmtTokens(saved) }));
- if (durationMs > 0) stats.push(`${(durationMs / 1000).toFixed(1)}s`);
+ if (durationMs > 0) {
+ stats.push(formatCompactionDuration(durationMs, t));
+ }
const triggerLabel =
trigger === 'manual' ? t('chat.systemCard.compact.manual') : t('chat.systemCard.compact.auto');
@@ -801,14 +804,6 @@ function CompactBoundaryCard({ data }: { data?: Record<string, unknown> }) {
* 它不是要读的信息面板,而是会话里的一条达成标记("目标已达成 · N 轮 · 耗时 X")。
* 由 mapServerMessages 从持久化的 agentMeta.goalCompletion 派生(重开会话仍在)。
*/
-function fmtGoalDuration(ms: number): string {
- const totalSec = Math.max(0, Math.round(ms / 1000));
- if (totalSec < 60) return `${totalSec}s`;
- const min = Math.floor(totalSec / 60);
- const sec = totalSec % 60;
- return sec > 0 ? `${min}m ${sec}s` : `${min}m`;
-}
-
function GoalCompleteCard({ data }: { data?: Record<string, unknown> }) {
const { t } = useTranslation();
const turnsUsed = typeof data?.turnsUsed === 'number' ? data.turnsUsed : 0;
@@ -816,7 +811,7 @@ function GoalCompleteCard({ data }: { data?: Record<string, unknown> }) {
const reason = typeof data?.reason === 'string' ? data.reason : '';
const label = t('goal.complete.record', {
turns: turnsUsed,
- duration: fmtGoalDuration(elapsedMs),
+ duration: formatSessionDuration(elapsedMs, t, { minimumSeconds: 0 }),
});
return (
@@ -1411,6 +1406,7 @@ export function SystemCard({
// apps/desktop/src/main/commands/builtins.ts:CmdExecutionResult。
function CmdCard({ data }: { data?: Record<string, unknown> }) {
+ const { t } = useTranslation();
const cmdLine = (data?.cmdLine as string) ?? '';
const cwd = (data?.cwd as string) ?? '';
const exitCode = (data?.exitCode as number) ?? -1;
@@ -1458,7 +1454,9 @@ function CmdCard({ data }: { data?: Record<string, unknown> }) {
<div className="flex items-center gap-2">
<span className={cn(titleClass, 'mb-0')}>$ Shell</span>
{statusChip}
- <span className={cn(labelClass, 'text-12 ml-auto')}>{elapsedMs}ms</span>
+ <span className={cn(labelClass, 'text-12 ml-auto')}>
+ {formatShellDuration(elapsedMs, t)}
+ </span>
</div>
<pre className={cmdLineClass}>{cmdLine || '<empty>'}</pre>
diff --git a/apps/desktop/src/renderer/components/chat/ThinkingCard.tsx b/apps/desktop/src/renderer/components/chat/ThinkingCard.tsx
index a696b54887..744a219495 100644
--- a/apps/desktop/src/renderer/components/chat/ThinkingCard.tsx
+++ b/apps/desktop/src/renderer/components/chat/ThinkingCard.tsx
@@ -1,3 +1,5 @@
+import { formatSessionDuration as formatDuration } from '@/lib/sessionDurationFormat';
+import { useTranslation } from 'react-i18next';
/**
* ThinkingCard
* ---------------------------------------------------------------------------
@@ -65,16 +67,10 @@ interface ThinkingCardProps {
}
/**
- * Format ms as `Xs` for short durations, or `Xm Ys` for longer.
+ * Format ms with hours/days for long durations, always retaining minutes.
* Exported for reuse by WorkGroupBlock (same display convention).
*/
-export function formatDuration(ms: number): string {
- const totalSec = Math.max(1, Math.round(ms / 1000));
- if (totalSec < 60) return `${totalSec}s`;
- const m = Math.floor(totalSec / 60);
- const s = totalSec % 60;
- return s === 0 ? `${m}m` : `${m}m ${s}s`;
-}
+export { formatDuration };
/** Shared body wrapper — left-railed container mirroring AgentActionsBlock. */
function BodyRail({ children }: { children: React.ReactNode }) {
@@ -100,6 +96,7 @@ export function ThinkingCard({
aborted,
blockKey,
}: ThinkingCardProps) {
+ const { t } = useTranslation();
// Live elapsed counter while streaming. Re-renders every 500ms.
const [elapsedMs, setElapsedMs] = useState(0);
useEffect(() => {
@@ -191,7 +188,7 @@ export function ThinkingCard({
</div>
<div className="flex-1" />
<span className="font-mono text-12 text-[var(--msg-tool-card-chevron)]">
- {formatDuration(elapsedMs)}
+ {formatDuration(elapsedMs, t)}
</span>
<ChevronRight
size={14}
@@ -223,9 +220,9 @@ export function ThinkingCard({
// ── Final / aborted variant ───────────────────────────────────────────
// aborted 是 Codex 专属(turn_aborted 时 reasoning 提前结束),Claude 不传。
- const summary = aborted
- ? `Thought for ${formatDuration(durationMs ?? 0)} (aborted)`
- : `Thought for ${formatDuration(durationMs ?? 0)}`;
+ const summary = t(aborted ? 'chat.thinking.aborted' : 'chat.thinking.completed', {
+ duration: formatDuration(durationMs ?? 0, t),
+ });
return (
<div data-render-item-key={renderItemKey} className="flex w-full justify-start">
<div className="w-full">
diff --git a/apps/desktop/src/renderer/components/chat/WorkGroupBlock.tsx b/apps/desktop/src/renderer/components/chat/WorkGroupBlock.tsx
index 8854d96c9e..af716c736b 100644
--- a/apps/desktop/src/renderer/components/chat/WorkGroupBlock.tsx
+++ b/apps/desktop/src/renderer/components/chat/WorkGroupBlock.tsx
@@ -356,7 +356,7 @@ export function WorkGroupBlock({
: isStreaming
? t('chat.workGroup.working')
: durationMs !== undefined
- ? t('chat.workGroup.worked', { duration: formatDuration(durationMs) })
+ ? t('chat.workGroup.worked', { duration: formatDuration(durationMs, t) })
: t('chat.workGroup.workDetails');
const explorationSummary =
!compact && activityProjection?.isPureExploration
@@ -415,7 +415,7 @@ export function WorkGroupBlock({
<div className="flex-1" />
{!compact && isStreaming && startedAtMs !== undefined && (
<span className="font-mono text-12 text-[var(--msg-tool-card-chevron)]">
- {formatDuration(elapsedMs)}
+ {formatDuration(elapsedMs, t)}
</span>
)}
{canToggle && (
diff --git a/apps/desktop/src/renderer/components/chat/__tests__/AgentTaskCardBackgroundCommand.test.tsx b/apps/desktop/src/renderer/components/chat/__tests__/AgentTaskCardBackgroundCommand.test.tsx
index 5869d715d8..4443fd928c 100644
--- a/apps/desktop/src/renderer/components/chat/__tests__/AgentTaskCardBackgroundCommand.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/__tests__/AgentTaskCardBackgroundCommand.test.tsx
@@ -229,7 +229,8 @@ describe('background command formatting', () => {
it('pads elapsed seconds so the running label does not jitter', () => {
expect(formatTaskElapsed(9_400)).toBe('9s');
expect(formatTaskElapsed(309_000)).toBe('5m 09s');
- expect(formatTaskElapsed(7_509_000)).toBe('2h 05m 09s');
+ expect(formatTaskElapsed(7_509_000)).toBe('2h 05m');
+ expect(formatTaskElapsed(183_845_000)).toBe('2d 03h 04m');
});
it('keeps only the last lines and trims trailing blank lines', () => {
diff --git a/apps/desktop/src/renderer/components/new-chat/GoalIndicator.tsx b/apps/desktop/src/renderer/components/new-chat/GoalIndicator.tsx
index aa78edd234..11d1b3a5b7 100644
--- a/apps/desktop/src/renderer/components/new-chat/GoalIndicator.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/GoalIndicator.tsx
@@ -1,3 +1,5 @@
+import type { TFunction } from 'i18next';
+import { formatSessionDuration } from '@/lib/sessionDurationFormat';
import { Button } from '@/components/ui/button';
/**
* GoalIndicator —— 会话内 /goal 进行中的状态 chip(composer 上方)。
@@ -30,20 +32,13 @@ function isAttentionStatus(status: GoalStatusPayload['status']): boolean {
return status === 'blocked' || status === 'budgetLimited' || status === 'usageLimited';
}
-/**
- * 运行时长(ms)→ 紧凑展示,**始终显示秒**(每秒 tick):
- * <60s → `9s`;<60m → `5m 09s`;否则 → `2h 05m 09s`。
- * 秒(及小时档的分)零补两位,避免位数变化导致每秒宽度抖动。
- */
-function formatElapsed(ms: number): string {
- const total = Math.max(0, Math.floor(ms / 1000));
- const s = total % 60;
- const m = Math.floor(total / 60) % 60;
- const h = Math.floor(total / 3600);
- const ss = String(s).padStart(2, '0');
- if (h > 0) return `${h}h ${String(m).padStart(2, '0')}m ${ss}s`;
- if (m > 0) return `${m}m ${ss}s`;
- return `${s}s`;
+/** 运行时长折算小时、天后保留分钟,低位补零以保持计时宽度稳定。 */
+function formatElapsed(ms: number, t?: TFunction): string {
+ return formatSessionDuration(Math.floor(ms / 1000) * 1000, t, {
+ minimumSeconds: 0,
+ alwaysShowRemainder: true,
+ padRemainder: true,
+ });
}
/** 限额重置时刻 → 本地"时:分"(跨天则带日期);拿不到返回空。 */
@@ -277,7 +272,7 @@ export function GoalIndicator({ sessionId }: GoalIndicatorProps): React.ReactEle
style={{ color: 'var(--text-tertiary)' }}
title={t('goal.elapsedTooltip')}
>
- {formatElapsed(elapsedMs)}
+ {formatElapsed(elapsedMs, t)}
</span>
)}
<GoalEditor sessionId={sessionId} goal={goal} />
diff --git a/apps/desktop/src/renderer/features/bots/BotCollaborationCard.tsx b/apps/desktop/src/renderer/features/bots/BotCollaborationCard.tsx
index d1d1049938..499475e3f0 100644
--- a/apps/desktop/src/renderer/features/bots/BotCollaborationCard.tsx
+++ b/apps/desktop/src/renderer/features/bots/BotCollaborationCard.tsx
@@ -26,7 +26,7 @@ import { BOT_TASK_CARD_CLASS, BotTaskCardHeader } from './BotTaskCardHeader';
/**
* 「用时」是说给人听的,不是给日志看的:中文界面里 `8s` 和「用时」并排是两套语言。
- * 单位走 i18n,按秒 / 分 / 时+分显示。
+ * 单位走 i18n,按秒 / 分 / 时+分 / 天+时+分显示。
*/
export function formatBotCollaborationDuration(
t: (key: string, options?: Record<string, unknown>) => string,
@@ -37,6 +37,13 @@ export function formatBotCollaborationDuration(
if (seconds < 60) return t('bots.collab.duration.seconds', { n: seconds });
const minutes = Math.floor(seconds / 60);
if (minutes < 60) return t('bots.collab.duration.minutes', { n: minutes });
+ if (seconds >= 86_400) {
+ return t('bots.collab.duration.daysHoursMinutes', {
+ d: Math.floor(seconds / 86_400),
+ h: Math.floor((seconds % 86_400) / 3_600),
+ m: minutes % 60,
+ });
+ }
return t('bots.collab.duration.hoursMinutes', {
h: Math.floor(minutes / 60),
m: minutes % 60,
diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
index 75208afbe1..c2a9a3f28f 100644
--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
@@ -1,3 +1,4 @@
+import { formatSessionDuration } from '@/lib/sessionDurationFormat';
import { shouldShowOpenPathError } from '../../../shared/openPathResult';
import { shouldShowFailedScheduleNotice } from '@cindy/maker-shared/schedule-model';
/**
@@ -6069,9 +6070,10 @@ function RunningStatusBar({
// the icon answers "what is it doing right now".
const isCompacting = typeof status === 'string' && status.toLowerCase().startsWith('compact');
- const minutes = Math.floor(elapsed / 60);
- const seconds = elapsed % 60;
- const elapsedText = minutes > 0 ? `${minutes}m ${seconds}s` : `${seconds}s`;
+ const elapsedText = formatSessionDuration(elapsed * 1000, t, {
+ minimumSeconds: 0,
+ alwaysShowRemainder: true,
+ });
// Cadenced shimmer(DESIGN.md §14.4):status-shimmer 已是一次性动画,这里在
// 每次真实动静(状态文案变化 / token 计数推进)时通过 key 重挂载触发一次呼吸。
diff --git a/apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/BackgroundTasksBody.tsx b/apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/BackgroundTasksBody.tsx
index 0fc936f642..47af9ad51d 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/BackgroundTasksBody.tsx
+++ b/apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/BackgroundTasksBody.tsx
@@ -1,3 +1,5 @@
+import type { TFunction } from 'i18next';
+import { formatSessionDuration } from '@/lib/sessionDurationFormat';
/**
* BackgroundTasksBody —— 「后台任务」tab 的内容区。
*
@@ -168,15 +170,11 @@ function statusIcon(status: string): LucideIcon {
return LoaderCircle;
}
-/** 毫秒 → 紧凑时长文案(与 AgentTaskCard 同口径;该实现未导出,此处内联)。 */
-function formatDuration(ms: number | undefined): string | undefined {
+/** 与 AgentTaskCard 共用长耗时换算,保留亚秒精度。 */
+function formatDuration(ms: number | undefined, t?: TFunction): string | undefined {
if (typeof ms !== 'number' || !Number.isFinite(ms) || ms < 0) return undefined;
if (ms < 1000) return `${ms}ms`;
- const seconds = Math.round(ms / 1000);
- if (seconds < 60) return `${seconds}s`;
- const minutes = Math.floor(seconds / 60);
- const rest = seconds % 60;
- return rest > 0 ? `${minutes}m ${rest}s` : `${minutes}m`;
+ return formatSessionDuration(ms, t);
}
/** workflow 行副标题:workflow_agent 条目 done/error 计数 / 总数。 */
@@ -310,7 +308,7 @@ function TaskRow({
}
}
const usage = item.update?.usage;
- const duration = formatDuration(usage?.durationMs);
+ const duration = formatDuration(usage?.durationMs, t);
if (duration) parts.push(duration);
if (typeof usage?.totalTokens === 'number') {
parts.push(
diff --git a/apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowProgressTree.tsx b/apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowProgressTree.tsx
index edee633225..d8ba988b52 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowProgressTree.tsx
+++ b/apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowProgressTree.tsx
@@ -92,7 +92,7 @@ export function WorkflowProgressTree({ model }: WorkflowProgressTreeProps) {
metaParts.push(t('chat.agentTask.toolUses', { count: aggregate.totalToolCalls }));
}
if (typeof aggregate.durationMs === 'number') {
- metaParts.push(formatDuration(aggregate.durationMs));
+ metaParts.push(formatDuration(aggregate.durationMs, t));
}
const stripCells = model.groups.flatMap((group) =>
@@ -193,7 +193,7 @@ function AgentRow({ row }: { row: WorkflowTreeAgentRow }) {
)}
{isDoneState && typeof row.durationMs === 'number' && (
<span className="shrink-0 text-11 leading-4 text-[var(--text-tertiary)]">
- {formatDuration(row.durationMs)}
+ {formatDuration(row.durationMs, t)}
</span>
)}
</div>
diff --git a/apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentFormat.ts b/apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentFormat.ts
index 7df426fd60..041777a508 100644
--- a/apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentFormat.ts
+++ b/apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentFormat.ts
@@ -1,3 +1,4 @@
+import { formatSessionDuration } from '@/lib/sessionDurationFormat';
/**
* Presentation helpers shared by the Subagent list and detail views.
*
@@ -35,13 +36,9 @@ export function statusIcon(status: SubagentDisplayStatus): LucideIcon {
return LoaderCircle;
}
-export function formatDuration(ms: number | undefined): string | undefined {
+export function formatDuration(ms: number | undefined, t?: TFunction): string | undefined {
if (typeof ms !== 'number' || !Number.isFinite(ms) || ms < 0) return undefined;
- const seconds = Math.max(1, Math.round(ms / 1000));
- if (seconds < 60) return `${seconds}s`;
- const minutes = Math.floor(seconds / 60);
- const rest = seconds % 60;
- return rest > 0 ? `${minutes}m ${rest}s` : `${minutes}m`;
+ return formatSessionDuration(ms, t);
}
export function providerLabel(provider: SubagentProvider): string {
@@ -74,7 +71,7 @@ export function usageMetadata(
options: { includeCost?: boolean } = {},
): string[] {
const parts: string[] = [];
- const duration = formatDuration(usage?.durationMs);
+ const duration = formatDuration(usage?.durationMs, t);
if (duration) parts.push(duration);
if (typeof usage?.totalTokens === 'number' && usage.totalTokens > 0) {
parts.push(
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index f4cc8a38a8..5dd2662f22 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -6718,6 +6718,8 @@
"usageDetails": {
"durationSeconds": "{{value}}s",
"durationMinutesSeconds": "{{minutes}}m {{seconds}}s",
+ "durationHoursMinutes": "{{hours}}h {{minutes}}m",
+ "durationDaysHoursMinutes": "{{days}}d {{hours}}h {{minutes}}m",
"performanceLine": "TPS {{rate}} · Time {{duration}}",
"performanceRateLine": "TPS {{rate}}",
"timeLine": "Time {{duration}}",
@@ -8239,7 +8241,8 @@
"duration": {
"seconds": "{{n}}s",
"minutes": "{{n}} min",
- "hoursMinutes": "{{h}} h {{m}} min"
+ "hoursMinutes": "{{h}} h {{m}} min",
+ "daysHoursMinutes": "{{d}}d {{h}}h {{m}}m"
},
"viewResult": "View Result",
"noWrittenResult": "No written result."
@@ -9649,6 +9652,10 @@
"noFeedback": "(no feedback provided)",
"cancelled": "Cancelled"
},
+ "thinking": {
+ "completed": "Thought for {{duration}}",
+ "aborted": "Thought for {{duration}} (aborted)"
+ },
"workGroup": {
"working": "Working…",
"worked": "Worked for {{duration}}",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 8c483578e6..8d80f80842 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -6716,6 +6716,8 @@
"usageDetails": {
"durationSeconds": "{{value}}秒",
"durationMinutesSeconds": "{{minutes}}分 {{seconds}}秒",
+ "durationHoursMinutes": "{{hours}}時間{{minutes}}分",
+ "durationDaysHoursMinutes": "{{days}}日{{hours}}時間{{minutes}}分",
"performanceLine": "速度 {{rate}} トークン/秒 · 時間 {{duration}}",
"performanceRateLine": "速度 {{rate}} トークン/秒",
"timeLine": "時間 {{duration}}",
@@ -8226,7 +8228,8 @@
"duration": {
"seconds": "{{n}} 秒",
"minutes": "{{n}} 分",
- "hoursMinutes": "{{h}} 時間 {{m}} 分"
+ "hoursMinutes": "{{h}} 時間 {{m}} 分",
+ "daysHoursMinutes": "{{d}}日{{h}}時間{{m}}分"
},
"viewResult": "結果を見る",
"noWrittenResult": "テキストの結果はありません。"
@@ -9636,6 +9639,10 @@
"noFeedback": "(フィードバックなし)",
"cancelled": "キャンセル済み"
},
+ "thinking": {
+ "completed": "思考 {{duration}}",
+ "aborted": "思考 {{duration}}(中止)"
+ },
"workGroup": {
"working": "作業中…",
"worked": "{{duration}} 作業しました",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 47980c1ce4..5a3ef8a751 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -6716,6 +6716,8 @@
"usageDetails": {
"durationSeconds": "{{value}}초",
"durationMinutesSeconds": "{{minutes}}분 {{seconds}}초",
+ "durationHoursMinutes": "{{hours}}시간 {{minutes}}분",
+ "durationDaysHoursMinutes": "{{days}}일 {{hours}}시간 {{minutes}}분",
"performanceLine": "속도 {{rate}} 토큰/초 · 시간 {{duration}}",
"performanceRateLine": "속도 {{rate}} 토큰/초",
"timeLine": "시간 {{duration}}",
@@ -8226,7 +8228,8 @@
"duration": {
"seconds": "{{n}}초",
"minutes": "{{n}}분",
- "hoursMinutes": "{{h}}시간 {{m}}분"
+ "hoursMinutes": "{{h}}시간 {{m}}분",
+ "daysHoursMinutes": "{{d}}일 {{h}}시간 {{m}}분"
},
"viewResult": "결과 보기",
"noWrittenResult": "텍스트 결과가 없습니다."
@@ -9636,6 +9639,10 @@
"noFeedback": "(피드백 없음)",
"cancelled": "취소됨"
},
+ "thinking": {
+ "completed": "생각 {{duration}}",
+ "aborted": "생각 {{duration}} (중단됨)"
+ },
"workGroup": {
"working": "작업 중…",
"worked": "{{duration}} 동안 작업함",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index 5a0eb1b9a6..38041b9eda 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -6716,6 +6716,8 @@
"usageDetails": {
"durationSeconds": "{{value}}秒",
"durationMinutesSeconds": "{{minutes}}分 {{seconds}}秒",
+ "durationHoursMinutes": "{{hours}} 小时 {{minutes}} 分",
+ "durationDaysHoursMinutes": "{{days}} 天 {{hours}} 小时 {{minutes}} 分",
"performanceLine": "速度 {{rate}} tokens/秒 · 耗时 {{duration}}",
"performanceRateLine": "速度 {{rate}} tokens/秒",
"timeLine": "耗时 {{duration}}",
@@ -8226,7 +8228,8 @@
"duration": {
"seconds": "{{n}} 秒",
"minutes": "{{n}} 分钟",
- "hoursMinutes": "{{h}} 小时 {{m}} 分"
+ "hoursMinutes": "{{h}} 小时 {{m}} 分",
+ "daysHoursMinutes": "{{d}} 天 {{h}} 小时 {{m}} 分"
},
"viewResult": "查看结果",
"noWrittenResult": "没有文字结果。"
@@ -9636,6 +9639,10 @@
"noFeedback": "(未提供反馈)",
"cancelled": "已取消"
},
+ "thinking": {
+ "completed": "思考 {{duration}}",
+ "aborted": "思考 {{duration}}(已终止)"
+ },
"workGroup": {
"working": "正在工作…",
"worked": "已工作 {{duration}}",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 8f7ae38de5..904dd2b198 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -6716,6 +6716,8 @@
"usageDetails": {
"durationSeconds": "{{value}}秒",
"durationMinutesSeconds": "{{minutes}}分 {{seconds}}秒",
+ "durationHoursMinutes": "{{hours}} 小時 {{minutes}} 分",
+ "durationDaysHoursMinutes": "{{days}} 天 {{hours}} 小時 {{minutes}} 分",
"performanceLine": "速度 {{rate}} tokens/秒 · 耗時 {{duration}}",
"performanceRateLine": "速度 {{rate}} tokens/秒",
"timeLine": "耗時 {{duration}}",
@@ -8226,7 +8228,8 @@
"duration": {
"seconds": "{{n}} 秒",
"minutes": "{{n}} 分鐘",
- "hoursMinutes": "{{h}} 小時 {{m}} 分"
+ "hoursMinutes": "{{h}} 小時 {{m}} 分",
+ "daysHoursMinutes": "{{d}} 天 {{h}} 小時 {{m}} 分"
},
"viewResult": "查看結果",
"noWrittenResult": "沒有文字結果。"
@@ -9635,6 +9638,10 @@
"noFeedback": "(未提供反饋)",
"cancelled": "已取消"
},
+ "thinking": {
+ "completed": "思考 {{duration}}",
+ "aborted": "思考 {{duration}}(已終止)"
+ },
"workGroup": {
"working": "正在工作…",
"worked": "已工作 {{duration}}",
diff --git a/apps/desktop/src/renderer/lib/__tests__/sessionDurationFormat.test.ts b/apps/desktop/src/renderer/lib/__tests__/sessionDurationFormat.test.ts
new file mode 100644
index 0000000000..2797b5a0ad
--- /dev/null
+++ b/apps/desktop/src/renderer/lib/__tests__/sessionDurationFormat.test.ts
@@ -0,0 +1,62 @@
+import { describe, expect, it } from 'vitest';
+import type { TFunction } from 'i18next';
+
+import en from '../../i18n/locales/en/common.json';
+import zhCN from '../../i18n/locales/zh-CN/common.json';
+import zhTW from '../../i18n/locales/zh-TW/common.json';
+import ja from '../../i18n/locales/ja/common.json';
+import ko from '../../i18n/locales/ko/common.json';
+import { formatCompactionDuration, formatSessionDuration, formatShellDuration } from '../sessionDurationFormat';
+
+function translator(catalog: Record<string, unknown>): TFunction {
+ return ((key: string, values: Record<string, string | number>) => {
+ const template = key.split('.').reduce<unknown>((node, part) =>
+ (node as Record<string, unknown>)[part], catalog);
+ if (typeof template !== 'string') throw new Error(`Missing translation: ${key}`);
+ return template.replace(/\{\{(\w+)\}\}/g, (_, name: string) => String(values[name]));
+ }) as TFunction;
+}
+
+describe('Desktop task durations', () => {
+ it.each([
+ [en, '21h 31m', '2d 3h 4m', '1h 0m', '1d 0h 0m'],
+ [zhCN, '21 小时 31 分', '2 天 3 小时 4 分', '1 小时 0 分', '1 天 0 小时 0 分'],
+ [zhTW, '21 小時 31 分', '2 天 3 小時 4 分', '1 小時 0 分', '1 天 0 小時 0 分'],
+ [ja, '21時間31分', '2日3時間4分', '1時間0分', '1日0時間0分'],
+ [ko, '21시간 31분', '2일 3시간 4분', '1시간 0분', '1일 0시간 0분'],
+ ] as const)('localizes promoted units with real catalog %#', (catalog, hours, days, hour, day) => {
+ const t = translator(catalog);
+ expect(formatSessionDuration(77_516_000, t)).toBe(hours);
+ expect(formatSessionDuration(183_845_000, t)).toBe(days);
+ expect(formatSessionDuration(3_599_600, t)).toBe(hour);
+ expect(formatSessionDuration(86_399_600, t)).toBe(day);
+ });
+
+ it('uses localized units in work summaries and preserves live padding', () => {
+ const t = translator(zhCN);
+ expect(t('chat.workGroup.worked', { duration: formatSessionDuration(183_845_000, t) }))
+ .toBe('已工作 2 天 3 小时 4 分');
+ const options = { minimumSeconds: 0, alwaysShowRemainder: true, padRemainder: true };
+ expect(formatSessionDuration(0, t, options)).toBe('0s');
+ expect(formatSessionDuration(65_000, t, options)).toBe('1m 05s');
+ expect(formatSessionDuration(7_509_000, t, options)).toBe('2 小时 05 分');
+ expect(formatSessionDuration(86_400_000, t, options)).toBe('1 天 00 小时 00 分');
+ });
+
+ it('keeps exact shell milliseconds below an hour', () => {
+ const t = translator(en);
+ expect(formatShellDuration(1500, t)).toBe('1500ms');
+ expect(formatShellDuration(59_999, t)).toBe('59999ms');
+ expect(formatShellDuration(3_599_999, t)).toBe('3599999ms');
+ expect(formatShellDuration(3_600_000, t)).toBe('1h 0m');
+ expect(formatShellDuration(86_400_000, translator(zhCN))).toBe('1 天 0 小时 0 分');
+ });
+
+ it('keeps fractional compaction seconds below an hour', () => {
+ const t = translator(en);
+ expect(formatCompactionDuration(1500, t)).toBe('1.5s');
+ expect(formatCompactionDuration(75_500, t)).toBe('75.5s');
+ expect(formatCompactionDuration(3_599_900, t)).toBe('3599.9s');
+ expect(formatCompactionDuration(3_600_000, t)).toBe('1h 0m');
+ });
+});
diff --git a/apps/desktop/src/renderer/lib/__tests__/turnUsageTooltip.test.ts b/apps/desktop/src/renderer/lib/__tests__/turnUsageTooltip.test.ts
index bc35202785..08af2c0c4c 100644
--- a/apps/desktop/src/renderer/lib/__tests__/turnUsageTooltip.test.ts
+++ b/apps/desktop/src/renderer/lib/__tests__/turnUsageTooltip.test.ts
@@ -30,6 +30,8 @@ const t = ((key: string, opts?: Record<string, unknown>) => {
if (key === 'usageDetails.durationMinutesSeconds') {
return `${opts?.minutes}分 ${opts?.seconds}秒`;
}
+ if (key === 'usageDetails.durationHoursMinutes') return `${opts?.hours} 小时 ${opts?.minutes} 分`;
+ if (key === 'usageDetails.durationDaysHoursMinutes') return `${opts?.days} 天 ${opts?.hours} 小时 ${opts?.minutes} 分`;
return opts ? `${key}|${JSON.stringify(opts)}` : key;
}) as unknown as TFunction;
@@ -260,6 +262,13 @@ describe('buildTurnUsageTooltipLines — 输出速度', () => {
expect(formatTurnDuration(119_600)).toBe('2m 00s');
expect(formatTurnDuration(12_345, t)).toBe('12.3秒');
expect(formatTurnDuration(119_600, t)).toBe('2分 00秒');
+ expect(formatTurnDuration(3_599_600)).toBe('1h 0m');
+ expect(formatTurnDuration(77_516_000)).toBe('21h 31m');
+ expect(formatTurnDuration(77_516_000, t)).toBe('21 小时 31 分');
+ expect(formatTurnDuration(86_399_600, t)).toBe('1 天 0 小时 0 分');
+ expect(formatTurnDuration(86_700_000)).toBe('1d 0h 5m');
+ expect(formatTurnDuration(183_845_000)).toBe('2d 3h 4m');
+ expect(formatTurnDuration(183_845_000, t)).toBe('2 天 3 小时 4 分');
});
});
diff --git a/apps/desktop/src/renderer/lib/sessionDurationFormat.ts b/apps/desktop/src/renderer/lib/sessionDurationFormat.ts
new file mode 100644
index 0000000000..66540b095d
--- /dev/null
+++ b/apps/desktop/src/renderer/lib/sessionDurationFormat.ts
@@ -0,0 +1,26 @@
+import type { TFunction } from 'i18next';
+import { formatDuration } from '@cindy/maker-shared/message-render';
+
+/** Localize promoted units while retaining each caller's existing short-time precision. */
+export function formatSessionDuration(
+ ms: number,
+ t?: TFunction,
+ options: Parameters<typeof formatDuration>[1] = {},
+): string {
+ return formatDuration(ms, {
+ ...options,
+ formatLongDuration: t
+ ? ({ days, hours, minutes }) => days > 0
+ ? t('usageDetails.durationDaysHoursMinutes', { days, hours, minutes })
+ : t('usageDetails.durationHoursMinutes', { hours, minutes })
+ : undefined,
+ });
+}
+
+export function formatShellDuration(ms: number, t: TFunction): string {
+ return ms >= 3_600_000 ? formatSessionDuration(ms, t) : `${ms}ms`;
+}
+
+export function formatCompactionDuration(ms: number, t: TFunction): string {
+ return ms >= 3_600_000 ? formatSessionDuration(ms, t) : `${(ms / 1000).toFixed(1)}s`;
+}
diff --git a/apps/desktop/src/renderer/lib/turnUsageTooltip.ts b/apps/desktop/src/renderer/lib/turnUsageTooltip.ts
index 3cc0c7f32b..76d55a4738 100644
--- a/apps/desktop/src/renderer/lib/turnUsageTooltip.ts
+++ b/apps/desktop/src/renderer/lib/turnUsageTooltip.ts
@@ -67,6 +67,21 @@ export function formatTurnDuration(durationMs: number, t?: TFunction): string |
}
}
const roundedSeconds = Math.round(seconds);
+ if (roundedSeconds >= 86_400) {
+ const days = Math.floor(roundedSeconds / 86_400);
+ const hours = Math.floor((roundedSeconds % 86_400) / 3_600);
+ const minutes = Math.floor((roundedSeconds % 3_600) / 60);
+ return t
+ ? t('usageDetails.durationDaysHoursMinutes', { days, hours, minutes })
+ : `${days}d ${hours}h ${minutes}m`;
+ }
+ if (roundedSeconds >= 3_600) {
+ const hours = Math.floor(roundedSeconds / 3_600);
+ const minutes = Math.floor((roundedSeconds % 3_600) / 60);
+ return t
+ ? t('usageDetails.durationHoursMinutes', { hours, minutes })
+ : `${hours}h ${minutes}m`;
+ }
const minutes = Math.floor(roundedSeconds / 60);
const remainder = roundedSeconds % 60;
const paddedSeconds = String(remainder).padStart(2, '0');
diff --git a/apps/mobile/src/__tests__/sessionDurationFormat.test.ts b/apps/mobile/src/__tests__/sessionDurationFormat.test.ts
new file mode 100644
index 0000000000..5793de1590
--- /dev/null
+++ b/apps/mobile/src/__tests__/sessionDurationFormat.test.ts
@@ -0,0 +1,62 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import en from '../i18n/locales/en/message.json';
+import zhCN from '../i18n/locales/zh-CN/message.json';
+import zhTW from '../i18n/locales/zh-TW/message.json';
+import ja from '../i18n/locales/ja/message.json';
+import ko from '../i18n/locales/ko/message.json';
+import { formatLocalizedDuration, formatLocalizedSeconds } from '../session/sessionDurationFormat';
+import { formatMobileSystemCard } from '../session/systemCard';
+
+// Exercise the real catalogs without loading native system-locale detection.
+const state = vi.hoisted(() => ({ catalog: {} as Record<string, unknown> }));
+vi.mock('@/i18n', () => ({
+ i18n: {
+ t(key: string, values: Record<string, number>) {
+ const template = key.replace(/^message\./, '').split('.').reduce<unknown>((node, part) =>
+ (node as Record<string, unknown>)[part], state.catalog);
+ if (typeof template !== 'string') throw new Error(`Missing duration translation: ${key}`);
+ return template.replace(/\{\{(\w+)\}\}/g, (_, name: string) => String(values[name]));
+ },
+ },
+}));
+
+describe('localized task durations', () => {
+ it.each([
+ [en, '21h 31m', '2d 3h 4m', '1h 0m', '1d 0h 0m'],
+ [zhCN, '21 小时 31 分', '2 天 3 小时 4 分', '1 小时 0 分', '1 天 0 小时 0 分'],
+ [zhTW, '21 小時 31 分', '2 天 3 小時 4 分', '1 小時 0 分', '1 天 0 小時 0 分'],
+ [ja, '21時間31分', '2日3時間4分', '1時間0分', '1日0時間0分'],
+ [ko, '21시간 31분', '2일 3시간 4분', '1시간 0분', '1일 0시간 0분'],
+ ] as const)('converts long durations using the catalog %#', (catalog, hours, days, hour, day) => {
+ state.catalog = catalog;
+ expect(formatLocalizedDuration(77_516_000)).toBe(hours);
+ expect(formatLocalizedDuration(183_845_000)).toBe(days);
+ expect(formatLocalizedDuration(3_599_600)).toBe(hour);
+ expect(formatLocalizedDuration(86_399_600)).toBe(day);
+ });
+
+ it('preserves short-duration rounding and live zero values', () => {
+ state.catalog = en;
+ expect(formatLocalizedDuration(400)).toBe('1s');
+ expect(formatLocalizedDuration(59_499)).toBe('59s');
+ expect(formatLocalizedDuration(59_500)).toBe('1m');
+ expect(formatLocalizedDuration(65_000)).toBe('1m 5s');
+ expect(formatLocalizedDuration(120_000)).toBe('2m');
+ expect(formatLocalizedDuration(3_599_000)).toBe('59m 59s');
+ expect(formatLocalizedDuration(86_399_000)).toBe('23h 59m');
+ expect(formatLocalizedDuration(86_700_000)).toBe('1d 0h 5m');
+ expect(formatLocalizedSeconds(0)).toBe('0s');
+ expect(formatLocalizedSeconds(60, { alwaysShowSeconds: true })).toBe('1m 0s');
+ expect(formatLocalizedSeconds(3_600, { alwaysShowSeconds: true })).toBe('1h 0m');
+ expect(formatLocalizedSeconds(86_400, { alwaysShowSeconds: true })).toBe('1d 0h 0m');
+ });
+
+ it('keeps compaction tenths of a second below an hour in the actual system card', () => {
+ state.catalog = en;
+ expect(formatMobileSystemCard('compact', { durationMs: 1500 }).title).toBe('Auto compact · 1.5s');
+ expect(formatMobileSystemCard('compact', { durationMs: 75_500 }).title).toBe('Auto compact · 75.5s');
+ expect(formatMobileSystemCard('compact', { durationMs: 3_599_900 }).title).toBe('Auto compact · 3599.9s');
+ expect(formatMobileSystemCard('compact', { durationMs: 3_600_000 }).title).toBe('Auto compact · 1h 0m');
+ });
+});
diff --git a/apps/mobile/src/i18n/locales/en/message.json b/apps/mobile/src/i18n/locales/en/message.json
index f12ec46fa5..128a3966f0 100644
--- a/apps/mobile/src/i18n/locales/en/message.json
+++ b/apps/mobile/src/i18n/locales/en/message.json
@@ -68,6 +68,8 @@
"durationSeconds": "{{seconds}}s",
"durationMinutes": "{{minutes}}m",
"durationMinutesSeconds": "{{minutes}}m {{seconds}}s",
+ "durationHoursMinutes": "{{hours}}h {{minutes}}m",
+ "durationDaysHoursMinutes": "{{days}}d {{hours}}h {{minutes}}m",
"subagentSummary": "Subagent summary",
"agentSwitchLabel": "Switched from {{from}} to {{to}}",
"agentSwitchViewHandoff": "{{label}}, view handoff",
diff --git a/apps/mobile/src/i18n/locales/ja/message.json b/apps/mobile/src/i18n/locales/ja/message.json
index b161874421..e9a844e5cc 100644
--- a/apps/mobile/src/i18n/locales/ja/message.json
+++ b/apps/mobile/src/i18n/locales/ja/message.json
@@ -68,6 +68,8 @@
"durationSeconds": "{{seconds}}秒",
"durationMinutes": "{{minutes}}分",
"durationMinutesSeconds": "{{minutes}}分{{seconds}}秒",
+ "durationHoursMinutes": "{{hours}}時間{{minutes}}分",
+ "durationDaysHoursMinutes": "{{days}}日{{hours}}時間{{minutes}}分",
"subagentSummary": "サブエージェントの要約",
"agentSwitchLabel": "{{from}} から {{to}} に切り替えました",
"agentSwitchViewHandoff": "{{label}}、引き継ぎ内容を表示",
diff --git a/apps/mobile/src/i18n/locales/ko/message.json b/apps/mobile/src/i18n/locales/ko/message.json
index 3b63391c15..413ee8f153 100644
--- a/apps/mobile/src/i18n/locales/ko/message.json
+++ b/apps/mobile/src/i18n/locales/ko/message.json
@@ -68,6 +68,8 @@
"durationSeconds": "{{seconds}}초",
"durationMinutes": "{{minutes}}분",
"durationMinutesSeconds": "{{minutes}}분 {{seconds}}초",
+ "durationHoursMinutes": "{{hours}}시간 {{minutes}}분",
+ "durationDaysHoursMinutes": "{{days}}일 {{hours}}시간 {{minutes}}분",
"subagentSummary": "하위 에이전트 요약",
"agentSwitchLabel": "{{from}}에서 {{to}}(으)로 전환됨",
"agentSwitchViewHandoff": "{{label}}, 인계 내용 보기",
diff --git a/apps/mobile/src/i18n/locales/zh-CN/message.json b/apps/mobile/src/i18n/locales/zh-CN/message.json
index 82797b6616..fd00c103d7 100644
--- a/apps/mobile/src/i18n/locales/zh-CN/message.json
+++ b/apps/mobile/src/i18n/locales/zh-CN/message.json
@@ -68,6 +68,8 @@
"durationSeconds": "{{seconds}} 秒",
"durationMinutes": "{{minutes}} 分钟",
"durationMinutesSeconds": "{{minutes}} 分 {{seconds}} 秒",
+ "durationHoursMinutes": "{{hours}} 小时 {{minutes}} 分",
+ "durationDaysHoursMinutes": "{{days}} 天 {{hours}} 小时 {{minutes}} 分",
"subagentSummary": "Subagent 小结",
"agentSwitchLabel": "已从 {{from}} 切换到 {{to}}",
"agentSwitchViewHandoff": "{{label}},查看交接内容",
diff --git a/apps/mobile/src/i18n/locales/zh-TW/message.json b/apps/mobile/src/i18n/locales/zh-TW/message.json
index 8d9170d0f9..8bcab5001c 100644
--- a/apps/mobile/src/i18n/locales/zh-TW/message.json
+++ b/apps/mobile/src/i18n/locales/zh-TW/message.json
@@ -68,6 +68,8 @@
"durationSeconds": "{{seconds}} 秒",
"durationMinutes": "{{minutes}} 分鐘",
"durationMinutesSeconds": "{{minutes}} 分 {{seconds}} 秒",
+ "durationHoursMinutes": "{{hours}} 小時 {{minutes}} 分",
+ "durationDaysHoursMinutes": "{{days}} 天 {{hours}} 小時 {{minutes}} 分",
"subagentSummary": "Subagent 小結",
"agentSwitchLabel": "已從 {{from}} 切換到 {{to}}",
"agentSwitchViewHandoff": "{{label}},檢視交接內容",
diff --git a/apps/mobile/src/session/CompanionMessageCard.tsx b/apps/mobile/src/session/CompanionMessageCard.tsx
index c3dc9b2938..6858233fa1 100644
--- a/apps/mobile/src/session/CompanionMessageCard.tsx
+++ b/apps/mobile/src/session/CompanionMessageCard.tsx
@@ -1,3 +1,4 @@
+import { formatLocalizedSeconds } from './sessionDurationFormat';
import { CompanionTaskResultCard } from './CompanionTaskResultCard';
import { Component, useEffect, useRef, useState, useSyncExternalStore, type ReactNode } from 'react';
import { useLocalSearchParams } from 'expo-router';
@@ -228,10 +229,12 @@ function CompanionTaskCard({
? t('devices.companions.duration.minutes', {
n: Math.floor(seconds / 60),
})
- : t('devices.companions.duration.hoursMinutes', {
- h: Math.floor(seconds / 3600),
- m: Math.floor(seconds / 60) % 60,
- });
+ : seconds >= 86_400
+ ? formatLocalizedSeconds(seconds)
+ : t('devices.companions.duration.hoursMinutes', {
+ h: Math.floor(seconds / 3600),
+ m: Math.floor(seconds / 60) % 60,
+ });
const associated = useRemoteCompanionQuery<SessionPrRef[]>(
deviceId,
'git-context:pr-refs:list',
diff --git a/apps/mobile/src/session/messageNormalize.ts b/apps/mobile/src/session/messageNormalize.ts
index a0deba83eb..db98bc201d 100644
--- a/apps/mobile/src/session/messageNormalize.ts
+++ b/apps/mobile/src/session/messageNormalize.ts
@@ -1,3 +1,4 @@
+import { formatDuration } from '@cindy/maker-shared/message-render';
import { collectPluginInvocations, type PluginInvocation } from './pluginInvocations';
import { extractPayloadToolResultFiles, extractPayloadToolCardIds, type PayloadToolFile } from '@cindy/maker-shared/payload-summary';
import { placeBotTaskCardsAfterIntroduction, readBotCollaborationMeta, type BotCollaborationMeta } from '@cindy/maker-shared/botCollaboration';
@@ -865,14 +866,6 @@ function summarizePlan(plan: string, maxLines = 3): string {
return lines.length > maxLines ? `${head}\n...` : head;
}
-function formatDuration(ms: number): string {
- const totalSec = Math.max(1, Math.round(ms / 1000));
- if (totalSec < 60) return `${totalSec}s`;
- const minutes = Math.floor(totalSec / 60);
- const seconds = totalSec % 60;
- return seconds === 0 ? `${minutes}m` : `${minutes}m ${seconds}s`;
-}
-
function readRecord(value: unknown): Record<string, unknown> | null {
return value && typeof value === 'object' && !Array.isArray(value)
? value as Record<string, unknown>
diff --git a/apps/mobile/src/session/sessionDurationFormat.ts b/apps/mobile/src/session/sessionDurationFormat.ts
index 1ebaf56a0a..849094291b 100644
--- a/apps/mobile/src/session/sessionDurationFormat.ts
+++ b/apps/mobile/src/session/sessionDurationFormat.ts
@@ -2,8 +2,8 @@
* 会话页里展示给用户的时长(「已工作 3 分 25 秒」「思考 12 秒」、composer 工作状态计时)。
*
* 共享包 `formatDuration`(@cindy/maker-shared)固定输出 `3m 25s` 这种英文紧凑写法,
- * 桌面也在用,不改共享包;移动端展示层在这里按当前语言本地化,五语格式各自走 i18n。
- * 取整口径与共享包一致:按秒四舍五入,至少 1 秒;不折算小时(与共享包同语义)。
+ * 移动端在这里按当前语言本地化,五语格式各自走 i18n。
+ * 取整口径与共享包一致:按秒四舍五入,至少 1 秒;折算小时、天后始终保留分钟(含 0)。
*/
import { i18n } from '@/i18n';
@@ -15,13 +15,24 @@ export function formatLocalizedDuration(ms: number): string {
/**
* 整秒时长 → 本地化文案(允许 0 秒,供实时计时从 0 起跳)。
- * alwaysShowSeconds:实时计时用,整分时也写「3 分 0 秒」,避免文案宽度逐秒跳动。
+ * alwaysShowSeconds:实时计时用,整分时保留 0 秒;超过一小时后始终保留分钟。
*/
export function formatLocalizedSeconds(
seconds: number,
{ alwaysShowSeconds = false }: { alwaysShowSeconds?: boolean } = {},
): string {
const safe = Math.max(0, Math.floor(Number.isFinite(seconds) ? seconds : 0));
+ if (safe >= 86_400) {
+ const days = Math.floor(safe / 86_400);
+ const hours = Math.floor((safe % 86_400) / 3_600);
+ const minutes = Math.floor((safe % 3_600) / 60);
+ return i18n.t('message.renderer.durationDaysHoursMinutes', { days, hours, minutes });
+ }
+ if (safe >= 3_600) {
+ const hours = Math.floor(safe / 3_600);
+ const minutes = Math.floor((safe % 3_600) / 60);
+ return i18n.t('message.renderer.durationHoursMinutes', { hours, minutes });
+ }
const minutes = Math.floor(safe / 60);
const rest = safe % 60;
if (minutes === 0) return i18n.t('message.renderer.durationSeconds', { seconds: rest });
diff --git a/apps/mobile/src/session/systemCard.ts b/apps/mobile/src/session/systemCard.ts
index b9dd5ebcc2..96703c8d1d 100644
--- a/apps/mobile/src/session/systemCard.ts
+++ b/apps/mobile/src/session/systemCard.ts
@@ -1,3 +1,4 @@
+import { formatLocalizedDuration, formatLocalizedSeconds } from './sessionDurationFormat';
import type { MobileSlashCommand } from '@/device-link/mobileMakerTransport';
import type { InputProjection, RemoteSession } from '@/session/types';
import {
@@ -46,11 +47,7 @@ function formatGoalCompleteCard(data: Record<string, unknown> | undefined): Syst
}
function formatGoalDuration(ms: number): string {
- const totalSec = Math.max(0, Math.round(ms / 1000));
- if (totalSec < 60) return `${totalSec}s`;
- const min = Math.floor(totalSec / 60);
- const sec = totalSec % 60;
- return sec > 0 ? `${min}m ${sec}s` : `${min}m`;
+ return formatLocalizedSeconds(Math.max(0, Math.round(ms / 1000)));
}
export const MOBILE_LOCAL_SYSTEM_COMMANDS = DEFAULT_LOCAL_SYSTEM_COMMANDS as MobileSlashCommand[];
@@ -147,7 +144,11 @@ function formatCompactCard(data: Record<string, unknown> | undefined): SystemCar
if (preTokens !== undefined && postTokens !== undefined && preTokens > postTokens) {
parts.push(i18n.t('message.systemCard.compact.savedTokens', { tokens: formatCompactTokens(preTokens - postTokens) }));
}
- if (durationMs) parts.push(`${(durationMs / 1000).toFixed(1)}s`);
+ if (durationMs) {
+ parts.push(durationMs >= 3_600_000
+ ? formatLocalizedDuration(durationMs)
+ : `${(durationMs / 1000).toFixed(1)}s`);
+ }
return { title: parts.join(' · '), rows: [] };
}
diff --git a/docs/design-rules/DESIGN.md b/docs/design-rules/DESIGN.md
index c54ec76c0d..275dc6c1c4 100644
--- a/docs/design-rules/DESIGN.md
+++ b/docs/design-rules/DESIGN.md
@@ -934,6 +934,7 @@ Cindy's product voice matches its visuals: **restrained, direct, never self-cong
- **zh-TW**: likewise has no Title Case; use Traditional Chinese characters and punctuation, while keeping English terms as-is in mixed text. No full stop at the end of toasts / labels.
- **ja / ko**: likewise no Title Case; follow each language's particle / politeness conventions, and verify terminology when unsure (per `docs/dev-rules/engineering-conventions.md` §5: no improvised ja/ko).
- **Numbers / units**: Arabic numerals + half-width in all five languages; number-to-unit spacing per language convention.
+- **Task elapsed time**: promote long durations to hours/minutes at one hour and days/hours/minutes at one day. Always retain the minute field, including zero (for example, `1h 0m` or `2d 0h 5m`). Apply this to work summaries, thinking, live counters, task cards and usage details on Desktop and Mobile. Keep existing sub-hour precision; live counters may retain a zero-padded remainder. Stored durations and rate calculations keep their original precision.
### 11.3 Self-Check (when touching copy)
diff --git a/packages/maker-shared/src/__tests__/messagePresentation.test.ts b/packages/maker-shared/src/__tests__/messagePresentation.test.ts
index 07bd5df267..a91062d3be 100644
--- a/packages/maker-shared/src/__tests__/messagePresentation.test.ts
+++ b/packages/maker-shared/src/__tests__/messagePresentation.test.ts
@@ -601,6 +601,13 @@ describe('messagePresentation', () => {
header: { title: 'Working…' },
});
+ expect(summarizeWorkGroupPresentation({ ...workGroup, durationMs: 77_516_000 })).toMatchObject({
+ title: 'Worked for 21h 31m',
+ header: { title: 'Worked for 21h 31m' },
+ });
+ expect(summarizeWorkGroupPresentation({ ...workGroup, durationMs: 183_845_000 }).title)
+ .toBe('Worked for 2d 3h 4m');
+
expect(summarizeWorkGroupPresentation({
...workGroup,
durationMs: undefined,
diff --git a/packages/maker-shared/src/__tests__/messageRender.test.ts b/packages/maker-shared/src/__tests__/messageRender.test.ts
index 6ec7a9ad04..bac1293926 100644
--- a/packages/maker-shared/src/__tests__/messageRender.test.ts
+++ b/packages/maker-shared/src/__tests__/messageRender.test.ts
@@ -776,6 +776,27 @@ describe('message render shared model', () => {
expect(formatDuration(65_000)).toBe('1m 5s');
expect(formatDuration(120_000)).toBe('2m');
});
+
+ it.each([
+ [3_599_000, '59m 59s'],
+ [3_599_600, '1h 0m'],
+ [3_661_000, '1h 1m'],
+ [77_516_000, '21h 31m'],
+ [86_399_000, '23h 59m'],
+ [86_399_600, '1d 0h 0m'],
+ [86_700_000, '1d 0h 5m'],
+ [183_845_000, '2d 3h 4m'],
+ ])('keeps long work durations readable (%i ms)', (ms, expected) => {
+ expect(formatDuration(ms)).toBe(expected);
+ });
+
+ it('preserves zero and padded remainder for live counters', () => {
+ const options = { minimumSeconds: 0, alwaysShowRemainder: true, padRemainder: true };
+ expect(formatDuration(0, options)).toBe('0s');
+ expect(formatDuration(60_000, options)).toBe('1m 00s');
+ expect(formatDuration(7_509_000, options)).toBe('2h 05m');
+ expect(formatDuration(86_400_000, options)).toBe('1d 00h 00m');
+ });
});
function expectType<TType extends MessageRenderItem<FixtureMessage>['type']>(
diff --git a/packages/maker-shared/src/messageRender.ts b/packages/maker-shared/src/messageRender.ts
index 6d530d3830..b95512e271 100644
--- a/packages/maker-shared/src/messageRender.ts
+++ b/packages/maker-shared/src/messageRender.ts
@@ -1778,12 +1778,43 @@ function workRunFallbackEnd<TMessage extends MessageRenderNormalizedMessage>(
return latest;
}
-export function formatDuration(ms: number): string {
- const totalSec = Math.max(1, Math.round(ms / 1000));
+/** Promote long durations to hours/days, always retaining minutes (including zero). */
+export function formatDuration(
+ ms: number,
+ {
+ minimumSeconds = 1,
+ alwaysShowRemainder = false,
+ padRemainder = false,
+ formatLongDuration,
+ }: {
+ minimumSeconds?: number;
+ alwaysShowRemainder?: boolean;
+ padRemainder?: boolean;
+ formatLongDuration?: (parts: { days: number; hours: string; minutes: string }) => string;
+ } = {},
+): string {
+ const totalSec = Math.max(minimumSeconds, Math.round((Number.isFinite(ms) ? ms : 0) / 1000));
if (totalSec < 60) return `${totalSec}s`;
+ const formatRemainder = (value: number) => padRemainder ? String(value).padStart(2, '0') : String(value);
+ if (totalSec >= 3_600) {
+ const days = Math.floor(totalSec / 86_400);
+ const hours = Math.floor((totalSec % 86_400) / 3_600);
+ const minutes = Math.floor((totalSec % 3_600) / 60);
+ if (formatLongDuration) {
+ return formatLongDuration({
+ days,
+ hours: days > 0 ? formatRemainder(hours) : String(hours),
+ minutes: formatRemainder(minutes),
+ });
+ }
+ return days > 0
+ ? `${days}d ${formatRemainder(hours)}h ${formatRemainder(minutes)}m`
+ : `${hours}h ${formatRemainder(minutes)}m`;
+ }
const minutes = Math.floor(totalSec / 60);
const seconds = totalSec % 60;
- return seconds === 0 ? `${minutes}m` : `${minutes}m ${seconds}s`;
+ if (seconds === 0 && !alwaysShowRemainder) return `${minutes}m`;
+ return `${minutes}m ${formatRemainder(seconds)}s`;
}
function itemTimestamp<