instar 1.3.524 → 1.3.526

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;AA+G7D,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;AAm1CD,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,CAm5ZtE;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;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;AAm1CD,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,CA69ZtE;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

@@ -87,6 +87,8 @@ import { wireRegistrySync } from '../core/wireRegistrySync.js';
 import { assertSeamlessnessInvariants } from '../core/seamlessnessConfig.js';
 import { assertStateSyncInvariants } from '../core/stateSyncConfig.js';
 import { ReplicatedKindRegistry, checkPoolFlagCoherence } from '../core/ReplicatedRecordEnvelope.js';
+import { ConflictStore } from '../core/ConflictStore.js';
+import { RollbackUnmerge, DroppedOriginRegistry } from '../core/RollbackUnmerge.js';
 import { SnapshotCache, SnapshotRebuildBreaker, StoreSnapshotEngine } from '../core/StoreSnapshot.js';
 import { FencedLease } from '../core/FencedLease.js';
 import { GitLeaseStore } from '../core/GitLeaseStore.js';
@@ -3335,6 +3337,40 @@ export async function startServer(options) {
             }
             return out;
         };
+        // ── Replicated-store union-reader / conflict / rollback substrate (Component
+        //    6, multi-machine-replicated-store-foundation §7.2/§7.3/§7.4). Constructed
+        //    here so the durable conflict ledger + the un-merged-origins registry +
+        //    the rollback engine are WIRED + dependency-injectable from this PR
+        //    (machinery presence, never a null/no-op). With the registry EMPTY (no
+        //    concrete store yet) the routes report "no conflicts / no dropped origins"
+        //    and the rollback engine has no kind to drop — the correct single-machine
+        //    / no-store-yet behavior (a strict no-op). The first concrete store (WS2.1)
+        //    supplies the per-origin record loader onto the union reader; this PR ships
+        //    the substrate dark. The conflict ledger + dropped-origins set persist under
+        //    .instar/state/state-sync so an un-merge survives restarts (§7.4).
+        const conflictStore = new ConflictStore({
+            stateDir: config.stateDir,
+            now: () => new Date(),
+        });
+        const droppedOriginRegistry = new DroppedOriginRegistry({ stateDir: config.stateDir });
+        const rollbackUnmerge = new RollbackUnmerge(droppedOriginRegistry, {
+            // The peers/ replica directory the journal applier writes (§7.1 layout).
+            peersDir: () => path.join(config.stateDir, 'state', 'coherence-journal', 'peers'),
+            // A store rides the journal kind(s) its registration declared (empty until
+            // WS2.1 registers a concrete kind ⇒ a no-op un-merge today).
+            kindsForStore: (store) => {
+                const reg = replicatedKindRegistry.getByStore(store);
+                return reg ? [reg.kind] : [];
+            },
+            now: () => new Date(),
+            // §7.4 step 2 cache leg: drop the dropped origin's snapshot-cache entries.
+            dropSnapshotCacheForOrigin: (origin) => snapshotCache.dropOrigin(origin),
+            // §7.4 conflict auto-resolution leg.
+            autoResolveConflicts: (origin) => conflictStore.autoResolveForDroppedOrigin(origin),
+        });
+        void rollbackUnmerge;
+        void conflictStore;
+        void droppedOriginRegistry; // consumed by the /state/* routes + the store PRs (WS2.1+)
         // Read local signing key for machine route authentication
         let localSigningKeyPem = '';
         if (coordinator.enabled && coordinator.identity) {
@@ -7724,6 +7760,13 @@ export async function startServer(options) {
         // consolidated message to the existing system topic. No new-topic-per-event.
         // Spec: docs/specs/silently-stopped-trio.md.
         //
+        // Subagent Tracker — monitors subagent lifecycle via hook events. Constructed
+        // BEFORE the silently-stopped trio block so ActiveWorkSilenceSentinel's
+        // corroboration (HONEST-PROGRESS-MESSAGING A2 — "is a sub-agent live?") can be
+        // wired into it (it was previously built after the trio block).
+        const { SubagentTracker } = await import('../monitoring/SubagentTracker.js');
+        const subagentTracker = new SubagentTracker({ stateDir: config.stateDir });
+        console.log(pc.green('  Subagent tracker enabled'));
         // Captured out of the trio block so the SessionReaper's recovery veto can
         // compose socket + silence in too (SESSION-REAPER-SPEC §4 "compose, don't
         // replace"). undefined when the corresponding sentinel is disabled.
@@ -7823,6 +7866,28 @@ export async function startServer(options) {
                             return result.ok;
                         }
                         : undefined,
+                    // HONEST-PROGRESS-MESSAGING A1/A2 — corroborate before claiming a
+                    // session is stuck: re-capture the live frame, check it isn't still
+                    // generating, and check no sub-agent is live. The whole path fails
+                    // closed inside the sentinel (FD-6).
+                    captureFrame: (name) => sessionSurface.captureOutput(name, 60),
+                    frameworkForSession: (name) => sessionManager.frameworkForSession(name),
+                    hasActiveSubagents: (name) => {
+                        const csid = sessionManager
+                            .listRunningSessions()
+                            .find((s) => s.tmuxSession === name)?.claudeSessionId;
+                        return csid ? subagentTracker.hasActiveSubagents(csid) : false;
+                    },
+                    // Observability (E) — funnel events to the sentinel-events.jsonl audit
+                    // trail via the notifier, mapped onto its kind enum.
+                    recordEvent: (event, name, detail) => {
+                        const kind = event.startsWith('suppressed')
+                            ? 'escalation-suppressed'
+                            : event.startsWith('escalated')
+                                ? 'escalation-sent'
+                                : 'detected';
+                        notifier.record(kind, 'active-silence', name, detail ? `${event}: ${detail}` : event);
+                    },
                 }), silenceCfg);
                 silenceSentinel.on('silence', (e) => notifier.record('detected', 'active-silence', e.sessionName, `idleMs=${e.idleMs}`));
                 silenceSentinel.on('recovered', (n) => notifier.record('recovered', 'active-silence', n));
