fix(plugin): disable duplicate OMO plugin startup
This commit is contained in:
@@ -5,6 +5,13 @@ import { createPluginModule } from "./create-plugin-module"
|
||||
const mockInitConfigContext = mock(() => {})
|
||||
const mockDetectExternalSkillPlugin = mock(() => ({ detected: false, pluginName: null, allPlugins: [] }))
|
||||
const mockGetSkillPluginConflictWarning = mock(() => "")
|
||||
const mockDetectDuplicateOmoPlugin = mock(() => ({
|
||||
detected: false,
|
||||
pluginName: null,
|
||||
duplicatePlugins: [],
|
||||
allPlugins: [],
|
||||
}))
|
||||
const mockGetDuplicateOmoPluginWarning = mock(() => "")
|
||||
const mockInjectServerAuthIntoClient = mock(() => {})
|
||||
const mockLogLegacyPluginStartupWarning = mock(() => {})
|
||||
const mockMigrateLegacyWorkspaceDirectory = mock(() => ({ migrated: false, skipped: [] }))
|
||||
@@ -55,6 +62,8 @@ function createTestPluginModule(): ReturnType<typeof createPluginModule> {
|
||||
initConfigContext: mockInitConfigContext,
|
||||
detectExternalSkillPlugin: mockDetectExternalSkillPlugin,
|
||||
getSkillPluginConflictWarning: mockGetSkillPluginConflictWarning,
|
||||
detectDuplicateOmoPlugin: mockDetectDuplicateOmoPlugin,
|
||||
getDuplicateOmoPluginWarning: mockGetDuplicateOmoPluginWarning,
|
||||
injectServerAuthIntoClient: mockInjectServerAuthIntoClient,
|
||||
logLegacyPluginStartupWarning: mockLogLegacyPluginStartupWarning,
|
||||
migrateLegacyWorkspaceDirectory: mockMigrateLegacyWorkspaceDirectory,
|
||||
@@ -77,7 +86,20 @@ function createTestPluginModule(): ReturnType<typeof createPluginModule> {
|
||||
|
||||
describe("createPluginModule()", () => {
|
||||
beforeEach(() => {
|
||||
mockDetectDuplicateOmoPlugin.mockClear()
|
||||
mockGetDuplicateOmoPluginWarning.mockClear()
|
||||
mockInjectServerAuthIntoClient.mockClear()
|
||||
mockLoadPluginConfig.mockClear()
|
||||
mockCreateManagers.mockClear()
|
||||
mockCreateTools.mockClear()
|
||||
mockCreateHooks.mockClear()
|
||||
mockCreatePluginInterface.mockClear()
|
||||
mockDetectDuplicateOmoPlugin.mockReturnValue({
|
||||
detected: false,
|
||||
pluginName: null,
|
||||
duplicatePlugins: [],
|
||||
allPlugins: [],
|
||||
})
|
||||
initI18n({ locale: "en", fallback: "en" })
|
||||
})
|
||||
|
||||
@@ -100,4 +122,44 @@ describe("createPluginModule()", () => {
|
||||
expect(t("toast.task_completed")).toBe("任务完成")
|
||||
})
|
||||
})
|
||||
|
||||
describe("#given duplicate OMO plugin entries are configured", () => {
|
||||
it("#then startup warns and returns no prompt-producing hooks", async () => {
|
||||
// given
|
||||
const pluginModule = createTestPluginModule()
|
||||
const duplicatePlugins = [
|
||||
"file:///Users/yeongyu/local-workspaces/omo/src/index.ts",
|
||||
"oh-my-openagent@latest",
|
||||
]
|
||||
mockDetectDuplicateOmoPlugin.mockReturnValue({
|
||||
detected: true,
|
||||
pluginName: "oh-my-openagent",
|
||||
duplicatePlugins,
|
||||
allPlugins: duplicatePlugins,
|
||||
})
|
||||
mockGetDuplicateOmoPluginWarning.mockReturnValue("duplicate OMO startup disabled")
|
||||
const consoleWarn = mock(() => {})
|
||||
const originalWarn = console.warn
|
||||
console.warn = consoleWarn
|
||||
|
||||
try {
|
||||
// when
|
||||
const hooks = await pluginModule.server({
|
||||
directory: "/tmp/project",
|
||||
client: {},
|
||||
} as Parameters<typeof pluginModule.server>[0])
|
||||
|
||||
// then
|
||||
expect(hooks).toEqual({})
|
||||
expect(consoleWarn).toHaveBeenCalledWith("duplicate OMO startup disabled")
|
||||
expect(mockInjectServerAuthIntoClient).not.toHaveBeenCalled()
|
||||
expect(mockCreateManagers).not.toHaveBeenCalled()
|
||||
expect(mockCreateTools).not.toHaveBeenCalled()
|
||||
expect(mockCreateHooks).not.toHaveBeenCalled()
|
||||
expect(mockCreatePluginInterface).not.toHaveBeenCalled()
|
||||
} finally {
|
||||
console.warn = originalWarn
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@@ -16,7 +16,12 @@ import {
|
||||
type CompactionAutocontinueHook,
|
||||
} from "../plugin/session-compacting"
|
||||
import { installAgentSortShim, setAgentSortOrder } from "../shared/agent-sort-shim"
|
||||
import { detectExternalSkillPlugin, getSkillPluginConflictWarning } from "../shared/external-plugin-detector"
|
||||
import {
|
||||
detectDuplicateOmoPlugin,
|
||||
detectExternalSkillPlugin,
|
||||
getDuplicateOmoPluginWarning,
|
||||
getSkillPluginConflictWarning,
|
||||
} from "../shared/external-plugin-detector"
|
||||
import { createFirstMessageVariantGate } from "../shared/first-message-variant"
|
||||
import { initI18n } from "../shared/i18n"
|
||||
import { log } from "../shared/logger"
|
||||
@@ -36,6 +41,8 @@ export type PluginModuleDeps = {
|
||||
log: typeof log
|
||||
logLegacyPluginStartupWarning: typeof logLegacyPluginStartupWarning
|
||||
migrateLegacyWorkspaceDirectory: typeof migrateLegacyWorkspaceDirectory
|
||||
detectDuplicateOmoPlugin: typeof detectDuplicateOmoPlugin
|
||||
getDuplicateOmoPluginWarning: typeof getDuplicateOmoPluginWarning
|
||||
detectExternalSkillPlugin: typeof detectExternalSkillPlugin
|
||||
getSkillPluginConflictWarning: typeof getSkillPluginConflictWarning
|
||||
injectServerAuthIntoClient: typeof injectServerAuthIntoClient
|
||||
@@ -60,6 +67,8 @@ const defaultPluginModuleDeps: PluginModuleDeps = {
|
||||
log,
|
||||
logLegacyPluginStartupWarning,
|
||||
migrateLegacyWorkspaceDirectory,
|
||||
detectDuplicateOmoPlugin,
|
||||
getDuplicateOmoPluginWarning,
|
||||
detectExternalSkillPlugin,
|
||||
getSkillPluginConflictWarning,
|
||||
injectServerAuthIntoClient,
|
||||
@@ -88,6 +97,12 @@ export function createPluginModule(overrides: Partial<PluginModuleDeps> = {}): P
|
||||
deps.logLegacyPluginStartupWarning()
|
||||
deps.migrateLegacyWorkspaceDirectory(input.directory)
|
||||
|
||||
const duplicateOmoPluginCheck = deps.detectDuplicateOmoPlugin(input.directory)
|
||||
if (duplicateOmoPluginCheck.detected) {
|
||||
console.warn(deps.getDuplicateOmoPluginWarning(duplicateOmoPluginCheck.duplicatePlugins))
|
||||
return {}
|
||||
}
|
||||
|
||||
const skillPluginCheck = deps.detectExternalSkillPlugin(input.directory)
|
||||
if (skillPluginCheck.detected && skillPluginCheck.pluginName) {
|
||||
console.warn(deps.getSkillPluginConflictWarning(skillPluginCheck.pluginName))
|
||||
|
||||
Reference in New Issue
Block a user