mirror of
https://github.com/multica-ai/multica.git
synced 2026-08-06 19:00:01 +02:00
2cbd72e800
Every conflict was i18n or a file this branch had already rewritten.
Helper-flow templates (create-agent-guide-issue, helper-instructions,
helper-starter-prompts) came back as modify/delete: this branch removed
the flow, main only retranslated them. Deleted. Same call for
install-runtime-issue.ts and welcome-after-onboarding.test.tsx, which
keep the Mika step over main's Helper step.
The locale bundles were merged per key rather than per side, because
main's e3bf9ccd4 renamed the filed unit (issue -> 任务 / タスク / 태스크)
and gave the execution run a distinct form (zh `task`, ja 作業, ko 작업).
Taking either side wholesale would have reverted one of the two changes,
so this branch's newly written strings were re-rendered in main's new
vocabulary instead — including the strings that merged cleanly and so
never surfaced as conflicts.
Key sets follow the auto-merged en bundle: keys main added under the
removed Helper flow are dropped, keys main genuinely added are taken,
and the renamed pickers.*.clear_action is gone. Parity is exact.
Also moves the agents instructions-tab onto the role-named type scale.
apps/web/app/type-scale.test.ts had been failing since this branch added
the system-instructions panel with text-sm/text-xs.
Co-authored-by: multica-agent <github@multica.ai>