claude-code-session-manager 0.110.0 → 0.112.0

package/src/main/chatRunner.cjs

@@ -44,20 +44,20 @@
 
 const { spawn } = require('node:child_process');
 const { ipcMain } = require('electron');
-const { resolveClaudeBin, claudeSpawnTarget } = require('./lib/claudeBin.cjs');
-const { cleanChildEnv, pathWithUserBins } = require('./lib/cleanEnv.cjs');
+const { resolveClaudeBin, claudeSpawnTarget } = require('./lib/claude/claudeBin.cjs');
+const { cleanChildEnv, pathWithUserBins } = require('./lib/process/cleanEnv.cjs');
 const { recordExchange } = require('./exchanges.cjs');
 const { classifyToolUse } = require('./lib/toolUseClassify.cjs');
-const { extractJson } = require('./lib/extractJson.cjs');
+const { extractJson } = require('./lib/util/extractJson.cjs');
 const { classifyPromptTicket } = require('./lib/classifyPromptTicket.cjs');
-const sessionSlots = require('./lib/sessionSlots.cjs');
-const opsErrorLog = require('./lib/opsErrorLog.cjs');
-const { killTree, detachedSpawnOpts } = require('./lib/killTree.cjs');
-const agentModelResolve = require('./lib/agentModelResolve.cjs');
-const { resolveEpicEffort, effortArgs } = require('./lib/agentEffortResolve.cjs');
-const { planEpicSpawn } = require('./lib/epicSpawnPlan.cjs');
+const sessionSlots = require('./lib/scheduler/sessionSlots.cjs');
+const opsErrorLog = require('./lib/telemetry/opsErrorLog.cjs');
+const { killTree, detachedSpawnOpts } = require('./lib/process/killTree.cjs');
+const agentModelResolve = require('./lib/claude/agentModelResolve.cjs');
+const { resolveEpicEffort, effortArgs } = require('./lib/claude/agentEffortResolve.cjs');
+const { planEpicSpawn } = require('./lib/epic/epicSpawnPlan.cjs');
 const logs = require('./logs.cjs');
-const { createHeadTailBuffer } = require('./lib/headTailBuffer.cjs');
+const { createHeadTailBuffer } = require('./lib/util/headTailBuffer.cjs');
 
 // Caps on per-run stream buffers (a run can last hours).
 const STDERR_TAIL_MAX = 64 * 1024;
