instar 1.3.270 → 1.3.271

package/dashboard/index.html

@@ -203,6 +203,19 @@
     .model-badge.sonnet { background: #1b2e4e; color: #60a5fa; }
     .model-badge.haiku { background: #1b3e3e; color: #5eead4; }
 
+    /* Which machine a session runs on (multi-machine pool). */
+    .machine-badge {
+      padding: 1px 6px;
+      border-radius: 4px;
+      font-size: 10px;
+      font-weight: 600;
+      background: #3a2a1b;
+      color: #fbbf24;
+    }
+    /* A session running on ANOTHER machine — visible, but its terminal can't
+       stream here (open that machine's dashboard to interact). */
+    .session-item.remote { opacity: 0.8; cursor: default; }
+
     .type-badge {
       padding: 1px 6px;
       border-radius: 4px;
@@ -3472,6 +3485,11 @@
     let ws = null;
     let token = '';
     let sessions = [];
+    // Sessions running on OTHER machines in the pool (GET /sessions?scope=pool).
+    // Kept separate from `sessions` because the WebSocket replaces that array
+    // with LOCAL sessions on every broadcast — merging would be wiped each tick.
+    let remoteSessions = [];
+    let selfMachineNickname = null;
     let activeSession = null;
     let term = null;
     let fitAddon = null;
@@ -3518,6 +3536,7 @@
             connectWebSocket();
             startWaPolling();
             startVitalSigns();
+            startPoolSessionsPolling();
           } else {
             showAuthError('Incorrect PIN');
           }
@@ -3543,6 +3562,7 @@
             connectWebSocket();
             startWaPolling();
             startVitalSigns();
+            startPoolSessionsPolling();
           }
         })
         .catch(() => {});
@@ -3681,17 +3701,31 @@
     }
 
     // ── Session List ─────────────────────────────────────────
