elanous 0.2.36 → 0.2.38

package/src/self-implement/gate-remote.ts

@@ -94,6 +94,7 @@ export function remoteSelfGateArgv(input: {
   changed?: boolean;
   base?: string;
   shards?: number;
+  shardConcurrency?: number;
   fixedShardDistribution?: boolean;
   includeImporters?: boolean;
   artifactDir?: string;
@@ -102,6 +103,7 @@ export function remoteSelfGateArgv(input: {
   return ['bun', 'bin/elanous.mjs', 'self', 'gate', '--local', ...(input.changed ? ['--changed'] : []),
     ...(input.base ? ['--base', input.base === 'origin/main' ? input.base : sha(input.base)] : []),
     ...(shards !== undefined ? ['--shards', String(shards)] : []),
+    ...(input.shardConcurrency !== undefined ? ['--shard-concurrency', String(input.shardConcurrency)] : []),
     ...(input.fixedShardDistribution ? ['--fixed-shard-distribution'] : []),
     ...(input.includeImporters ? ['--include-importers'] : []),
     ...(input.artifactDir ? ['--artifact-dir', input.artifactDir] : [])];
@@ -142,8 +144,9 @@ function hostSlotScriptWithSlot(cap: number, dir: string, tools: readonly SlotLo
   return [
     `GS=${quote(dir)}; mkdir -p "$GS" || infra slots`,
     `${pick}else infra lock-tool; fi`,
+    'load1() { if [ -r /proc/loadavg ]; then awk \'NR==1 {print $1}\' /proc/loadavg; elif command -v sysctl >/dev/null 2>&1; then sysctl -n vm.loadavg 2>/dev/null | awk \'{gsub(/[{}]/, ""); print $1}\'; else echo unknown; fi; }',
     `n=1; while [ $n -le ${n} ]; do $GL "$GS/slot$n" ${passSlot ? 'env GATE_REMOTE_SLOT="$n" ' : ''}sh "$W/run.sh"; s=$?; [ -f "$W/started" ] && exit $s; n=$((n+1)); done`,
-    `echo "${BUSY}=$((n-1))" >&2; exit 98`,
+    `echo "${BUSY}=$((n-1));load1=$(load1)" >&2; exit 98`,
   ];
 }
 
@@ -184,7 +187,7 @@ export const PUSH_TIMEOUT_MS = 10 * 60_000;
 
 export type RemoteRunOutcome =
   | { kind: 'ran'; rc: number; stdout: Buffer; stderr: Buffer; commit: string; host: string; ms: number }
-  | { kind: 'busy'; occupied?: number; rc?: number }
+  | { kind: 'busy'; occupied?: number; load1?: number | null; rc?: number }
   | { kind: 'infra'; reason: string; stage?: string; rc?: number | null; stderr?: string };
 
 export interface RemoteRunOptions {
@@ -349,8 +352,10 @@ export function runOnRemote(opts: RemoteRunOptions, runner: GateRemoteRunner = r
   if (!(run.rc === 0 && marker >= 0)) {
     const last = stderrText.trimEnd().split('\n').at(-1) ?? '';
     if (run.rc === 98) {
-      const busy = /^__GATE_REMOTE_BUSY(?:=(\d+))?$/.exec(last);
-      if (busy) return { kind: 'busy', rc: run.rc, ...(busy[1] !== undefined ? { occupied: Number(busy[1]) } : {}) };
+      const busy = /^__GATE_REMOTE_BUSY(?:=(\d+))?(?:;load1=(unknown|\d+(?:\.\d+)?|))?$/.exec(last);
+      if (busy) return { kind: 'busy', rc: run.rc,
+        ...(busy[1] !== undefined ? { occupied: Number(busy[1]) } : {}),
+        ...(busy[2] !== undefined ? { load1: busy[2] === '' || busy[2] === 'unknown' ? null : Number(busy[2]) } : {}) };
     }
     if (run.rc === 97 && last.startsWith(INFRA)) return { kind: 'infra', stage: last.slice(INFRA.length).trim(), rc: run.rc, stderr: stderrText, reason: `remote-${last.slice(INFRA.length).trim()}` };
   }
@@ -459,6 +464,8 @@ export interface DispatchDeps {
   env?: NodeJS.ProcessEnv;
   sleep?: (ms: number) => Promise<void>;
   now?: () => number;
+  /** Test seam for gate.remote events; production defaults to the structured debug log. */
+  log?: (event: string, data: Record<string, unknown>) => void;
   write?: { out: (data: string | Uint8Array) => void; err: (data: string | Uint8Array) => void };
 }
 
@@ -531,6 +538,9 @@ export async function dispatchHeavyCheck(opts: DispatchOptions, deps: DispatchDe
   const sleep = deps.sleep ?? ((ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms)));
   const now = deps.now ?? Date.now;
   const deadline = now() + settings.slotWaitSeconds * 1000;
+  let waitStartedAt: number | undefined;
+  const logWait = deps.log ?? ((event: string, data: Record<string, unknown>) => debug.log('gate.remote', event, data));
+  let waitedForSlot = false;
   debug.log('gate.remote', 'dispatch', { tool: opts.tool, host, reason: decision.reason });
   let outcome: RemoteRunOutcome;
   for (;;) {
@@ -540,6 +550,14 @@ export async function dispatchHeavyCheck(opts: DispatchOptions, deps: DispatchDe
       outcome = { kind: 'infra', reason: `exception: ${error instanceof Error ? error.message : String(error)}` };
     }
     if (outcome.kind !== 'busy') break;
+    waitedForSlot = true;
+    waitStartedAt ??= now();
+    const waitData = {
+      tool: opts.tool, host, reason: 'host-busy', load1: outcome.load1 ?? null, loadThreshold: settings.loadThreshold,
+      occupied: outcome.occupied ?? null, cap: hostCap, elapsedMs: Math.max(0, now() - waitStartedAt),
+    };
+    logWait('wait-reason', waitData);
+    write.err(`[gate.remote] waiting on ${host} — reason=host-busy load=${outcome.load1 ?? 'unknown'}/${settings.loadThreshold} slots=${outcome.occupied ?? 'unknown'}/${hostCap} elapsed=${Math.floor(waitData.elapsedMs / 1000)}s\n`);
     debug.log('gate.remote', 'host-busy', { tool: opts.tool, host, cap: hostCap, occupied: outcome.occupied ?? null });
     // Never start an attempt past the deadline: an expired self gate wait remains unmeasured.
     const left = deadline - now();
@@ -547,6 +565,14 @@ export async function dispatchHeavyCheck(opts: DispatchOptions, deps: DispatchDe
     await sleep(Math.min(15_000, left));
     if (now() >= deadline) break;
   }
+  if (waitedForSlot) {
+    const resolution = outcome.kind === 'ran' ? 'slot-open' : outcome.kind === 'busy' ? 'deadline-slot-still-busy'
+      : `remote-infra: ${outcome.reason}`;
+    const waitData = { tool: opts.tool, host, reason: resolution, elapsedMs: Math.max(0, now() - waitStartedAt!),
+      ...(outcome.kind === 'busy' ? { occupied: outcome.occupied ?? null, cap: hostCap } : {}) };
+    logWait('wait-ended', waitData);
+    write.err(`[gate.remote] wait ended on ${host} — reason=${resolution} elapsed=${Math.floor(waitData.elapsedMs / 1000)}s${outcome.kind === 'busy' ? ` slots=${outcome.occupied ?? 'unknown'}/${hostCap}` : ''}\n`);
+  }
   if (opts.onRemoteOutcome) {
     try { opts.onRemoteOutcome(outcome, host, deps.runner ?? realGateRemoteRunner); }
     catch (error) { debug.log('gate.remote', 'outcome-hook-failed', { tool: opts.tool, host, error: error instanceof Error ? error.message : String(error) }); }

package/src/self-implement/gate-scope.ts

@@ -28,7 +28,8 @@
 //    · 필터가 아무 파일도 매치하지 않으면 **의도적으로 FAIL** 한다("0 files ran … 거짓통과 차단")
 //      → 유도 결과는 **반드시 존재하는 파일**이어야 한다.
 
-import { importerTestsNotInRunSet, type ImporterTestIndex } from './importer-test-index.js';
+import { importerTestsNotInRunSet, measureRuntimeEdgeImpact, type ImporterTestIndex, type RuntimeEdgeImpact } from './importer-test-index.js';
+import { GATE_SPAWN_LANE_FILES } from '../self-dev/spawn-lane-files.js';
 import type { RouteConsumerTestIndex } from './route-consumer-test-index.js';
 import { rankGateCallerCandidates } from './gate-candidate-ranking.js';
 import { debug } from '../debug/log.js';
@@ -283,6 +284,11 @@ interface GateScopeDecision {
     readonly truncated: boolean;
     readonly unresolvedRelativeSpecifiers: number;
   } | null;
+  /** ⭐ 실측한 런타임 간선(spawn · git · 파일 상태)의 영향 크기.
+   *  `importerTestsNotRun` 은 «임포트 간선»만 본다 — 실물 프로세스로 그 소스를 지나는 시험은 그 계
+   *  산에 «없다». 그 사각지대의 크기를 **재서** 여기 싣는다(판정 자체는 바꾸지 않는다 — 관측만 더한다).
+   *  색인을 안 실었거나 런타임 간선을 안 가지면 `null` 이다. */
+  readonly runtimeEdgeImpact: RuntimeEdgeImpact | null;
   /** Selected reverse-dependent tests and why they were pulled into the gate. */
   readonly callerTests: readonly { readonly file: string; readonly reasons: readonly GateCallerReason[] }[];
   /** Caller tests exceeding the cap, retained in full for warning and diagnosis. */
@@ -384,6 +390,12 @@ export function resolveGateScope(
     ? PAIRED_REGISTRY_TESTS.tests.filter(exists) : [];
   const runWithCallers = (tests: readonly string[]) => [...new Set([...tests, ...callerTests.map(({ file }) => file), ...pairedRegistryTests])];
   const base = { sourceFiles, documentPaths, ignoredOutsideSrc, missingTestFiles, elanousRuntimeArtifacts, callerTests, callerTestsOverflow,
+    // ⭐ IMPORTER-TEST-INDEX-EDGE · 런타임 spawn/git/파일 상태 간선의 영향 크기를 «여기서» 잰다
+    // (생산 호출자 = 이 함수 · gate-cli 가 부른다). 손 목록은 착지 열차의 GATE_SPAWN_LANE_FILES 다 —
+    // 그 목록이 빠뜨린 실측 시험 수가 착지 열차 소비자의 영향 크기다. 판정 필드는 하나도 안 바뀐다.
+    runtimeEdgeImpact: importerTestIndex
+      ? measureRuntimeEdgeImpact(importerTestIndex, userChanged, { handListed: GATE_SPAWN_LANE_FILES })
+      : null,
     unverified: [] as readonly string[], derived: [] as readonly string[], pulledInRelatedTests: [] as readonly string[] };
   const withDocumentNonContribution = (runSet: readonly string[]) => ({
     documentsWithoutDerivedTests: documentsWithoutDerivedTestsFor(runSet),