@@ -27,6 +27,7 @@ import { defaultModeSlug } from "../../../shared/modes"
2727import { experimentDefault } from "../../../shared/experiments"
2828import { setTtsEnabled } from "../../../utils/tts"
2929import { ContextProxy } from "../../config/ContextProxy"
30+ import { WorkspaceIndexingEnablementManager } from "../../../services/code-index/workspace-indexing-enablement-manager"
3031import { Task , TaskOptions } from "../../task/Task"
3132import { safeWriteJson } from "../../../utils/safeWriteJson"
3233
@@ -2966,7 +2967,7 @@ describe("webviewMessageHandler no-floating-promises coverage", () => {
29662967 postMessageToWebview : vi . fn ( ) . mockResolvedValue ( true ) ,
29672968 postStateToWebview : vi . fn ( ) . mockResolvedValue ( undefined ) ,
29682969 getCurrentTask : vi . fn ( ) ,
2969- getCurrentWorkspaceCodeIndexManager : vi . fn ( ) ,
2970+ getCurrentWorkspaceCodeIndexScope : vi . fn ( ) ,
29702971 getMcpHub : vi . fn ( ) . mockReturnValue ( {
29712972 getMcpSettingsFilePath : vi . fn ( ) . mockResolvedValue ( "/test/mcp.json" ) ,
29722973 } ) ,
@@ -3022,10 +3023,11 @@ describe("webviewMessageHandler no-floating-promises coverage", () => {
30223023 startIndexing : vi . fn ( ) . mockReturnValue ( indexingPromise ) ,
30233024 } )
30243025 const provider = createProvider ( {
3025- getCurrentWorkspaceCodeIndexManager : vi . fn ( ) . mockReturnValue ( manager ) ,
3026+ getCurrentWorkspaceCodeIndexScope : vi . fn ( ) . mockReturnValue ( { codeIndexManager : manager } ) ,
30263027 } )
30273028
30283029 await expect ( webviewMessageHandler ( provider , { type : "startIndexing" } ) ) . resolves . toBeUndefined ( )
3030+ expect ( provider . getCurrentWorkspaceCodeIndexScope ) . toHaveBeenCalledOnce ( )
30293031 expect ( manager . startIndexing ) . toHaveBeenCalledOnce ( )
30303032
30313033 rejectIndexing ( new Error ( "boom" ) )
@@ -3179,14 +3181,29 @@ describe("webviewMessageHandler no-floating-promises coverage", () => {
31793181
31803182 it ( "covers changed indexing status, secret, and missing-manager responses" , async ( ) => {
31813183 const manager = createIndexManager ( )
3182- const getManager = vi . fn ( ) . mockReturnValueOnce ( undefined ) . mockReturnValue ( manager )
3183- const provider = createProvider ( { getCurrentWorkspaceCodeIndexManager : getManager } )
3184+ const getScope = vi . fn ( ) . mockReturnValueOnce ( undefined ) . mockReturnValue ( { codeIndexManager : manager } )
3185+ const provider = createProvider ( {
3186+ getCurrentWorkspaceCodeIndexScope : getScope ,
3187+ } )
31843188
31853189 await webviewMessageHandler ( provider , { type : "requestIndexingStatus" } )
3190+ expect ( manager . getCurrentStatus ) . not . toHaveBeenCalled ( )
3191+ expect ( provider . postMessageToWebview ) . toHaveBeenCalledWith ( {
3192+ type : "indexingStatusUpdate" ,
3193+ values : expect . objectContaining ( { systemStatus : "Error" , message : expect . any ( String ) } ) ,
3194+ } )
31863195 await webviewMessageHandler ( provider , { type : "requestIndexingStatus" } )
3196+ expect ( getScope ) . toHaveBeenCalledTimes ( 2 )
3197+ expect ( manager . getCurrentStatus ) . toHaveBeenCalledOnce ( )
3198+ expect ( provider . postMessageToWebview ) . toHaveBeenLastCalledWith ( {
3199+ type : "indexingStatusUpdate" ,
3200+ values : manager . getCurrentStatus . mock . results [ 0 ] . value ,
3201+ } )
31873202 await webviewMessageHandler ( provider , { type : "requestCodeIndexSecretStatus" } )
3188- getManager . mockReturnValueOnce ( undefined )
3203+ getScope . mockReturnValueOnce ( undefined )
31893204 await webviewMessageHandler ( provider , { type : "startIndexing" } )
3205+ expect ( getScope ) . toHaveBeenCalledTimes ( 3 )
3206+ expect ( manager . setWorkspaceEnabled ) . not . toHaveBeenCalled ( )
31903207
31913208 expect ( provider . postMessageToWebview ) . toHaveBeenCalledWith (
31923209 expect . objectContaining ( { type : "codeIndexSecretStatus" } ) ,
@@ -3203,7 +3220,7 @@ describe("webviewMessageHandler no-floating-promises coverage", () => {
32033220 . mockRejectedValueOnce ( new Error ( "second failure" ) ) ,
32043221 } )
32053222 const provider = createProvider ( {
3206- getCurrentWorkspaceCodeIndexManager : vi . fn ( ) . mockReturnValue ( manager ) ,
3223+ getCurrentWorkspaceCodeIndexScope : vi . fn ( ) . mockReturnValue ( { codeIndexManager : manager } ) ,
32073224 } )
32083225
32093226 await webviewMessageHandler ( provider , { type : "startIndexing" } )
@@ -3219,10 +3236,18 @@ describe("webviewMessageHandler no-floating-promises coverage", () => {
32193236 startIndexing : vi . fn ( ) . mockRejectedValue ( new Error ( "toggle failure" ) ) ,
32203237 } )
32213238 const provider = createProvider ( {
3222- getCurrentWorkspaceCodeIndexManager : vi . fn ( ) . mockReturnValue ( manager ) ,
3239+ getCurrentWorkspaceCodeIndexScope : vi . fn ( ) . mockReturnValue ( {
3240+ codeIndexManager : manager ,
3241+ workspaceIndexingEnablementManager : new WorkspaceIndexingEnablementManager ( manager ) ,
3242+ } ) ,
32233243 } )
32243244
32253245 await webviewMessageHandler ( provider , { type : "stopIndexing" } )
3246+ expect ( provider . getCurrentWorkspaceCodeIndexScope ) . toHaveBeenCalledOnce ( )
3247+ expect ( provider . postMessageToWebview ) . toHaveBeenCalledExactlyOnceWith ( {
3248+ type : "indexingStatusUpdate" ,
3249+ values : manager . getCurrentStatus ( ) ,
3250+ } )
32263251 await webviewMessageHandler ( provider , { type : "toggleWorkspaceIndexing" , bool : true } )
32273252 await Promise . resolve ( )
32283253
@@ -3233,6 +3258,53 @@ describe("webviewMessageHandler no-floating-promises coverage", () => {
32333258 )
32343259 } )
32353260
3261+ it ( "does not stop indexing or publish status without a workspace scope" , async ( ) => {
3262+ const provider = createProvider ( )
3263+ await webviewMessageHandler ( provider , { type : "stopIndexing" } )
3264+ expect ( provider . getCurrentWorkspaceCodeIndexScope ) . toHaveBeenCalledOnce ( )
3265+ expect ( provider . log ) . toHaveBeenCalledWith ( "Cannot stop indexing: No workspace folder open" )
3266+ expect ( provider . postMessageToWebview ) . not . toHaveBeenCalled ( )
3267+ } )
3268+
3269+ it . each ( [ true , false ] ) ( "resolves the scope after saving index settings (workspace=%s)" , async ( hasWorkspace ) => {
3270+ const handleSettingsChange = vi . fn ( ) . mockResolvedValue ( undefined )
3271+ const manager = createIndexManager ( { handleSettingsChange, isFeatureEnabled : false } )
3272+ const provider = createProvider ( {
3273+ getCurrentWorkspaceCodeIndexScope : vi
3274+ . fn ( )
3275+ . mockReturnValue ( hasWorkspace ? { codeIndexManager : manager } : undefined ) ,
3276+ } )
3277+
3278+ await webviewMessageHandler ( provider , {
3279+ type : "saveCodeIndexSettingsAtomic" ,
3280+ codeIndexSettings : {
3281+ codebaseIndexEnabled : false ,
3282+ codebaseIndexQdrantUrl : "http://localhost:6333" ,
3283+ codebaseIndexEmbedderProvider : providerIdentifiers . openai ,
3284+ codebaseIndexEmbedderModelId : "text-embedding-3-small" ,
3285+ } ,
3286+ } )
3287+
3288+ expect ( provider . getCurrentWorkspaceCodeIndexScope ) . toHaveBeenCalledOnce ( )
3289+ expect ( provider . postMessageToWebview ) . toHaveBeenCalledWith (
3290+ expect . objectContaining ( { type : "codeIndexSettingsSaved" , success : true } ) ,
3291+ )
3292+ if ( hasWorkspace ) {
3293+ expect ( handleSettingsChange ) . toHaveBeenCalledOnce ( )
3294+ } else {
3295+ expect ( handleSettingsChange ) . not . toHaveBeenCalled ( )
3296+ expect ( provider . log ) . toHaveBeenCalledWith ( "Cannot save code index settings: No workspace folder open" )
3297+ }
3298+ } )
3299+
3300+ it ( "does not update auto-enable defaults without a workspace scope" , async ( ) => {
3301+ const provider = createProvider ( )
3302+ await webviewMessageHandler ( provider , { type : "setAutoEnableDefault" , bool : true } )
3303+ expect ( provider . getCurrentWorkspaceCodeIndexScope ) . toHaveBeenCalledOnce ( )
3304+ expect ( provider . log ) . toHaveBeenCalledWith ( "Cannot set auto-enable default: No workspace folder open" )
3305+ expect ( provider . postMessageToWebview ) . not . toHaveBeenCalled ( )
3306+ } )
3307+
32363308 it ( "catches auto-enabled indexing failures and posts the resulting status" , async ( ) => {
32373309 const { CodeIndexManagerRegistry } = await import ( "../../../services/code-index/code-index-manager-registry" )
32383310 let workspaceEnabled = false
@@ -3247,13 +3319,14 @@ describe("webviewMessageHandler no-floating-promises coverage", () => {
32473319 . spyOn ( CodeIndexManagerRegistry , "getAllInstances" )
32483320 . mockReturnValue ( [ manager ] as unknown as ReturnType < typeof CodeIndexManagerRegistry . getAllInstances > )
32493321 const provider = createProvider ( {
3250- getCurrentWorkspaceCodeIndexManager : vi . fn ( ) . mockReturnValue ( manager ) ,
3322+ getCurrentWorkspaceCodeIndexScope : vi . fn ( ) . mockReturnValue ( { codeIndexManager : manager } ) ,
32513323 } )
32523324
32533325 try {
32543326 await webviewMessageHandler ( provider , { type : "setAutoEnableDefault" , bool : true } )
32553327 await Promise . resolve ( )
32563328
3329+ expect ( provider . getCurrentWorkspaceCodeIndexScope ) . toHaveBeenCalledOnce ( )
32573330 expect ( manager . startIndexing ) . toHaveBeenCalledOnce ( )
32583331 expect ( provider . log ) . toHaveBeenCalledWith ( "Indexing error: Error: auto-enable failure" )
32593332 expect ( provider . postMessageToWebview ) . toHaveBeenCalledWith (
@@ -3266,14 +3339,22 @@ describe("webviewMessageHandler no-floating-promises coverage", () => {
32663339
32673340 it ( "covers changed clear-index response paths" , async ( ) => {
32683341 const manager = createIndexManager ( )
3269- const getManager = vi . fn ( ) . mockReturnValueOnce ( undefined ) . mockReturnValue ( manager )
3270- const provider = createProvider ( { getCurrentWorkspaceCodeIndexManager : getManager } )
3342+ const getScope = vi . fn ( ) . mockReturnValueOnce ( undefined ) . mockReturnValue ( { codeIndexManager : manager } )
3343+ const provider = createProvider ( { getCurrentWorkspaceCodeIndexScope : getScope } )
32713344
32723345 await webviewMessageHandler ( provider , { type : "clearIndexData" } )
3346+ expect ( manager . clearIndexData ) . not . toHaveBeenCalled ( )
3347+ expect ( provider . log ) . toHaveBeenCalledWith ( "Cannot clear index data: No workspace folder open" )
3348+ expect ( provider . postMessageToWebview ) . toHaveBeenCalledExactlyOnceWith ( {
3349+ type : "indexCleared" ,
3350+ values : { success : false , error : expect . any ( String ) } ,
3351+ } )
32733352 await webviewMessageHandler ( provider , { type : "clearIndexData" } )
32743353 manager . clearIndexData . mockRejectedValueOnce ( new Error ( "clear failed" ) )
32753354 await webviewMessageHandler ( provider , { type : "clearIndexData" } )
32763355
3356+ expect ( getScope ) . toHaveBeenCalledTimes ( 3 )
3357+ expect ( manager . clearIndexData ) . toHaveBeenCalledTimes ( 2 )
32773358 expect ( provider . postMessageToWebview ) . toHaveBeenCalledWith ( {
32783359 type : "indexCleared" ,
32793360 values : { success : true } ,
0 commit comments