fix(auto-update-checker): trigger deferred startup on session.created with parentID guard

This commit is contained in:
Sisyphus
2026-04-18 17:23:50 +09:00
parent a6a5a08b56
commit 0a808de6a2
5 changed files with 35 additions and 20 deletions
+11 -11
View File
@@ -6,7 +6,7 @@ type HookOptions = Parameters<CreateAutoUpdateCheckerHook>[1]
type HookDeps = NonNullable<Parameters<CreateAutoUpdateCheckerHook>[2]>
let latestVersionCallCount = 0
let scheduleDeferredIdleCheckCallCount = 0
let scheduleDeferredStartupCheckCallCount = 0
const flushMicrotasks = async (count: number): Promise<void> => {
for (let index = 0; index < count; index += 1) {
@@ -19,8 +19,8 @@ const latestVersionMock = async () => {
return "3.0.1"
}
const scheduleDeferredIdleCheckMock = (runCheck: () => void) => {
scheduleDeferredIdleCheckCallCount += 1
const scheduleDeferredStartupCheckMock = (runCheck: () => void) => {
scheduleDeferredStartupCheckCallCount += 1
scheduledCheck = runCheck
}
@@ -30,8 +30,8 @@ mock.module("./checker/latest-version", () => ({
getLatestVersion: latestVersionMock,
}))
mock.module("./hook/deferred-idle-check", () => ({
scheduleDeferredIdleCheck: scheduleDeferredIdleCheckMock,
mock.module("./hook/deferred-startup-check", () => ({
scheduleDeferredStartupCheck: scheduleDeferredStartupCheckMock,
}))
const createPluginInput = (): PluginInput => ({
@@ -105,7 +105,7 @@ const createHook = async (
const resetDeferredState = (): void => {
latestVersionCallCount = 0
scheduleDeferredIdleCheckCallCount = 0
scheduleDeferredStartupCheckCallCount = 0
scheduledCheck = null
}
@@ -135,7 +135,7 @@ describe("auto-update-checker hook", () => {
triggerSessionCreated(hook)
// then
expect(scheduleDeferredIdleCheckCallCount).toBe(1)
expect(scheduleDeferredStartupCheckCallCount).toBe(1)
expect(mocks.showVersionToast).not.toHaveBeenCalled()
expect(mocks.runBackgroundUpdateCheck).not.toHaveBeenCalled()
expect(latestVersionCallCount).toBe(0)
@@ -158,7 +158,7 @@ describe("auto-update-checker hook", () => {
triggerSessionCreated(hook, { info: { parentID: "parent-123" } })
// then
expect(scheduleDeferredIdleCheckCallCount).toBe(0)
expect(scheduleDeferredStartupCheckCallCount).toBe(0)
expect(mocks.showVersionToast).not.toHaveBeenCalled()
expect(mocks.runBackgroundUpdateCheck).not.toHaveBeenCalled()
})
@@ -172,7 +172,7 @@ describe("auto-update-checker hook", () => {
triggerSessionIdle(hook)
// then
expect(scheduleDeferredIdleCheckCallCount).toBe(0)
expect(scheduleDeferredStartupCheckCallCount).toBe(0)
expect(mocks.showVersionToast).not.toHaveBeenCalled()
expect(mocks.runBackgroundUpdateCheck).not.toHaveBeenCalled()
})
@@ -205,14 +205,14 @@ describe("auto-update-checker hook", () => {
triggerSessionCreated(hook)
// then
expect(scheduleDeferredIdleCheckCallCount).toBe(1)
expect(scheduleDeferredStartupCheckCallCount).toBe(1)
// when
await runScheduledCheck()
triggerSessionCreated(hook)
// then
expect(scheduleDeferredIdleCheckCallCount).toBe(1)
expect(scheduleDeferredStartupCheckCallCount).toBe(1)
expect(mocks.showConfigErrorsIfAny).toHaveBeenCalledTimes(1)
expect(mocks.updateAndShowConnectedProvidersCacheStatus).toHaveBeenCalledTimes(1)
expect(mocks.showModelCacheWarningIfNeeded).toHaveBeenCalledTimes(1)
+18 -3
View File
@@ -3,7 +3,7 @@ import { log } from "../../shared/logger"
import type { AutoUpdateCheckerOptions } from "./types"
import { getCachedVersion, getLocalDevVersion } from "./checker"
import { runBackgroundUpdateCheck } from "./hook/background-update-check"
import { scheduleDeferredIdleCheck } from "./hook/deferred-idle-check"
import { scheduleDeferredStartupCheck } from "./hook/deferred-startup-check"
import { showConfigErrorsIfAny } from "./hook/config-errors-toast"
import { updateAndShowConnectedProvidersCacheStatus } from "./hook/connected-providers-status"
import { refreshModelCapabilitiesOnStartup } from "./hook/model-capabilities-status"
@@ -36,6 +36,20 @@ const defaultDeps: AutoUpdateCheckerDeps = {
log,
}
const isRecord = (value: unknown): value is Record<string, unknown> => {
return typeof value === "object" && value !== null
}
const getParentID = (properties: unknown): string | undefined => {
if (!isRecord(properties)) return undefined
const { info } = properties
if (!isRecord(info)) return undefined
const { parentID } = info
return typeof parentID === "string" && parentID.length > 0 ? parentID : undefined
}
export function createAutoUpdateCheckerHook(
ctx: PluginInput,
options: AutoUpdateCheckerOptions = {},
@@ -65,13 +79,14 @@ export function createAutoUpdateCheckerHook(
return {
event: ({ event }: { event: { type: string; properties?: unknown } }) => {
if (event.type !== "session.idle") return
if (event.type !== "session.created") return
if (isCliRunMode) return
if (hasChecked || hasScheduled) return
if (getParentID(event.properties)) return
hasScheduled = true
scheduleDeferredIdleCheck(() => {
scheduleDeferredStartupCheck(() => {
hasChecked = true
void (async () => {
const cachedVersion = deps.getCachedVersion()
@@ -1,4 +0,0 @@
export function scheduleDeferredIdleCheck(runCheck: () => void): void {
const timeout = setTimeout(runCheck, 5000)
timeout.unref?.()
}
@@ -0,0 +1,4 @@
export function scheduleDeferredStartupCheck(runCheck: () => void): void {
const timeout = setTimeout(runCheck, 5000)
timeout.unref?.()
}
+2 -2
View File
@@ -1,8 +1,8 @@
import { afterEach, beforeEach, describe, expect, it, mock } from "bun:test"
let scheduledDeferredCheck: (() => void) | null = null
mock.module("../auto-update-checker/hook/deferred-idle-check", () => ({
scheduleDeferredIdleCheck: (runCheck: () => void) => {
mock.module("../auto-update-checker/hook/deferred-startup-check", () => ({
scheduleDeferredStartupCheck: (runCheck: () => void) => {
scheduledDeferredCheck = runCheck
},
}))