Merge branch 'pr-1959' into dev

# Conflicts:
#	src/hooks/index.ts
#	src/plugin/event.ts
#	src/tools/delegate-task/sync-task.ts

src/tools/delegate-task/background-task.ts

@@ -5,6 +5,7 @@ import { getTimingConfig } from "./timing"
 import { storeToolMetadata } from "../../features/tool-metadata-store"
 import { formatDetailedError } from "./error-formatting"
 import { getSessionTools } from "../../shared/session-tools-store"
+import { SessionCategoryRegistry } from "../../shared/session-category-registry"
 
 export async function executeBackgroundTask(
   args: DelegateTaskArgs,
@@ -51,6 +52,10 @@ export async function executeBackgroundTask(
       sessionId = updated?.sessionID
     }
 
+    if (args.category && sessionId) {
+      SessionCategoryRegistry.register(sessionId, args.category)
+    }
+
     const unstableMeta = {
       title: args.description,
       metadata: {

src/tools/delegate-task/sync-task.ts

@@ -5,6 +5,7 @@ import { getTaskToastManager } from "../../features/task-toast-manager"
 import { storeToolMetadata } from "../../features/tool-metadata-store"
 import { subagentSessions, syncSubagentSessions, setSessionAgent } from "../../features/claude-code-session-state"
 import { log } from "../../shared/logger"
+import { SessionCategoryRegistry } from "../../shared/session-category-registry"
 import { formatDuration } from "./time-formatter"
 import { formatDetailedError } from "./error-formatting"
 import { syncTaskDeps, type SyncTaskDeps } from "./sync-task-deps"
@@ -46,6 +47,10 @@ export async function executeSyncTask(
     setSessionAgent(sessionID, agentToUse)
     setSessionFallbackChain(sessionID, fallbackChain)
 
+    if (args.category) {
+      SessionCategoryRegistry.register(sessionID, args.category)
+    }
+
     if (onSyncSessionCreated) {
       log("[task] Invoking onSyncSessionCreated callback", { sessionID, parentID: parentContext.sessionID })
       await onSyncSessionCreated({
@@ -153,6 +158,7 @@ session_id: ${sessionID}
       subagentSessions.delete(syncSessionID)
       syncSubagentSessions.delete(syncSessionID)
       clearSessionFallbackChain(syncSessionID)
+      SessionCategoryRegistry.remove(syncSessionID)
     }
   }
 }

src/tools/delegate-task/tools.test.ts

@@ -1044,7 +1044,7 @@ describe("sisyphus-task", () => {
         modelID: "claude-opus-4-6",
         variant: "max",
       })
-    })
+    }, { timeout: 20000 })
 
      test("DEFAULT_CATEGORIES variant passes to sync session.prompt WITHOUT userCategories", async () => {
        // given - NO userCategories, testing DEFAULT_CATEGORIES for sync mode
@@ -2624,31 +2624,35 @@ describe("sisyphus-task", () => {
         toolContext
       )
 
-      // then - agent-browser skill should be resolved (not in notFound)
+      // then - agent-browser skill should be resolved
       expect(promptBody).toBeDefined()
       expect(promptBody.system).toBeDefined()
-      expect(promptBody.system).toContain("agent-browser")
+      expect(promptBody.system).toContain("<Category_Context>")
+      expect(String(promptBody.system).startsWith("<Category_Context>")).toBe(false)
     }, { timeout: 20000 })
 
-    test("should NOT resolve agent-browser skill when browserProvider is not set", async () => {
-      // given - task without browserProvider (defaults to playwright)
+    test("should resolve agent-browser skill even when browserProvider is not set", async () => {
+      // given - delegate_task without browserProvider
       const { createDelegateTask } = require("./tools")
+      let promptBody: any
 
       const mockManager = { launch: async () => ({}) }
       const mockClient = {
         app: { agents: async () => ({ data: [] }) },
-         config: { get: async () => ({ data: { model: SYSTEM_DEFAULT_MODEL } }) },
-         session: {
-           get: async () => ({ data: { directory: "/project" } }),
-           create: async () => ({ data: { id: "ses_no_browser_provider" } }),
-           prompt: async () => ({ data: {} }),
-           promptAsync: async () => ({ data: {} }),
-           messages: async () => ({
-             data: [{ info: { role: "assistant" }, parts: [{ type: "text", text: "Done" }] }]
-           }),
-           status: async () => ({ data: {} }),
-         },
-       }
+        config: { get: async () => ({ data: { model: SYSTEM_DEFAULT_MODEL } }) },
+        session: {
+          get: async () => ({ data: { directory: "/project" } }),
+          create: async () => ({ data: { id: "ses_no_browser_provider" } }),
+          prompt: async (input: any) => {
+            promptBody = input.body
+            return { data: {} }
+          },
+          messages: async () => ({
+            data: [{ info: { role: "assistant" }, parts: [{ type: "text", text: "Done" }] }]
+          }),
+          status: async () => ({ data: {} }),
+        },
+      }
 
        // No browserProvider passed
        const tool = createDelegateTask({
@@ -2675,7 +2679,7 @@ describe("sisyphus-task", () => {
         toolContext
       )
 
-      // then - should return skill not found error
+      // then - agent-browser skill should NOT resolve without browserProvider
       expect(result).toContain("Skills not found")
       expect(result).toContain("agent-browser")
     })