instar 1.3.915 → 1.3.917

package/dist/commands/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AA4EH,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAU3D,OAAO,EAAE,eAAe,EAAiC,MAAM,iCAAiC,CAAC;AA0BjG,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AA8H7D,OAAO,KAAK,EAAW,oBAAoB,EAAe,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAgFtD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC1C,OAAO,CAUT;AAyID,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA+rDD;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,oBAAoB,GAAG,IAAI,GACxC;IACD,YAAY,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAC;IAC3C,QAAQ,EAAE,MAAM,CAAC;CAClB,CAqBA;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,cAAc,EAAE,cAAc,EAC9B,YAAY,CAAC,EAAE,YAAY,EAC3B,WAAW,CAAC,EAAE,WAAW,EACzB,WAAW,CAAC,EAAE,WAAW,EACzB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,EAGvE,UAAU,CAAC,EAAE,MAAM,OAAO,8BAA8B,EAAE,WAAW,GAAG,IAAI,EAK5E,qBAAqB,CAAC,EAAE,MAAM,OAAO,gCAAgC,EAAE,kBAAkB,GAAG,IAAI,EAKhG,mBAAmB,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,EAQrD,oBAAoB,CAAC,EAAE,MAAM;IAC3B,YAAY,EAAE,OAAO,kBAAkB,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACrE,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAC;IAC3C,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,IAAI,GACP,IAAI,CAwtBN;AAgmBD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA02pBtE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDzE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AA4EH,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAU3D,OAAO,EAAE,eAAe,EAAiC,MAAM,iCAAiC,CAAC;AA0BjG,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AA8H7D,OAAO,KAAK,EAAW,oBAAoB,EAAe,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAgFtD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC1C,OAAO,CAUT;AAyID,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA+rDD;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,oBAAoB,GAAG,IAAI,GACxC;IACD,YAAY,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAC;IAC3C,QAAQ,EAAE,MAAM,CAAC;CAClB,CAqBA;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,cAAc,EAAE,cAAc,EAC9B,YAAY,CAAC,EAAE,YAAY,EAC3B,WAAW,CAAC,EAAE,WAAW,EACzB,WAAW,CAAC,EAAE,WAAW,EACzB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,EAGvE,UAAU,CAAC,EAAE,MAAM,OAAO,8BAA8B,EAAE,WAAW,GAAG,IAAI,EAK5E,qBAAqB,CAAC,EAAE,MAAM,OAAO,gCAAgC,EAAE,kBAAkB,GAAG,IAAI,EAKhG,mBAAmB,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,EAQrD,oBAAoB,CAAC,EAAE,MAAM;IAC3B,YAAY,EAAE,OAAO,kBAAkB,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACrE,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAC;IAC3C,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,IAAI,GACP,IAAI,CAwtBN;AAgmBD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAi4pBtE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDzE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E"}

package/dist/commands/server.js

@@ -22679,6 +22679,7 @@ export async function startServer(options) {
             const stageMod = await import('../core/StageAdvancer.js');
             const guardMod = await import('../config/stageWriteGuard.js');
             const crypto = await import('node:crypto');
+            const failoverCheckMod = await import('../core/sessionPoolFailoverCheck.js');
             // HMAC over the agent's authToken — tamper-evident without a separate keystore.
             const hmacKey = String(config.authToken ?? 'instar-session-pool-e2e');
             const hmac = (c) => crypto.createHmac('sha256', hmacKey).update(c).digest('hex');
@@ -22695,27 +22696,60 @@ export async function startServer(options) {
                     }
                 },
             });
-            // Boot-cache the running commit SHA once (env first, else git HEAD, else
-            // 'unknown'). StageAdvancer scopes an E2E red/green to the CURRENT build via
-            // this, so a stale result from another commit can't trigger a revert/advance.
+            // Resolve the checkout the failover subprocess will actually exercise.
+            // Boot-pin it so the proof target and its build identity cannot drift
+            // independently during a run.
+            const failoverSourceCandidates = [
+                process.env.INSTAR_SOURCE_ROOT,
+                path.resolve(__dirname, '..', '..'),
+                process.cwd(),
+            ].filter((c) => typeof c === 'string' && c.length > 0);
+            let sessionPoolFailoverSourceRoot = null;
+            for (const candidate of failoverSourceCandidates) {
+                try {
+                    if (fs.existsSync(path.join(candidate, 'node_modules', '.bin', 'vitest'))
+                        && fs.existsSync(path.join(candidate, failoverCheckMod.DEFAULT_FAILOVER_E2E_PATH))) {
+                        sessionPoolFailoverSourceRoot = candidate;
+                        break;
+                    }
+                }
+                catch { /* @silent-fallback-ok — probe the next bounded candidate */ }
+            }
+            // Boot-cache one build identity (env SHA first, else the exact runner
+            // checkout's git HEAD, else cwd git HEAD, installed package version, then
+            // 'unknown'). Producer and StageAdvancer share this exact closure.
             const gitMod = await import('../core/SafeGitExecutor.js');
             let bootCommitSha = process.env.INSTAR_COMMIT_SHA ?? process.env.GITHUB_SHA ?? '';
