mirror of
https://github.com/Yeachan-Heo/oh-my-claudecode.git
synced 2026-09-03 06:25:33 +08:00
44c55993df
Resolve conflicts after dev advanced past the merge base: - package.json / plugin.json / marketplace.json / docs/CLAUDE.md: keep dev's 4.14.4 version (feature PR carries no version bump) - scripts/keyword-detector.mjs: combine dev's added 'ultragoal' clear target with branch's omcRoot arg - src/hud/render.ts: combine branch's local-build "L" suffix with dev's updateNotification gate - src/__tests__/doctor-conflicts.test.ts: keep both new imports (checkWorkspaceMarker + checkWindowsUnsafePluginHooks) - dist/ and bridge/: regenerated via npm run build (generated artifacts) Confidence: high Scope-risk: moderate