@haywoodmarx/agent-pager 0.2.0 → 0.2.1

package/dist/src/tui/model.js

@@ -1,7 +1,20 @@
-import { archivedOperatorRepositoryIds, selectOperatorAgentHealth, } from "../operator/agent-projection.js";
+import { archivedOperatorRepositoryIds, isOperatorAgentArchived, selectOperatorAgentHealth, } from "../operator/agent-projection.js";
 import { OPERATOR_PROTOCOL_VERSION, } from "../operator/protocol.js";
 import { classifyOperatorEvent, validateOperatorSnapshot } from "../operator/validation.js";
 import { isTuiExpirable } from "../operator/agent-projection.js";
+/**
+ * List the agents a purge confirmation still deletes.
+ * @param target - What the confirmation names.
+ * @param agents - Agents the current projection holds.
+ * @returns - The named agent while it is projected, or those the archive section held when the
+ * confirmation opened that are still archived in that workspace.
+ */
+export function selectTuiPurgeableAgents(target, agents) {
+    if (target.kind === "agent")
+        return agents.filter((agent) => agent.id === target.agentId);
+    const named = new Set(target.agentIds);
+    return agents.filter((agent) => named.has(agent.id) && agent.repository.repositoryId === target.repositoryId && isOperatorAgentArchived(agent));
+}
 /* eslint-enable jsdoc/require-jsdoc -- The state field declarations end here. */
 /** Entries the diagnostics log keeps before discarding its oldest. */
 const TUI_DIAGNOSTIC_LIMIT = 200;
