refactor: major codebase cleanup - BDD comments, file splitting, bug fixes (#1350)
* 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>
This commit is contained in:
@@ -26,7 +26,7 @@ describe("TaskToastManager", () => {
|
||||
|
||||
describe("skills in toast message", () => {
|
||||
test("should display skills when provided", () => {
|
||||
// #given - a task with skills
|
||||
// given - a task with skills
|
||||
const task = {
|
||||
id: "task_1",
|
||||
description: "Test task",
|
||||
@@ -35,10 +35,10 @@ describe("TaskToastManager", () => {
|
||||
skills: ["playwright", "git-master"],
|
||||
}
|
||||
|
||||
// #when - addTask is called
|
||||
// when - addTask is called
|
||||
toastManager.addTask(task)
|
||||
|
||||
// #then - toast message should include skills
|
||||
// then - toast message should include skills
|
||||
expect(mockClient.tui.showToast).toHaveBeenCalled()
|
||||
const call = mockClient.tui.showToast.mock.calls[0][0]
|
||||
expect(call.body.message).toContain("playwright")
|
||||
@@ -46,7 +46,7 @@ describe("TaskToastManager", () => {
|
||||
})
|
||||
|
||||
test("should not display skills section when no skills provided", () => {
|
||||
// #given - a task without skills
|
||||
// given - a task without skills
|
||||
const task = {
|
||||
id: "task_2",
|
||||
description: "Test task without skills",
|
||||
@@ -54,10 +54,10 @@ describe("TaskToastManager", () => {
|
||||
isBackground: true,
|
||||
}
|
||||
|
||||
// #when - addTask is called
|
||||
// when - addTask is called
|
||||
toastManager.addTask(task)
|
||||
|
||||
// #then - toast message should not include skills prefix
|
||||
// then - toast message should not include skills prefix
|
||||
expect(mockClient.tui.showToast).toHaveBeenCalled()
|
||||
const call = mockClient.tui.showToast.mock.calls[0][0]
|
||||
expect(call.body.message).not.toContain("Skills:")
|
||||
@@ -66,7 +66,7 @@ describe("TaskToastManager", () => {
|
||||
|
||||
describe("concurrency info in toast message", () => {
|
||||
test("should display concurrency status in toast", () => {
|
||||
// #given - multiple running tasks
|
||||
// given - multiple running tasks
|
||||
toastManager.addTask({
|
||||
id: "task_1",
|
||||
description: "First task",
|
||||
@@ -80,7 +80,7 @@ describe("TaskToastManager", () => {
|
||||
isBackground: true,
|
||||
})
|
||||
|
||||
// #when - third task is added
|
||||
// when - third task is added
|
||||
toastManager.addTask({
|
||||
id: "task_3",
|
||||
description: "Third task",
|
||||
@@ -88,7 +88,7 @@ describe("TaskToastManager", () => {
|
||||
isBackground: true,
|
||||
})
|
||||
|
||||
// #then - toast should show concurrency info
|
||||
// then - toast should show concurrency info
|
||||
expect(mockClient.tui.showToast).toHaveBeenCalledTimes(3)
|
||||
const lastCall = mockClient.tui.showToast.mock.calls[2][0]
|
||||
// Should show "Running (3):" header
|
||||
@@ -96,7 +96,7 @@ describe("TaskToastManager", () => {
|
||||
})
|
||||
|
||||
test("should display concurrency limit info when available", () => {
|
||||
// #given - a concurrency manager with known limit
|
||||
// given - a concurrency manager with known limit
|
||||
const mockConcurrencyWithCounts = {
|
||||
getConcurrencyLimit: mock(() => 5),
|
||||
getRunningCount: mock(() => 2),
|
||||
@@ -106,7 +106,7 @@ describe("TaskToastManager", () => {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const managerWithConcurrency = new TaskToastManager(mockClient as any, mockConcurrencyWithCounts)
|
||||
|
||||
// #when - a task is added
|
||||
// when - a task is added
|
||||
managerWithConcurrency.addTask({
|
||||
id: "task_1",
|
||||
description: "Test task",
|
||||
@@ -114,7 +114,7 @@ describe("TaskToastManager", () => {
|
||||
isBackground: true,
|
||||
})
|
||||
|
||||
// #then - toast should show concurrency status like "2/5 slots"
|
||||
// then - toast should show concurrency status like "2/5 slots"
|
||||
expect(mockClient.tui.showToast).toHaveBeenCalled()
|
||||
const call = mockClient.tui.showToast.mock.calls[0][0]
|
||||
expect(call.body.message).toMatch(/\d+\/\d+/)
|
||||
@@ -123,7 +123,7 @@ describe("TaskToastManager", () => {
|
||||
|
||||
describe("combined skills and concurrency display", () => {
|
||||
test("should display both skills and concurrency info together", () => {
|
||||
// #given - a task with skills and concurrency manager
|
||||
// given - a task with skills and concurrency manager
|
||||
const task = {
|
||||
id: "task_1",
|
||||
description: "Full info task",
|
||||
@@ -132,10 +132,10 @@ describe("TaskToastManager", () => {
|
||||
skills: ["frontend-ui-ux"],
|
||||
}
|
||||
|
||||
// #when - addTask is called
|
||||
// when - addTask is called
|
||||
toastManager.addTask(task)
|
||||
|
||||
// #then - toast should include both skills and task count
|
||||
// then - toast should include both skills and task count
|
||||
expect(mockClient.tui.showToast).toHaveBeenCalled()
|
||||
const call = mockClient.tui.showToast.mock.calls[0][0]
|
||||
expect(call.body.message).toContain("frontend-ui-ux")
|
||||
@@ -145,7 +145,7 @@ describe("TaskToastManager", () => {
|
||||
|
||||
describe("model fallback info in toast message", () => {
|
||||
test("should NOT display warning when model is category-default (normal behavior)", () => {
|
||||
// #given - category-default is the intended behavior, not a fallback
|
||||
// given - category-default is the intended behavior, not a fallback
|
||||
const task = {
|
||||
id: "task_1",
|
||||
description: "Task with category default model",
|
||||
@@ -154,10 +154,10 @@ describe("TaskToastManager", () => {
|
||||
modelInfo: { model: "google/gemini-3-pro", type: "category-default" as const },
|
||||
}
|
||||
|
||||
// #when - addTask is called
|
||||
// when - addTask is called
|
||||
toastManager.addTask(task)
|
||||
|
||||
// #then - toast should NOT show warning - category default is expected
|
||||
// then - toast should NOT show warning - category default is expected
|
||||
expect(mockClient.tui.showToast).toHaveBeenCalled()
|
||||
const call = mockClient.tui.showToast.mock.calls[0][0]
|
||||
expect(call.body.message).not.toContain("[FALLBACK]")
|
||||
@@ -165,7 +165,7 @@ describe("TaskToastManager", () => {
|
||||
})
|
||||
|
||||
test("should display warning when model falls back to system-default", () => {
|
||||
// #given - system-default is a fallback (no category default, no user config)
|
||||
// given - system-default is a fallback (no category default, no user config)
|
||||
const task = {
|
||||
id: "task_1b",
|
||||
description: "Task with system default model",
|
||||
@@ -174,10 +174,10 @@ describe("TaskToastManager", () => {
|
||||
modelInfo: { model: "anthropic/claude-sonnet-4-5", type: "system-default" as const },
|
||||
}
|
||||
|
||||
// #when - addTask is called
|
||||
// when - addTask is called
|
||||
toastManager.addTask(task)
|
||||
|
||||
// #then - toast should show fallback warning
|
||||
// then - toast should show fallback warning
|
||||
expect(mockClient.tui.showToast).toHaveBeenCalled()
|
||||
const call = mockClient.tui.showToast.mock.calls[0][0]
|
||||
expect(call.body.message).toContain("[FALLBACK]")
|
||||
@@ -186,7 +186,7 @@ describe("TaskToastManager", () => {
|
||||
})
|
||||
|
||||
test("should display warning when model is inherited from parent", () => {
|
||||
// #given - inherited is a fallback (custom category without model definition)
|
||||
// given - inherited is a fallback (custom category without model definition)
|
||||
const task = {
|
||||
id: "task_2",
|
||||
description: "Task with inherited model",
|
||||
@@ -195,10 +195,10 @@ describe("TaskToastManager", () => {
|
||||
modelInfo: { model: "cliproxy/claude-opus-4-5", type: "inherited" as const },
|
||||
}
|
||||
|
||||
// #when - addTask is called
|
||||
// when - addTask is called
|
||||
toastManager.addTask(task)
|
||||
|
||||
// #then - toast should show fallback warning
|
||||
// then - toast should show fallback warning
|
||||
expect(mockClient.tui.showToast).toHaveBeenCalled()
|
||||
const call = mockClient.tui.showToast.mock.calls[0][0]
|
||||
expect(call.body.message).toContain("[FALLBACK]")
|
||||
@@ -207,7 +207,7 @@ describe("TaskToastManager", () => {
|
||||
})
|
||||
|
||||
test("should not display model info when user-defined", () => {
|
||||
// #given - a task with user-defined model
|
||||
// given - a task with user-defined model
|
||||
const task = {
|
||||
id: "task_3",
|
||||
description: "Task with user model",
|
||||
@@ -216,10 +216,10 @@ describe("TaskToastManager", () => {
|
||||
modelInfo: { model: "my-provider/my-model", type: "user-defined" as const },
|
||||
}
|
||||
|
||||
// #when - addTask is called
|
||||
// when - addTask is called
|
||||
toastManager.addTask(task)
|
||||
|
||||
// #then - toast should NOT show model warning
|
||||
// then - toast should NOT show model warning
|
||||
expect(mockClient.tui.showToast).toHaveBeenCalled()
|
||||
const call = mockClient.tui.showToast.mock.calls[0][0]
|
||||
expect(call.body.message).not.toContain("[FALLBACK] Model:")
|
||||
@@ -229,7 +229,7 @@ describe("TaskToastManager", () => {
|
||||
})
|
||||
|
||||
test("should not display model info when not provided", () => {
|
||||
// #given - a task without model info
|
||||
// given - a task without model info
|
||||
const task = {
|
||||
id: "task_4",
|
||||
description: "Task without model info",
|
||||
@@ -237,10 +237,10 @@ describe("TaskToastManager", () => {
|
||||
isBackground: true,
|
||||
}
|
||||
|
||||
// #when - addTask is called
|
||||
// when - addTask is called
|
||||
toastManager.addTask(task)
|
||||
|
||||
// #then - toast should NOT show model warning
|
||||
// then - toast should NOT show model warning
|
||||
expect(mockClient.tui.showToast).toHaveBeenCalled()
|
||||
const call = mockClient.tui.showToast.mock.calls[0][0]
|
||||
expect(call.body.message).not.toContain("[FALLBACK] Model:")
|
||||
|
||||
Reference in New Issue
Block a user