feat: replace collision strategy dropdown with inline conflict resolution UI

- Remove the collision strategy dropdown; always default to "rename"
- Add a "Conflicts to resolve" chores list above the package file tree
  showing each collision with editable rename fields (oldname → newname)
- Default rename uses source folder prefix (e.g. gstack-CEO)
- Per-item "skip" button that syncs with file tree checkboxes
- COMPANY.md defaults to skip when importing to an existing company
- Add nameOverrides support to API types and server so user-edited
  renames are passed through to the import

Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
Dotta
2026-03-16 09:21:48 -05:00
parent bc8fde5433
commit ad494e74ad
4 changed files with 314 additions and 44 deletions

View File

@@ -2036,6 +2036,28 @@ export function companyPortabilityService(db: Db) {
}
}
// Apply user-specified name overrides (keyed by slug)
if (input.nameOverrides) {
for (const ap of agentPlans) {
const override = input.nameOverrides[ap.slug];
if (override) {
ap.plannedName = override;
}
}
for (const pp of projectPlans) {
const override = input.nameOverrides[pp.slug];
if (override) {
pp.plannedName = override;
}
}
for (const ip of issuePlans) {
const override = input.nameOverrides[ip.slug];
if (override) {
ip.plannedTitle = override;
}
}
}
// Warn about agents that will be overwritten/updated
for (const ap of agentPlans) {
if (ap.action === "update") {