Merge pull request #731 from oussamadouhou/fix/background-task-directory-inheritance

fix(background-agent): inherit parent session directory for background tasks
This commit is contained in:
Kenny 2026-01-13 12:38:38 -05:00 committed by GitHub
commit 31c5951dfc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 43 additions and 1 deletions

View File

@ -75,11 +75,23 @@ export class BackgroundManager {
await this.concurrencyManager.acquire(concurrencyKey) await this.concurrencyManager.acquire(concurrencyKey)
const parentSession = await this.client.session.get({
path: { id: input.parentSessionID },
}).catch((err) => {
log(`[background-agent] Failed to get parent session: ${err}`)
return null
})
const parentDirectory = parentSession?.data?.directory ?? this.directory
log(`[background-agent] Parent dir: ${parentSession?.data?.directory}, using: ${parentDirectory}`)
const createResult = await this.client.session.create({ const createResult = await this.client.session.create({
body: { body: {
parentID: input.parentSessionID, parentID: input.parentSessionID,
title: `Background: ${input.description}`, title: `Background: ${input.description}`,
}, },
query: {
directory: parentDirectory,
},
}).catch((error) => { }).catch((error) => {
this.concurrencyManager.release(concurrencyKey) this.concurrencyManager.release(concurrencyKey)
throw error throw error

View File

@ -240,6 +240,7 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
const sisyphusTask = createSisyphusTask({ const sisyphusTask = createSisyphusTask({
manager: backgroundManager, manager: backgroundManager,
client: ctx.client, client: ctx.client,
directory: ctx.directory,
userCategories: pluginConfig.categories, userCategories: pluginConfig.categories,
gitMasterConfig: pluginConfig.git_master, gitMasterConfig: pluginConfig.git_master,
}); });

View File

@ -145,11 +145,23 @@ async function executeSync(
sessionID = args.session_id sessionID = args.session_id
} else { } else {
log(`[call_omo_agent] Creating new session with parent: ${toolContext.sessionID}`) log(`[call_omo_agent] Creating new session with parent: ${toolContext.sessionID}`)
const parentSession = await ctx.client.session.get({
path: { id: toolContext.sessionID },
}).catch((err) => {
log(`[call_omo_agent] Failed to get parent session:`, err)
return null
})
log(`[call_omo_agent] Parent session dir: ${parentSession?.data?.directory}, fallback: ${ctx.directory}`)
const parentDirectory = parentSession?.data?.directory ?? ctx.directory
const createResult = await ctx.client.session.create({ const createResult = await ctx.client.session.create({
body: { body: {
parentID: toolContext.sessionID, parentID: toolContext.sessionID,
title: `${args.description} (@${args.subagent_type} subagent)`, title: `${args.description} (@${args.subagent_type} subagent)`,
}, },
query: {
directory: parentDirectory,
},
}) })
if (createResult.error) { if (createResult.error) {

View File

@ -65,11 +65,19 @@ Be thorough on what was requested, concise on everything else.
If the requested information is not found, clearly state what is missing.` If the requested information is not found, clearly state what is missing.`
log(`[look_at] Creating session with parent: ${toolContext.sessionID}`) log(`[look_at] Creating session with parent: ${toolContext.sessionID}`)
const parentSession = await ctx.client.session.get({
path: { id: toolContext.sessionID },
}).catch(() => null)
const parentDirectory = parentSession?.data?.directory ?? ctx.directory
const createResult = await ctx.client.session.create({ const createResult = await ctx.client.session.create({
body: { body: {
parentID: toolContext.sessionID, parentID: toolContext.sessionID,
title: `look_at: ${args.goal.substring(0, 50)}`, title: `look_at: ${args.goal.substring(0, 50)}`,
}, },
query: {
directory: parentDirectory,
},
}) })
if (createResult.error) { if (createResult.error) {

View File

@ -89,6 +89,7 @@ function resolveCategoryConfig(
export interface SisyphusTaskToolOptions { export interface SisyphusTaskToolOptions {
manager: BackgroundManager manager: BackgroundManager
client: OpencodeClient client: OpencodeClient
directory: string
userCategories?: CategoriesConfig userCategories?: CategoriesConfig
gitMasterConfig?: GitMasterConfig gitMasterConfig?: GitMasterConfig
} }
@ -113,7 +114,7 @@ export function buildSystemContent(input: BuildSystemContentInput): string | und
} }
export function createSisyphusTask(options: SisyphusTaskToolOptions): ToolDefinition { export function createSisyphusTask(options: SisyphusTaskToolOptions): ToolDefinition {
const { manager, client, userCategories, gitMasterConfig } = options const { manager, client, directory, userCategories, gitMasterConfig } = options
return tool({ return tool({
description: SISYPHUS_TASK_DESCRIPTION, description: SISYPHUS_TASK_DESCRIPTION,
@ -406,11 +407,19 @@ System notifies on completion. Use \`background_output\` with task_id="${task.id
let syncSessionID: string | undefined let syncSessionID: string | undefined
try { try {
const parentSession = await client.session.get({
path: { id: ctx.sessionID },
}).catch(() => null)
const parentDirectory = parentSession?.data?.directory ?? directory
const createResult = await client.session.create({ const createResult = await client.session.create({
body: { body: {
parentID: ctx.sessionID, parentID: ctx.sessionID,
title: `Task: ${args.description}`, title: `Task: ${args.description}`,
}, },
query: {
directory: parentDirectory,
},
}) })
if (createResult.error) { if (createResult.error) {