@@ -657,14 +670,19 @@ function reconcileView(view, snapshot, previous) {
     const messageIds = acceptedIds(snapshot.traffic);
     const trafficIds = new Set(snapshot.traffic.map((traffic) => traffic.trafficId));
     const hiddenRepositories = new Set([...view.hiddenRepositories].filter((id) => repositoryIds.has(id)));
-    const selection = selectionSurviving(view.selection, repositoryIds, agentIds, hiddenRepositories);
+    // A repository with no agent keeps its view state but has no row to select.
+    const occupied = new Set(snapshot.agents.map((agent) => agent.repository.repositoryId));
+    const sections = new Set(snapshot.agents.filter(isOperatorAgentArchived).map((agent) => agent.repository.repositoryId));
+    const selection = selectionSurviving(view.selection, occupied, sections, agentIds, new Set([...hiddenRepositories].filter((id) => occupied.has(id))));
     const trafficId = view.trafficId !== null && !trafficIds.has(view.trafficId) ? null : view.trafficId;
     return {
         ...view,
         selection,
         trafficId,
-        overlay: reconcileOverlay(view.overlay, repositoryIds, agentIds, messageIds, expirableIds(snapshot.traffic)),
-        collapsedRepositories: new Set([...collapsedRepositories].filter((id) => repositoryIds.has(id))),
+        overlay: reconcileOverlay(view.overlay, snapshot.agents, agentIds, occupied, sections, messageIds, expirableIds(snapshot.traffic)),
+        // An empty workspace's collapse is dropped, so one that was collapsed for being archived opens for
+        // the agent that next starts in it.
+        collapsedRepositories: new Set([...collapsedRepositories].filter((id) => occupied.has(id))),
         hiddenRepositories,
         archivedSections: new Map([...view.archivedSections].filter(([id]) => repositoryIds.has(id))),
     };
@@ -672,16 +690,18 @@ function reconcileView(view, snapshot, previous) {
 /**
  * Keep a tree selection only while the row it names can still be shown.
  * @param selection - Selection held before the projection changed.
- * @param repositoryIds - Repositories the new projection holds.
+ * @param repositoryIds - Repositories the new projection shows a row for.
+ * @param archivedSections - Repositories the new projection shows an archive section for.
  * @param agentIds - Agents the new projection holds.
- * @param hiddenRepositories - Hidden repositories that survive in the new projection; the hidden section exists only while any do.
+ * @param hiddenRepositories - Hidden repositories the new projection shows; the hidden section exists only while any do.
  * @returns The same selection, or null when its row is gone.
  */
-function selectionSurviving(selection, repositoryIds, agentIds, hiddenRepositories) {
+function selectionSurviving(selection, repositoryIds, archivedSections, agentIds, hiddenRepositories) {
     switch (selection?.kind) {
         case "workspace":
-        case "archived":
             return repositoryIds.has(selection.repositoryId) ? selection : null;
+        case "archived":
+            return archivedSections.has(selection.repositoryId) ? selection : null;
         case "agent":
             return agentIds.has(selection.agentId) ? selection : null;
         case "hidden":
@@ -693,13 +713,15 @@ function selectionSurviving(selection, repositoryIds, agentIds, hiddenRepositori
 function expirableIds(traffic) {
     return new Set(traffic.flatMap((entry) => (entry.kind === "accepted_delivery" && isTuiExpirable(entry) ? [entry.messageId] : [])));
 }
-function reconcileOverlay(overlay, repositoryIds, agentIds, messageIds, expirable) {
+function reconcileOverlay(overlay, agents, agentIds, repositoryIds, archivedSections, messageIds, expirable) {
     const closed = { kind: "none" };
     switch (overlay.kind) {
         case "agent_identity":
             return agentIds.has(overlay.agentId) ? overlay : closed;
         case "archive_confirm":
             return agentIds.has(overlay.agentId) ? overlay : closed;
+        case "purge_confirm":
+            return selectTuiPurgeableAgents(overlay.target, agents).length > 0 ? overlay : closed;
         case "full_message":
             return messageIds.has(overlay.messageId) ? overlay : closed;
         case "expire_confirm":
@@ -710,6 +732,8 @@ function reconcileOverlay(overlay, repositoryIds, agentIds, messageIds, expirabl
                 return agentIds.has(overlay.agentId) ? overlay : closed;
             if (overlay.target === "message")
                 return messageIds.has(overlay.messageId) ? overlay : closed;
+            if (overlay.target === "archived")
+                return archivedSections.has(overlay.repositoryId) ? overlay : closed;
             return repositoryIds.has(overlay.repositoryId) ? overlay : closed;
         case "none":
         case "actions":

package/dist/src/tui/presentation.d.ts

@@ -119,12 +119,21 @@ export declare function formatDiagnostic(diagnostic: OperatorDiagnostic, width:
  * An answer is admission, not the resulting state change, so an accepted command is worded as
  * accepted. A command that got no answer at all is worded as unknown, because the broker may have
  * applied it.
- * @param state - Current projection, which names the agent a command targeted.
+ * @param target - What the command acted on, as `describeCommandTarget` named it when the command was submitted.
  * @param command - Command the operator submitted.
  * @param result - The broker's admission answer, or null when none came back.
  * @returns Severity and content-free summary for the log row.
  */
-export declare function describeCommandOutcome(state: TuiOperatorModelState, command: OperatorCommand, result: OperatorCommandResult | null): Pick<OperatorDiagnostic, "severity" | "summary">;
+export declare function describeCommandOutcome(target: string, command: OperatorCommand, result: OperatorCommandResult | null): Pick<OperatorDiagnostic, "severity" | "summary">;
+/**
+ * Name what one operator command acts on, in the words the diagnostics log uses.
+ *
+ * Read at submission: a purge removes its agents from the projection before its answer arrives.
+ * @param state - Current projection, which names the agents a command targets while they remain in it.
+ * @param command - Command the operator is submitting.
+ * @returns - The message id, the agent handle, or the number of agents a multi-agent purge names.
+ */
+export declare function describeCommandTarget(state: TuiOperatorModelState, command: OperatorCommand): string;
 /**
  * Select the colour role one diagnostic severity carries.
  * @param severity - Attention the condition asks for.

package/dist/src/tui/presentation.js

@@ -135,20 +135,42 @@ export function formatDiagnostic(diagnostic, width) {
  * An answer is admission, not the resulting state change, so an accepted command is worded as
  * accepted. A command that got no answer at all is worded as unknown, because the broker may have
  * applied it.
- * @param state - Current projection, which names the agent a command targeted.
+ * @param target - What the command acted on, as `describeCommandTarget` named it when the command was submitted.
  * @param command - Command the operator submitted.
  * @param result - The broker's admission answer, or null when none came back.
  * @returns Severity and content-free summary for the log row.
  */
-export function describeCommandOutcome(state, command, result) {
-    const verb = { ping_agent: "ping", archive_agent: "archive", expire_message: "expire" }[command.type];
+export function describeCommandOutcome(target, command, result) {
+    const verb = { ping_agent: "ping", archive_agent: "archive", expire_message: "expire", purge_agents: "purge" }[command.type];
     if (result === null)
         return { severity: "error", summary: `${verb} outcome unknown: no answer came back from the broker` };
     if (result.status === "rejected")
         return { severity: "warning", summary: `${verb} refused: ${result.reason}` };
-    const target = command.type === "expire_message" ? command.messageId : agentHandle(state, command.targetAgentId);
     return { severity: "info", summary: `${verb} accepted for ${target}` };
 }
+/**
+ * Name what one operator command acts on, in the words the diagnostics log uses.
+ *
+ * Read at submission: a purge removes its agents from the projection before its answer arrives.
+ * @param state - Current projection, which names the agents a command targets while they remain in it.
+ * @param command - Command the operator is submitting.
+ * @returns - The message id, the agent handle, or the number of agents a multi-agent purge names.
+ */
+export function describeCommandTarget(state, command) {
+    switch (command.type) {
+        case "expire_message":
+            return command.messageId;
+        case "ping_agent":
+        case "archive_agent":
+            return agentHandle(state, command.targetAgentId);
+        case "purge_agents": {
+            const [only] = command.targetAgentIds;
+            return command.targetAgentIds.length === 1 && only !== undefined
+                ? agentHandle(state, only)
+                : `${String(command.targetAgentIds.length)} agents`;
+        }
+    }
+}
 /**
  * Select the colour role one diagnostic severity carries.
  * @param severity - Attention the condition asks for.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haywoodmarx/agent-pager",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Durable local messaging between agent implementations.",
   "type": "module",
   "main": "./dist/src/index.js",