@@ -7946,10 +8011,6 @@ export async function startServer(options) {
             compactionSentinel.report(sessionName, triggerLabel || 'recovery-hook');
             return Promise.resolve(true);
         };
-        // Subagent Tracker — monitors subagent lifecycle via hook events
-        const { SubagentTracker } = await import('../monitoring/SubagentTracker.js');
-        const subagentTracker = new SubagentTracker({ stateDir: config.stateDir });
-        console.log(pc.green('  Subagent tracker enabled'));
         // Helper Watchdog — detects subagent stalls and rate-limit failures,
         // surfacing them back into the parent session's stdin so the agent
         // can decide whether to retry smaller. Complements SessionWatchdog,
@@ -8805,6 +8866,9 @@ export async function startServer(options) {
                 // Spec: docs/specs/PROMISE-BEACON-SPEC.md
                 try {
                     const { PromiseBeacon } = await import('../monitoring/PromiseBeacon.js');
+                    // HONEST-PROGRESS-MESSAGING B2 — strict "generating now" detector for
+                    // the beacon's turn-finished close-out (live spinner / esc-to-interrupt).
+                    const { looksGeneratingNow: _beaconLooksGeneratingNow } = await import('../monitoring/sentinelWiring.js');
                     // ── Escalation deps (PROMISE-BEACON-ESCALATION-SPEC §3–§5) ────────
                     // Dark-ship: enabled resolves via the developmentAgent gate; dryRun
                     // defaults true so the dark→live promotion is evidence-gated (§5).
@@ -8932,6 +8996,14 @@ export async function startServer(options) {
                         sentinelAutoEnable: promiseBeaconCfg.sentinelAutoEnable ?? false,
                         quietHours: promiseBeaconCfg.quietHours ?? { start: '22:00', end: '08:00' },
                         maxActiveBeacons: promiseBeaconCfg.maxActiveBeacons ?? 20,
+                        // HONEST-PROGRESS-MESSAGING B1/B1b/B2 — silent-unless-true defaults.
+                        // Each reads from config (operator opt-out / tuning); undefined leaves
+                        // the beacon's own defaults (suppress on, 60m liveness, N=3 close-out).
+                        suppressUnchangedHeartbeats: promiseBeaconCfg.suppressUnchangedHeartbeats,
+                        beaconLivenessIntervalMs: promiseBeaconCfg.beaconLivenessIntervalMs,
+                        turnFinishedCloseoutChecks: promiseBeaconCfg.turnFinishedCloseoutChecks,
+                        // B2 turn-finished detection — "is the session still generating now?"
+                        looksActivelyWorking: (frame, name) => _beaconLooksGeneratingNow(frame, sessionManager.frameworkForSession(name)),
                     });
                     promiseBeacon.start();
                     globalThis.__instarPromiseBeacon = promiseBeacon;
@@ -14635,7 +14707,7 @@ export async function startServer(options) {
                 carrier: _topicProfileCarrier,
             }
             : null;
-        const server = new AgentServer({ config, sessionManager, state, scheduler, telegram, relationships, feedback, feedbackAnomalyDetector, dispatches, updateChecker, autoUpdater, autoDispatcher, quotaTracker, quotaManager, publisher, viewer, tunnel, evolution, watchdog, topicMemory, triageNurse, projectMapper, cartographer: cartographer ?? undefined, coherenceGate: scopeVerifier, contextHierarchy, canonicalState, operationGate, sentinel, adaptiveTrust, memoryMonitor, orphanReaper, coherenceMonitor, commitmentTracker, subscriptionPool, quotaPoller, quotaAwareScheduler: _quotaAwareScheduler ?? undefined, proactiveSwapMonitor: _proactiveSwapMonitor ?? undefined, inUseAccountResolver, enrollmentWizard, semanticMemory, activitySentinel, rateLimitSentinel, releaseReadinessSentinel: releaseReadinessSentinel ?? undefined, greenPrAutoMerger: greenPrAutoMerger ?? undefined, guardLatchStore: guardLatchStore ?? undefined, messageRouter, summarySentinel, spawnManager, systemReviewer, capabilityMapper, selfKnowledgeTree, coverageAuditor, topicResumeMap: _topicResumeMap ?? undefined, topicProfile: _topicProfileCtx ?? undefined, sessionRefresh: _sessionRefresh ?? undefined, autonomyManager, trustElevationTracker, autonomousEvolution, coordinator: coordinator.enabled ? coordinator : undefined, localSigningKeyPem, leaseTransport, onLeasePullRequest: () => leaseCoordinatorRef?.currentLease() ?? null, liveTailReceiver, handoffWireTransport, onHandoffBegin, onHandoffInitiate: handoffInitiate, handoffInProgress: handoffSentinelInProgress, messageLedger, currentInboundByTopic, replyMarkerTransport, onReplyMarker: messageLedger ? (marker) => { const m = marker; messageLedger.applyRemoteReplyMarker(m.dedupeKey, { platform: m.platform, replyIdempotencyKey: m.replyIdempotencyKey, epoch: m.epoch, topic: m.topic ?? null }); } : undefined, whatsapp: whatsappAdapter, slack: slackAdapter, imessage: imessageAdapter, whatsappBusinessBackend, messageBridge, hookEventReceiver, worktreeMonitor, subagentTracker, instructionsVerifier, handshakeManager: threadlineHandshake, threadlineRouter, conversationStore, threadLog, threadMessageRecorder, warrantsReplyGate, collaborationSurfacer, threadResumeMap, topicLinkageHandler: topicLinkageHandler ?? undefined, threadlineRelayClient, threadlineReplyWaiters, listenerManager: listenerManager ?? undefined, a2aDeliveryTracker: a2aDeliveryTracker ?? undefined, responseReviewGate, messagingToneGate, outboundDedupGate, telemetryHeartbeat, pasteManager, featureRegistry, discoveryEvaluator, completionEvaluator, unifiedTrust, liveConfig, sharedStateLedger, ledgerSessionRegistry, worktreeManager, oidcEnrolledRepos: parallelDevConfig?.oidcEnrolledRepos, initiativeTracker, projectRoundRunner, projectDriftChecker, machineHeartbeat, machinePoolRegistry, getInboundQueue: () => _inboundQueue, meshRpcDispatcher, workingSetPullCoordinator, commitmentReplicaStore, preferenceReplicaStore, forwardCommitmentMutate, sessionOwnershipRegistry, topicPinStore: _topicPinStore ?? undefined, streamTicketStore: _streamTicketStore ?? undefined, poolStreamAllowRemoteInput: config.dashboard?.poolStream?.allowRemoteInput ?? false, poolStreamConnector: _poolStreamConnector ?? undefined, secretSync: _secretSyncHandle ?? undefined, meshSelfId: _meshSelfId ?? undefined, resolveRouterUrl: _resolveRouterUrl ?? undefined, resolvePeerUrls: _resolvePeerUrls ?? undefined, guardRegistry, listPoolMachines: _listPoolMachines ?? undefined, poolLink: _poolLink ?? undefined, sessionPoolE2EResultStore, proxyCoordinator, topicIntentStore, topicIntentArcCheck, usherSignalStore, intelligence: sharedIntelligence ?? undefined, telegramBridgeConfig, telegramBridge: telegramBridge ?? undefined, threadlineObservability, briefDeps, workingMemory, taskFlowRegistry, threadlineFlowBridge, sessionReaper, agentWorktreeReaper, orphanedWorkSentinel, mcpProcessReaper, geminiLoopRunner, sleepController, agentActivityState, reapLog, resumeQueue, resumeDrainer, operatorStopRecorder: recordOperatorStop, sleepWakeDetector, unjustifiedStopGate, stopGateDb, stopNotifier }); // Resolve the late-bound topic-operator getter (increment 2e): routing was
+        const server = new AgentServer({ config, sessionManager, state, scheduler, telegram, relationships, feedback, feedbackAnomalyDetector, dispatches, updateChecker, autoUpdater, autoDispatcher, quotaTracker, quotaManager, publisher, viewer, tunnel, evolution, watchdog, topicMemory, triageNurse, projectMapper, cartographer: cartographer ?? undefined, coherenceGate: scopeVerifier, contextHierarchy, canonicalState, operationGate, sentinel, adaptiveTrust, memoryMonitor, orphanReaper, coherenceMonitor, commitmentTracker, subscriptionPool, quotaPoller, quotaAwareScheduler: _quotaAwareScheduler ?? undefined, proactiveSwapMonitor: _proactiveSwapMonitor ?? undefined, inUseAccountResolver, enrollmentWizard, semanticMemory, activitySentinel, rateLimitSentinel, releaseReadinessSentinel: releaseReadinessSentinel ?? undefined, greenPrAutoMerger: greenPrAutoMerger ?? undefined, guardLatchStore: guardLatchStore ?? undefined, messageRouter, summarySentinel, spawnManager, systemReviewer, capabilityMapper, selfKnowledgeTree, coverageAuditor, topicResumeMap: _topicResumeMap ?? undefined, topicProfile: _topicProfileCtx ?? undefined, sessionRefresh: _sessionRefresh ?? undefined, autonomyManager, trustElevationTracker, autonomousEvolution, coordinator: coordinator.enabled ? coordinator : undefined, localSigningKeyPem, leaseTransport, onLeasePullRequest: () => leaseCoordinatorRef?.currentLease() ?? null, liveTailReceiver, handoffWireTransport, onHandoffBegin, onHandoffInitiate: handoffInitiate, handoffInProgress: handoffSentinelInProgress, messageLedger, currentInboundByTopic, replyMarkerTransport, onReplyMarker: messageLedger ? (marker) => { const m = marker; messageLedger.applyRemoteReplyMarker(m.dedupeKey, { platform: m.platform, replyIdempotencyKey: m.replyIdempotencyKey, epoch: m.epoch, topic: m.topic ?? null }); } : undefined, whatsapp: whatsappAdapter, slack: slackAdapter, imessage: imessageAdapter, whatsappBusinessBackend, messageBridge, hookEventReceiver, worktreeMonitor, subagentTracker, instructionsVerifier, handshakeManager: threadlineHandshake, threadlineRouter, conversationStore, threadLog, threadMessageRecorder, warrantsReplyGate, collaborationSurfacer, threadResumeMap, topicLinkageHandler: topicLinkageHandler ?? undefined, threadlineRelayClient, threadlineReplyWaiters, listenerManager: listenerManager ?? undefined, a2aDeliveryTracker: a2aDeliveryTracker ?? undefined, responseReviewGate, messagingToneGate, outboundDedupGate, telemetryHeartbeat, pasteManager, featureRegistry, discoveryEvaluator, completionEvaluator, unifiedTrust, liveConfig, sharedStateLedger, ledgerSessionRegistry, worktreeManager, oidcEnrolledRepos: parallelDevConfig?.oidcEnrolledRepos, initiativeTracker, projectRoundRunner, projectDriftChecker, machineHeartbeat, machinePoolRegistry, getInboundQueue: () => _inboundQueue, meshRpcDispatcher, workingSetPullCoordinator, commitmentReplicaStore, preferenceReplicaStore, conflictStore, rollbackUnmerge, droppedOriginRegistry, forwardCommitmentMutate, sessionOwnershipRegistry, topicPinStore: _topicPinStore ?? undefined, streamTicketStore: _streamTicketStore ?? undefined, poolStreamAllowRemoteInput: config.dashboard?.poolStream?.allowRemoteInput ?? false, poolStreamConnector: _poolStreamConnector ?? undefined, secretSync: _secretSyncHandle ?? undefined, meshSelfId: _meshSelfId ?? undefined, resolveRouterUrl: _resolveRouterUrl ?? undefined, resolvePeerUrls: _resolvePeerUrls ?? undefined, guardRegistry, listPoolMachines: _listPoolMachines ?? undefined, poolLink: _poolLink ?? undefined, sessionPoolE2EResultStore, proxyCoordinator, topicIntentStore, topicIntentArcCheck, usherSignalStore, intelligence: sharedIntelligence ?? undefined, telegramBridgeConfig, telegramBridge: telegramBridge ?? undefined, threadlineObservability, briefDeps, workingMemory, taskFlowRegistry, threadlineFlowBridge, sessionReaper, agentWorktreeReaper, orphanedWorkSentinel, mcpProcessReaper, geminiLoopRunner, sleepController, agentActivityState, reapLog, resumeQueue, resumeDrainer, operatorStopRecorder: recordOperatorStop, sleepWakeDetector, unjustifiedStopGate, stopGateDb, stopNotifier }); // Resolve the late-bound topic-operator getter (increment 2e): routing was
         // wired before the server existed; from here on inbound binds use the
         // server's own store instance.
         _agentServerRef = server;