claude-code-session-manager 0.110.0 → 0.112.0

package/src/main/lib/prereqs.cjs

@@ -11,8 +11,8 @@ const fs = require('node:fs');
 const path = require('node:path');
 const { promisify } = require('node:util');
 const childProcess = require('node:child_process');
-const { pathWithUserBins } = require('./cleanEnv.cjs');
-const { resolveClaudeBin } = require('./claudeBin.cjs');
+const { pathWithUserBins } = require('./process/cleanEnv.cjs');
+const { resolveClaudeBin } = require('./claude/claudeBin.cjs');
 const { readCredentials } = require('./credentials.cjs');
 
 const PROBE_TIMEOUT_MS = 5000;

package/src/main/lib/{instanceLock.cjs → process/instanceLock.cjs}

@@ -28,9 +28,9 @@
 const fs = require('node:fs');
 const path = require('node:path');
 const { identity, isDifferentProcess } = require('./procIdentity.cjs');
-const { instanceLockPath } = require('./schedulerPaths.cjs');
-const { appendAuditEvent } = require('./auditLog.cjs');
-const { pidAlive: pidAliveCore } = require('./pidAlive.cjs');
+const { instanceLockPath } = require('../scheduler/schedulerPaths.cjs');
+const { appendAuditEvent } = require('../telemetry/auditLog.cjs');
+const { pidAlive } = require('./pidAlive.cjs');
 
 // Env override is for unit tests only (isolates the lock from the real
 // ~/.claude of the machine running the suite).
@@ -39,13 +39,6 @@ function lockPath() {
     || instanceLockPath();
 }
 
-// Thin alias over pidAlive.cjs's shared pidAlive() — kept as its own named
-// export (rather than inlining the require at every call site) so existing
-// imports of `pidAlive` from this module keep working unchanged.
-function pidAlive(pid) {
-  return pidAliveCore(pid);
-}
-
 function readLock() {
   try {
     const raw = fs.readFileSync(lockPath(), 'utf8');
@@ -121,4 +114,4 @@ function releaseSchedulerOwnership() {
   } catch { /* nothing to release */ }
 }
 
-module.exports = { acquireSchedulerOwnership, releaseSchedulerOwnership, pidAlive, lockPath };
+module.exports = { acquireSchedulerOwnership, releaseSchedulerOwnership, lockPath };

package/src/main/lib/{pidAlive.cjs → process/pidAlive.cjs}

@@ -6,7 +6,7 @@
  * Four independent copies of this exact check had drifted apart:
  * reaperHelpers.cjs's claudePidAlive (bug: caught EPERM and returned false,
  * never crediting a pid it couldn't signal but which demonstrably exists),
- * watchdogHelpers.cjs's isPidAlive, reservationExpiry.cjs's defaultPidAlive,
+ * watchdogHelpers.cjs's old pid check, reservationExpiry.cjs's old one,
  * and instanceLock.cjs's pidAlive (these three already treated EPERM as
  * alive, but each reimplemented the same three lines). This module is now
  * the one place the rule lives; the others re-export thin aliases so every

package/src/main/lib/{procName.cjs → process/procName.cjs}

@@ -27,7 +27,7 @@
 const fs = require('node:fs');
 const path = require('node:path');
 
-const { procnamesRoot } = require('./schedulerPaths.cjs');
+const { procnamesRoot } = require('../scheduler/schedulerPaths.cjs');
 const MAX_ALIAS_LEN = 15; // Linux TASK_COMM_LEN (16) minus NUL
 const MAX_LABEL_LEN = 120;
 