+    // Stable per-row key. Remote sessions are namespaced by machine so a tmux
+    // name reused on two machines never collides with a local row.
+    function sessionRowKey(s) {
+      return s.remote ? `remote:${s.machineId || '?'}:${s.tmuxSession}` : s.tmuxSession;
+    }
+
     function renderSessionList() {
       const list = document.getElementById('sessionList');
       const empty = document.getElementById('emptyState');
       const count = document.getElementById('sessionCount');
 
-      count.textContent = sessions.length;
+      // Local sessions (live via WebSocket) + every other machine's sessions
+      // (via the /sessions?scope=pool poll). Local rows inherit this machine's
+      // nickname so EVERY row states where it runs once the pool is live.
+      const all = [
+        ...sessions.map(s => (s.machineNickname || !selfMachineNickname) ? s : { ...s, machineNickname: selfMachineNickname }),
+        ...remoteSessions,
+      ];
+
+      count.textContent = all.length;
       // Keep tab bar count in sync
       const tabCount = document.getElementById('tabSessionCount');
-      if (tabCount) tabCount.textContent = sessions.length;
+      if (tabCount) tabCount.textContent = all.length;
 
-      if (sessions.length === 0) {
+      if (all.length === 0) {
         empty.style.display = 'flex';
         // Clear any existing session items
         list.querySelectorAll('.session-item').forEach(el => el.remove());
@@ -3708,29 +3742,35 @@
 
       // Remove sessions no longer running
       for (const [name, el] of existing) {
-        if (!sessions.find(s => s.tmuxSession === name)) {
+        if (!all.find(s => sessionRowKey(s) === name)) {
           el.remove();
         }
       }
 
       // Add/update sessions
-      for (const session of sessions) {
-        let el = existing.get(session.tmuxSession);
+      for (const session of all) {
+        let el = existing.get(sessionRowKey(session));
         if (!el) {
           el = document.createElement('div');
           el.className = 'session-item';
-          el.dataset.session = session.tmuxSession;
-          el.onclick = () => selectSession(session.tmuxSession, session);
+          el.dataset.session = sessionRowKey(session);
+          if (session.remote) {
+            // A remote session's terminal streams on ITS machine's dashboard —
+            // clicking here can't subscribe to it, so the row is informational.
+            el.title = `Running on ${session.machineNickname || session.machineId || 'another machine'} — open that machine's dashboard to interact.`;
+          } else {
+            el.onclick = () => selectSession(session.tmuxSession, session);
+          }
           list.appendChild(el);
         }
 
         const elapsed = formatElapsed(session.startedAt);
         const model = session.model || 'opus';
-        const isActive = session.tmuxSession === activeSession;
+        const isActive = !session.remote && session.tmuxSession === activeSession;
         const sType = session.type || (session.jobSlug ? 'job' : 'interactive');
         const tele = session.telemetry;
 
-        el.className = `session-item${isActive ? ' active' : ''}`;
+        el.className = `session-item${isActive ? ' active' : ''}${session.remote ? ' remote' : ''}`;
 
         let telemetryHtml = '';
         if (tele) {
@@ -3765,12 +3805,13 @@
         el.innerHTML = `
           <div class="session-name-row">
             <div class="session-name">${escapeHtml(session.platformName || session.name)}</div>
-            <button class="session-close-btn" data-tmux="${escapeHtml(session.tmuxSession)}" data-name="${escapeHtml(session.name)}" onclick="event.stopPropagation();closeSession(this.dataset.tmux,this.dataset.name)" title="Close session">&times;</button>
+            ${session.remote ? '' : `<button class="session-close-btn" data-tmux="${escapeHtml(session.tmuxSession)}" data-name="${escapeHtml(session.name)}" onclick="event.stopPropagation();closeSession(this.dataset.tmux,this.dataset.name)" title="Close session">&times;</button>`}
           </div>
           <div class="session-meta">
             <span class="type-badge ${sType}">${sType}</span>
             <span class="model-badge ${model}">${model}</span>
             <span class="platform-badge ${platform}" title="${platformLabel}">${platformIcon}</span>
+            ${session.machineNickname ? `<span class="machine-badge" title="Machine this session runs on">${escapeHtml(session.machineNickname)}</span>` : ''}
             <span>${elapsed}</span>
           </div>
           ${telemetryHtml}
@@ -4210,6 +4251,27 @@
     const WA_QR_TIMEOUT_MS = 30000; // 30s timeout for QR appearance
     let waLastError = ''; // last error message for display
 
+    // ── Pool-wide sessions (multi-machine) ───────────────────
+    // The WebSocket only carries THIS machine's sessions. When the agent runs a
+    // multi-machine pool, poll the aggregated view so every session — on every
+    // machine — shows in the list, each tagged with the machine it runs on.
+    let poolPollTimer = null;
+    function startPoolSessionsPolling() {
+      if (poolPollTimer) return;
+      const poll = async () => {
+        try {
+          const r = await fetch('/sessions?scope=pool', { headers: { 'Authorization': `Bearer ${token}` } });
+          if (!r.ok) return;
+          const j = await r.json();
+          selfMachineNickname = (j.pool && j.pool.selfMachineNickname) || null;
+          remoteSessions = (j.sessions || []).filter(s => s.remote === true);
+          renderSessionList();
+        } catch { /* best-effort — peers may be offline; next tick retries */ }
+      };
+      poll();
+      poolPollTimer = setInterval(poll, 15000);
+    }
+
     function startWaPolling() {
       if (waQrInterval) return;
       waQrPollingStarted = Date.now();

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;AA4SH,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAkxDD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAs+QtE;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;AA4SH,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAqxDD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAi/QtE;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

@@ -326,6 +326,9 @@ let _meshSelfId = null;
  *  a moved topic's prior history from the router (bug #2). Set in the mesh block where
  *  the peer-URL resolver + coordinator are in scope. */
 let _resolveRouterUrl = null;
+/** Every OTHER active machine with a known URL — backs GET /sessions?scope=pool
+ *  (pool-wide session aggregation for the dashboard). Set in the same mesh block. */
+let _resolvePeerUrls = null;
 /** Multi-Machine Session Pool §L4: per-topic placement pin store ("move this to <nickname>"). */
 let _topicPinStore = null;
 /** Cross-machine secret-sync (spec Phase 4): route-facing handle (push lever + read-only status). */
@@ -9295,6 +9298,10 @@ export async function startServer(options) {
                         const h = coordinator.getSyncStatus().leaseHolder;
                         return h && h !== meshSelfId ? peerUrl(h) : null;
                     };
+                    _resolvePeerUrls = () => meshIdMgr
+                        .getActiveMachines()
+                        .filter((m) => m.machineId !== meshSelfId && !!m.entry.lastKnownUrl)
+                        .map((m) => ({ machineId: m.machineId, url: m.entry.lastKnownUrl }));
                     // ── Self-nickname convergence (§L4, 2026-06-04 live-caught fix) ──
                     // `updateNickname` (PATCH /pool/machines) is local-only, so a rename applied on a
                     // PEER's registry never reaches the owning machine — leaving that machine unable to
@@ -9602,6 +9609,10 @@ export async function startServer(options) {
                             isOnline: (m) => machinePoolRegistry?.getCapacity(m)?.online ?? false,
                             currentOwnerOf: (sk) => ownReg.ownerOf(sk),
                             isMidReply: () => false, // best-effort; the pin takes effect on the next routed message
+                            // Pin-aware idempotency: a duplicate "move to X" while already pinned
+                            // to X (e.g. a lifeline retry / post-restart replay of the same
+                            // message) no-ops as "already there" instead of burning the rate limit.
+                            currentPinOf: (sk) => _topicPinStore?.get(sk)?.preferredMachine ?? null,
                             lastPlacementUpdateAt: (sk) => _topicPinStore?.lastUpdatedAtMs(sk) ?? null,
                             now: () => Date.now(),
                         }, sessionKey);
@@ -9616,7 +9627,9 @@ export async function startServer(options) {
                             }
                             catch { /* best-effort; route() re-places regardless once the owner is cleared */ }
                             await telegram?.sendToTopic(topicId, plan.action === 'noop'
-                                ? `This conversation is already pinned to ${cmd.nickname} — it'll keep running there.`
+                                ? (plan.detail === 'already-on-target'
+                                    ? `This conversation is already running on ${cmd.nickname} — nothing to move.`
+                                    : `This conversation is already pinned to ${cmd.nickname} — it'll keep running there.`)
                                 : `Moving this conversation to ${cmd.nickname} — it'll pick up there on your next message.`).catch(() => { });
                             console.log(pc.green(`  [session-pool] topic ${topicId} pinned to ${target} (${plan.action}) via "${cmd.matchedVerb}"`));
                             return { handled: true };
@@ -9708,7 +9721,7 @@ export async function startServer(options) {
         catch (err) {
             console.log(pc.dim(`  [session-pool] rollout gate not wired: ${err instanceof Error ? err.message : String(err)}`));
         }
-        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, coherenceGate: scopeVerifier, contextHierarchy, canonicalState, operationGate, sentinel, adaptiveTrust, memoryMonitor, orphanReaper, coherenceMonitor, commitmentTracker, semanticMemory, activitySentinel, rateLimitSentinel, releaseReadinessSentinel: releaseReadinessSentinel ?? undefined, messageRouter, summarySentinel, spawnManager, systemReviewer, capabilityMapper, selfKnowledgeTree, coverageAuditor, topicResumeMap: _topicResumeMap ?? 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, warrantsReplyGate, collaborationSurfacer, threadResumeMap, topicLinkageHandler: topicLinkageHandler ?? undefined, threadlineRelayClient, threadlineReplyWaiters, listenerManager: listenerManager ?? undefined, responseReviewGate, messagingToneGate, outboundDedupGate, telemetryHeartbeat, pasteManager, featureRegistry, discoveryEvaluator, completionEvaluator, unifiedTrust, liveConfig, sharedStateLedger, ledgerSessionRegistry, worktreeManager, oidcEnrolledRepos: parallelDevConfig?.oidcEnrolledRepos, initiativeTracker, projectRoundRunner, projectDriftChecker, machineHeartbeat, machinePoolRegistry, meshRpcDispatcher, sessionOwnershipRegistry, topicPinStore: _topicPinStore ?? undefined, secretSync: _secretSyncHandle ?? undefined, meshSelfId: _meshSelfId ?? undefined, resolveRouterUrl: _resolveRouterUrl ?? undefined, sessionPoolE2EResultStore, proxyCoordinator, topicIntentStore, topicIntentArcCheck, usherSignalStore, intelligence: sharedIntelligence ?? undefined, telegramBridgeConfig, telegramBridge: telegramBridge ?? undefined, threadlineObservability, briefDeps, workingMemory, taskFlowRegistry, threadlineFlowBridge, sessionReaper, agentWorktreeReaper, mcpProcessReaper, geminiLoopRunner, sleepController, agentActivityState, reapLog, sleepWakeDetector, unjustifiedStopGate, stopGateDb, stopNotifier });
+        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, coherenceGate: scopeVerifier, contextHierarchy, canonicalState, operationGate, sentinel, adaptiveTrust, memoryMonitor, orphanReaper, coherenceMonitor, commitmentTracker, semanticMemory, activitySentinel, rateLimitSentinel, releaseReadinessSentinel: releaseReadinessSentinel ?? undefined, messageRouter, summarySentinel, spawnManager, systemReviewer, capabilityMapper, selfKnowledgeTree, coverageAuditor, topicResumeMap: _topicResumeMap ?? 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, warrantsReplyGate, collaborationSurfacer, threadResumeMap, topicLinkageHandler: topicLinkageHandler ?? undefined, threadlineRelayClient, threadlineReplyWaiters, listenerManager: listenerManager ?? undefined, responseReviewGate, messagingToneGate, outboundDedupGate, telemetryHeartbeat, pasteManager, featureRegistry, discoveryEvaluator, completionEvaluator, unifiedTrust, liveConfig, sharedStateLedger, ledgerSessionRegistry, worktreeManager, oidcEnrolledRepos: parallelDevConfig?.oidcEnrolledRepos, initiativeTracker, projectRoundRunner, projectDriftChecker, machineHeartbeat, machinePoolRegistry, meshRpcDispatcher, sessionOwnershipRegistry, topicPinStore: _topicPinStore ?? undefined, secretSync: _secretSyncHandle ?? undefined, meshSelfId: _meshSelfId ?? undefined, resolveRouterUrl: _resolveRouterUrl ?? undefined, resolvePeerUrls: _resolvePeerUrls ?? undefined, sessionPoolE2EResultStore, proxyCoordinator, topicIntentStore, topicIntentArcCheck, usherSignalStore, intelligence: sharedIntelligence ?? undefined, telegramBridgeConfig, telegramBridge: telegramBridge ?? undefined, threadlineObservability, briefDeps, workingMemory, taskFlowRegistry, threadlineFlowBridge, sessionReaper, agentWorktreeReaper, mcpProcessReaper, geminiLoopRunner, sleepController, agentActivityState, reapLog, sleepWakeDetector, unjustifiedStopGate, stopGateDb, stopNotifier });
         // Boot-recovery (tunnel-failure-resilience spec Part 6): if the agent
         // died mid-relay-episode, the persisted tunnel.json carries
         // rotationPending=true. Rotate the dashboard PIN + authToken BEFORE