luna/oh-my-opencode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: major codebase cleanup - BDD comments, file splitting, bug fixes (#1350)

Browse Source 
* 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
2026-02-01 16:47:50 +09:00
committed by GitHub
parent c83150d9ea
commit f146aeff0f
145 changed files with 10307 additions and 9562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/run/completion.test.ts
+21 -21
View File
@@ -30,20 +30,20 @@ const createMockContext = (overrides: {
describe("checkCompletionConditions", () => {
it("returns true when no todos and no children", async () => {
// #given
// given
spyOn(console, "log").mockImplementation(() => {})
const ctx = createMockContext()
const { checkCompletionConditions } = await import("./completion")
// #when
// when
const result = await checkCompletionConditions(ctx)
// #then
// then
expect(result).toBe(true)
})
it("returns false when incomplete todos exist", async () => {
// #given
// given
spyOn(console, "log").mockImplementation(() => {})
const ctx = createMockContext({
todo: [
@@ -53,15 +53,15 @@ describe("checkCompletionConditions", () => {
})
const { checkCompletionConditions } = await import("./completion")
// #when
// when
const result = await checkCompletionConditions(ctx)
// #then
// then
expect(result).toBe(false)
})
it("returns true when all todos completed or cancelled", async () => {
// #given
// given
spyOn(console, "log").mockImplementation(() => {})
const ctx = createMockContext({
todo: [
@@ -71,15 +71,15 @@ describe("checkCompletionConditions", () => {
})
const { checkCompletionConditions } = await import("./completion")
// #when
// when
const result = await checkCompletionConditions(ctx)
// #then
// then
expect(result).toBe(true)
})
it("returns false when child session is busy", async () => {
// #given
// given
spyOn(console, "log").mockImplementation(() => {})
const ctx = createMockContext({
childrenBySession: {
@@ -90,15 +90,15 @@ describe("checkCompletionConditions", () => {
})
const { checkCompletionConditions } = await import("./completion")
// #when
// when
const result = await checkCompletionConditions(ctx)
// #then
// then
expect(result).toBe(false)
})
it("returns true when all children idle", async () => {
// #given
// given
spyOn(console, "log").mockImplementation(() => {})
const ctx = createMockContext({
childrenBySession: {
@@ -113,15 +113,15 @@ describe("checkCompletionConditions", () => {
})
const { checkCompletionConditions } = await import("./completion")
// #when
// when
const result = await checkCompletionConditions(ctx)
// #then
// then
expect(result).toBe(true)
})
it("returns false when grandchild is busy (recursive)", async () => {
// #given
// given
spyOn(console, "log").mockImplementation(() => {})
const ctx = createMockContext({
childrenBySession: {
@@ -136,15 +136,15 @@ describe("checkCompletionConditions", () => {
})
const { checkCompletionConditions } = await import("./completion")
// #when
// when
const result = await checkCompletionConditions(ctx)
// #then
// then
expect(result).toBe(false)
})
it("returns true when all descendants idle (recursive)", async () => {
// #given
// given
spyOn(console, "log").mockImplementation(() => {})
const ctx = createMockContext({
childrenBySession: {
@@ -161,10 +161,10 @@ describe("checkCompletionConditions", () => {
})
const { checkCompletionConditions } = await import("./completion")
// #when
// when
const result = await checkCompletionConditions(ctx)
// #then
// then
expect(result).toBe(true)
})
})
src/cli/run/events.test.ts
+39 -39
View File
@@ -17,56 +17,56 @@ async function* toAsyncIterable<T>(items: T[]): AsyncIterable<T> {
describe("serializeError", () => {
it("returns 'Unknown error' for null/undefined", () => {
// #given / #when / #then
// given / when / then
expect(serializeError(null)).toBe("Unknown error")
expect(serializeError(undefined)).toBe("Unknown error")
})
it("returns message from Error instance", () => {
// #given
// given
const error = new Error("Something went wrong")
// #when / #then
// when / then
expect(serializeError(error)).toBe("Something went wrong")
})
it("returns string as-is", () => {
// #given / #when / #then
// given / when / then
expect(serializeError("Direct error message")).toBe("Direct error message")
})
it("extracts message from plain object", () => {
// #given
// given
const errorObj = { message: "Object error message", code: "ERR_001" }
// #when / #then
// when / then
expect(serializeError(errorObj)).toBe("Object error message")
})
it("extracts message from nested error object", () => {
// #given
// given
const errorObj = { error: { message: "Nested error message" } }
// #when / #then
// when / then
expect(serializeError(errorObj)).toBe("Nested error message")
})
it("extracts message from data.message path", () => {
// #given
// given
const errorObj = { data: { message: "Data error message" } }
// #when / #then
// when / then
expect(serializeError(errorObj)).toBe("Data error message")
})
it("JSON stringifies object without message property", () => {
// #given
// given
const errorObj = { code: "ERR_001", status: 500 }
// #when
// when
const result = serializeError(errorObj)
// #then
// then
expect(result).toContain("ERR_001")
expect(result).toContain("500")
})
@@ -74,10 +74,10 @@ describe("serializeError", () => {
describe("createEventState", () => {
it("creates initial state with correct defaults", () => {
// #given / #when
// given / when
const state = createEventState()
// #then
// then
expect(state.mainSessionIdle).toBe(false)
expect(state.lastOutput).toBe("")
expect(state.lastPartText).toBe("")
@@ -88,7 +88,7 @@ describe("createEventState", () => {
describe("event handling", () => {
it("session.idle sets mainSessionIdle to true for matching session", async () => {
// #given
// given
const ctx = createMockContext("my-session")
const state = createEventState()
@@ -100,15 +100,15 @@ describe("event handling", () => {
const events = toAsyncIterable([payload])
const { processEvents } = await import("./events")
// #when
// when
await processEvents(ctx, events, state)
// #then
// then
expect(state.mainSessionIdle).toBe(true)
})
it("session.idle does not affect state for different session", async () => {
// #given
// given
const ctx = createMockContext("my-session")
const state = createEventState()
@@ -120,15 +120,15 @@ describe("event handling", () => {
const events = toAsyncIterable([payload])
const { processEvents } = await import("./events")
// #when
// when
await processEvents(ctx, events, state)
// #then
// then
expect(state.mainSessionIdle).toBe(false)
})
it("hasReceivedMeaningfulWork is false initially after session.idle", async () => {
// #given - session goes idle without any assistant output (race condition scenario)
// given - session goes idle without any assistant output (race condition scenario)
const ctx = createMockContext("my-session")
const state = createEventState()
@@ -140,16 +140,16 @@ describe("event handling", () => {
const events = toAsyncIterable([payload])
const { processEvents } = await import("./events")
// #when
// when
await processEvents(ctx, events, state)
// #then - idle but no meaningful work yet
// then - idle but no meaningful work yet
expect(state.mainSessionIdle).toBe(true)
expect(state.hasReceivedMeaningfulWork).toBe(false)
})
it("message.updated with assistant role sets hasReceivedMeaningfulWork", async () => {
// #given
// given
const ctx = createMockContext("my-session")
const state = createEventState()
@@ -163,15 +163,15 @@ describe("event handling", () => {
const events = toAsyncIterable([payload])
const { processEvents } = await import("./events")
// #when
// when
await processEvents(ctx, events, state)
// #then
// then
expect(state.hasReceivedMeaningfulWork).toBe(true)
})
it("message.updated with user role does not set hasReceivedMeaningfulWork", async () => {
// #given - user message should not count as meaningful work
// given - user message should not count as meaningful work
const ctx = createMockContext("my-session")
const state = createEventState()
@@ -185,15 +185,15 @@ describe("event handling", () => {
const events = toAsyncIterable([payload])
const { processEvents } = await import("./events")
// #when
// when
await processEvents(ctx, events, state)
// #then - user role should not count as meaningful work
// then - user role should not count as meaningful work
expect(state.hasReceivedMeaningfulWork).toBe(false)
})
it("tool.execute sets hasReceivedMeaningfulWork", async () => {
// #given
// given
const ctx = createMockContext("my-session")
const state = createEventState()
@@ -209,15 +209,15 @@ describe("event handling", () => {
const events = toAsyncIterable([payload])
const { processEvents } = await import("./events")
// #when
// when
await processEvents(ctx, events, state)
// #then
// then
expect(state.hasReceivedMeaningfulWork).toBe(true)
})
it("tool.execute from different session does not set hasReceivedMeaningfulWork", async () => {
// #given
// given
const ctx = createMockContext("my-session")
const state = createEventState()
@@ -233,15 +233,15 @@ describe("event handling", () => {
const events = toAsyncIterable([payload])
const { processEvents } = await import("./events")
// #when
// when
await processEvents(ctx, events, state)
// #then - different session's tool call shouldn't count
// then - different session's tool call shouldn't count
expect(state.hasReceivedMeaningfulWork).toBe(false)
})
it("session.status with busy type sets mainSessionIdle to false", async () => {
// #given
// given
const ctx = createMockContext("my-session")
const state: EventState = {
mainSessionIdle: true,
@@ -261,10 +261,10 @@ describe("event handling", () => {
const events = toAsyncIterable([payload])
const { processEvents } = await import("./events")
// #when
// when
await processEvents(ctx, events, state)
// #then
// then
expect(state.mainSessionIdle).toBe(false)
})
})