@@ -37,7 +37,7 @@ function resolveBare(bin) {
   if (path.isAbsolute(bin)) return bin;
   try {
     // Lazy: openExternalApp requires 'electron', unavailable outside the app.
-    const { findCommand } = require('./openExternalApp.cjs');
+    const { findCommand } = require('../openExternalApp.cjs');
     const found = findCommand(bin);
     return found && path.isAbsolute(found) ? found : null;
   } catch { return null; }

package/src/main/lib/{timeoutShim.cjs → process/timeoutShim.cjs}

@@ -22,7 +22,7 @@
 const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
-const { writeTextAtomic, addAllowedRoot } = require('../config.cjs');
+const { writeTextAtomic, addAllowedRoot } = require('../../config.cjs');
 
 function shimDir(homeDir = os.homedir()) {
   return path.join(homeDir, '.claude', 'session-manager', 'bin');

package/src/main/lib/projectRootResolve.cjs

@@ -35,7 +35,7 @@
 
 const path = require('node:path');
 const { projectRootOf, allProjectCwds } = require('./activeSessions.cjs');
-const { readActiveIndex } = require('./epicMint.cjs');
+const { readActiveIndex } = require('./epic/epicMint.cjs');
 const { isEphemeralCwd } = require('./ephemeralCwd.cjs');
 
 /**

package/src/main/lib/promptSessionSchema.cjs

@@ -14,7 +14,7 @@
 'use strict';
 
 const { z } = require('zod');
-const { WorkTypeSchema, LEGACY_WORK_TYPES } = require('./workTypeLibrary.cjs');
+const { WorkTypeSchema, LEGACY_WORK_TYPES } = require('./prd/workTypeLibrary.cjs');
 
 // Mirrors EpicTag (src/renderer/lib/tagLibrary.ts:10) — the Epic-level
 // mission tag. Epic tag and PRD tag (ipcSchemas.cjs's scheduleRetagPrd `tag`

package/src/main/lib/{definitionOfDone.cjs → scheduler/definitionOfDone.cjs}

@@ -12,11 +12,11 @@ const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
 const { spawn, spawnSync } = require('node:child_process');
-const { splitFrontmatter } = require('./prdFrontmatter.cjs');
-const { resolvePrdWriteDir } = require('./prdLocations.cjs');
+const { splitFrontmatter } = require('../prd/prdFrontmatter.cjs');
+const { resolvePrdWriteDir } = require('../prd/prdLocations.cjs');
 const schedulerPaths = require('./schedulerPaths.cjs');
-const atomicFs = require('./atomicFs.cjs');
-const { resolveSpawn } = require('./winSpawn.cjs');
+const atomicFs = require('../util/atomicFs.cjs');
+const { resolveSpawn } = require('../process/winSpawn.cjs');
 
 // Regex identifying meta/dod slugs that must NOT influence the batchKey.
 // This is the load-bearing loop-avoidance filter: when the gate job itself
@@ -648,12 +648,6 @@ function flagRiskySurfaces(jobs, { prdsDir, gitTimeoutMs = 10_000 } = {}) {
   return results;
 }
 
-// ─── Atomic write helper ───────────────────────────────────────────────────────
-// Delegates to atomicFs.cjs's tmp+rename recipe (pure-node, no Electron import).
-function _writeFileAtomic(absPath, text) {
-  atomicFs.writeTextAtomicSync(absPath, text);
-}
-
 const STATUS_EMOJI = { pass: '✅', fail: '❌', unverifiable: '⚠️' };
 
 /**
@@ -751,7 +745,7 @@ function writeReport(key, { acResults = [], riskFlags = [], runsDir } = {}) {
   ].join('\n');
 
   fs.mkdirSync(dir, { recursive: true });
-  _writeFileAtomic(reportPath, report);
+  atomicFs.writeTextAtomicSync(reportPath, report);
 
   return reportPath;
 }
@@ -882,7 +876,7 @@ function readWatermark(runsDir = schedulerPaths.runsDir()) {
  */
 function writeWatermark(lastFinishedAt, runsDir = schedulerPaths.runsDir()) {
   fs.mkdirSync(runsDir, { recursive: true });
-  _writeFileAtomic(
+  atomicFs.writeTextAtomicSync(
     path.join(runsDir, WATERMARK_FILENAME),
     JSON.stringify({ lastFinishedAt }, null, 2)
   );

package/src/main/lib/{fixChainDepth.cjs → scheduler/fixChainDepth.cjs}

@@ -10,7 +10,7 @@
  * since segments are compared for exact equality after splitting on '-'.
  *
  * No filesystem access, no scheduler.cjs dependency — safe to require from
- * lib/prdCreate.cjs without pulling in the scheduler module graph.
+ * lib/prd/prdCreate.cjs without pulling in the scheduler module graph.
  */
 'use strict';
 

package/src/main/lib/{jobDirtFilter.cjs → scheduler/jobDirtFilter.cjs}

@@ -33,7 +33,7 @@
  * rather than a second hardcoded literal — this file matches git-porcelain
  * RELATIVE paths, never builds an fs path, so opsPath() itself doesn't apply.
  */
-const { OPS_ROOT_DIR: OPS_ROOT_SEGMENT } = require('./opsOwnership.cjs');
+const { OPS_ROOT_DIR: OPS_ROOT_SEGMENT } = require('../opsOwnership.cjs');
 
 /** True when `p` lives under an app-owned operations root. Pure. */
 function isAppOwnedChurn(p) {

package/src/main/lib/{jobSupervisorRecord.cjs → scheduler/jobSupervisorRecord.cjs}

@@ -20,7 +20,7 @@
 const fs = require('node:fs');
 const path = require('node:path');
 const { writeJsonAtomicSync } = require('./queueStore.cjs');
-const { isDifferentProcess } = require('./procIdentity.cjs');
+const { isDifferentProcess } = require('../process/procIdentity.cjs');
 
 const SUFFIX = '.supervisor.json';
 const META_SUFFIX = '.meta.json';

package/src/main/lib/{launchFailure.cjs → scheduler/launchFailure.cjs}

@@ -39,8 +39,8 @@
 
 const fs = require('node:fs');
 const path = require('node:path');
-const { readTail } = require('./fileTail.cjs');
-const atomicFs = require('./atomicFs.cjs');
+const { readTail } = require('../util/fileTail.cjs');
+const atomicFs = require('../util/atomicFs.cjs');
 
 const LAUNCH_FAILURE_KINDS = Object.freeze({
   /** HTTP 400 naming a thinking/effort/config parameter the model rejects — the issue-#11 signature. */

package/src/main/lib/{queueStore.cjs → scheduler/queueStore.cjs}

@@ -32,9 +32,9 @@ const fs = require('node:fs');
 const fsp = require('node:fs/promises');
 const path = require('node:path');
 const crypto = require('node:crypto');
-const { allProjectCwds, activeProjectCwds, bustProjectCwdCache } = require('./activeSessions.cjs');
-const { classifyCwd } = require('./cwdClassify.cjs');
-const { assertOpsWrite, resolveOpsRoot, OPS_ROOT_DIR } = require('./opsOwnership.cjs');
+const { allProjectCwds, activeProjectCwds, bustProjectCwdCache } = require('../activeSessions.cjs');
+const { classifyCwd } = require('../cwdClassify.cjs');
+const { assertOpsWrite, resolveOpsRoot, OPS_ROOT_DIR } = require('../opsOwnership.cjs');
 const { ScheduleJobSchema } = require('./scheduleJobSchema.cjs');
 const schedulerPaths = require('./schedulerPaths.cjs');
 
@@ -238,11 +238,11 @@ function shapeMachine(data) {
     // classifyQueueStarvation's header for why the two must never merge.
     lastDispatchAttemptAt: data.lastDispatchAttemptAt ?? null,
     paused: data.paused ?? null,
-    // Upgrade-drain state (lib/upgradeDrain.cjs): deliberately NOT part of
+    // Upgrade-drain state (lib/scheduler/upgradeDrain.cjs): deliberately NOT part of
     // `paused`, so a rate-limit pause can neither overwrite it nor have the
     // manual-clear cooldown swallow it.
     drain: data.drain && typeof data.drain === 'object' ? data.drain : null,
-    // Launch circuit breaker (lib/launchFailure.cjs): per-persona blocks and
+    // Launch circuit breaker (lib/scheduler/launchFailure.cjs): per-persona blocks and
     // the degraded-mode env a persona is currently launching with. Machine
     // state, not per-project: the broken thing is the installed CLI.
     launchBlocks: data.launchBlocks && typeof data.launchBlocks === 'object' ? data.launchBlocks : {},
@@ -315,7 +315,7 @@ const PAUSED_HINT_RE = /"paused"|resumeAt/;
 
 function logMachineStateRecovery({ level, message, meta }) {
   try {
-    const { appendError } = require('./opsErrorLog.cjs');
+    const { appendError } = require('../telemetry/opsErrorLog.cjs');
     appendError({ cwd: schedulerPaths.machineStateLogCwd(), scope: 'scheduler', level, message, meta });
   } catch { /* durable logging must never block recovery */ }
   console.error(`[queueStore] ${message}`);

package/src/main/lib/{quietMachineLease.cjs → scheduler/quietMachineLease.cjs}

@@ -12,7 +12,7 @@
  */
 'use strict';
 
-const { appendAuditEvent } = require('./auditLog.cjs');
+const { appendAuditEvent } = require('../telemetry/auditLog.cjs');
 const { isProvablyDead, DEFAULT_GRACE_MS } = require('./reservationExpiry.cjs');
 
 // slug of the job currently holding the lease, or null.

package/src/main/lib/{rcaReport.cjs → scheduler/rcaReport.cjs}

@@ -32,10 +32,10 @@
 
 const fs = require('node:fs');
 const path = require('node:path');
-const { splitFrontmatter } = require('./prdFrontmatter.cjs');
-const { readTail } = require('./fileTail.cjs');
-const { resolvePrdWriteDir } = require('./prdLocations.cjs');
-const atomicFs = require('./atomicFs.cjs');
+const { splitFrontmatter } = require('../prd/prdFrontmatter.cjs');
+const { readTail } = require('../util/fileTail.cjs');
+const { resolvePrdWriteDir } = require('../prd/prdLocations.cjs');
+const atomicFs = require('../util/atomicFs.cjs');
 
 // ─── VERDICT_LABELS — deliberate duplicate ──────────────────────────────────
 // Mirrors src/renderer/components/tabs/scheduler/sched-primitives.tsx:123-131.

package/src/main/lib/{reaperHelpers.cjs → scheduler/reaperHelpers.cjs}

@@ -9,9 +9,9 @@
 
 const fs = require('node:fs');
 const path = require('node:path');
-const { readTail } = require('./fileTail.cjs');
-const { detectRateLimitInLog } = require('./rateLimitDetect.cjs');
-const { pidAlive } = require('./pidAlive.cjs');
+const { readTail } = require('../util/fileTail.cjs');
+const { detectRateLimitInLog } = require('../claude/rateLimitDetect.cjs');
+const { pidAlive } = require('../process/pidAlive.cjs');
 
 /**
  * Return true if pid is alive AND its cmdline looks like a claude process.

package/src/main/lib/{reservationExpiry.cjs → scheduler/reservationExpiry.cjs}

@@ -9,27 +9,20 @@
  */
 'use strict';
 
-const { pidAlive } = require('./pidAlive.cjs');
+const { pidAlive } = require('../process/pidAlive.cjs');
 
 const DEFAULT_GRACE_MS = 10 * 60 * 1000;
 
-// Thin alias over pidAlive.cjs's shared pidAlive() — kept as its own named
-// export (rather than inlining the require at every call site) so existing
-// imports of `defaultPidAlive` from this module keep working unchanged.
-function defaultPidAlive(pid) {
-  return pidAlive(pid);
-}
-
 /**
  * @param {{ claimedAt: number, pid: number|null }} res
  * @param {{ live: boolean, pidAlive?: (pid:number)=>boolean, now: number, graceMs?: number }} ctx
  */
-function isProvablyDead(res, { live, pidAlive = defaultPidAlive, now, graceMs = DEFAULT_GRACE_MS }) {
+function isProvablyDead(res, { live, pidAlive: isAlive = pidAlive, now, graceMs = DEFAULT_GRACE_MS }) {
   if (live) return false;
   // Made after the pass began (i.e. this tick) — never expire it.
   if (!Number.isFinite(res.claimedAt) || res.claimedAt > now) return false;
-  if (Number.isInteger(res.pid) && res.pid > 0) return !pidAlive(res.pid);
+  if (Number.isInteger(res.pid) && res.pid > 0) return !isAlive(res.pid);
   return now - res.claimedAt > graceMs;
 }
 
-module.exports = { isProvablyDead, defaultPidAlive, DEFAULT_GRACE_MS };
+module.exports = { isProvablyDead, DEFAULT_GRACE_MS };

package/src/main/lib/{reviewNotice.cjs → scheduler/reviewNotice.cjs}

@@ -43,7 +43,7 @@ const DEFAULT_HOLD_MINUTES = 240;
 // `NN-`) — reused here, not reimplemented, so formatReviewNotice's "blocks"
 // wording can never disagree with what actually holds a dependent `pending`
 // row in the real queue.
-const { bareSlug } = require('./depSlugResolve.cjs');
+const { bareSlug } = require('../prd/depSlugResolve.cjs');
 
 /**
  * buildReviewNotice({ job, report, epicId, now, prior }) → ReviewNotice

package/src/main/lib/{scheduleJobTransitions.cjs → scheduler/scheduleJobTransitions.cjs}

@@ -30,8 +30,8 @@
  */
 'use strict';
 
-const { appendAuditEvent } = require('./auditLog.cjs');
-const telemetryCounters = require('./telemetryCounters.cjs');
+const { appendAuditEvent } = require('../telemetry/auditLog.cjs');
+const telemetryCounters = require('../telemetry/telemetryCounters.cjs');
 const queueHistory = require('./queueHistory.cjs');
 const { buildNeedsReviewEntryLine, buildNeedsReviewResolutionLine } = require('./needsReviewLedger.cjs');
 
@@ -42,7 +42,7 @@ const { buildNeedsReviewEntryLine, buildNeedsReviewResolutionLine } = require('.
 const FINISH_STATUSES = new Set(['completed', 'failed', 'skipped', 'needs_review']);
 
 // Bounded so queue.json (mutation cost, broadcast payload, pickNextBatch
-// scan) stays small — same rationale as lib/queueHistory.cjs's retention
+// scan) stays small — same rationale as lib/scheduler/queueHistory.cjs's retention
 // window.
 const STATUS_HISTORY_CAP = 20;
 

package/src/main/lib/{schedulerBatch.cjs → scheduler/schedulerBatch.cjs}

@@ -15,7 +15,7 @@
 const path = require('node:path');
 const os = require('node:os');
 const { projectJobCap, quietMachineWaitMs } = require('./schedulerConfig.cjs');
-const { bareSlug } = require('./depSlugResolve.cjs');
+const { bareSlug } = require('../prd/depSlugResolve.cjs');
 
 const DEFAULT_PROJECT_CWD = path.join(os.homedir(), 'Projects', 'session-manager');
 
@@ -250,7 +250,7 @@ function pickForProject(projectJobs, runningSlugsInProject, slots, heldSlugs = n
   // (evaluated before this function is ever called) is the only path that
   // can fire one, since dispatching one is a whole-tick, all-projects
   // exclusive decision this per-project function can't see.
-  // Launch-gate holds (lib/launchFailure.cjs, issue #11): a pending row
+  // Launch-gate holds (lib/scheduler/launchFailure.cjs, issue #11): a pending row
   // whose launch persona is circuit-broken is NOT a candidate this tick and
   // must not shadow a pickable sibling behind it. It still gets a per-row
   // hold record so the Queue UI says why it is waiting.

package/src/main/lib/{schedulerConfig.cjs → scheduler/schedulerConfig.cjs}

@@ -68,7 +68,7 @@ module.exports = {
   RECONCILE_SLOW_PASS_MS: 2_000,
   // Terminal (completed/failed) jobs older than this move from queue.json's
   // hot jobs[] into the append-only history.jsonl sidecar. See
-  // src/main/lib/queueHistory.cjs.
+  // src/main/lib/scheduler/queueHistory.cjs.
   HISTORY_RETENTION_MS: 7 * 24 * 60 * 60_000,
   // Cadence for the in-app intraday refresher that keeps TODAY's History
   // rollup line current (see historyAggregator.cjs's refreshIntradayToday).

package/src/main/lib/{schedulerRuntimeState.cjs → scheduler/schedulerRuntimeState.cjs}

@@ -7,7 +7,7 @@
  */
 'use strict';
 
-const { appendAuditEvent } = require('./auditLog.cjs');
+const { appendAuditEvent } = require('../telemetry/auditLog.cjs');
 const { isProvablyDead, DEFAULT_GRACE_MS } = require('./reservationExpiry.cjs');
 
 const investigations = new Map(); // slug -> { claimedAt, pid }

package/src/main/lib/{sessionSlots.cjs → scheduler/sessionSlots.cjs}

@@ -27,8 +27,8 @@ const crypto = require('node:crypto');
 const fs = require('node:fs');
 const path = require('node:path');
 const { sessionSlotsConfigPath } = require('./schedulerPaths.cjs');
-const { appendAuditEvent } = require('./auditLog.cjs');
-const atomicFs = require('./atomicFs.cjs');
+const { appendAuditEvent } = require('../telemetry/auditLog.cjs');
+const atomicFs = require('../util/atomicFs.cjs');
 const { isProvablyDead, DEFAULT_GRACE_MS } = require('./reservationExpiry.cjs');
 
 const MIN_SLOTS = 0;

package/src/main/lib/{upgradeDrain.cjs → scheduler/upgradeDrain.cjs}

@@ -24,7 +24,7 @@
 const fs = require('node:fs');
 const path = require('node:path');
 const schedulerPaths = require('./schedulerPaths.cjs');
-const atomicFs = require('./atomicFs.cjs');
+const atomicFs = require('../util/atomicFs.cjs');
 
 // Observed max job run is 240 min; 4 h converts a stuck drain to an abort.
 const DEFAULT_DRAIN_DEADLINE_MS = 4 * 60 * 60_000;
@@ -32,11 +32,8 @@ const DEFAULT_DRAIN_DEADLINE_MS = 4 * 60 * 60_000;
 // relaunch is picked up by the watchdog again.
 const RESTARTING_MARKER_TTL_MS = 5 * 60_000;
 
-function writeJsonAtomicSync(file, value) {
-  atomicFs.writeJsonAtomicSync(file, value);
-}
-
-function readJsonSafe(file) {
+/** Object-or-null view over atomicFs.readJsonOrSync (arrays/scalars → null). */
+function readJsonObject(file) {
   const v = atomicFs.readJsonOrSync(file, null);
   return v && typeof v === 'object' ? v : null;
 }
@@ -44,7 +41,7 @@ function readJsonSafe(file) {
 // ---------- request file ----------
 
 function readRestartRequest(file = schedulerPaths.restartRequestPath()) {
-  return readJsonSafe(file);
+  return readJsonObject(file);
 }
 
 /**
@@ -60,7 +57,7 @@ function requestRestart({ reason, requestedBy } = {}, { file = schedulerPaths.re
     requestedBy: typeof requestedBy === 'string' && requestedBy ? requestedBy : 'unknown',
     requestedAt: new Date(now).toISOString(),
   };
-  writeJsonAtomicSync(file, request);
+  atomicFs.writeJsonAtomicSync(file, request);
   return request;
 }
 
@@ -69,7 +66,7 @@ function stampDrainCompleted(now = Date.now(), file = schedulerPaths.restartRequ
   const existing = readRestartRequest(file);
   if (!existing) return null;
   const stamped = { ...existing, drainCompletedAt: new Date(now).toISOString() };
-  writeJsonAtomicSync(file, stamped);
+  atomicFs.writeJsonAtomicSync(file, stamped);
   return stamped;
 }
 
@@ -151,7 +148,7 @@ function installedBuildDiffers({ running, installed } = {}) {
 // ---------- restarting marker (watchdog) ----------
 
 function markRestarting({ file = schedulerPaths.restartingMarkerPath(), now = Date.now(), ttlMs = RESTARTING_MARKER_TTL_MS } = {}) {
-  writeJsonAtomicSync(file, { pid: process.pid, at: now, expiresAt: now + ttlMs });
+  atomicFs.writeJsonAtomicSync(file, { pid: process.pid, at: now, expiresAt: now + ttlMs });
 }
 
 function clearRestartingMarker(file = schedulerPaths.restartingMarkerPath()) {
@@ -160,7 +157,7 @@ function clearRestartingMarker(file = schedulerPaths.restartingMarkerPath()) {
 
 /** True while the marker exists and has not expired (bounded lifetime). */
 function isRestartingMarkerActive({ file = schedulerPaths.restartingMarkerPath(), now = Date.now() } = {}) {
-  const m = readJsonSafe(file);
+  const m = readJsonObject(file);
   return Boolean(m) && typeof m.expiresAt === 'number' && now < m.expiresAt;
 }
 

package/src/main/lib/{watchdogHelpers.cjs → scheduler/watchdogHelpers.cjs}

@@ -7,9 +7,9 @@ const fs = require('node:fs');
 const path = require('node:path');
 const schedulerPaths = require('./schedulerPaths.cjs');
 const { isRestartingMarkerActive } = require('./upgradeDrain.cjs');
-const { pidAlive: pidAliveCore } = require('./pidAlive.cjs');
-const atomicFs = require('./atomicFs.cjs');
-const { isPackagedApp } = require('./appRuntime.cjs');
+const { pidAlive } = require('../process/pidAlive.cjs');
+const atomicFs = require('../util/atomicFs.cjs');
+const { isPackagedApp } = require('../appRuntime.cjs');
 
 
 
@@ -142,19 +142,6 @@ function evaluateDispatchLiveness(entry, now = Date.now(), { deadMs = DEFAULT_DI
   return { dead: true, reason: 'dispatch-dead' };
 }
 
-/**
- * isPidAlive(pid) → boolean
- *
- * Thin alias over pidAlive.cjs's shared pidAlive() — single source of truth
- * for the "is this recorded pid still alive" check used by
- * checkAppLiveness's defense-in-depth relaunch gate. Kept as a named export
- * here (rather than inlining the require at every call site) so existing
- * imports of `isPidAlive` from this module keep working unchanged.
- */
-function isPidAlive(pid) {
-  return pidAliveCore(pid);
-}
-
 // Offline queue.json reconciliation (orphaned 'running' jobs whose pid died
 // while Electron wasn't running) used to live here as reconcileQueueOffline().
 // PRD 686 moved that responsibility into src/main/scheduler.cjs's own boot
@@ -188,7 +175,7 @@ function checkAppLiveness({
     return { alive: true, reason: 'heartbeat-fresh' };
   }
   const last = readLastHeartbeat(heartbeatPath);
-  if (last !== null && typeof last.pid === 'number' && isPidAlive(last.pid)) {
+  if (last !== null && typeof last.pid === 'number' && pidAlive(last.pid)) {
     return { alive: true, reason: 'pid-alive-heartbeat-stale' };
   }
   return { alive: false, reason: 'stale-and-dead' };
@@ -408,7 +395,7 @@ function releaseLock(lockPath) {
  *  dependency fails inside maybeFinalizeHistory's try/catch, not at require
  *  time for the whole watchdog script. */
 function defaultFinalizeClosedDays(opts) {
-  const { finalizeClosedDays } = require('../historyAggregator.cjs');
+  const { finalizeClosedDays } = require('../../historyAggregator.cjs');
   return finalizeClosedDays(opts);
 }
 
@@ -470,7 +457,6 @@ module.exports = {
   readLastHeartbeatTs,
   heartbeatFresh,
   evaluateDispatchLiveness,
-  isPidAlive,
   localDateStr,
   maybeFinalizeHistory,
   tryAcquireLock,

package/src/main/lib/{auditLog.cjs → telemetry/auditLog.cjs}

@@ -18,7 +18,7 @@
 const fs = require('node:fs');
 const path = require('node:path');
 
-const { auditLogPath } = require('./schedulerPaths.cjs');
+const { auditLogPath } = require('../scheduler/schedulerPaths.cjs');
 
 /**
  * Best-effort identity of the process making this call — there is no

package/src/main/lib/{opsErrorLog.cjs → telemetry/opsErrorLog.cjs}

@@ -14,8 +14,8 @@
 const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
-const { assertOpsWrite } = require('./opsOwnership.cjs');
-const { isEphemeralCwd } = require('./ephemeralCwd.cjs');
+const { assertOpsWrite } = require('../opsOwnership.cjs');
+const { isEphemeralCwd } = require('../ephemeralCwd.cjs');
 
 // Same redaction policy as logs.cjs's sanitizeMeta — kept independent (not
 // shared/required) so this module has no dependency on the Electron `app`
@@ -33,7 +33,7 @@ function sanitizeMeta(meta) {
 }
 
 function logsDir(cwd) {
-  const { opsPath } = require('./opsOwnership.cjs');
+  const { opsPath } = require('../opsOwnership.cjs');
   return opsPath(cwd, 'logs');
 }
 
@@ -108,7 +108,7 @@ function writeLocalLine({ cwd, scope, level, tabId, epicId, tags, message, meta
 function reportToTelemetry({ cwd, scope, level, tabId, epicId, tags, message }) {
   try {
     const telemetryClient = require('./telemetryClient.cjs');
-    const { projectRootOf } = require('./activeSessions.cjs');
+    const { projectRootOf } = require('../activeSessions.cjs');
     const normalizedCwd = projectRootOf(cwd) || cwd;
     const autoTags = [
       `scope:${scope || 'unknown'}`,

package/src/main/lib/{telemetryBacklog.cjs → telemetry/telemetryBacklog.cjs}

@@ -70,7 +70,7 @@ const os = require('node:os');
 const path = require('node:path');
 const crypto = require('node:crypto');
 
-const config = require('../config.cjs');
+const config = require('../../config.cjs');
 
 const DEFAULT_LIMIT = 500;
 const RETENTION_DAYS = 30;
@@ -97,9 +97,9 @@ function watermarksPath() {
 
 function resolveDeps(deps = {}) {
   return {
-    sessionsStore: deps.sessionsStore || require('../sessionsStore.cjs'),
-    isEphemeralCwd: deps.isEphemeralCwd || require('./ephemeralCwd.cjs').isEphemeralCwd,
-    resolveProjectContext: deps.resolveProjectContext || require('./projectRootResolve.cjs').resolveProjectContext,
+    sessionsStore: deps.sessionsStore || require('../../sessionsStore.cjs'),
+    isEphemeralCwd: deps.isEphemeralCwd || require('../ephemeralCwd.cjs').isEphemeralCwd,
+    resolveProjectContext: deps.resolveProjectContext || require('../projectRootResolve.cjs').resolveProjectContext,
     telemetryClient: deps.telemetryClient || require('./telemetryClient.cjs'),
     opsErrorLog: deps.opsErrorLog || require('./opsErrorLog.cjs'),
     config: deps.config || config,

package/src/main/lib/{telemetryBoot.cjs → telemetry/telemetryBoot.cjs}

@@ -22,7 +22,7 @@ function resolveDeps(deps = {}) {
   return {
     telemetrySettings: deps.telemetrySettings || require('./telemetrySettings.cjs'),
     telemetryClient: deps.telemetryClient || require('./telemetryClient.cjs'),
-    buildMachineProfile: deps.buildMachineProfile || require('./machineProfile.cjs').buildMachineProfile,
+    buildMachineProfile: deps.buildMachineProfile || require('../machineProfile.cjs').buildMachineProfile,
     telemetryCounters: deps.telemetryCounters || require('./telemetryCounters.cjs'),
   };
 }

package/src/main/lib/{telemetryClient.cjs → telemetry/telemetryClient.cjs}

@@ -20,7 +20,7 @@
  * returned promise resolves once accepted/dropped, but callers are free to
  * not await it). Telemetry failing must stay invisible to the user.
  *
- * Single-writer precedent (../lib/instanceLock.cjs): this module assumes the
+ * Single-writer precedent (../lib/process/instanceLock.cjs): this module assumes the
  * app's main process is the only writer of the queue/sent-set files for a
  * given machine. It does not itself arbitrate multiple OS processes.
  *
@@ -35,9 +35,9 @@ const os = require('node:os');
 const path = require('node:path');
 const crypto = require('node:crypto');
 
-const config = require('../config.cjs');
+const config = require('../../config.cjs');
 const telemetrySettings = require('./telemetrySettings.cjs');
-const machineProfile = require('./machineProfile.cjs');
+const machineProfile = require('../machineProfile.cjs');
 
 const MAX_BATCH = 50;
 const QUEUE_CAP_COUNT = 5000;
@@ -104,7 +104,7 @@ const S = {
  */
 function logWarn(message, meta) {
   try {
-    const fn = S.logger || require('../logs.cjs').writeLine;
+    const fn = S.logger || require('../../logs.cjs').writeLine;
     fn({ scope: 'telemetry', level: 'warn', message, meta });
   } catch { /* logs unavailable outside an Electron runtime */ }
 }

package/src/main/lib/{telemetrySettings.cjs → telemetry/telemetrySettings.cjs}

@@ -26,7 +26,7 @@ const fsp = require('node:fs/promises');
 const path = require('node:path');
 const os = require('node:os');
 const crypto = require('node:crypto');
-const config = require('../config.cjs');
+const config = require('../../config.cjs');
 
 const SCHEMA_VERSION = 1;
 const DAY_MS = 24 * 60 * 60 * 1000;

package/src/main/logs.cjs

@@ -1,7 +1,7 @@
 const { app, ipcMain } = require('electron');
 const fs = require('node:fs');
 const path = require('node:path');
-const opsErrorLog = require('./lib/opsErrorLog.cjs');
+const opsErrorLog = require('./lib/telemetry/opsErrorLog.cjs');
 
 // Rolling daily files under <userData>/logs/. Anything mtime'd older than
 // RETENTION_MS is pruned at boot; we never compact mid-session, since the