instar 1.3.559 → 1.3.560

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;AAgCH,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAS3D,OAAO,EAAE,eAAe,EAAiC,MAAM,iCAAiC,CAAC;AAuBjG,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAiH7D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAsBtD;;;;;;;;;;;;;;;;;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;AAy3CD,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,GACpD,IAAI,CA8eN;AA2lBD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA02btE;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;AAiCH,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAS3D,OAAO,EAAE,eAAe,EAAiC,MAAM,iCAAiC,CAAC;AAuBjG,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAiH7D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAsBtD;;;;;;;;;;;;;;;;;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;AAy3CD,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,GACpD,IAAI,CA8eN;AA2lBD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAg5btE;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

@@ -23,6 +23,7 @@ import { CodexResumeMap } from '../core/CodexResumeMap.js';
 import { paneIdleWithEmptyInput } from '../core/ModelSwapService.js';
 import { escalatedModelIds, normalizeTierEscalationConfig } from '../core/ModelTierEscalation.js';
 import { activeAutonomousJobs, autonomousRunRemainingForTopic } from '../core/AutonomousSessions.js';
+import { AGE_LIMIT_ACTIVE_RUN_REASON } from '../core/WorkEvidence.js';
 import { TopicProfileTransferCarrier, createTopicProfilePullHandler } from '../core/TopicProfileTransferCarrier.js';
 import { closeAllSqlite } from '../core/SqliteRegistry.js';
 import { SessionManager } from '../core/SessionManager.js';
@@ -6197,7 +6198,13 @@ export async function startServer(options) {
                 raiseAggregated: raiseResumeAggregated,
             }, {
                 enabled: rqCfg.enabled ?? true,
-                dryRun: rqCfg.dryRun ?? true, // shipped observe-only (decision 2)
+                // Live-on-dev (no-dark-on-dev directive, topic 13481): the queue ships
+                // observe-only (dryRun:true) fleet-wide, but resolves to LIVE
+                // (dryRun:false) on a development agent so the resume-idle-autonomous
+                // fix is genuinely exercised on Echo. An explicit operator
+                // monitoring.resumeQueue.dryRun still wins; the resume-queue keys stay
+                // CODE-defaulted (never frozen into ConfigDefaults — preserves the fleet flip).
+                dryRun: rqCfg.dryRun ?? !resolveDevAgentGate(undefined, config),
                 maxAttempts: rqCfg.maxAttempts ?? 3,
                 maxResurrections: rqCfg.maxResurrections ?? 2,
                 entryTtlHours: rqCfg.entryTtlHours ?? 24,
@@ -6268,6 +6275,15 @@ export async function startServer(options) {
                         catch { /* no flag */ }
                         return Math.max(perTopic, globalOperatorStopAt, flagAt) > since;
                     },
+                    // Resume-idle-autonomous fix (spec: resume-idle-autonomous-on-reap.md):
+                    // drain-time liveness re-check for an entry admitted via the
+                    // age-limit-active-run path. Returns true (= run FINISHED) when the topic's
+                    // autonomous run is no longer active (completed OR window elapsed) since
+                    // enqueue → the drainer invalidates `autonomous-run-finished`, never a
+                    // spawn. Reads the LOCAL autonomous-run state file (same vantage that
+                    // admitted the entry). A throw resolves to NOT-finished inside the drainer's
+                    // safeBool (SAFE side — the revival still passes the other reality gates).
+                    autonomousRunFinished: (topicId) => autonomousRunRemainingForTopic(config.stateDir, topicId) == null,
                     jobCheck: (slug, queuedAtIso) => {
                         if (!scheduler)
                             return { ok: false, why: 'scheduler-unavailable' };
@@ -6381,7 +6397,7 @@ export async function startServer(options) {
                     tier1Check: rqCfg.tier1Check ?? true,
                 });
                 resumeDrainer.start();
-                console.log(pc.green(`  ResumeQueue started (${rqCfg.dryRun ?? true ? 'dry-run observe-only' : 'LIVE'}; drainer ${rqCfg.drainIntervalSec ?? 60}s tick)`));
+                console.log(pc.green(`  ResumeQueue started (${(rqCfg.dryRun ?? !resolveDevAgentGate(undefined, config)) ? 'dry-run observe-only' : 'LIVE'}; drainer ${rqCfg.drainIntervalSec ?? 60}s tick)`));
                 // Boot reconciliation half 2 (R2.4): re-enqueue recent mid-work reaps
                 // the queue lost to a crash window. Deferred 30s so the Telegram
                 // adapter (topic resolution) exists; topic-bound candidates only —
@@ -6456,6 +6472,26 @@ export async function startServer(options) {
                     const jobDef = e.session.jobSlug
                         ? scheduler?.getJobs().find((j) => j.slug === e.session.jobSlug)
                         : undefined;
+                    // Resume-idle-autonomous fix (spec: resume-idle-autonomous-on-reap.md):
+                    // an age-limit reap fires precisely when an autonomous session is IDLE
+                    // between turns, so its process-based work evidence is empty by
+                    // construction → it is never enqueued for revival, and an away-operator's
+                    // run sits dead until the next message. When the reaped topic still has an
+                    // ACTIVE autonomous run, the live run IS the work evidence: append the TRUE
+                    // `build-or-autonomous-active` strong signal (re-clamped by considerEnqueue)
+                    // and tag the reason so the drainer can re-verify liveness at drain time.
+                    // Guard ordering is load-bearing: the cold-path autonomousRunRemainingForTopic
+                    // read runs ONLY on the literal `age-limit` reason (every other reap pays
+                    // zero added cost), and the whole block sits inside the existing try/catch so
+                    // a throw fails toward NO injection (status-quo no-revive), never a spawn.
+                    let candidateReason = e.reason;
+                    let candidateWorkEvidence = e.workEvidence ?? [];
+                    if (e.reason === 'age-limit' &&
+                        topicId != null &&
+                        autonomousRunRemainingForTopic(config.stateDir, topicId) != null) {
+                        candidateReason = AGE_LIMIT_ACTIVE_RUN_REASON;
+                        candidateWorkEvidence = [...candidateWorkEvidence, 'build-or-autonomous-active'];
+                    }
                     resumeQueue.considerEnqueue({
                         sessionName: e.session.name,
                         tmuxSession: e.session.tmuxSession,
@@ -6464,10 +6500,10 @@ export async function startServer(options) {
                         jobResumeOptIn: jobDef?.resumeOnReap === true,
                         resumeUuid: topicId != null ? (_topicResumeMap?.get(topicId) ?? null) : null,
                         cwd: e.session.cwd ?? _projectDir,
-                        reason: e.reason,
+                        reason: candidateReason,
                         disposition: e.disposition ?? 'terminal',
                         origin: e.origin ?? 'autonomous',
-                        workEvidence: e.workEvidence ?? [],
+                        workEvidence: candidateWorkEvidence,
                     });
                 }
             }