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
12 changes: 7 additions & 5 deletions extensions/ce-core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ function createSubagentRunner(
prompt,
agent: "",
task: "",
cwd: pi.cwd ?? process.cwd(),
cwd: (pi as any).cwd ?? process.cwd(),
extraFlags: options?.extraFlags,
extraEnv: options?.extraEnv,
signal,
Expand Down Expand Up @@ -503,7 +503,7 @@ export default function ceCoreExtension(pi: ExtensionAPI) {
inheritSkills: params.inheritSkills,
},
createSubagentRunner(pi, signal),
{ onUpdate },
{ onUpdate: onUpdate ? (details) => onUpdate({ content: [], details }) : undefined },
)

// Build final content from results
Expand Down Expand Up @@ -623,7 +623,7 @@ export default function ceCoreExtension(pi: ExtensionAPI) {
inheritSkills: params.inheritSkills,
},
createSubagentRunner(pi, signal),
{ onUpdate },
{ onUpdate: onUpdate ? (details) => onUpdate({ content: [], details }) : undefined },
)

// Build compact summary content for LLM consumption
Expand Down Expand Up @@ -654,12 +654,14 @@ export default function ceCoreExtension(pi: ExtensionAPI) {
}
},
renderCall(args, theme, _context) {
return renderSubagentCall(args, theme)
return renderSubagentCall({
tasks: typeof args.tasks === "string" ? [] : args.tasks,
}, theme)
},
renderResult(result, renderContext, theme, _context) {
// Handle partial updates where data is at top level (from onUpdate)
// rather than nested in .details (from final result return value)
const data = (result.details || result) as SubagentLiveDetails
const data = (result.details || result) as ParallelSubagentLiveDetails
return renderSubagentResult(data, renderContext, theme)
},
})
Expand Down
4 changes: 3 additions & 1 deletion extensions/ce-core/tools/parallel-subagent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ import {
getFinalOutput,
makeFailedResult,
invokeRunner,
type AnyRunner,
} from "./subagent-events"
import {
assertNonPipelineStageSkill,
type SubagentLiveRunner,
type SubagentLiveExecOptions,
type SubagentRunner,
} from "./subagent"

// ---------------------------------------------------------------------------
Expand Down Expand Up @@ -88,7 +90,7 @@ export function createParallelSubagentTool() {

async execute(
input: ParallelSubagentInput,
runner: SubagentLiveRunner,
runner: SubagentLiveRunner | SubagentRunner,
toolCtx?: { onUpdate?: (details: ParallelSubagentLiveDetails) => void },
): Promise<ParallelSubagentLiveDetails> {
// Recursion depth guard
Expand Down
2 changes: 1 addition & 1 deletion extensions/ce-core/tools/subagent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export interface SubagentInput {
}

export interface SubagentLiveDetails {
mode: "single" | "chain"
mode: "single" | "chain" | "parallel"
results: SingleResult[]
}

Expand Down
4 changes: 2 additions & 2 deletions tests/subagent-events.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ describe("subagent-events: parseJsonEvent", () => {
expect(event).not.toBeNull()
expect(event!.type).toBe("message_end")
if (event!.type === "message_end") {
expect(event!.message.role).toBe("assistant")
expect((event!.message as any).role).toBe("assistant")
expect(event!.usage).toBeDefined()
expect(event!.usage!.input).toBe(100)
expect(event!.stopReason).toBe("end")
Expand All @@ -166,7 +166,7 @@ describe("subagent-events: parseJsonEvent", () => {
expect(event).not.toBeNull()
expect(event!.type).toBe("tool_result_end")
if (event!.type === "tool_result_end") {
expect(event!.message.role).toBe("user")
expect((event!.message as any).role).toBe("user")
}
})

Expand Down
3 changes: 2 additions & 1 deletion tests/subagent-live-updates.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { describe, expect, test } from "bun:test"
import { createSubagentTool } from "../extensions/ce-core/tools/subagent"
import type { SingleResult, SubagentLiveExecOptions, SubagentLiveRunner } from "../extensions/ce-core/tools/subagent"
import type { SingleResult } from "../extensions/ce-core/tools/subagent-events"
import type { SubagentLiveExecOptions, SubagentLiveRunner } from "../extensions/ce-core/tools/subagent"

/**
* Fake live runner that simulates JSON event stream results
Expand Down
Loading