diff --git a/src/hooks/runtime-fallback/first-prompt-watchdog.test.ts b/src/hooks/runtime-fallback/first-prompt-watchdog.test.ts
index cc187b7ac..298475c5e 100644
--- a/src/hooks/runtime-fallback/first-prompt-watchdog.test.ts
+++ b/src/hooks/runtime-fallback/first-prompt-watchdog.test.ts
@@ -35,7 +35,7 @@ function createContext(): RuntimeFallbackPluginInput {
   }
 }
 
-function createDeps(pluginConfig: Record<string, unknown> = {}): HookDeps {
+function createDeps(pluginConfig: HookDeps["pluginConfig"] = undefined): HookDeps {
   return {
     ctx: createContext(),
     config: {
@@ -54,6 +54,7 @@ function createDeps(pluginConfig: Record<string, unknown> = {}): HookDeps {
     sessionAwaitingFallbackResult: new Set(),
     sessionFallbackTimeouts: new Map(),
     sessionStatusRetryKeys: new Map(),
+    internallyAbortedSessions: new Set(),
   }
 }
 
@@ -81,6 +82,11 @@ const AGENT = "sisyphus-junior"
 const PRIMARY_MODEL = "openai/gpt-5.4-mini"
 const FALLBACK_MODEL = "anthropic/claude-haiku-4-5"
 const PLUGIN_CONFIG_WITH_FALLBACK = {
+  git_master: {
+    commit_footer: true,
+    include_co_authored_by: true,
+    git_env_prefix: "GIT_MASTER=1",
+  },
   agents: {
     [AGENT]: {
       model: PRIMARY_MODEL,
@@ -189,7 +195,7 @@ describe("first-prompt-watchdog", () => {
     // given
     const sessionID = "session-no-fallback"
     subagentSessions.add(sessionID)
-    const deps = createDeps({}) // empty pluginConfig → no fallback models
+    const deps = createDeps()
     const calls: RecordedCalls = { abort: [], autoRetry: [] }
     const helpers = createHelpers(calls, AGENT)
     const watchdog = createFirstPromptWatchdog(deps, helpers, WATCHDOG_MS)
@@ -248,7 +254,7 @@ describe("observeEventForWatchdog", () => {
     expect(calls.terminal).toEqual([])
   })
 
-  it.each([
+  const assistantProgressParts: ReadonlyArray<readonly [string, { readonly type: string; readonly text?: string; readonly id?: string; readonly name?: string; readonly tool_use_id?: string }]> = [
     ["text", { type: "text", text: "hello" }],
     ["reasoning", { type: "reasoning", text: "thinking..." }],
     ["tool", { type: "tool" }],
@@ -257,7 +263,9 @@ describe("observeEventForWatchdog", () => {
     ["tool-call", { type: "tool-call" }],
     ["step-start", { type: "step-start" }],
     ["file", { type: "file" }],
-  ])("#given a message.updated assistant event whose only part is type=%s #when observed #then onAssistantProgress is called (model is *working*, not silent)", (_label, part) => {
+  ]
+
+  it.each(assistantProgressParts)("#given a message.updated assistant event whose only part is type=%s #when observed #then onAssistantProgress is called (model is *working*, not silent)", (_label: string, part: { readonly type: string; readonly text?: string; readonly id?: string; readonly name?: string; readonly tool_use_id?: string }) => {
     const calls = freshCalls()
     observeEventForWatchdog(
       {
@@ -305,9 +313,11 @@ describe("observeEventForWatchdog", () => {
     expect(calls.progress).toEqual([sessionID])
   })
 
-  it.each([["session.idle"], ["session.stop"], ["session.deleted"], ["session.error"]])(
+  const terminalEventTypes: ReadonlyArray<readonly [string]> = [["session.idle"], ["session.stop"], ["session.deleted"], ["session.error"]]
+
+  it.each(terminalEventTypes)(
     "#given a %s event #when observed #then onSessionTerminal is called",
-    (eventType) => {
+    (eventType: string) => {
       const calls = freshCalls()
       observeEventForWatchdog(
         { type: eventType, properties: { sessionID } },