Skip to content

Sync site list when CLI creates sites while app is running #2313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bcotrim merged 6 commits into from
Jan 6, 2026
Merged

Sync site list when CLI creates sites while app is running #2313

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a02f81b
add new site from CLI to Studio runtime
bcotrim Dec 24, 2025
e4b5f5b
Fix external site changes not reflecting in UI (STU-1163)
bcotrim Dec 24, 2025
1b8f3c9
Fix TypeScript error: handle url property for stopped sites
bcotrim Dec 24, 2025
8226e99
Merge branch 'dev/studio-cli-i2' of github.com:Automattic/studio into…
sejas Dec 30, 2025
56a4ad8
Fix tests
sejas Dec 30, 2025
8d9f0df
add comments for site changes watch workflow
bcotrim Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/hooks/use-site-details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,16 @@ export function SiteDetailsProvider( { children }: SiteDetailsProviderProps ) {
);
} );

useIpcListener( 'user-data-updated', async () => {
const updatedSites = await getIpcApi().getSiteDetails();
setSites( updatedSites );

// Handle case where selected site was deleted externally
if ( selectedSiteId && ! updatedSites.find( ( site ) => site.id === selectedSiteId ) ) {
setSelectedSiteId( updatedSites.length ? updatedSites[ 0 ].id : '' );
}
} );

const toggleLoadingServerForSite = useCallback( ( siteId: string ) => {
setLoadingServer( ( currentLoading ) => ( {
...currentLoading,
Expand Down
14 changes: 13 additions & 1 deletion src/ipc-handlers.ts
View file
Open in desktop
Copy link
Contributor

@fredrikekelund fredrikekelund Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a concern for a later PR, but I think we should reconsider storing a global list of SiteServer instances in the node process. The CLI (or pm2, really) will soon be the source of truth for whether a server is running. It might make more sense to treat server instances as ephemeral variables in the node process, always reading from disk or the CLI whenever the client process queries them.

Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,19 @@ function mergeSiteDetailsWithRunningDetails( sites: SiteDetails[] ): SiteDetails
return sites.map( ( site ) => {
const server = SiteServer.get( site.id );
if ( server ) {
return server.details;
// Merge fresh data from disk with running state from server
// This ensures external changes (e.g., from CLI) are reflected
if ( server.details.running ) {
return {
...site,
running: true as const,
url: server.details.url,
};
}
return {
...site,
running: false as const,
};
}
return site;
} );
Expand Down
Loading