* 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>
337 lines
7.5 KiB
TypeScript
337 lines
7.5 KiB
TypeScript
import { describe, expect, test } from "bun:test"
|
|
import { deepMerge, isPlainObject } from "./deep-merge"
|
|
|
|
type AnyObject = Record<string, unknown>
|
|
|
|
describe("isPlainObject", () => {
|
|
test("returns false for null", () => {
|
|
// given
|
|
const value = null
|
|
|
|
// when
|
|
const result = isPlainObject(value)
|
|
|
|
// then
|
|
expect(result).toBe(false)
|
|
})
|
|
|
|
test("returns false for undefined", () => {
|
|
// given
|
|
const value = undefined
|
|
|
|
// when
|
|
const result = isPlainObject(value)
|
|
|
|
// then
|
|
expect(result).toBe(false)
|
|
})
|
|
|
|
test("returns false for string", () => {
|
|
// given
|
|
const value = "hello"
|
|
|
|
// when
|
|
const result = isPlainObject(value)
|
|
|
|
// then
|
|
expect(result).toBe(false)
|
|
})
|
|
|
|
test("returns false for number", () => {
|
|
// given
|
|
const value = 42
|
|
|
|
// when
|
|
const result = isPlainObject(value)
|
|
|
|
// then
|
|
expect(result).toBe(false)
|
|
})
|
|
|
|
test("returns false for boolean", () => {
|
|
// given
|
|
const value = true
|
|
|
|
// when
|
|
const result = isPlainObject(value)
|
|
|
|
// then
|
|
expect(result).toBe(false)
|
|
})
|
|
|
|
test("returns false for array", () => {
|
|
// given
|
|
const value = [1, 2, 3]
|
|
|
|
// when
|
|
const result = isPlainObject(value)
|
|
|
|
// then
|
|
expect(result).toBe(false)
|
|
})
|
|
|
|
test("returns false for Date", () => {
|
|
// given
|
|
const value = new Date()
|
|
|
|
// when
|
|
const result = isPlainObject(value)
|
|
|
|
// then
|
|
expect(result).toBe(false)
|
|
})
|
|
|
|
test("returns false for RegExp", () => {
|
|
// given
|
|
const value = /test/
|
|
|
|
// when
|
|
const result = isPlainObject(value)
|
|
|
|
// then
|
|
expect(result).toBe(false)
|
|
})
|
|
|
|
test("returns true for plain object", () => {
|
|
// given
|
|
const value = { a: 1 }
|
|
|
|
// when
|
|
const result = isPlainObject(value)
|
|
|
|
// then
|
|
expect(result).toBe(true)
|
|
})
|
|
|
|
test("returns true for empty object", () => {
|
|
// given
|
|
const value = {}
|
|
|
|
// when
|
|
const result = isPlainObject(value)
|
|
|
|
// then
|
|
expect(result).toBe(true)
|
|
})
|
|
|
|
test("returns true for nested object", () => {
|
|
// given
|
|
const value = { a: { b: 1 } }
|
|
|
|
// when
|
|
const result = isPlainObject(value)
|
|
|
|
// then
|
|
expect(result).toBe(true)
|
|
})
|
|
})
|
|
|
|
describe("deepMerge", () => {
|
|
describe("basic merging", () => {
|
|
test("merges two simple objects", () => {
|
|
// given
|
|
const base: AnyObject = { a: 1 }
|
|
const override: AnyObject = { b: 2 }
|
|
|
|
// when
|
|
const result = deepMerge(base, override)
|
|
|
|
// then
|
|
expect(result).toEqual({ a: 1, b: 2 })
|
|
})
|
|
|
|
test("override value takes precedence", () => {
|
|
// given
|
|
const base = { a: 1 }
|
|
const override = { a: 2 }
|
|
|
|
// when
|
|
const result = deepMerge(base, override)
|
|
|
|
// then
|
|
expect(result).toEqual({ a: 2 })
|
|
})
|
|
|
|
test("deeply merges nested objects", () => {
|
|
// given
|
|
const base: AnyObject = { a: { b: 1, c: 2 } }
|
|
const override: AnyObject = { a: { b: 10 } }
|
|
|
|
// when
|
|
const result = deepMerge(base, override)
|
|
|
|
// then
|
|
expect(result).toEqual({ a: { b: 10, c: 2 } })
|
|
})
|
|
|
|
test("handles multiple levels of nesting", () => {
|
|
// given
|
|
const base: AnyObject = { a: { b: { c: { d: 1 } } } }
|
|
const override: AnyObject = { a: { b: { c: { e: 2 } } } }
|
|
|
|
// when
|
|
const result = deepMerge(base, override)
|
|
|
|
// then
|
|
expect(result).toEqual({ a: { b: { c: { d: 1, e: 2 } } } })
|
|
})
|
|
})
|
|
|
|
describe("edge cases", () => {
|
|
test("returns undefined when both are undefined", () => {
|
|
// given
|
|
const base = undefined
|
|
const override = undefined
|
|
|
|
// when
|
|
const result = deepMerge<AnyObject>(base, override)
|
|
|
|
// then
|
|
expect(result).toBeUndefined()
|
|
})
|
|
|
|
test("returns override when base is undefined", () => {
|
|
// given
|
|
const base = undefined
|
|
const override = { a: 1 }
|
|
|
|
// when
|
|
const result = deepMerge<AnyObject>(base, override)
|
|
|
|
// then
|
|
expect(result).toEqual({ a: 1 })
|
|
})
|
|
|
|
test("returns base when override is undefined", () => {
|
|
// given
|
|
const base = { a: 1 }
|
|
const override = undefined
|
|
|
|
// when
|
|
const result = deepMerge<AnyObject>(base, override)
|
|
|
|
// then
|
|
expect(result).toEqual({ a: 1 })
|
|
})
|
|
|
|
test("preserves base value when override value is undefined", () => {
|
|
// given
|
|
const base = { a: 1, b: 2 }
|
|
const override = { a: undefined, b: 3 }
|
|
|
|
// when
|
|
const result = deepMerge(base, override)
|
|
|
|
// then
|
|
expect(result).toEqual({ a: 1, b: 3 })
|
|
})
|
|
|
|
test("does not mutate base object", () => {
|
|
// given
|
|
const base = { a: 1, b: { c: 2 } }
|
|
const override = { b: { c: 10 } }
|
|
const originalBase = JSON.parse(JSON.stringify(base))
|
|
|
|
// when
|
|
deepMerge(base, override)
|
|
|
|
// then
|
|
expect(base).toEqual(originalBase)
|
|
})
|
|
})
|
|
|
|
describe("array handling", () => {
|
|
test("replaces arrays instead of merging them", () => {
|
|
// given
|
|
const base = { arr: [1, 2] }
|
|
const override = { arr: [3, 4, 5] }
|
|
|
|
// when
|
|
const result = deepMerge(base, override)
|
|
|
|
// then
|
|
expect(result).toEqual({ arr: [3, 4, 5] })
|
|
})
|
|
|
|
test("replaces nested arrays", () => {
|
|
// given
|
|
const base = { a: { arr: [1, 2, 3] } }
|
|
const override = { a: { arr: [4] } }
|
|
|
|
// when
|
|
const result = deepMerge(base, override)
|
|
|
|
// then
|
|
expect(result).toEqual({ a: { arr: [4] } })
|
|
})
|
|
})
|
|
|
|
describe("prototype pollution protection", () => {
|
|
test("ignores __proto__ key", () => {
|
|
// given
|
|
const base: AnyObject = { a: 1 }
|
|
const override: AnyObject = JSON.parse('{"__proto__": {"polluted": true}, "b": 2}')
|
|
|
|
// when
|
|
const result = deepMerge(base, override)
|
|
|
|
// then
|
|
expect(result).toEqual({ a: 1, b: 2 })
|
|
expect(({} as AnyObject).polluted).toBeUndefined()
|
|
})
|
|
|
|
test("ignores constructor key", () => {
|
|
// given
|
|
const base: AnyObject = { a: 1 }
|
|
const override: AnyObject = { constructor: { polluted: true }, b: 2 }
|
|
|
|
// when
|
|
const result = deepMerge(base, override)
|
|
|
|
// then
|
|
expect(result!.b).toBe(2)
|
|
expect(result!["constructor"]).not.toEqual({ polluted: true })
|
|
})
|
|
|
|
test("ignores prototype key", () => {
|
|
// given
|
|
const base: AnyObject = { a: 1 }
|
|
const override: AnyObject = { prototype: { polluted: true }, b: 2 }
|
|
|
|
// when
|
|
const result = deepMerge(base, override)
|
|
|
|
// then
|
|
expect(result!.b).toBe(2)
|
|
expect(result!.prototype).toBeUndefined()
|
|
})
|
|
})
|
|
|
|
describe("depth limit", () => {
|
|
test("returns override when depth exceeds MAX_DEPTH", () => {
|
|
// given
|
|
const createDeepObject = (depth: number, leaf: AnyObject): AnyObject => {
|
|
if (depth === 0) return leaf
|
|
return { nested: createDeepObject(depth - 1, leaf) }
|
|
}
|
|
// Use different keys to distinguish base vs override
|
|
const base = createDeepObject(55, { baseKey: "base" })
|
|
const override = createDeepObject(55, { overrideKey: "override" })
|
|
|
|
// when
|
|
const result = deepMerge(base, override)
|
|
|
|
// then
|
|
// Navigate to depth 55 (leaf level, beyond MAX_DEPTH of 50)
|
|
let current: AnyObject = result as AnyObject
|
|
for (let i = 0; i < 55; i++) {
|
|
current = current.nested as AnyObject
|
|
}
|
|
// At depth 55, only override's key should exist because
|
|
// override replaced base entirely at depth 51+ (beyond MAX_DEPTH)
|
|
expect(current.overrideKey).toBe("override")
|
|
expect(current.baseKey).toBeUndefined()
|
|
})
|
|
})
|
|
})
|