refactor(service-graph): eagerly construct leaf services in init()
Moves skill, budget-enforcement, and session-management service construction to the top of service-graph init(), so the three getOrCreate* getters are pure readers that throw if called before init. This also fixes a duplicate-allocation bug in the orchestration listRuntimeSkillEntries closure, which was building a second SkillService instance instead of reusing the shared one. The outer getOrCreate* API surface stays intact for main-runtime-support.ts callers. The teardown setTimeout(app.exit, 3000) is left in place because worker CLI child processes keep the event loop alive; replacing it needs a full Disposable chain refactor that conflicts with in-progress pi-runtime integration work.
This commit is contained in:
1 parent
0f1b7c0b33
commit
2bd47a601a
1 file changed
+18
-35
+18
-35
@@ -78,40 +78,23 @@ export function createServiceGraph({
|
|||||||
let workerService: ReturnType<typeof createWorkerService> | null = null;
|
let workerService: ReturnType<typeof createWorkerService> | null = null;
|
||||||
let updaterService: ReturnType<typeof createUpdaterService> | null = null;
|
let updaterService: ReturnType<typeof createUpdaterService> | null = null;
|
||||||
let appLifecycleService: ReturnType<typeof createAppLifecycleService> | null = null;
|
let appLifecycleService: ReturnType<typeof createAppLifecycleService> | null = null;
|
||||||
|
// Eagerly constructed inside init() and resolved via getOrCreate* getters.
|
||||||
let skillService: ReturnType<typeof createSkillService> | null = null;
|
let skillService: ReturnType<typeof createSkillService> | null = null;
|
||||||
let budgetEnforcementService: ReturnType<typeof createBudgetEnforcementService> | null = null;
|
let budgetEnforcementService: ReturnType<typeof createBudgetEnforcementService> | null = null;
|
||||||
let sessionManagementService: ReturnType<typeof createSessionManagementService> | null = null;
|
let sessionManagementService: ReturnType<typeof createSessionManagementService> | null = null;
|
||||||
|
|
||||||
function getOrCreateSkillService() {
|
function getOrCreateSkillService() {
|
||||||
if (!skillService) {
|
if (!skillService) throw new Error("Skill service is not initialized.");
|
||||||
skillService = createSkillService({
|
|
||||||
db,
|
|
||||||
profileDir: db.profileDir,
|
|
||||||
logger,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return skillService;
|
return skillService;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getOrCreateBudgetEnforcementService() {
|
function getOrCreateBudgetEnforcementService() {
|
||||||
if (!budgetEnforcementService) {
|
if (!budgetEnforcementService) throw new Error("Budget enforcement service is not initialized.");
|
||||||
budgetEnforcementService = createBudgetEnforcementService({
|
|
||||||
db,
|
|
||||||
logger,
|
|
||||||
notify,
|
|
||||||
publishDomainChanged,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return budgetEnforcementService;
|
return budgetEnforcementService;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getOrCreateSessionManagementService() {
|
function getOrCreateSessionManagementService() {
|
||||||
if (!sessionManagementService) {
|
if (!sessionManagementService) throw new Error("Session management service is not initialized.");
|
||||||
sessionManagementService = createSessionManagementService({
|
|
||||||
db,
|
|
||||||
logger,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return sessionManagementService;
|
return sessionManagementService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -159,6 +142,12 @@ export function createServiceGraph({
|
|||||||
|
|
||||||
function init() {
|
function init() {
|
||||||
nativeTheme.themeSource = db.listSnapshot().theme;
|
nativeTheme.themeSource = db.listSnapshot().theme;
|
||||||
|
// Eagerly construct leaf services that other services depend on. Keeps
|
||||||
|
// the graph deterministic and lets getOrCreate* getters stay pure readers.
|
||||||
|
skillService = createSkillService({ db, profileDir: db.profileDir, logger });
|
||||||
|
budgetEnforcementService = createBudgetEnforcementService({ db, logger, notify, publishDomainChanged });
|
||||||
|
sessionManagementService = createSessionManagementService({ db, logger });
|
||||||
|
|
||||||
desktopShellService = createDesktopShellService({
|
desktopShellService = createDesktopShellService({
|
||||||
preloadPath,
|
preloadPath,
|
||||||
rendererDist,
|
rendererDist,
|
||||||
@@ -232,20 +221,14 @@ export function createServiceGraph({
|
|||||||
workerService?.getWorker()?.postMessage({ type: "enqueue-run", payload });
|
workerService?.getWorker()?.postMessage({ type: "enqueue-run", payload });
|
||||||
},
|
},
|
||||||
isQuitting: () => isQuittingRef.current,
|
isQuitting: () => isQuittingRef.current,
|
||||||
listRuntimeSkillEntries: (() => {
|
listRuntimeSkillEntries: (companyId: string, agentId: string, connectorId: string) => {
|
||||||
let cachedSkillService: ReturnType<typeof createSkillService> | null = null;
|
try {
|
||||||
return (companyId: string, agentId: string, connectorId: string) => {
|
return getOrCreateSkillService().listRuntimeSkillEntries(companyId, agentId, connectorId);
|
||||||
try {
|
} catch (error) {
|
||||||
if (!cachedSkillService) {
|
logger.warn(`[service-graph] listRuntimeSkillEntries failed for agent ${agentId}:`, error);
|
||||||
cachedSkillService = createSkillService({ db, profileDir: db.profileDir, logger });
|
return [];
|
||||||
}
|
}
|
||||||
return cachedSkillService.listRuntimeSkillEntries(companyId, agentId, connectorId);
|
},
|
||||||
} catch (error) {
|
|
||||||
logger.warn(`[service-graph] listRuntimeSkillEntries failed for agent ${agentId}:`, error);
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
};
|
|
||||||
})(),
|
|
||||||
budgetService: getOrCreateBudgetEnforcementService(),
|
budgetService: getOrCreateBudgetEnforcementService(),
|
||||||
checkpointEngine,
|
checkpointEngine,
|
||||||
getSessionHandoff: (taskId: string) => {
|
getSessionHandoff: (taskId: string) => {
|
||||||
|
|||||||
Reference in new issue
Block a user