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

fix(start-work): restore atlas handoff

Browse Source 
Keep native /start-work resolvable on Sisyphus, but switch the work session back to Atlas when Atlas is registered. Stamp the outgoing agent with Atlas's actual list-display key so config→start-work execution resolves correctly and still falls back to Sisyphus when Atlas is unavailable.

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
YeonGyu-Kim
2026-03-31 20:02:00 -07:00
parent d029bc7621
commit 7f846b2da3
8 changed files with 503 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hooks/start-work/index.test.ts
+59 -32
View File
@@ -4,6 +4,7 @@ import { join } from "node:path"
import { tmpdir } from "node:os"
import { randomUUID } from "node:crypto"
import { createStartWorkHook } from "./index"
import { getAgentListDisplayName } from "../../shared/agent-display-names"
import {
writeBoulderState,
clearBoulderState,
@@ -24,6 +25,22 @@ describe("start-work hook", () => {
} as Parameters<typeof createStartWorkHook>[0]
}
function createStartWorkPrompt(options?: {
sessionContext?: string
userRequest?: string
}): string {
const sessionContext = options?.sessionContext ?? ""
const userRequest = options?.userRequest ?? ""
return `<command-instruction>
You are starting a Sisyphus work session.
</command-instruction>
<session-context>${sessionContext}</session-context>${userRequest ? `
<user-request>${userRequest}</user-request>` : ""}`
}
beforeEach(() => {
sessionState._resetForTesting()
sessionState.registerAgentName("atlas")
@@ -65,6 +82,24 @@ describe("start-work hook", () => {
expect(output.parts[0].text).toBe("Just a regular message")
})
test("should ignore plain session-context blocks without the start-work marker", async () => {
// given
const hook = createStartWorkHook(createMockPluginInput())
const output = {
parts: [{ type: "text", text: "<session-context>Some context here</session-context>" }],
}
// when
await hook["chat.message"](
{ sessionID: "session-123" },
output
)
// then
expect(output.parts[0].text).toBe("<session-context>Some context here</session-context>")
expect(readBoulderState(testDir)).toBeNull()
})
test("should detect start-work command via session-context tag", async () => {
// given - hook and start-work message
const hook = createStartWorkHook(createMockPluginInput())
@@ -72,7 +107,7 @@ describe("start-work hook", () => {
parts: [
{
type: "text",
text: "<session-context>Some context here</session-context>",
text: createStartWorkPrompt({ sessionContext: "Some context here" }),
},
],
}
@@ -102,7 +137,7 @@ describe("start-work hook", () => {
const hook = createStartWorkHook(createMockPluginInput())
const output = {
parts: [{ type: "text", text: "<session-context></session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt() }],
}
// when
@@ -123,7 +158,7 @@ describe("start-work hook", () => {
parts: [
{
type: "text",
text: "<session-context>Session: $SESSION_ID</session-context>",
text: createStartWorkPrompt({ sessionContext: "Session: $SESSION_ID" }),
},
],
}
@@ -146,7 +181,7 @@ describe("start-work hook", () => {
parts: [
{
type: "text",
text: "<session-context>Time: $TIMESTAMP</session-context>",
text: createStartWorkPrompt({ sessionContext: "Time: $TIMESTAMP" }),
},
],
}
@@ -177,7 +212,7 @@ describe("start-work hook", () => {
const hook = createStartWorkHook(createMockPluginInput())
const output = {
parts: [{ type: "text", text: "<session-context></session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt() }],
}
// when
@@ -205,7 +240,7 @@ describe("start-work hook", () => {
const hook = createStartWorkHook(createMockPluginInput())
const output = {
parts: [{ type: "text", text: "<session-context></session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt() }],
}
// when
@@ -233,7 +268,7 @@ describe("start-work hook", () => {
const hook = createStartWorkHook(createMockPluginInput())
const output = {
parts: [{ type: "text", text: "<session-context></session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt() }],
}
// when
@@ -274,9 +309,7 @@ describe("start-work hook", () => {
parts: [
{
type: "text",
text: `<session-context>
<user-request>new-plan</user-request>
</session-context>`,
text: createStartWorkPrompt({ userRequest: "new-plan" }),
},
],
}
@@ -306,9 +339,7 @@ describe("start-work hook", () => {
parts: [
{
type: "text",
text: `<session-context>
<user-request>my-feature-plan ultrawork</user-request>
</session-context>`,
text: createStartWorkPrompt({ userRequest: "my-feature-plan ultrawork" }),
},
],
}
@@ -337,9 +368,7 @@ describe("start-work hook", () => {
parts: [
{
type: "text",
text: `<session-context>
<user-request>api-refactor ulw</user-request>
</session-context>`,
text: createStartWorkPrompt({ userRequest: "api-refactor ulw" }),
},
],
}
@@ -368,9 +397,7 @@ describe("start-work hook", () => {
parts: [
{
type: "text",
text: `<session-context>
<user-request>feature-implementation</user-request>
</session-context>`,
text: createStartWorkPrompt({ userRequest: "feature-implementation" }),
},
],
}
@@ -394,7 +421,7 @@ describe("start-work hook", () => {
const hook = createStartWorkHook(createMockPluginInput())
const output = {
parts: [{ type: "text", text: "<session-context></session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt() }],
}
// when
@@ -408,12 +435,12 @@ describe("start-work hook", () => {
updateSpy.mockRestore()
})
test("should stamp the outgoing message with Atlas so follow-up events keep the handoff", async () => {
test("should stamp the outgoing message with Atlas list key so follow-up events keep the handoff", async () => {
// given
const hook = createStartWorkHook(createMockPluginInput())
const output = {
message: {} as Record<string, unknown>,
parts: [{ type: "text", text: "<session-context></session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt() }],
}
// when
@@ -423,7 +450,7 @@ describe("start-work hook", () => {
)
// then
expect(output.message.agent).toBe("Atlas (Plan Executor)")
expect(output.message.agent).toBe(getAgentListDisplayName("atlas"))
})
test("should keep the current agent when Atlas is unavailable", async () => {
@@ -435,7 +462,7 @@ describe("start-work hook", () => {
const hook = createStartWorkHook(createMockPluginInput())
const output = {
message: {} as Record<string, unknown>,
parts: [{ type: "text", text: "<session-context></session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt() }],
}
// when
@@ -463,7 +490,7 @@ describe("start-work hook", () => {
const hook = createStartWorkHook(createMockPluginInput())
const output = {
message: {} as Record<string, unknown>,
parts: [{ type: "text", text: "<session-context></session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt() }],
}
// when
@@ -498,7 +525,7 @@ describe("start-work hook", () => {
const hook = createStartWorkHook(createMockPluginInput())
const output = {
message: {} as Record<string, unknown>,
parts: [{ type: "text", text: "<session-context></session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt() }],
}
// when
@@ -532,7 +559,7 @@ describe("start-work hook", () => {
const hook = createStartWorkHook(createMockPluginInput())
const output = {
parts: [{ type: "text", text: "<session-context></session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt() }],
}
// when
@@ -553,7 +580,7 @@ describe("start-work hook", () => {
const hook = createStartWorkHook(createMockPluginInput())
const output = {
parts: [{ type: "text", text: "<session-context>\n<user-request>--worktree /validated/worktree</user-request>\n</session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt({ userRequest: "--worktree /validated/worktree" }) }],
}
// when
@@ -575,7 +602,7 @@ describe("start-work hook", () => {
const hook = createStartWorkHook(createMockPluginInput())
const output = {
parts: [{ type: "text", text: "<session-context>\n<user-request>--worktree /valid/wt</user-request>\n</session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt({ userRequest: "--worktree /valid/wt" }) }],
}
// when
@@ -595,7 +622,7 @@ describe("start-work hook", () => {
const hook = createStartWorkHook(createMockPluginInput())
const output = {
parts: [{ type: "text", text: "<session-context>\n<user-request>--worktree /nonexistent/wt</user-request>\n</session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt({ userRequest: "--worktree /nonexistent/wt" }) }],
}
// when
@@ -624,7 +651,7 @@ describe("start-work hook", () => {
const hook = createStartWorkHook(createMockPluginInput())
const output = {
parts: [{ type: "text", text: "<session-context>\n<user-request>--worktree /new/wt</user-request>\n</session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt({ userRequest: "--worktree /new/wt" }) }],
}
// when
@@ -651,7 +678,7 @@ describe("start-work hook", () => {
const hook = createStartWorkHook(createMockPluginInput())
const output = {
parts: [{ type: "text", text: "<session-context></session-context>" }],
parts: [{ type: "text", text: createStartWorkPrompt() }],
}
// when
src/hooks/start-work/start-work-hook.ts
+159 -118
View File
@@ -11,18 +11,33 @@ import {
clearBoulderState,
} from "../../features/boulder-state"
import { log } from "../../shared/logger"
import { getAgentConfigKey, getAgentDisplayName } from "../../shared/agent-display-names"
import { getSessionAgent, isAgentRegistered, updateSessionAgent } from "../../features/claude-code-session-state"
import {
getAgentConfigKey,
getAgentDisplayName,
getAgentListDisplayName,
} from "../../shared/agent-display-names"
import {
getSessionAgent,
isAgentRegistered,
updateSessionAgent,
} from "../../features/claude-code-session-state"
import { detectWorktreePath } from "./worktree-detector"
import { parseUserRequest } from "./parse-user-request"
export const HOOK_NAME = "start-work" as const
const START_WORK_TEMPLATE_MARKER = "You are starting a Sisyphus work session."
interface StartWorkHookInput {
sessionID: string
messageID?: string
}
interface StartWorkCommandExecuteBeforeInput {
sessionID: string
command: string
arguments: string
}
interface StartWorkHookOutput {
message?: Record<string, unknown>
parts: Array<{ type: string; text?: string }>
@@ -67,61 +82,76 @@ function resolveWorktreeContext(
}
export function createStartWorkHook(ctx: PluginInput) {
return {
"chat.message": async (input: StartWorkHookInput, output: StartWorkHookOutput): Promise<void> => {
const parts = output.parts
const promptText =
parts
?.filter((p) => p.type === "text" && p.text)
.map((p) => p.text)
.join("\n")
.trim() || ""
const processStartWork = async (
input: StartWorkHookInput,
output: StartWorkHookOutput,
): Promise<void> => {
const parts = output.parts
const promptText =
parts
?.filter((p) => p.type === "text" && p.text)
.map((p) => p.text)
.join("\n")
.trim() || ""
if (!promptText.includes("<session-context>")) return
if (
!promptText.includes("<session-context>")
|| !promptText.includes(START_WORK_TEMPLATE_MARKER)
) {
return
}
log(`[${HOOK_NAME}] Processing start-work command`, { sessionID: input.sessionID })
const currentSessionAgent = getSessionAgent(input.sessionID)
const activeAgent = isAgentRegistered("atlas")
? "atlas"
: currentSessionAgent && getAgentConfigKey(currentSessionAgent) !== "prometheus"
? currentSessionAgent
log(`[${HOOK_NAME}] Processing start-work command`, { sessionID: input.sessionID })
const currentSessionAgent = getSessionAgent(input.sessionID)
const currentSessionAgentKey = currentSessionAgent
? getAgentConfigKey(currentSessionAgent)
: undefined
const activeAgent = currentSessionAgent
&& currentSessionAgentKey
&& currentSessionAgentKey !== "prometheus"
&& currentSessionAgentKey !== "atlas"
? currentSessionAgent
: isAgentRegistered("atlas")
? "atlas"
: "sisyphus"
const activeAgentDisplayName = getAgentDisplayName(activeAgent)
updateSessionAgent(input.sessionID, activeAgent)
if (output.message) {
output.message["agent"] = activeAgentDisplayName
}
const activeAgentDisplayName = activeAgent === "atlas"
? getAgentListDisplayName(activeAgent)
: getAgentDisplayName(activeAgent)
updateSessionAgent(input.sessionID, activeAgent)
if (output.message) {
output.message["agent"] = activeAgentDisplayName
}
const existingState = readBoulderState(ctx.directory)
const sessionId = input.sessionID
const timestamp = new Date().toISOString()
const existingState = readBoulderState(ctx.directory)
const sessionId = input.sessionID
const timestamp = new Date().toISOString()
const { planName: explicitPlanName, explicitWorktreePath } = parseUserRequest(promptText)
const { worktreePath, block: worktreeBlock } = resolveWorktreeContext(explicitWorktreePath)
const { planName: explicitPlanName, explicitWorktreePath } = parseUserRequest(promptText)
const { worktreePath, block: worktreeBlock } = resolveWorktreeContext(explicitWorktreePath)
let contextInfo = ""
let contextInfo = ""
if (explicitPlanName) {
log(`[${HOOK_NAME}] Explicit plan name requested: ${explicitPlanName}`, { sessionID: input.sessionID })
if (explicitPlanName) {
log(`[${HOOK_NAME}] Explicit plan name requested: ${explicitPlanName}`, { sessionID: input.sessionID })
const allPlans = findPrometheusPlans(ctx.directory)
const matchedPlan = findPlanByName(allPlans, explicitPlanName)
const allPlans = findPrometheusPlans(ctx.directory)
const matchedPlan = findPlanByName(allPlans, explicitPlanName)
if (matchedPlan) {
const progress = getPlanProgress(matchedPlan)
if (matchedPlan) {
const progress = getPlanProgress(matchedPlan)
if (progress.isComplete) {
contextInfo = `
if (progress.isComplete) {
contextInfo = `
## Plan Already Complete
The requested plan "${getPlanName(matchedPlan)}" has been completed.
All ${progress.total} tasks are done. Create a new plan with: /plan "your task"`
} else {
if (existingState) clearBoulderState(ctx.directory)
const newState = createBoulderState(matchedPlan, sessionId, activeAgent, worktreePath)
writeBoulderState(ctx.directory, newState)
} else {
if (existingState) clearBoulderState(ctx.directory)
const newState = createBoulderState(matchedPlan, sessionId, activeAgent, worktreePath)
writeBoulderState(ctx.directory, newState)
contextInfo = `
contextInfo = `
## Auto-Selected Plan
**Plan**: ${getPlanName(matchedPlan)}
@@ -132,18 +162,18 @@ All ${progress.total} tasks are done. Create a new plan with: /plan "your task"`
${worktreeBlock}
boulder.json has been created. Read the plan and begin execution.`
}
} else {
const incompletePlans = allPlans.filter((p) => !getPlanProgress(p).isComplete)
if (incompletePlans.length > 0) {
const planList = incompletePlans
.map((p, i) => {
const prog = getPlanProgress(p)
return `${i + 1}. [${getPlanName(p)}] - Progress: ${prog.completed}/${prog.total}`
})
.join("\n")
}
} else {
const incompletePlans = allPlans.filter((p) => !getPlanProgress(p).isComplete)
if (incompletePlans.length > 0) {
const planList = incompletePlans
.map((p, i) => {
const prog = getPlanProgress(p)
return `${i + 1}. [${getPlanName(p)}] - Progress: ${prog.completed}/${prog.total}`
})
.join("\n")
contextInfo = `
contextInfo = `
## Plan Not Found
Could not find a plan matching "${explicitPlanName}".
@@ -152,39 +182,39 @@ Available incomplete plans:
${planList}
Ask the user which plan to work on.`
} else {
contextInfo = `
} else {
contextInfo = `
## Plan Not Found
Could not find a plan matching "${explicitPlanName}".
No incomplete plans available. Create a new plan with: /plan "your task"`
}
}
} else if (existingState) {
const progress = getPlanProgress(existingState.active_plan)
}
} else if (existingState) {
const progress = getPlanProgress(existingState.active_plan)
if (!progress.isComplete) {
const effectiveWorktree = worktreePath ?? existingState.worktree_path
const sessionAlreadyTracked = existingState.session_ids.includes(sessionId)
const updatedSessions = sessionAlreadyTracked
? existingState.session_ids
: [...existingState.session_ids, sessionId]
const shouldRewriteState = existingState.agent !== activeAgent || worktreePath !== undefined
if (!progress.isComplete) {
const effectiveWorktree = worktreePath ?? existingState.worktree_path
const sessionAlreadyTracked = existingState.session_ids.includes(sessionId)
const updatedSessions = sessionAlreadyTracked
? existingState.session_ids
: [...existingState.session_ids, sessionId]
const shouldRewriteState = existingState.agent !== activeAgent || worktreePath !== undefined
if (shouldRewriteState) {
writeBoulderState(ctx.directory, {
...existingState,
agent: activeAgent,
...(worktreePath !== undefined ? { worktree_path: worktreePath } : {}),
session_ids: updatedSessions,
})
} else if (!sessionAlreadyTracked) {
appendSessionId(ctx.directory, sessionId)
}
if (shouldRewriteState) {
writeBoulderState(ctx.directory, {
...existingState,
agent: activeAgent,
...(worktreePath !== undefined ? { worktree_path: worktreePath } : {}),
session_ids: updatedSessions,
})
} else if (!sessionAlreadyTracked) {
appendSessionId(ctx.directory, sessionId)
}
const worktreeDisplay = effectiveWorktree ? createWorktreeActiveBlock(effectiveWorktree) : worktreeBlock
const worktreeDisplay = effectiveWorktree ? createWorktreeActiveBlock(effectiveWorktree) : worktreeBlock
contextInfo = `
contextInfo = `
## Active Work Session Found
**Status**: RESUMING existing work
@@ -197,41 +227,41 @@ ${worktreeDisplay}
The current session (${sessionId}) has been added to session_ids.
Read the plan file and continue from the first unchecked task.`
} else {
contextInfo = `
} else {
contextInfo = `
## Previous Work Complete
The previous plan (${existingState.plan_name}) has been completed.
Looking for new plans...`
}
}
}
if (
(!existingState && !explicitPlanName) ||
(existingState && !explicitPlanName && getPlanProgress(existingState.active_plan).isComplete)
) {
const plans = findPrometheusPlans(ctx.directory)
const incompletePlans = plans.filter((p) => !getPlanProgress(p).isComplete)
if (
(!existingState && !explicitPlanName) ||
(existingState && !explicitPlanName && getPlanProgress(existingState.active_plan).isComplete)
) {
const plans = findPrometheusPlans(ctx.directory)
const incompletePlans = plans.filter((p) => !getPlanProgress(p).isComplete)
if (plans.length === 0) {
contextInfo += `
if (plans.length === 0) {
contextInfo += `
## No Plans Found
No Prometheus plan files found at .sisyphus/plans/
Use Prometheus to create a work plan first: /plan "your task"`
} else if (incompletePlans.length === 0) {
contextInfo += `
} else if (incompletePlans.length === 0) {
contextInfo += `
## All Plans Complete
All ${plans.length} plan(s) are complete. Create a new plan with: /plan "your task"`
} else if (incompletePlans.length === 1) {
const planPath = incompletePlans[0]
const progress = getPlanProgress(planPath)
const newState = createBoulderState(planPath, sessionId, activeAgent, worktreePath)
writeBoulderState(ctx.directory, newState)
} else if (incompletePlans.length === 1) {
const planPath = incompletePlans[0]
const progress = getPlanProgress(planPath)
const newState = createBoulderState(planPath, sessionId, activeAgent, worktreePath)
writeBoulderState(ctx.directory, newState)
contextInfo += `
contextInfo += `
## Auto-Selected Plan
@@ -243,16 +273,16 @@ All ${plans.length} plan(s) are complete. Create a new plan with: /plan "your ta
${worktreeBlock}
boulder.json has been created. Read the plan and begin execution.`
} else {
const planList = incompletePlans
.map((p, i) => {
const progress = getPlanProgress(p)
const modified = new Date(statSync(p).mtimeMs).toISOString()
return `${i + 1}. [${getPlanName(p)}] - Modified: ${modified} - Progress: ${progress.completed}/${progress.total}`
})
.join("\n")
} else {
const planList = incompletePlans
.map((p, i) => {
const progress = getPlanProgress(p)
const modified = new Date(statSync(p).mtimeMs).toISOString()
return `${i + 1}. [${getPlanName(p)}] - Modified: ${modified} - Progress: ${progress.completed}/${progress.total}`
})
.join("\n")
contextInfo += `
contextInfo += `
<system-reminder>
## Multiple Plans Found
@@ -265,23 +295,34 @@ ${planList}
Ask the user which plan to work on. Present the options above and wait for their response.
${worktreeBlock}
</system-reminder>`
}
}
}
const idx = output.parts.findIndex((p) => p.type === "text" && p.text)
if (idx >= 0 && output.parts[idx].text) {
output.parts[idx].text = output.parts[idx].text
.replace(/\$SESSION_ID/g, sessionId)
.replace(/\$TIMESTAMP/g, timestamp)
const idx = output.parts.findIndex((p) => p.type === "text" && p.text)
if (idx >= 0 && output.parts[idx].text) {
output.parts[idx].text = output.parts[idx].text
.replace(/\$SESSION_ID/g, sessionId)
.replace(/\$TIMESTAMP/g, timestamp)
output.parts[idx].text += `\n\n---\n${contextInfo}`
}
output.parts[idx].text += `\n\n---\n${contextInfo}`
}
log(`[${HOOK_NAME}] Context injected`, {
sessionID: input.sessionID,
hasExistingState: !!existingState,
worktreePath,
})
log(`[${HOOK_NAME}] Context injected`, {
sessionID: input.sessionID,
hasExistingState: !!existingState,
worktreePath,
})
}
return {
"chat.message": async (input: StartWorkHookInput, output: StartWorkHookOutput): Promise<void> => {
await processStartWork(input, output)
},
"command.execute.before": async (
input: StartWorkCommandExecuteBeforeInput,
output: StartWorkHookOutput,
): Promise<void> => {
await processStartWork(input, output)
},
}
}