fix(core): count image jobs as background work for idle hooks

Author: rekram1-node

packages/core/src/plugin/goal.ts

@@ -145,9 +145,12 @@ export const Plugin = define({
       if (goal?.status !== "active") return
       if (goal.boot !== boot())
         return yield* settle(sessionID, goal, "paused", "The server restarted while the goal was active")
-      // The Session's own running subagent wakes it with its report, and the hook runs again then. A grandchild reports
-      // to its own parent, so it would never wake this Session.
-      if (background.some((work) => work.kind === "subagent" && work.sessionID === sessionID)) return
+      // The Session's own running subagent or image job wakes it with its notice, and the hook runs again then. A
+      // grandchild reports to its own parent, so it would never wake this Session.
+      if (
+        background.some((work) => (work.kind === "subagent" || work.kind === "image") && work.sessionID === sessionID)
+      )
+        return
       if (goal.rounds >= goal.maxRounds)
         return yield* settle(sessionID, goal, "paused", `Reached the limit of ${goal.maxRounds} rounds`)
 

packages/core/src/session/background.ts

@@ -16,24 +16,26 @@ export const outstanding = Effect.fnUntraced(function* (
   sessionID: SessionSchema.ID,
 ) {
   const owned = yield* Effect.filter(yield* jobs.runningBackground, (recovery) =>
-    descends(store, recovery.kind === "shell" ? recovery.sessionID : recovery.parentSessionID, sessionID),
-  )
-  return owned.map((recovery) =>
-    recovery.kind === "shell"
-      ? {
-          kind: "shell" as const,
-          sessionID: recovery.sessionID,
-          shellID: recovery.shellID,
-          command: recovery.command,
-        }
-      : {
-          kind: "subagent" as const,
-          sessionID: recovery.parentSessionID,
-          childSessionID: recovery.childSessionID,
-          agent: recovery.agent,
-          description: recovery.description,
-        },
+    descends(store, recovery.kind === "subagent" ? recovery.parentSessionID : recovery.sessionID, sessionID),
   )
+  return owned.map((recovery) => {
+    if (recovery.kind === "shell")
+      return {
+        kind: "shell" as const,
+        sessionID: recovery.sessionID,
+        shellID: recovery.shellID,
+        command: recovery.command,
+      }
+    if (recovery.kind === "image")
+      return { kind: "image" as const, sessionID: recovery.sessionID, path: recovery.path, model: recovery.model }
+    return {
+      kind: "subagent" as const,
+      sessionID: recovery.parentSessionID,
+      childSessionID: recovery.childSessionID,
+      agent: recovery.agent,
+      description: recovery.description,
+    }
+  })
 })
 
 const descends = Effect.fnUntraced(function* (

packages/plugin/src/effect/session.ts

@@ -154,6 +154,12 @@ export type SessionIdleBackground =
       readonly agent: string
       readonly description: string
     }
+  | {
+      readonly kind: "image"
+      readonly sessionID: Session.ID
+      readonly path: string
+      readonly model: string
+    }
 
 /**
  * Runs when a Session finishes model work and has no pending input, just before it goes idle.

packages/plugin/src/promise/session.ts

@@ -154,6 +154,12 @@ export type SessionIdleBackground =
       readonly agent: string
       readonly description: string
     }
+  | {
+      readonly kind: "image"
+      readonly sessionID: Session.ID
+      readonly path: string
+      readonly model: string
+    }
 
 /**
  * Runs when a Session finishes model work and has no pending input, just before it goes idle.