* style(tests): normalize BDD comments from '// #given' to '// given' - Replace 4,668 Python-style BDD comments across 107 test files - Patterns changed: // #given -> // given, // #when -> // when, // #then -> // then - Also handles no-space variants: //#given -> // given * fix(rules-injector): prefer output.metadata.filePath over output.title - Extract file path resolution to dedicated output-path.ts module - Prefer metadata.filePath which contains actual file path - Fall back to output.title only when metadata unavailable - Fixes issue where rules weren't injected when tool output title was a label * feat(slashcommand): add optional user_message parameter - Add user_message optional parameter for command arguments - Model can now call: command='publish' user_message='patch' - Improves error messages with clearer format guidance - Helps LLMs understand correct parameter usage * feat(hooks): restore compaction-context-injector hook - Restore hook deleted in cbbc7bd0 for session compaction context - Injects 7 mandatory sections: User Requests, Final Goal, Work Completed, Remaining Tasks, Active Working Context, MUST NOT Do, Agent Verification State - Re-register in hooks/index.ts and main plugin entry * refactor(background-agent): split manager.ts into focused modules - Extract constants.ts for TTL values and internal types (52 lines) - Extract state.ts for TaskStateManager class (204 lines) - Extract spawner.ts for task creation logic (244 lines) - Extract result-handler.ts for completion handling (265 lines) - Reduce manager.ts from 1377 to 755 lines (45% reduction) - Maintain backward compatible exports * refactor(agents): split prometheus-prompt.ts into subdirectory - Move 1196-line prometheus-prompt.ts to prometheus/ subdirectory - Organize prompt sections into separate files for maintainability - Update agents/index.ts exports * refactor(delegate-task): split tools.ts into focused modules - Extract categories.ts for category definitions and routing - Extract executor.ts for task execution logic - Extract helpers.ts for utility functions - Extract prompt-builder.ts for prompt construction - Reduce tools.ts complexity with cleaner separation of concerns * refactor(builtin-skills): split skills.ts into individual skill files - Move each skill to dedicated file in skills/ subdirectory - Create barrel export for backward compatibility - Improve maintainability with focused skill modules * chore: update import paths and lockfile - Update prometheus import path after refactor - Update bun.lock * fix(tests): complete BDD comment normalization - Fix remaining #when/#then patterns missed by initial sed - Affected: state.test.ts, events.test.ts --------- Co-authored-by: justsisyphus <justsisyphus@users.noreply.github.com>
120 lines
3.6 KiB
TypeScript
120 lines
3.6 KiB
TypeScript
import { describe, expect, it } from "bun:test";
|
|
import { mergeConfigs } from "./plugin-config";
|
|
import type { OhMyOpenCodeConfig } from "./config";
|
|
|
|
describe("mergeConfigs", () => {
|
|
describe("categories merging", () => {
|
|
// given base config has categories, override has different categories
|
|
// when merging configs
|
|
// then should deep merge categories, not override completely
|
|
|
|
it("should deep merge categories from base and override", () => {
|
|
const base = {
|
|
categories: {
|
|
general: {
|
|
model: "openai/gpt-5.2",
|
|
temperature: 0.5,
|
|
},
|
|
quick: {
|
|
model: "anthropic/claude-haiku-4-5",
|
|
},
|
|
},
|
|
} as OhMyOpenCodeConfig;
|
|
|
|
const override = {
|
|
categories: {
|
|
general: {
|
|
temperature: 0.3,
|
|
},
|
|
visual: {
|
|
model: "google/gemini-3-pro",
|
|
},
|
|
},
|
|
} as unknown as OhMyOpenCodeConfig;
|
|
|
|
const result = mergeConfigs(base, override);
|
|
|
|
// then general.model should be preserved from base
|
|
expect(result.categories?.general?.model).toBe("openai/gpt-5.2");
|
|
// then general.temperature should be overridden
|
|
expect(result.categories?.general?.temperature).toBe(0.3);
|
|
// then quick should be preserved from base
|
|
expect(result.categories?.quick?.model).toBe("anthropic/claude-haiku-4-5");
|
|
// then visual should be added from override
|
|
expect(result.categories?.visual?.model).toBe("google/gemini-3-pro");
|
|
});
|
|
|
|
it("should preserve base categories when override has no categories", () => {
|
|
const base: OhMyOpenCodeConfig = {
|
|
categories: {
|
|
general: {
|
|
model: "openai/gpt-5.2",
|
|
},
|
|
},
|
|
};
|
|
|
|
const override: OhMyOpenCodeConfig = {};
|
|
|
|
const result = mergeConfigs(base, override);
|
|
|
|
expect(result.categories?.general?.model).toBe("openai/gpt-5.2");
|
|
});
|
|
|
|
it("should use override categories when base has no categories", () => {
|
|
const base: OhMyOpenCodeConfig = {};
|
|
|
|
const override: OhMyOpenCodeConfig = {
|
|
categories: {
|
|
general: {
|
|
model: "openai/gpt-5.2",
|
|
},
|
|
},
|
|
};
|
|
|
|
const result = mergeConfigs(base, override);
|
|
|
|
expect(result.categories?.general?.model).toBe("openai/gpt-5.2");
|
|
});
|
|
});
|
|
|
|
describe("existing behavior preservation", () => {
|
|
it("should deep merge agents", () => {
|
|
const base: OhMyOpenCodeConfig = {
|
|
agents: {
|
|
oracle: { model: "openai/gpt-5.2" },
|
|
},
|
|
};
|
|
|
|
const override: OhMyOpenCodeConfig = {
|
|
agents: {
|
|
oracle: { temperature: 0.5 },
|
|
explore: { model: "anthropic/claude-haiku-4-5" },
|
|
},
|
|
};
|
|
|
|
const result = mergeConfigs(base, override);
|
|
|
|
expect(result.agents?.oracle?.model).toBe("openai/gpt-5.2");
|
|
expect(result.agents?.oracle?.temperature).toBe(0.5);
|
|
expect(result.agents?.explore?.model).toBe("anthropic/claude-haiku-4-5");
|
|
});
|
|
|
|
it("should merge disabled arrays without duplicates", () => {
|
|
const base: OhMyOpenCodeConfig = {
|
|
disabled_hooks: ["comment-checker", "think-mode"],
|
|
};
|
|
|
|
const override: OhMyOpenCodeConfig = {
|
|
disabled_hooks: ["think-mode", "session-recovery"],
|
|
};
|
|
|
|
const result = mergeConfigs(base, override);
|
|
|
|
expect(result.disabled_hooks).toContain("comment-checker");
|
|
expect(result.disabled_hooks).toContain("think-mode");
|
|
expect(result.disabled_hooks).toContain("session-recovery");
|
|
expect(result.disabled_hooks?.length).toBe(3);
|
|
});
|
|
});
|
|
});
|