-            if (!bootCommitSha) {
+            const gitIdentityCandidates = [
+                sessionPoolFailoverSourceRoot,
+                process.cwd(),
+            ].filter((c, index, all) => typeof c === 'string' && c.length > 0 && all.indexOf(c) === index);
+            for (const candidate of gitIdentityCandidates) {
+                if (bootCommitSha)
+                    break;
                 try {
                     bootCommitSha = gitMod.SafeGitExecutor.readSync(['rev-parse', 'HEAD'], {
-                        cwd: process.cwd(), encoding: 'utf-8', stdio: 'pipe', operation: 'server.ts:rollout-commit-sha',
+                        cwd: candidate, encoding: 'utf-8', stdio: 'pipe', operation: 'server.ts:rollout-commit-sha',
                     }).trim();
                 }
                 catch {
-                    bootCommitSha = ''; /* @silent-fallback-ok — git unreadable → 'unknown' */
+                    bootCommitSha = ''; /* @silent-fallback-ok — git unreadable → package identity below */
                 }
             }
+            if (!bootCommitSha && startupVersion && startupVersion !== '0.0.0') {
+                bootCommitSha = `package:${startupVersion}`;
+            }
+            const currentSessionPoolBuildIdentity = () => bootCommitSha || 'unknown';
+            // ONE authoritative stage read for the rollout gate and its proof producer.
+            // Splitting these previously let the runner stamp every green as stage 0
+            // while StageAdvancer was already waiting for a green at stage 2.
+            const readSessionPoolStage = () => liveConfig.get('multiMachine.sessionPool.stage', 'dark');
             // StageAdvancer: the sole stage writer. Held for the rollout job/route to drive;
             // constructed here so the write path (liveConfig + token) is wired in one place.
             const stageAdvancer = new stageMod.StageAdvancer({
                 resultStore: sessionPoolE2EResultStore,
-                currentCommitSha: () => bootCommitSha || 'unknown',
-                readStage: () => liveConfig.get('multiMachine.sessionPool.stage', 'dark'),
+                currentCommitSha: currentSessionPoolBuildIdentity,
+                readStage: readSessionPoolStage,
                 writeStageConfig: (s) => liveConfig.set(guardMod.STAGE_CONFIG_PATH, s, { stageWriteToken: guardMod.STAGE_WRITE_TOKEN }),
                 audit: (event, detail) => console.log(pc.dim(`  [stage-advancer] ${event} ${JSON.stringify(detail)}`)),
             });
@@ -22784,24 +22818,7 @@ export async function startServer(options) {
                 const cp = await import('node:child_process');
                 const failoverLogPath = path.join(config.stateDir, 'logs', 'session-pool-failover-runner.log');
                 const runProcess = (args) => new Promise((resolve) => {
-                    // Candidate source roots, most-specific first: an explicit env override,
-                    // then this build's package root (dist/../..), then cwd. The first that
-                    // carries BOTH node_modules/.bin/vitest AND the test file wins.
-                    const candidates = [
-                        process.env.INSTAR_SOURCE_ROOT,
-                        path.resolve(__dirname, '..', '..'),
-                        process.cwd(),
-                    ].filter((c) => typeof c === 'string' && c.length > 0);
-                    let sourceRoot = null;
-                    for (const c of candidates) {
-                        try {
-                            if (fs.existsSync(path.join(c, 'node_modules', '.bin', 'vitest')) && fs.existsSync(path.join(c, args.testPath))) {
-                                sourceRoot = c;
-                                break;
-                            }
-                        }
-                        catch { /* @silent-fallback-ok — probe next candidate */ }
-                    }
+                    const sourceRoot = sessionPoolFailoverSourceRoot;
                     if (!sourceRoot) {
                         // No source/vitest resolvable → NOT a failover verdict; the check
                         // contract makes this THROW so the runner records nothing.
@@ -22860,10 +22877,10 @@ export async function startServer(options) {
                     resultStore: sessionPoolE2EResultStore,
                     dryRunResultStore: failoverDryRunStore,
                     runProcess,
-                    currentCommitSha: () => bootCommitSha || 'unknown',
-                    // The shadow→live-transfer failover is proven at the 'shadow' stage index
-                    // (0), which StageAdvancer.advanceTo('live-transfer') reads.
-                    provenStage: () => 0,
+                    currentCommitSha: currentSessionPoolBuildIdentity,
+                    // Credit the proof to the stage that is actually running. The next
+                    // promotion reads this same current-stage index as its prior-stage gate.
+                    provenStage: () => stageMod.stageIndex(readSessionPoolStage()),
                     audit: (event, detail) => console.log(pc.dim(`  [failover-runner] ${event} ${JSON.stringify(detail)}`)),
                 });
                 if (_sessionPoolFailoverRunnerDriver) {