@@ -424,7 +424,7 @@ function pump() {
     if (idx === -1) break;
     // The chat lane cap is a POLICY bound; actual capacity comes from the
     // Session-Manager-wide slot pool shared with the scheduler
-    // (lib/sessionSlots.cjs). No slot → everyone keeps waiting; the next
+    // (lib/scheduler/sessionSlots.cjs). No slot → everyone keeps waiting; the next
     // settle() in either subsystem re-pumps.
     const slotToken = sessionSlots.acquire(`chat:${waiting[idx].tabId}`);
     if (!slotToken) break;
@@ -982,7 +982,7 @@ function requestExternalNewSession(payload) {
  * job; this only owns route logic + body parsing).
  */
 function registerAdminRoute(adminHttp) {
-  const { readBody, sendJson } = require('./lib/localAdminHttp.cjs');
+  const { readBody, sendJson } = require('./lib/feedback-remote/localAdminHttp.cjs');
   const { schemas } = require('./ipcSchemas.cjs');
 
   adminHttp.registerRoute('POST', '/admin/chat/send-prompt', async (req, res) => {

package/src/main/config.cjs

@@ -23,9 +23,9 @@ const { assertOpsWrite, opsPath, OWNERS } = require('./lib/opsOwnership.cjs');
 const chokidar = require('chokidar');
 const logs = require('./logs.cjs');
 const { sendIfAlive } = require('./lib/sendToRenderer.cjs');
-const { expandHome } = require('./lib/expandHome.cjs');
+const { expandHome } = require('./lib/util/expandHome.cjs');
 const { listReferencedFiles } = require('./lib/importReferences.cjs');
-const atomicFs = require('./lib/atomicFs.cjs');
+const atomicFs = require('./lib/util/atomicFs.cjs');
 
 /** Map<watchKey, {watcher, refCount}> — one chokidar watcher per path (+ depth, see watchKeyOf). */
 const watchers = new Map();

package/src/main/crashDiagnostics.cjs

@@ -26,8 +26,8 @@
 const { app, powerSaveBlocker, powerMonitor, crashReporter } = require('electron');
 const fs = require('node:fs');
 const path = require('node:path');
-const { reportCrash } = require('./lib/crashTelemetry.cjs');
-const { createLoopDelayMonitor, stallVerdict } = require('./lib/loopDelay.cjs');
+const { reportCrash } = require('./lib/telemetry/crashTelemetry.cjs');
+const { createLoopDelayMonitor, stallVerdict } = require('./lib/util/loopDelay.cjs');
 
 let logs = null;
 let getPowerBlockerId = () => -1;

package/src/main/docEdit.cjs

@@ -17,12 +17,12 @@
 const { ipcMain } = require('electron');
 const { spawn } = require('node:child_process');
 const crypto = require('node:crypto');
-const { resolveClaudeBin, claudeSpawnTarget } = require('./lib/claudeBin.cjs');
-const { headlessPermissionArgs, ensureCliCapsProbed } = require('./lib/claudeCliCaps.cjs');
-const { withProcRole } = require('./lib/cleanEnv.cjs');
-const { extractJson } = require('./lib/extractJson.cjs');
+const { resolveClaudeBin, claudeSpawnTarget } = require('./lib/claude/claudeBin.cjs');
+const { headlessPermissionArgs, ensureCliCapsProbed } = require('./lib/claude/claudeCliCaps.cjs');
+const { withProcRole } = require('./lib/process/cleanEnv.cjs');
+const { extractJson } = require('./lib/util/extractJson.cjs');
 const { assertInsideHome } = require('./lib/insideHome.cjs');
-const { expandHome } = require('./lib/expandHome.cjs');
+const { expandHome } = require('./lib/util/expandHome.cjs');
 const chatRunner = require('./chatRunner.cjs');
 
 // System prompt sets the role server-side so the selection is treated as

package/src/main/files.cjs

@@ -21,8 +21,8 @@ const os = require('node:os');
 
 const { z } = require('zod');
 const { assertInsideHome } = require('./lib/insideHome.cjs');
-const { expandHome } = require('./lib/expandHome.cjs');
-const atomicFs = require('./lib/atomicFs.cjs');
+const { expandHome } = require('./lib/util/expandHome.cjs');
+const atomicFs = require('./lib/util/atomicFs.cjs');
 const { schemas } = require('./ipcSchemas.cjs');
 
 /**

package/src/main/git.cjs

@@ -23,7 +23,7 @@ const { spawn } = require('node:child_process');
 const path = require('node:path');
 const { schemas } = require('./ipcSchemas.cjs');
 const { validatePath } = require('./config.cjs');
-const { LRUCache } = require('./lib/lruCache.cjs');
+const { LRUCache } = require('./lib/util/lruCache.cjs');
 
 const GIT_TIMEOUT_MS = 5_000;
 const CACHE_TTL_MS = 5_000;

package/src/main/health.cjs

@@ -1,7 +1,7 @@
 /**
  * health.cjs — health check for session-manager Electron app.
  * Verifies: app startup, IPC responsiveness, scheduler health, watchers active.
- * Exported as check() for /local-project-health skill.
+ * Exported as check(); run via `npm run health`.
  */
 
 const fs = require('node:fs');
@@ -9,23 +9,25 @@ const fsp = require('node:fs/promises');
 const path = require('node:path');
 const os = require('node:os');
 const { execFileSync } = require('node:child_process');
-const { POLL_INTERVAL_MS, loadGateThreshold } = require('./lib/schedulerConfig.cjs');
+const { POLL_INTERVAL_MS, loadGateThreshold } = require('./lib/scheduler/schedulerConfig.cjs');
 const { opsPath } = require('./lib/opsOwnership.cjs');
-const { effectivePaused } = require('./lib/upgradeDrain.cjs');
-const { checkPersonaImports } = require('./lib/personaImportHealth.cjs');
-const { checkDelegationReadiness } = require('./lib/delegationReadiness.cjs');
-const { resolvePrdsDirs } = require('./lib/prdLocations.cjs');
-const { migratePrds } = require('./lib/prdMigration.cjs');
-const queueStore = require('./lib/queueStore.cjs');
-const schedulerPaths = require('./lib/schedulerPaths.cjs');
-const { evaluateDispatchLiveness } = require('./lib/watchdogHelpers.cjs');
-const { computeStallSummary, computeDepHistorySatisfaction, FAILURE_STREAK_ESCALATION_MS, classifyQueueStarvation, launchBlockedSlugs, STARVE_ESCALATION_MS, REVERIFY_INTERVAL_MS } = require('./scheduler.cjs');
-const { findStarvedProjects, findUnresolvableDepRoots, DEFAULT_PROJECT_CWD, DEP_HISTORY_FAIL_OPEN } = require('./lib/schedulerBatch.cjs');
-const { auditLogPath, readTail } = require('./lib/auditLog.cjs');
+const { effectivePaused } = require('./lib/scheduler/upgradeDrain.cjs');
+const { checkPersonaImports } = require('./lib/persona-macro/personaImportHealth.cjs');
+const { checkDelegationReadiness } = require('./lib/epic/delegationReadiness.cjs');
+const { resolvePrdsDirs } = require('./lib/prd/prdLocations.cjs');
+const { migratePrds } = require('./lib/prd/prdMigration.cjs');
+const queueStore = require('./lib/scheduler/queueStore.cjs');
+const schedulerPaths = require('./lib/scheduler/schedulerPaths.cjs');
+const { evaluateDispatchLiveness } = require('./lib/scheduler/watchdogHelpers.cjs');
+const { computeStallSummary, computeDepHistorySatisfaction, FAILURE_STREAK_ESCALATION_MS } = require('./scheduler/budget.cjs');
+const { classifyQueueStarvation, launchBlockedSlugs, STARVE_ESCALATION_MS } = require('./scheduler/starvation.cjs');
+const { REVERIFY_INTERVAL_MS } = require('./scheduler/reviewLadder.cjs');
+const { findStarvedProjects, findUnresolvableDepRoots, DEFAULT_PROJECT_CWD, DEP_HISTORY_FAIL_OPEN } = require('./lib/scheduler/schedulerBatch.cjs');
+const { auditLogPath, readTail } = require('./lib/telemetry/auditLog.cjs');
 const { resolveBuildIdentity } = require('./lib/buildIdentity.cjs');
-const { computeReport, isRetentionEnabled, liveKeysFromJobs } = require('./lib/runLogRetention.cjs');
+const { computeReport, isRetentionEnabled, liveKeysFromJobs } = require('./lib/scheduler/runLogRetention.cjs');
 const { allProjectCwds } = require('./lib/activeSessions.cjs');
-const { scanEpicTranscripts } = require('./lib/epicTranscriptDiagnostic.cjs');
+const { scanEpicTranscripts } = require('./lib/epic/epicTranscriptDiagnostic.cjs');
 
 const MAX_LOG_AGE_MS = 5 * 60_000; // 5 min — warn if no logs this old
 const PROJECT_ROOT = path.resolve(__dirname, '../..');
@@ -106,7 +108,7 @@ function evaluateTickLiveness(queueState, heartbeat, now, runningCount) {
   // sessionSlots pool is the only limit. Read it lazily so this stays a pure
   // function of its args when a caller supplies slotCap explicitly.
   const concurrencyCap = queueState.slotCap
-    ?? (() => { try { return require('./lib/sessionSlots.cjs').totalSlots(); } catch { return Infinity; } })();
+    ?? (() => { try { return require('./lib/scheduler/sessionSlots.cjs').totalSlots(); } catch { return Infinity; } })();
 
   if (pending.length === 0) return { stalled: false, reason: 'no-pending-jobs' };
   if (effectivePaused(queueState)) return { stalled: false, reason: queueState.paused ? 'paused' : 'draining' };
@@ -641,7 +643,7 @@ function evaluateBuildFreshness({ running = null, installedOnDisk = null, repoHe
  * names the cause and the fix (`claude login`).
  *
  * NON-CRITICAL by design: reported in components.credentials + issues so
- * /local-project-health shows it, but it does not flip status.ok — health must
+ * `npm run health` shows it, but it does not flip status.ok — health must
  * not hard-fail a repo checkout just because THIS machine's token lapsed, and
  * an expired token is an operator action (re-login), not a code defect. Maps:
  *   kind 'auth'   → not ok, actionable `claude login` message (the real block)
@@ -897,7 +899,7 @@ async function check(opts = {}) {
       path: queuePath,
       jobs: Object.keys(queueState.jobs || {}).length,
       running: runningCount,
-      // Deliberate restart drain (lib/upgradeDrain.cjs) — reported so it is never read as a stall.
+      // Deliberate restart drain (lib/scheduler/upgradeDrain.cjs) — reported so it is never read as a stall.
       drain: queueState.drain?.active ? { since: queueState.drain.since ?? null, requestedAt: queueState.drain.requestedAt ?? null } : null,
       failed: failedCount,
       needsReview: needsReviewCount,

package/src/main/heapSnapshot.cjs

@@ -24,7 +24,7 @@
 
 const path = require('node:path');
 const fsp = require('node:fs/promises');
-const { heapSnapshotDir } = require('./lib/schedulerPaths.cjs');
+const { heapSnapshotDir } = require('./lib/scheduler/schedulerPaths.cjs');
 
 const CHANNEL = 'diagnostics:heap-snapshot';
 const DEFAULT_TIMEOUT_MS = 3 * 60 * 1000; // 3 min — snapshots can be multi-hundred-MB

package/src/main/historyAggregator.cjs

@@ -50,8 +50,8 @@ function resolvePricingKey(modelId) {
 }
 
 // ── LRU cache ─────────────────────────────────────────────────────────────────
-// Shared implementation: lib/lruCache.cjs (re-exported below for existing callers).
-const { LRUCache } = require('./lib/lruCache.cjs');
+// Shared implementation: lib/util/lruCache.cjs (re-exported below for existing callers).
+const { LRUCache } = require('./lib/util/lruCache.cjs');
 
 // ── history:updated broadcast ─────────────────────────────────────────────────
 // Open History pages re-fetch on this event. Throttled leading+trailing so a

package/src/main/index.cjs

@@ -10,7 +10,7 @@ if (process.env.SM_BOOT_DIAG === '1') {
     process.stderr.write(`[boot-diag] failed: ${err && err.message}\n`);
   }
 }
-const { PROC_NAMES, setProcessTitle, inhibitHolderShell } = require('./lib/smProcNames.cjs');
+const { PROC_NAMES, setProcessTitle, inhibitHolderShell } = require('./lib/process/smProcNames.cjs');
 // Self-describing `comm` in System Monitor (pn-03). process.argv is a JS copy
 // made at startup, so the argv-memory overwrite below never affects the
 // `process.argv.includes('--simple')` read further down.
@@ -23,10 +23,10 @@ const fsp = require('node:fs/promises');
 const os = require('node:os');
 const { schemas, validated } = require('./ipcSchemas.cjs');
 const { createProjectFolder } = require('./lib/projectFolder.cjs');
-const { cleanChildEnv } = require('./lib/cleanEnv.cjs');
-const { applyLoginShellPath } = require('./lib/loginShellPath.cjs');
-const { terminateLosingInstance } = require('./lib/singleInstanceGuard.cjs');
-const { acquireSchedulerOwnership, releaseSchedulerOwnership } = require('./lib/instanceLock.cjs');
+const { cleanChildEnv } = require('./lib/process/cleanEnv.cjs');
+const { applyLoginShellPath } = require('./lib/process/loginShellPath.cjs');
+const { terminateLosingInstance } = require('./lib/process/singleInstanceGuard.cjs');
+const { acquireSchedulerOwnership, releaseSchedulerOwnership } = require('./lib/process/instanceLock.cjs');
 const { manager: ptyManager, registerPtyHandlers } = require('./pty.cjs');
 const configMgr = require('./config.cjs');
 const transcripts = require('./transcripts.cjs');
@@ -57,34 +57,30 @@ crashDiagnostics.startCrashReporter();
 const voiceHotkey = require('./voiceHotkey.cjs');
 const voiceWizard = require('./voiceWizard.cjs');
 const scheduler = require('./scheduler.cjs');
-const { createAdminHttp } = require('./lib/localAdminHttp.cjs');
-const prdCreate = require('./lib/prdCreate.cjs');
-const prdAdminRoutes = require('./lib/prdAdminRoutes.cjs');
-const projectHomeAdminRoutes = require('./lib/projectHomeAdminRoutes.cjs');
-const macroAdminRoutes = require('./lib/macroAdminRoutes.cjs');
+const { createAdminHttp } = require('./lib/feedback-remote/localAdminHttp.cjs');
+const prdCreate = require('./lib/prd/prdCreate.cjs');
+const prdAdminRoutes = require('./lib/prd/prdAdminRoutes.cjs');
+const projectHomeAdminRoutes = require('./lib/feedback-remote/projectHomeAdminRoutes.cjs');
+const macroAdminRoutes = require('./lib/feedback-remote/macroAdminRoutes.cjs');
 const { smfileResponseHeaders, shouldBlockFrameNavigation } = require('./lib/smfileHeaders.cjs');
-const { appendAuditEvent } = require('./lib/auditLog.cjs');
+const { appendAuditEvent } = require('./lib/telemetry/auditLog.cjs');
 const chatRunner = require('./chatRunner.cjs');
 const promptSessionEvents = require('./promptSessionEvents.cjs');
-const activeIndexMerge = require('./lib/activeIndexMerge.cjs');
-const promptSessionsCreateEpic = require('./lib/promptSessionsCreateEpic.cjs');
-const customerFeedbackIpc = require('./lib/customerFeedbackIpc.cjs');
-const epicWorktreeMint = require('./lib/epicWorktreeMint.cjs');
-const epicWorktreeMerge = require('./lib/epicWorktreeMerge.cjs');
-const epicWorktreeProjectConfig = require('./lib/epicWorktreeProjectConfig.cjs');
-const agentLibrary = require('./agentLibrary.cjs');
-const macroLibrary = require('./lib/macroLibrary.cjs');
-const agentModelResolve = require('./lib/agentModelResolve.cjs');
-const agentEffortResolve = require('./lib/agentEffortResolve.cjs');
-const { resolveEffectiveModelInfo } = require('./lib/effectiveModelInfo.cjs');
-const { resolveModelCatalog } = require('./lib/modelCatalog.cjs');
-const { checkDelegationReadiness, ensureGuardsInstalled, installPrdWriteGuard, installDestructiveGitGuard, installInlineImplementationGuard, installSelfScheduleGuard } = require('./lib/delegationReadiness.cjs');
+const activeIndexMerge = require('./lib/epic/activeIndexMerge.cjs');
+const promptSessionsCreateEpic = require('./lib/epic/promptSessionsCreateEpic.cjs');
+const customerFeedbackIpc = require('./lib/feedback-remote/customerFeedbackIpc.cjs');
+const epicWorktreeMint = require('./lib/epic/epicWorktreeMint.cjs');
+const epicWorktreeMerge = require('./lib/epic/epicWorktreeMerge.cjs');
+const epicWorktreeProjectConfig = require('./lib/epic/epicWorktreeProjectConfig.cjs');
+const macroLibrary = require('./lib/persona-macro/macroLibrary.cjs');
+const { resolveModelCatalog } = require('./lib/claude/modelCatalog.cjs');
+const { checkDelegationReadiness, ensureGuardsInstalled, installPrdWriteGuard, installDestructiveGitGuard, installInlineImplementationGuard, installSelfScheduleGuard } = require('./lib/epic/delegationReadiness.cjs');
 const { resolveProjectContext } = require('./lib/projectRootResolve.cjs');
-const upgradeDrain = require('./lib/upgradeDrain.cjs');
+const upgradeDrain = require('./lib/scheduler/upgradeDrain.cjs');
 const { writeGuardShims } = require('./lib/guardShims.cjs');
 const { MCP_TOOL_CATALOG, MCP_RECIPES } = require('./lib/mcpToolCatalog.cjs');
 const { sendIfAlive } = require('./lib/sendToRenderer.cjs');
-const crossProjectFeedback = require('./lib/crossProjectFeedback.cjs');
+const crossProjectFeedback = require('./lib/feedback-remote/crossProjectFeedback.cjs');
 const adminHttp = createAdminHttp();
 scheduler.registerAdminRoutes(adminHttp);
 prdCreate.registerAdminRoute(adminHttp, scheduler.remote);
@@ -94,9 +90,9 @@ macroAdminRoutes.registerAdminRoute(adminHttp, { onChanged: () => broadcastMacro
 chatRunner.registerAdminRoute(adminHttp);
 // Project-to-project feedback conduit — the app is the only process holding
 // several projects' operations roots open, so it performs the cross-folder
-// write (lib/crossProjectFeedback.cjs).
+// write (lib/feedback-remote/crossProjectFeedback.cjs).
 crossProjectFeedback.registerAdminRoute(adminHttp);
-require('./lib/customerFeedbackAdminRoutes.cjs').registerAdminRoute(adminHttp);
+require('./lib/feedback-remote/customerFeedbackAdminRoutes.cjs').registerAdminRoute(adminHttp);
 const supervisor = require('./supervisor.cjs');
 const watchers = require('./watchers.cjs');
 const queueOps = require('./queueOps.cjs');
@@ -107,22 +103,18 @@ const { seedSchedulerMcp } = require('./seedSchedulerMcp.cjs');
 const { getSeedStatus } = require('./seedStatus.cjs');
 const otel = require('./otel.cjs');
 const otelSettings = require('./otelSettings.cjs');
-const telemetrySettings = require('./lib/telemetrySettings.cjs');
-const telemetryClient = require('./lib/telemetryClient.cjs');
-const telemetryBacklog = require('./lib/telemetryBacklog.cjs');
-const telemetryConsent = require('./lib/telemetryConsent.cjs');
 const { registerHistoryAggregatorHandlers, finalizeClosedDays, refreshIntradayToday } = require('./historyAggregator.cjs');
-const runLogRetention = require('./lib/runLogRetention.cjs');
+const runLogRetention = require('./lib/scheduler/runLogRetention.cjs');
 const { registerHistoryDashboardHandlers } = require('./historyDashboard.cjs');
-const { tryAcquireLock, releaseLock, DEFAULT_LOCK_PATH } = require('./lib/watchdogHelpers.cjs');
+const { tryAcquireLock, releaseLock, DEFAULT_LOCK_PATH } = require('./lib/scheduler/watchdogHelpers.cjs');
 const { createIntradayRefresh } = require('./lib/intradayRefresh.cjs');
-const schedulerConfig = require('./lib/schedulerConfig.cjs');
+const schedulerConfig = require('./lib/scheduler/schedulerConfig.cjs');
 const memoryTool = require('./memoryTool.cjs');
 const { registerMemoryAggregateIpc } = require('./memoryAggregate.cjs');
 const { registerProjectBriefIpc } = require('./projectBrief.cjs');
 const { registerProjectPagesIpc, attachWindow: attachProjectPagesWindow, closeAllOutputWatchers: closeAllProjectPagesWatchers } = require('./projectPages.cjs');
 const promptSessionTranscript = require('./promptSessionTranscript.cjs');
-const { computeEpicDelegationStats } = require('./lib/epicDelegationStats.cjs');
+const { computeEpicDelegationStats } = require('./lib/epic/epicDelegationStats.cjs');
 const agentMemory = require('./agentMemory.cjs');
 const git = require('./git.cjs');
 const heapSnapshot = require('./heapSnapshot.cjs');
@@ -130,14 +122,16 @@ const filesIpc = require('./files.cjs');
 const { registerDocEditHandlers, attachWindow: attachDocEditWindow } = require('./docEdit.cjs');
 const webRemote = require('./webRemote.cjs');
 const { registerRemoteClientHandlers } = require('./remoteClientIpc.cjs');
+const { registerAgentsHandlers } = require('./agentsIpc.cjs');
+const { registerTelemetryHandlers } = require('./telemetryIpc.cjs');
 const { registerUpdaterIpc } = require('./updaterIpc.cjs');
 const { listExchanges } = require('./exchanges.cjs');
-const { resolveClaudeBin } = require('./lib/claudeBin.cjs');
+const { resolveClaudeBin } = require('./lib/claude/claudeBin.cjs');
 const { checkInsideHome, assertInsideHome } = require('./lib/insideHome.cjs');
 const { openInEditor, openFileInEditor, openInFinder, openInTerminal, runInTerminal } = require('./lib/openExternalApp.cjs');
 const { checkPrereqs } = require('./lib/prereqs.cjs');
-const { rebuildActiveIndex } = require('./lib/activeIndexRebuild.cjs');
-const { activeIndexPath: promptSessionsActiveIndexPath } = require('./lib/epicMint.cjs');
+const { rebuildActiveIndex } = require('./lib/epic/activeIndexRebuild.cjs');
+const { activeIndexPath: promptSessionsActiveIndexPath } = require('./lib/epic/epicMint.cjs');
 const { allProjectCwds } = require('./lib/activeSessions.cjs');
 const { scheduleBootSelfHeal } = require('./lib/bootSelfHeal.cjs');
 
@@ -354,7 +348,7 @@ function relaunchViaNpx() {
 
 /**
  * rebootApp({force}) — restart is a REQUEST that drains first and never kills
- * (lib/upgradeDrain.cjs): dispatch pauses, running jobs finish, then the
+ * (lib/scheduler/upgradeDrain.cjs): dispatch pauses, running jobs finish, then the
  * scheduler's heartbeat-driven drain calls performReboot(). `force: true`
  * keeps the old immediate behaviour (kills running executors) for humans who
  * accept the cost.
@@ -480,7 +474,7 @@ function createWindow() {
     // known project has already accumulated, marking exactly what's
     // CONFIRMED delivered. Fired after the window is shown (never blocks
     // startup) and yields between files internally. See telemetryBacklog.cjs.
-    require('./lib/telemetryBacklog.cjs')
+    require('./lib/telemetry/telemetryBacklog.cjs')
       .bootDrain({ appVersion: app.getVersion() })
       .catch((e) => {
         logs.writeLine({ scope: 'telemetry', level: 'warn', message: 'telemetryBacklog.bootDrain failed', meta: { error: e?.message } });
@@ -583,36 +577,6 @@ ipcMain.handle('mcp:status', () => probeMcpStatus());
 // the renderer never makes a direct HTTP call. Static data, no cwd needed.
 ipcMain.handle('mcp:catalog', () => ({ ok: true, tools: MCP_TOOL_CATALOG, recipes: MCP_RECIPES }));
 
-// Agent Library nav page (Home face only): global `~/.claude/agents/*.md`
-// personas plus, per currently-open project tab, whether that project
-// overlays the same agent name at `<cwd>/.claude/agents/<name>.md`. Read-only.
-ipcMain.handle('agents:list-personas', () => agentLibrary.listPersonas());
-// Agent Library CRUD — global personas only (`~/.claude/agents/*.md`); a
-// project's local overlay can only be removed here (removeOverride), never
-// created, since Agent Library is a Home-face, machine-wide surface with no
-// per-tab cwd context of its own. Each mutation broadcasts `agents:changed`
-// so Agent Library and Tag Library — two independently-mounted dockview
-// panels, each with its own component-local `listPersonas()` snapshot —
-// both refresh off the one file on disk instead of one panel going stale
-// after the other edits the agent<->tag relationship.
-function broadcastAgentsChanged() {
-  sendIfAlive(mainWindow, 'agents:changed', {});
-}
-ipcMain.handle('agents:save-persona', validated(schemas.agentsSavePersona, async (payload) => {
-  const result = await agentLibrary.savePersona(payload);
-  broadcastAgentsChanged();
-  return result;
-}));
-ipcMain.handle('agents:delete-persona', async (_e, payload) => {
-  const result = await agentLibrary.deletePersona(payload);
-  broadcastAgentsChanged();
-  return result;
-});
-ipcMain.handle('agents:remove-override', async (_e, payload) => {
-  const result = await agentLibrary.removeOverride(payload);
-  broadcastAgentsChanged();
-  return result;
-});
 // Macro library (macroLibrary.cjs): global machine-local one-click sidebar
 // macros (agent + tag + prompt). Store path is fixed in-module; the renderer
 // never supplies it. Mutations broadcast `macros:changed`.
@@ -635,31 +599,6 @@ ipcMain.handle('macros:set-project', validated(schemas.macrosSetProject, async (
   if (result.ok) broadcastMacrosChanged();
   return result;
 }));
-// New Epic AIM composer (epicIntake.ts's `agentBody`/`agentPath`): unlike
-// list-personas above (global dir only), this honors the project-overlay-
-// then-global precedence so an Epic's opening prompt carries the persona
-// body that actually applies to its cwd. Read-only.
-ipcMain.handle('agents:get-persona-body', validated(schemas.agentsGetPersonaBody, (payload) =>
-  agentLibrary.getPersonaBody(payload)));
-
-// "What will this Epic's launch actually use for --model?" — the SAME
-// resolver chatRunner.cjs's Chat-view launch calls in-process
-// (agentModelResolve.cjs's resolveEpicModel), reached here so Terminal's
-// launch (EpicTerminalPane.tsx, a renderer module with no fs access) agrees
-// with Chat by calling the identical function rather than a second one that
-// is merely supposed to. Never throws (resolveEpicModel's own contract).
-ipcMain.handle('agents:resolve-epic-model', validated(schemas.agentsResolveEpicModel, (payload) =>
-  agentModelResolve.resolveEpicModel(payload)));
-// Effort twin of the above (agentEffortResolve.cjs): Terminal appends
-// `--effort <level>` only when `effort` is non-null. Never throws.
-ipcMain.handle('agents:resolve-epic-effort', validated(schemas.agentsResolveEpicEffort, (payload) =>
-  agentEffortResolve.resolveEpicEffort(payload)));
-
-// "What will this Epic actually run as?" (PRD: effective-model-resolver) —
-// persona alias + evidence-based concrete model id + provenance, for a given
-// (cwd, agentType). Read-only observer; never affects what a launch resolves.
-ipcMain.handle('agents:resolve-model-info', validated(schemas.agentsResolveModelInfo, (payload) =>
-  resolveEffectiveModelInfo(payload)));
 
 // Live model/effort catalog (modelCatalog.cjs) — never throws; `force` bypasses its cache.
 ipcMain.handle('models:catalog', validated(schemas.modelsCatalog, (payload) =>
@@ -700,7 +639,7 @@ ipcMain.handle('app:delegation-readiness', validated(schemas.delegationReadiness
 // session-manager-operations/logs/errors-<date>.jsonl, same shape as every
 // other structured error line.
 function logGuardInstallAttempt(guard, cwd, outcome) {
-  const opsErrorLog = require('./lib/opsErrorLog.cjs');
+  const opsErrorLog = require('./lib/telemetry/opsErrorLog.cjs');
   opsErrorLog.appendError({
     cwd,
     scope: 'delegationReadinessGuardInstall',
@@ -1101,6 +1040,7 @@ filesIpc.registerFilesHandlers();
 registerDocEditHandlers();
 webRemote.registerRemoteHandlers();
 registerRemoteClientHandlers(() => mainWindow);
+registerAgentsHandlers({ ipcMain, getWindow: () => mainWindow });
 try {
   registerUpdaterIpc({ ipcMain, getWindow: () => mainWindow, ptyManager });
 } catch (e) {
@@ -1126,35 +1066,7 @@ ipcMain.handle('exchanges:list', validated(schemas.exchangesList, async (payload
   }
 }));
 
-// OTEL telemetry export (opt-in via ~/.claude/session-manager/otel.json).
-ipcMain.handle('otel:get-config', async () => otelSettings.load());
-ipcMain.handle('otel:set-config', async (_e, cfg) => {
-  if (!otelSettings.isValid(cfg)) {
-    return { ok: false, error: 'invalid config' };
-  }
-  const saved = await otelSettings.save(cfg);
-  const result = await otel.applyConfig(saved);
-  return { ok: !!result?.ok, error: result?.error ?? null, config: saved, status: otel.status() };
-});
-ipcMain.handle('otel:status', () => otel.status());
-ipcMain.handle('otel:config-path', () => otelSettings.storePath());
-
-// Product telemetry (bilko.run) — anonymous, on-by-default, opt-out consent
-// UX + inspector over the client PRDs above wired. Settings > Telemetry's
-// "Product telemetry" section is the sole UI surface for this; see
-// session-manager-operations/architecture/telemetry.md for the data model.
-ipcMain.handle('telemetry:get-config', async () => telemetrySettings.load());
-ipcMain.handle('telemetry:set-config', validated(schemas.telemetrySetConfig, async (cfg) => {
-  const saved = await telemetryConsent.applyConsentUpdate(cfg, { telemetrySettings, telemetryClient });
-  return { ok: true, config: saved, status: telemetryClient.status() };
-}));
-ipcMain.handle('telemetry:status', () => ({
-  ...telemetryClient.status(),
-  backlog: telemetryBacklog.lastRunSummary(),
-}));
-ipcMain.handle('telemetry:config-path', () => telemetrySettings.storePath());
-ipcMain.handle('telemetry:recent-records', () => telemetryClient.recentRecords());
-ipcMain.handle('telemetry:flush-now', () => telemetryClient.flush('manual'));
+registerTelemetryHandlers({ ipcMain });
 
 // Diagnostic-only renderer heap snapshot. No-op unless SM_HEAP_SNAPSHOT=1 —
 // see heapSnapshot.cjs for why this stays off by default.
@@ -1292,14 +1204,14 @@ app.whenReady().then(async () => {
 
   process.on('uncaughtException', (err) => {
     try {
-      require('./lib/telemetryClient.cjs').reportError({ name: 'uncaughtException', msg: err?.message, stack: err?.stack });
+      require('./lib/telemetry/telemetryClient.cjs').reportError({ name: 'uncaughtException', msg: err?.message, stack: err?.stack });
     } catch { /* telemetry must never break the existing handling below */ }
     logs.writeLine({ scope: 'main', level: 'error', message: 'uncaughtException', meta: { error: err?.message, stack: err?.stack } });
   });
   process.on('unhandledRejection', (reason) => {
     const r = reason instanceof Error ? { error: reason.message, stack: reason.stack } : { reason: String(reason) };
     try {
-      require('./lib/telemetryClient.cjs').reportError({ name: 'unhandledRejection', msg: r.error || r.reason, stack: r.stack });
+      require('./lib/telemetry/telemetryClient.cjs').reportError({ name: 'unhandledRejection', msg: r.error || r.reason, stack: r.stack });
     } catch { /* telemetry must never break the existing handling below */ }
     logs.writeLine({ scope: 'main', level: 'error', message: 'unhandledRejection', meta: r });
   });
@@ -1307,7 +1219,7 @@ app.whenReady().then(async () => {
   // Telemetry boot sequence: flush('boot') always, flush('version-change')
   // when detected, and the once-per-machine install upsert (app_installs) when
   // due (version bump or 30-day liveness heartbeat). See telemetryBoot.cjs.
-  require('./lib/telemetryBoot.cjs')
+  require('./lib/telemetry/telemetryBoot.cjs')
     .bootSequence({
       appVersion: app.getVersion(),
       installChannel: require('./lib/machineProfile.cjs').resolveInstallChannel({ appPath: app.getAppPath() }),
@@ -1490,7 +1402,7 @@ app.whenReady().then(async () => {
     console.log(`[main] scheduler ownership held by pid ${ownership.holderPid} — running scheduler-passive (no reconciliation, no admin server)`);
     logs.writeLine({ scope: 'scheduler', level: 'info', message: 'scheduler-passive: ownership held by another instance', meta: { holderPid: ownership.holderPid } });
   }
-  // First-boot default: install the bundled session-manager-dev plugin (its 10
+  // First-boot default: install the bundled session-manager-dev plugin (its 3
   // dev skills) from the app's own marketplace. One-shot + idempotent; never
   // throws. SM_SEED_DEV_PLUGIN_DISABLE=1 to opt out.
   seedDevPlugin({ logger: console, writeLog: logs.writeLine }).catch((e) => {
@@ -1560,7 +1472,7 @@ app.whenReady().then(async () => {
   }, 30_000);
   // Keep TODAY's rollup line current so the History dashboard never needs to
   // fall back to a live transcript scan. Shares the same O_EXCL lock file as
-  // the external watchdog's finalize pass (src/main/lib/watchdogHelpers.cjs)
+  // the external watchdog's finalize pass (src/main/lib/scheduler/watchdogHelpers.cjs)
   // so the two never interleave writes to the rollup; a contended lock just
   // means this tick's refresh is skipped (harmless — the next tick retries).
   const intradayTimer = setInterval(runIntradayRefresh, schedulerConfig.HISTORY_INTRADAY_REFRESH_MS);
@@ -1663,5 +1575,5 @@ app.on('before-quit', () => {
   // Best-effort delivery attempt for whatever telemetry accumulated this run.
   // flush() only removes records it actually delivered — an interrupted or
   // failed attempt leaves the queue file intact for the next boot's flush.
-  require('./lib/telemetryClient.cjs').flush('quit').catch(() => {});
+  require('./lib/telemetry/telemetryClient.cjs').flush('quit').catch(() => {});
 });

package/src/main/ipcSchemas.cjs

@@ -10,10 +10,10 @@ const { z } = require('zod');
 const os = require('node:os');
 const path = require('node:path');
 const { PromptSessionSchema, EpicTagSchema, EpicSourceSchema, EpicIntakeSectionSchema } = require('./lib/promptSessionSchema.cjs');
-const { PrdWorkTypeSchema } = require('./lib/workTypeLibrary.cjs');
+const { PrdWorkTypeSchema } = require('./lib/prd/workTypeLibrary.cjs');
 const { PERSONA_NAME_RE } = require('./agentLibrary.cjs');
-const { AgentPersonaSaveSchema } = require('./lib/agentPersonaSchema.cjs');
-const { MacroSaveSchema, MacroDeleteSchema, MacroSetProjectSchema } = require('./lib/macroLibrary.cjs');
+const { AgentPersonaSaveSchema } = require('./lib/persona-macro/agentPersonaSchema.cjs');
+const { MacroSaveSchema, MacroDeleteSchema, MacroSetProjectSchema } = require('./lib/persona-macro/macroLibrary.cjs');
 
 // ──────────────────────────────────────────── PTY
 const ptySpawn = z.object({
@@ -144,7 +144,7 @@ const configWatchOpts = z.object({ depth: z.number().int().min(0).max(2) }).stri
 const configParseImports = z.object({ path: z.string().min(1).max(4096) });
 
 // ──────────────────────────────────────────── PromptSessions (Epics) active-index merge
-// lib/activeIndexMerge.cjs's read-merge-write, invoked over IPC by the
+// lib/epic/activeIndexMerge.cjs's read-merge-write, invoked over IPC by the
 // renderer's persistActiveIndex (state/promptSessions.ts) instead of that
 // module doing its own config:read-json/config:write-json round trip. Payload
 // carries only the CALLING renderer's in-memory contribution for this cwd —
@@ -204,7 +204,7 @@ const promptSessionsMergeActiveIndex = z.object({
   source: z.literal('epics'),
 });
 
-// Renderer entry point for main's ensureEpic() (lib/promptSessionsCreateEpic.cjs)
+// Renderer entry point for main's ensureEpic() (lib/epic/promptSessionsCreateEpic.cjs)
 // — additive step 1 of a two-PRD chain; unused by the app until the next PRD
 // routes state/promptSessions.ts's createPromptSession through it. `tag`/
 // `source` reuse promptSessionSchema.cjs's own enums rather than retyping
@@ -226,14 +226,14 @@ const promptSessionsCreateEpic = z.object({
 });
 
 // Renderer entry point for creating an Epic's isolated git worktree
-// (lib/epicWorktreeMint.cjs) at the proposed->active transition — PRD 1033.
+// (lib/epic/epicWorktreeMint.cjs) at the proposed->active transition — PRD 1033.
 const promptSessionsCreateWorktree = z.object({
   cwd: z.string().min(1).max(4096),
   epicId: z.string().regex(PROMPT_SESSION_ID_RE),
 });
 
 // Renderer entry point for folding an Epic's isolated git worktree branch
-// back into its owning project's main tree (lib/epicWorktreeMerge.cjs) — PRD
+// back into its owning project's main tree (lib/epic/epicWorktreeMerge.cjs) — PRD
 // 1034, the ONLY point where the per-Epic isolation PRD 1033 wires resolves.
 // `branch`/`dir` are supplied by the caller (the renderer's own in-memory
 // `session.worktree`) rather than re-derived from active-index.json, since
@@ -253,7 +253,7 @@ const promptSessionsMergeToMain = z.object({
 });
 
 // Renderer entry points for the per-project "disable Epic worktree
-// isolation" UI toggle (lib/epicWorktreeProjectConfig.cjs) — PRD 1035.
+// isolation" UI toggle (lib/epic/epicWorktreeProjectConfig.cjs) — PRD 1035.
 const promptSessionsGetWorktreeDisabled = z.object({
   cwd: z.string().min(1).max(4096),
 });
@@ -415,7 +415,7 @@ const schedulerCreatePrd = z.object({
   // User-selected work-type tag (PRD 774; independence from the parent
   // Epic's own tag confirmed PRD 1041) — deterministic, never LLM-classified.
   // Epic tag and PRD tag draw on the same WorkType vocabulary
-  // (lib/workTypeLibrary.cjs) but are independent values; 'discussion' is
+  // (lib/prd/workTypeLibrary.cjs) but are independent values; 'discussion' is
   // excluded here for the same reason adminPrdFrontmatterPatch excludes it
   // below — a discussion-tagged Epic never reaches PRD authoring.
   tag: PrdWorkTypeSchema.optional(),
@@ -618,7 +618,7 @@ const setSessionSlotsSchema = z.object({
 // agents:save-persona — the Agent entity (Agent/WorkType/Epic/PRD/Job ERD)
 // had no boundary validation until this schema; Epic and Job each got theirs
 // only after a production incident (see scheduleJobSchema.cjs's header).
-// Full field-level rules live in lib/agentPersonaSchema.cjs, mirroring
+// Full field-level rules live in lib/persona-macro/agentPersonaSchema.cjs, mirroring
 // AgentPersonaSaveInput (src/preload/api.d.ts) field-for-field.
 const agentsSavePersona = AgentPersonaSaveSchema;
 const macrosSave = MacroSaveSchema;