Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .fork-features/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"formatCompletedTasksForInjection",
"TaskTool",
"CheckTaskTool",
"Agent.get(task.agent)"
"Agent.get(task.agent)",
"parent_session_id"
],
"tests": ["packages/opencode/test/tool/check_task.test.ts"],
"upstreamTracking": {
Expand Down
9 changes: 5 additions & 4 deletions packages/opencode/src/session/async-tasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export interface TaskMetadata {
agent_type: string
description: string
session_id: string
parent_session_id: string
start_time: number
release_slot?: () => void
}
Expand Down Expand Up @@ -216,7 +217,7 @@ export async function trackBackgroundTask(
}
if (sessionID) {
if (!closingSessions.has(sessionID)) {
const parentSessionID = metadata?.session_id
const parentSessionID = metadata?.parent_session_id
if (taskResult.status === "completed") {
Bus.publish(BackgroundTaskEvent.Completed, { taskID: id, sessionID, parentSessionID })
}
Expand Down Expand Up @@ -251,7 +252,7 @@ export async function trackBackgroundTask(
}
if (sessionID) {
if (!closingSessions.has(sessionID)) {
const parentSessionID = metadata?.session_id
const parentSessionID = metadata?.parent_session_id
Bus.publish(BackgroundTaskEvent.Failed, {
taskID: id,
sessionID,
Expand Down Expand Up @@ -325,7 +326,7 @@ export function getAndClearCompletedTasks(sessionID: string): BackgroundTaskResu
const completedTasks: BackgroundTaskResult[] = []

for (const [id, result] of backgroundTaskResults.entries()) {
const isFromSession = result.metadata?.session_id === sessionID
const isFromSession = result.metadata?.parent_session_id === sessionID
const isCompletedOrFailed = result.status === "completed" || result.status === "failed"

if (!isCompletedOrFailed || !isFromSession) {
Expand All @@ -351,7 +352,7 @@ export function getAndClearCompletedTasks(sessionID: string): BackgroundTaskResu

export function hasUndeliveredCompletedTasks(sessionID: string): boolean {
for (const [id, result] of backgroundTaskResults.entries()) {
const isFromSession = result.metadata?.session_id === sessionID
const isFromSession = result.metadata?.parent_session_id === sessionID
const isCompletedOrFailed = result.status === "completed" || result.status === "failed"
const alreadyDelivered = deliveredTaskResults.has(id)

Expand Down
5 changes: 3 additions & 2 deletions packages/opencode/src/tool/task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@ export const TaskTool = Tool.define("task", async (initCtx) => {
const taskMetadata: TaskMetadata = {
agent_type: agent.name,
description: params.description,
session_id: ctx.sessionID,
session_id: session.id,
parent_session_id: ctx.sessionID,
start_time: startTime,
release_slot: result.releaseSlot,
}
Expand Down Expand Up @@ -324,7 +325,7 @@ export const TaskTool = Tool.define("task", async (initCtx) => {
unsub()
}
})(),
session.id,
ctx.sessionID,
taskMetadata,
)
} catch (e) {
Expand Down