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:
YeonGyu-Kim
@@ -50,60 +50,60 @@ describe("session-manager storage", () => {
|
||||
})
|
||||
|
||||
test("getAllSessions returns empty array when no sessions exist", async () => {
|
||||
// #when
|
||||
// when
|
||||
const sessions = await getAllSessions()
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(Array.isArray(sessions)).toBe(true)
|
||||
expect(sessions).toEqual([])
|
||||
})
|
||||
|
||||
test("getMessageDir finds session in direct path", () => {
|
||||
// #given
|
||||
// given
|
||||
const sessionID = "ses_test123"
|
||||
const sessionPath = join(TEST_MESSAGE_STORAGE, sessionID)
|
||||
mkdirSync(sessionPath, { recursive: true })
|
||||
writeFileSync(join(sessionPath, "msg_001.json"), JSON.stringify({ id: "msg_001", role: "user" }))
|
||||
|
||||
// #when
|
||||
// when
|
||||
const result = getMessageDir(sessionID)
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(result).toBe(sessionPath)
|
||||
})
|
||||
|
||||
test("sessionExists returns false for non-existent session", () => {
|
||||
// #when
|
||||
// when
|
||||
const exists = sessionExists("ses_nonexistent")
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(exists).toBe(false)
|
||||
})
|
||||
|
||||
test("sessionExists returns true for existing session", () => {
|
||||
// #given
|
||||
// given
|
||||
const sessionID = "ses_exists"
|
||||
const sessionPath = join(TEST_MESSAGE_STORAGE, sessionID)
|
||||
mkdirSync(sessionPath, { recursive: true })
|
||||
writeFileSync(join(sessionPath, "msg_001.json"), JSON.stringify({ id: "msg_001" }))
|
||||
|
||||
// #when
|
||||
// when
|
||||
const exists = sessionExists(sessionID)
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(exists).toBe(true)
|
||||
})
|
||||
|
||||
test("readSessionMessages returns empty array for non-existent session", async () => {
|
||||
// #when
|
||||
// when
|
||||
const messages = await readSessionMessages("ses_nonexistent")
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(messages).toEqual([])
|
||||
})
|
||||
|
||||
test("readSessionMessages sorts messages by timestamp", async () => {
|
||||
// #given
|
||||
// given
|
||||
const sessionID = "ses_test123"
|
||||
const sessionPath = join(TEST_MESSAGE_STORAGE, sessionID)
|
||||
mkdirSync(sessionPath, { recursive: true })
|
||||
@@ -117,33 +117,33 @@ describe("session-manager storage", () => {
|
||||
JSON.stringify({ id: "msg_001", role: "user", time: { created: 1000 } })
|
||||
)
|
||||
|
||||
// #when
|
||||
// when
|
||||
const messages = await readSessionMessages(sessionID)
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(messages.length).toBe(2)
|
||||
expect(messages[0].id).toBe("msg_001")
|
||||
expect(messages[1].id).toBe("msg_002")
|
||||
})
|
||||
|
||||
test("readSessionTodos returns empty array when no todos exist", async () => {
|
||||
// #when
|
||||
// when
|
||||
const todos = await readSessionTodos("ses_nonexistent")
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(todos).toEqual([])
|
||||
})
|
||||
|
||||
test("getSessionInfo returns null for non-existent session", async () => {
|
||||
// #when
|
||||
// when
|
||||
const info = await getSessionInfo("ses_nonexistent")
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(info).toBeNull()
|
||||
})
|
||||
|
||||
test("getSessionInfo aggregates session metadata correctly", async () => {
|
||||
// #given
|
||||
// given
|
||||
const sessionID = "ses_test123"
|
||||
const sessionPath = join(TEST_MESSAGE_STORAGE, sessionID)
|
||||
mkdirSync(sessionPath, { recursive: true })
|
||||
@@ -168,10 +168,10 @@ describe("session-manager storage", () => {
|
||||
})
|
||||
)
|
||||
|
||||
// #when
|
||||
// when
|
||||
const info = await getSessionInfo(sessionID)
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(info).not.toBeNull()
|
||||
expect(info?.id).toBe(sessionID)
|
||||
expect(info?.message_count).toBe(2)
|
||||
@@ -228,7 +228,7 @@ describe("session-manager storage - getMainSessions", () => {
|
||||
}
|
||||
|
||||
test("getMainSessions returns only sessions without parentID", async () => {
|
||||
// #given
|
||||
// given
|
||||
const projectID = "proj_abc123"
|
||||
const now = Date.now()
|
||||
|
||||
@@ -240,16 +240,16 @@ describe("session-manager storage - getMainSessions", () => {
|
||||
createMessageForSession("ses_main2", "msg_001", now - 1000)
|
||||
createMessageForSession("ses_child1", "msg_001", now)
|
||||
|
||||
// #when
|
||||
// when
|
||||
const sessions = await storage.getMainSessions({ directory: "/test/path" })
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(sessions.length).toBe(2)
|
||||
expect(sessions.map((s) => s.id)).not.toContain("ses_child1")
|
||||
})
|
||||
|
||||
test("getMainSessions sorts by time.updated descending (most recent first)", async () => {
|
||||
// #given
|
||||
// given
|
||||
const projectID = "proj_abc123"
|
||||
const now = Date.now()
|
||||
|
||||
@@ -261,10 +261,10 @@ describe("session-manager storage - getMainSessions", () => {
|
||||
createMessageForSession("ses_mid", "msg_001", now - 2000)
|
||||
createMessageForSession("ses_new", "msg_001", now)
|
||||
|
||||
// #when
|
||||
// when
|
||||
const sessions = await storage.getMainSessions({ directory: "/test/path" })
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(sessions.length).toBe(3)
|
||||
expect(sessions[0].id).toBe("ses_new")
|
||||
expect(sessions[1].id).toBe("ses_mid")
|
||||
@@ -272,7 +272,7 @@ describe("session-manager storage - getMainSessions", () => {
|
||||
})
|
||||
|
||||
test("getMainSessions filters by directory (project path)", async () => {
|
||||
// #given
|
||||
// given
|
||||
const projectA = "proj_aaa"
|
||||
const projectB = "proj_bbb"
|
||||
const now = Date.now()
|
||||
@@ -283,11 +283,11 @@ describe("session-manager storage - getMainSessions", () => {
|
||||
createMessageForSession("ses_projA", "msg_001", now)
|
||||
createMessageForSession("ses_projB", "msg_001", now)
|
||||
|
||||
// #when
|
||||
// when
|
||||
const sessionsA = await storage.getMainSessions({ directory: "/path/to/projectA" })
|
||||
const sessionsB = await storage.getMainSessions({ directory: "/path/to/projectB" })
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(sessionsA.length).toBe(1)
|
||||
expect(sessionsA[0].id).toBe("ses_projA")
|
||||
expect(sessionsB.length).toBe(1)
|
||||
@@ -295,7 +295,7 @@ describe("session-manager storage - getMainSessions", () => {
|
||||
})
|
||||
|
||||
test("getMainSessions returns all main sessions when directory is not specified", async () => {
|
||||
// #given
|
||||
// given
|
||||
const projectA = "proj_aaa"
|
||||
const projectB = "proj_bbb"
|
||||
const now = Date.now()
|
||||
@@ -306,10 +306,10 @@ describe("session-manager storage - getMainSessions", () => {
|
||||
createMessageForSession("ses_projA", "msg_001", now)
|
||||
createMessageForSession("ses_projB", "msg_001", now - 1000)
|
||||
|
||||
// #when
|
||||
// when
|
||||
const sessions = await storage.getMainSessions({})
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(sessions.length).toBe(2)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -38,23 +38,23 @@ describe("session-manager tools", () => {
|
||||
})
|
||||
|
||||
test("session_list filters by project_path", async () => {
|
||||
// #given
|
||||
// given
|
||||
const projectPath = "/Users/yeongyu/local-workspaces/oh-my-opencode"
|
||||
|
||||
// #when
|
||||
// when
|
||||
const result = await session_list.execute({ project_path: projectPath }, mockContext)
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(typeof result).toBe("string")
|
||||
})
|
||||
|
||||
test("session_list uses process.cwd() as default project_path", async () => {
|
||||
// #given - no project_path provided
|
||||
// given - no project_path provided
|
||||
|
||||
// #when
|
||||
// when
|
||||
const result = await session_list.execute({}, mockContext)
|
||||
|
||||
// #then - should not throw and return string (uses process.cwd() internally)
|
||||
// then - should not throw and return string (uses process.cwd() internally)
|
||||
expect(typeof result).toBe("string")
|
||||
})
|
||||
|
||||
|
||||
@@ -11,29 +11,29 @@ import type { SessionInfo, SessionMessage, SearchResult } from "./types"
|
||||
|
||||
describe("session-manager utils", () => {
|
||||
test("formatSessionList handles empty array", async () => {
|
||||
// #given
|
||||
// given
|
||||
const sessions: string[] = []
|
||||
|
||||
// #when
|
||||
// when
|
||||
const result = await formatSessionList(sessions)
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(result).toContain("No sessions found")
|
||||
})
|
||||
|
||||
test("formatSessionMessages handles empty array", () => {
|
||||
// #given
|
||||
// given
|
||||
const messages: SessionMessage[] = []
|
||||
|
||||
// #when
|
||||
// when
|
||||
const result = formatSessionMessages(messages)
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(result).toContain("No messages")
|
||||
})
|
||||
|
||||
test("formatSessionMessages includes message content", () => {
|
||||
// #given
|
||||
// given
|
||||
const messages: SessionMessage[] = [
|
||||
{
|
||||
id: "msg_001",
|
||||
@@ -43,16 +43,16 @@ describe("session-manager utils", () => {
|
||||
},
|
||||
]
|
||||
|
||||
// #when
|
||||
// when
|
||||
const result = formatSessionMessages(messages)
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(result).toContain("user")
|
||||
expect(result).toContain("Hello world")
|
||||
})
|
||||
|
||||
test("formatSessionMessages includes todos when requested", () => {
|
||||
// #given
|
||||
// given
|
||||
const messages: SessionMessage[] = [
|
||||
{
|
||||
id: "msg_001",
|
||||
@@ -66,17 +66,17 @@ describe("session-manager utils", () => {
|
||||
{ id: "2", content: "Task 2", status: "pending" as const },
|
||||
]
|
||||
|
||||
// #when
|
||||
// when
|
||||
const result = formatSessionMessages(messages, true, todos)
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(result).toContain("Todos")
|
||||
expect(result).toContain("Task 1")
|
||||
expect(result).toContain("Task 2")
|
||||
})
|
||||
|
||||
test("formatSessionInfo includes all metadata", () => {
|
||||
// #given
|
||||
// given
|
||||
const info: SessionInfo = {
|
||||
id: "ses_test123",
|
||||
message_count: 42,
|
||||
@@ -89,10 +89,10 @@ describe("session-manager utils", () => {
|
||||
transcript_entries: 123,
|
||||
}
|
||||
|
||||
// #when
|
||||
// when
|
||||
const result = formatSessionInfo(info)
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(result).toContain("ses_test123")
|
||||
expect(result).toContain("42")
|
||||
expect(result).toContain("build, oracle")
|
||||
@@ -100,18 +100,18 @@ describe("session-manager utils", () => {
|
||||
})
|
||||
|
||||
test("formatSearchResults handles empty array", () => {
|
||||
// #given
|
||||
// given
|
||||
const results: SearchResult[] = []
|
||||
|
||||
// #when
|
||||
// when
|
||||
const result = formatSearchResults(results)
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(result).toContain("No matches")
|
||||
})
|
||||
|
||||
test("formatSearchResults formats matches correctly", () => {
|
||||
// #given
|
||||
// given
|
||||
const results: SearchResult[] = [
|
||||
{
|
||||
session_id: "ses_test123",
|
||||
@@ -123,10 +123,10 @@ describe("session-manager utils", () => {
|
||||
},
|
||||
]
|
||||
|
||||
// #when
|
||||
// when
|
||||
const result = formatSearchResults(results)
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(result).toContain("Found 1 matches")
|
||||
expect(result).toContain("ses_test123")
|
||||
expect(result).toContain("msg_001")
|
||||
@@ -135,25 +135,25 @@ describe("session-manager utils", () => {
|
||||
})
|
||||
|
||||
test("filterSessionsByDate filters correctly", async () => {
|
||||
// #given
|
||||
// given
|
||||
const sessionIDs = ["ses_001", "ses_002", "ses_003"]
|
||||
|
||||
// #when
|
||||
// when
|
||||
const result = await filterSessionsByDate(sessionIDs)
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(Array.isArray(result)).toBe(true)
|
||||
})
|
||||
|
||||
test("searchInSession finds matches case-insensitively", async () => {
|
||||
// #given
|
||||
// given
|
||||
const sessionID = "ses_nonexistent"
|
||||
const query = "test"
|
||||
|
||||
// #when
|
||||
// when
|
||||
const results = await searchInSession(sessionID, query, false)
|
||||
|
||||
// #then
|
||||
// then
|
||||
expect(Array.isArray(results)).toBe(true)
|
||||
expect(results.length).toBe(0)
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user