the_og/better-claude-config
1
0
Fork 0
Code Issues 8 Pull Requests 3 Actions Packages Projects Releases 4 Wiki Activity

Fix silent name-collision overwrite on drag-and-drop import (#8) #21

Closed
the_og wants to merge 0 commits from feat/8-dup-name-conflict into main
pull from: feat/8-dup-name-conflict
merge into: the_og:main
Conversation 2 Commits - Files Changed -
the_og commented 2026-07-07 20:27:36 -04:00
Owner
Copy Link
Copy Source

Closes #8

Investigation found the Paste-JSON dialog already prompted on a duplicate server name (replace vs. keep-both-renamed), but the drag-and-drop-a-.json-file import path did not — it silently renamed collisions to a fixed -imported suffix without checking that name was itself free, which could let two servers end up with the same name in memory and get silently collapsed into one at save time (apply_servers() in bcc_core.py rebuilds the on-disk dict via {s.name: s.data for s in servers}, last-value-wins).

Changes:

  • bcc_core.py: new pure, tested resolve_name_collision(name, existing) -> str — appends -2, -3, ... until unique.
  • bcc.py: extracted a shared MainWindow._import_server(name, data) helper used by both paste_json and dropEvent; it always prompts on collision (replace / keep-both-renamed) and always resolves the renamed name through resolve_name_collision, so drag-and-drop now behaves identically to paste — no more silent overwrite/collapse.
  • tests/test_core.py: 5 new unit tests for resolve_name_collision (no-conflict passthrough, single collision, multiple taken suffixes, empty existing set, and a repeated-call scenario simulating a double file-drop that previously could collide).

Verified locally: ruff check ., ruff format --check ., and pytest -q all pass (100 tests).

Closes #8 Investigation found the Paste-JSON dialog already prompted on a duplicate server name (replace vs. keep-both-renamed), but the drag-and-drop-a-.json-file import path did not — it silently renamed collisions to a fixed `-imported` suffix without checking that name was itself free, which could let two servers end up with the same name in memory and get silently collapsed into one at save time (`apply_servers()` in bcc_core.py rebuilds the on-disk dict via `{s.name: s.data for s in servers}`, last-value-wins). Changes: - `bcc_core.py`: new pure, tested `resolve_name_collision(name, existing) -> str` — appends `-2`, `-3`, ... until unique. - `bcc.py`: extracted a shared `MainWindow._import_server(name, data)` helper used by both `paste_json` and `dropEvent`; it always prompts on collision (replace / keep-both-renamed) and always resolves the renamed name through `resolve_name_collision`, so drag-and-drop now behaves identically to paste — no more silent overwrite/collapse. - `tests/test_core.py`: 5 new unit tests for `resolve_name_collision` (no-conflict passthrough, single collision, multiple taken suffixes, empty existing set, and a repeated-call scenario simulating a double file-drop that previously could collide). Verified locally: `ruff check .`, `ruff format --check .`, and `pytest -q` all pass (100 tests).
the_og added the P1 label 2026-07-07 20:27:36 -04:00
the_og added 4 commits 2026-07-07 20:27:36 -04:00
bcc_core.py: add resolve_name_collision() for paste/import name-collision handling 165c65be5f
bcc_core.py: fix non-breaking-space byte lost in transcription 0f1cdbef3c
bcc.py: unify paste/drop collision handling via shared _import_server() prompt 2a0802b22f
tests/test_core.py: add resolve_name_collision unit tests
CI / Lint (ruff) (pull_request) Failing after 8s
Details
CI / Tests (py3.10) (pull_request) Failing after 8s
Details
CI / Tests (py3.12) (pull_request) Failing after 8s
Details
0843c51c7d
the_og added 1 commit 2026-07-07 20:44:40 -04:00
Fix: rebuild from clean main (previous push included unrelated contaminated content)
CI / Lint (ruff) (pull_request) Failing after 6s
Details
CI / Tests (py3.10) (pull_request) Successful in 7s
Details
CI / Tests (py3.12) (pull_request) Successful in 8s
Details
a811e323e6
the_og added 1 commit 2026-07-07 20:48:54 -04:00
Fix: rebuild from clean main (previous push included unrelated contaminated content)
CI / Lint (ruff) (pull_request) Failing after 6s
Details
CI / Tests (py3.10) (pull_request) Successful in 7s
Details
CI / Tests (py3.12) (pull_request) Successful in 7s
Details
3e07b51134
the_og added 1 commit 2026-07-07 20:51:27 -04:00
Fix: rebuild from clean main (previous push included unrelated contaminated content)
CI / Lint (ruff) (pull_request) Failing after 8s
Details
CI / Tests (py3.10) (pull_request) Failing after 8s
Details
CI / Tests (py3.12) (pull_request) Failing after 7s
Details
4ab3c3b00a
the_og added 1 commit 2026-07-07 20:56:16 -04:00
Fix: correct smart-quote/nbsp characters mangled in previous push
CI / Lint (ruff) (pull_request) Successful in 6s
Details
CI / Tests (py3.10) (pull_request) Successful in 8s
Details
CI / Tests (py3.12) (pull_request) Successful in 8s
Details
2d9fb083dc
the_og commented 2026-07-07 22:01:51 -04:00
Author
Owner
Copy Link
Copy Source

Supervisor review (Cowork): approve. CI run #164 green; diff is isolated to bcc.py/bcc_core.py/tests. Good catch — the drag-and-drop path was a genuine silent-overwrite (only paste prompted); extracting _import_server so both paths prompt, plus a pure/tested resolve_name_collision (incl. the drop-twice case), is the right fix. Ready to merge into v1.2.0.

Supervisor review (Cowork): **approve.** CI run #164 green; diff is isolated to `bcc.py`/`bcc_core.py`/`tests`. Good catch — the drag-and-drop path was a genuine silent-overwrite (only paste prompted); extracting `_import_server` so both paths prompt, plus a pure/tested `resolve_name_collision` (incl. the drop-twice case), is the right fix. Ready to merge into v1.2.0.
the_og commented 2026-07-08 11:35:37 -04:00
Author
Owner
Copy Link
Copy Source

Superseded by #26 (release: v1.2.0), which merged this change into main as part of the integrated release. Closing.

Superseded by #26 (release: v1.2.0), which merged this change into `main` as part of the integrated release. Closing.
the_og closed this pull request 2026-07-08 11:35:38 -04:00
Some checks are pending
CI / Lint (ruff) (pull_request) Successful in 6s
Details
CI / Tests (py3.10) (pull_request) Successful in 8s
Details
CI / Tests (py3.12) (pull_request) Successful in 8s
Details

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
P0
P1
P2
blocked
Waiting on an external thing before it can move.
 decision
A decision record (D-007 style) — settled call, referenceable by number from any repo.
 needs-decision
Waiting on AJ's call.
 next
Current focus / next actionable item.
 status
The single pinned STATUS issue for this repo — live state, next action, open items, decisions needed.
No Label P1
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
the_og
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: the_og/better-claude-config#21
Delete Branch "feat/8-dup-name-conflict"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?