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
5 changes: 5 additions & 0 deletions .changeset/quiet-camels-share.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"kilo-code": patch
---

Fixed resumed agent runtime orchestrator tasks so previous task history is preserved.
45 changes: 29 additions & 16 deletions packages/agent-runtime/src/host/ExtensionHost.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { EventEmitter } from "events"
import { createVSCodeAPIMock, type IdentityInfo, type ExtensionContext } from "./VSCode.js"
import { logs } from "../utils/logger.js"
import type { ExtensionMessage, WebviewMessage, ExtensionState, ModeConfig } from "../types/index.js"
import type { ExtensionMessage, WebviewMessage, ExtensionState, ModeConfig, HistoryItem } from "../types/index.js" // kilocode_change
import { argsToMessage } from "../utils/safe-stringify.js"

export interface ExtensionHostOptions {
Expand Down Expand Up @@ -1229,26 +1229,39 @@ export class ExtensionHost extends EventEmitter {
throw new Error("Cannot add history item: globalState not available")
}

// kilocode_change start
// Get existing task history
const taskHistory = (globalState.get("taskHistory") as unknown[]) || []
type ResumeHistoryItem = Partial<HistoryItem> & { mentionCount?: number } & Record<string, unknown>
const taskHistory = ((globalState.get("taskHistory") as ResumeHistoryItem[]) || []).slice()

// Check if this task already exists in history
const existingIndex = taskHistory.findIndex((item: unknown) => (item as { id?: string }).id === taskId)

// Create the HistoryItem with minimal required fields
const historyItem = {
const existingItem = existingIndex >= 0 ? taskHistory[existingIndex] : undefined

const getExistingNumber = (value: unknown): number | undefined =>
typeof value === "number" && Number.isFinite(value) ? value : undefined
const getExistingString = (value: unknown): string | undefined =>
typeof value === "string" && value.length > 0 ? value : undefined
const getExistingBoolean = (value: unknown): boolean | undefined =>
typeof value === "boolean" ? value : undefined

// Create HistoryItem by merging existing entry with conservative resume bootstrap fields.
const historyItem: ResumeHistoryItem = {
...(existingItem || {}),
id: taskId,
number:
existingIndex >= 0
? (taskHistory[existingIndex] as { number?: number }).number || 0
: taskHistory.length + 1,
ts,
task,
tokensIn: 0,
tokensOut: 0,
totalCost: 0,
mode,
}
number: getExistingNumber(existingItem?.number) ?? taskHistory.length + 1,
ts: getExistingNumber(existingItem?.ts) ?? ts,
task: getExistingString(existingItem?.task) ?? task,
tokensIn: getExistingNumber(existingItem?.tokensIn) ?? 0,
tokensOut: getExistingNumber(existingItem?.tokensOut) ?? 0,
totalCost: getExistingNumber(existingItem?.totalCost) ?? 0,
size: getExistingNumber(existingItem?.size) ?? 0,
mode: getExistingString(existingItem?.mode) ?? mode,
workspace: getExistingString(existingItem?.workspace) ?? this.options.workspacePath,
mentionCount: getExistingNumber(existingItem?.mentionCount) ?? 0,
isFavorited: getExistingBoolean(existingItem?.isFavorited) ?? false,
}
// kilocode_change end

if (existingIndex >= 0) {
// Update existing entry
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
// kilocode_change - new file
import { afterEach, describe, expect, it, vi } from "vitest"
import { ExtensionHost } from "../ExtensionHost.js"

describe("ExtensionHost.addHistoryItemForResume", () => {
let host: ExtensionHost | undefined

const createHost = () =>
new ExtensionHost({
workspacePath: "/workspace/project",
extensionBundlePath: "/tmp/extension.js",
extensionRootPath: "/tmp",
})

afterEach(() => {
if (host) {
;(host as unknown as { removeGlobalErrorHandlers: () => void }).removeGlobalErrorHandlers()
host = undefined
}
})

it("merges resume bootstrap fields without dropping lineage metadata", async () => {
host = createHost()

const existingHistoryItem = {
id: "task-123",
number: 7,
ts: 1700000000000,
task: "Existing task title",
tokensIn: 120,
tokensOut: 340,
totalCost: 0.42,
size: 2048,
mode: "architect",
workspace: "/existing/workspace",
mentionCount: 9,
isFavorited: true,
rootTaskId: "root-1",
parentTaskId: "parent-1",
childIds: ["child-1"],
status: "delegated",
delegatedToId: "child-1",
awaitingChildId: "child-1",
completedByChildId: "child-1",
completionResultSummary: "done",
cacheWrites: 3,
cacheReads: 4,
}

const taskHistory = [existingHistoryItem]
const updateMock = vi.fn().mockResolvedValue(undefined)
const getMock = vi.fn().mockReturnValue(taskHistory)

;(host as unknown as { vscodeAPI: unknown }).vscodeAPI = {
context: {
globalState: {
get: getMock,
update: updateMock,
},
},
}

await host.addHistoryItemForResume("task-123", "Resume title", 1711111111111, "code")

expect(updateMock).toHaveBeenCalledTimes(1)
const updatedHistory = updateMock.mock.calls[0][1] as Array<Record<string, unknown>>
const mergedItem = updatedHistory[0]

expect(mergedItem.id).toBe("task-123")
expect(mergedItem.number).toBe(7)
expect(mergedItem.ts).toBe(1700000000000)
expect(mergedItem.task).toBe("Existing task title")
expect(mergedItem.tokensIn).toBe(120)
expect(mergedItem.tokensOut).toBe(340)
expect(mergedItem.totalCost).toBe(0.42)
expect(mergedItem.size).toBe(2048)
expect(mergedItem.mode).toBe("architect")
expect(mergedItem.workspace).toBe("/existing/workspace")
expect(mergedItem.mentionCount).toBe(9)
expect(mergedItem.isFavorited).toBe(true)

expect(mergedItem.rootTaskId).toBe("root-1")
expect(mergedItem.parentTaskId).toBe("parent-1")
expect(mergedItem.childIds).toEqual(["child-1"])
expect(mergedItem.status).toBe("delegated")
expect(mergedItem.delegatedToId).toBe("child-1")
expect(mergedItem.awaitingChildId).toBe("child-1")
expect(mergedItem.completedByChildId).toBe("child-1")
expect(mergedItem.completionResultSummary).toBe("done")
expect(mergedItem.cacheWrites).toBe(3)
expect(mergedItem.cacheReads).toBe(4)
})
})
Loading