agent: unify listening and dialing with directed mutual measurements

Replace Probe with Agent across node runtime, Fleet contracts, backend state, API and storage. Report incoming sessions and outgoing link health through each Agent uplink, and retain directed link controls and retry.

Update protocol fixtures and end-to-end coverage for the unified model; accept requested cancellation during the Fleet timeout test cleanup.

backend/src/MoShiro.Backend.Api/Admin/AgentEndpoints.cs

@@ -8,27 +8,26 @@ using MoShiro.Protocol;
 
 namespace MoShiro.Backend.Api;
 
-/// <summary>Agent 管理：列表、修改、审批、启停、接管、删除；加入令牌；Probe 身份。</summary>
+/// <summary>节点管理：列表、修改、审批、启停、接管、删除；加入令牌。</summary>
 public static class AgentEndpoints
 {
     private const string AgentsTag = "admin-agents";
     private const string TokensTag = "admin-join-tokens";
-    private const string ProbeTag = "admin-probe";
 
     public static void Map(RouteGroupBuilder group)
     {
         group.MapGet("/agents", ListAsync)
-            .Api("agents_list", "All agents including pending and disabled ones", AgentsTag).Returns<PageDto<AgentDto>>().ProducesProblems(401, 403)
+            .Api("agents_list", "All nodes (agents) including pending and disabled ones; each says whether it listens, which dialers are connected to it and which listeners it dials", AgentsTag).Returns<PageDto<AgentDto>>().ProducesProblems(401, 403)
             .Requires(Capability.FleetRead);
         group.MapGet("/agents/{id}", GetAsync)
             .Api("agents_get", "One agent", AgentsTag).Returns<AgentDto>().ProducesProblems(401, 403, 404)
             .Requires(Capability.FleetRead);
         group.MapGet("/nodes/{id}/logs", ListNodeLogsAsync)
-            .Api("node_runtime_logs", "Recent Agent or Probe runtime logs", "admin-nodes").Returns<NodeRuntimeLogsDto>().ProducesProblems(401, 403)
+            .Api("node_runtime_logs", "Recent runtime logs of a node", "admin-nodes").Returns<NodeRuntimeLogsDto>().ProducesProblems(401, 403)
             .Requires(Capability.FleetRead);
         group.MapPatch("/agents/{id}", PatchAsync)
             .Accepts<AgentPatchRequest>("application/merge-patch+json", "application/json")
-            .Api("agents_update", "Update name, labels, public host or visibility (merge-patch, If-Match supported)", AgentsTag)
+            .Api("agents_update", "Update name, labels, public host, ISP or visibility (merge-patch, If-Match supported)", AgentsTag)
             .Returns<AgentDto>().ProducesProblems(400, 401, 403, 404, 409, 412)
             .Requires(Capability.FleetWrite);
         group.MapPost("/agents/{id}/approve", (HttpContext http, AgentService agents, string id) => TransitionAsync(http, id, (nodeId, ct) => agents.ApproveAsync(nodeId, ct)))
@@ -53,7 +52,7 @@ public static class AgentEndpoints
             .Api("join_tokens_list", "Join tokens", TokensTag).Returns<PageDto<JoinTokenDto>>().ProducesProblems(401, 403)
             .Requires(Capability.FleetRead);
         group.MapPost("/join-tokens", CreateTokenAsync)
-            .Api("join_tokens_create", "Create a join token for an agent or a probe (role); the plaintext is returned only once", TokensTag)
+            .Api("join_tokens_create", "Create a join token for an agent; the plaintext is returned only once", TokensTag)
             .Returns<CreatedJoinTokenDto>(StatusCodes.Status201Created).ProducesProblems(400, 401, 403)
             .Requires(Capability.FleetEnroll);
         group.MapDelete("/join-tokens/{id}", RevokeTokenAsync)
@@ -61,25 +60,8 @@ public static class AgentEndpoints
             .Returns<object>(StatusCodes.Status204NoContent).ProducesProblems(401, 403)
             .Requires(Capability.FleetEnroll);
 
-        group.MapGet("/probes", ListProbesAsync)
-            .Api("probes_list", "All probes, with the agents each one is connected to", ProbeTag).Returns<PageDto<ProbeDto>>().ProducesProblems(401, 403)
-            .Requires(Capability.FleetRead);
-        group.MapGet("/probes/{id}", GetProbeAsync)
-            .Api("probes_get", "One probe", ProbeTag).Returns<ProbeDto>().ProducesProblems(401, 403, 404)
-            .Requires(Capability.FleetRead);
-        group.MapPatch("/probes/{id}", PatchProbeAsync)
-            .Api("probes_update", "Rename a probe", ProbeTag).Returns<ProbeDto>().ProducesProblems(400, 401, 403, 404, 409)
-            .Requires(Capability.FleetWrite);
-        group.MapPost("/probes/{id}/revoke", RevokeProbeAsync)
-            .Api("probes_revoke", "Revoke a probe: every agent drops its session and refuses it; history stays until it expires", ProbeTag)
-            .Returns<ProbeDto>().ProducesProblems(401, 403, 404)
-            .Requires(Capability.FleetRevoke);
-        group.MapDelete("/probes/{id}", DeleteProbeAsync)
-            .Api("probes_delete", "Delete a probe and its lines; stored data expires with the retention policy", ProbeTag)
-            .Returns<object>(StatusCodes.Status204NoContent).ProducesProblems(401, 403)
-            .Requires(Capability.FleetRevoke);
-        group.MapPost("/agents/{id}/probes/{probe_id}/disconnect", DisconnectProbeAsync)
-            .Api("agents_probe_disconnect", "Make an agent drop one probe's session (the probe reconnects unless it is revoked)", AgentsTag)
+        group.MapPost("/agents/{id}/dialers/{dialer_id}/disconnect", DisconnectDialerAsync)
+            .Api("agents_dialer_disconnect", "Make a listening node drop one dialer's session (the dialer reconnects unless it is disabled)", AgentsTag)
             .Returns<object>(StatusCodes.Status204NoContent).ProducesProblems(401, 403, 404, 409)
             .Requires(Capability.FleetWrite);
     }
@@ -107,8 +89,13 @@ public static class AgentEndpoints
         return TypedResults.Json(Mappers.ToDto(view), ApiJsonContext.Default.AgentDto);
     }
 
-    private static async Task<IResult> PatchAsync(HttpContext http, AgentService agents, AgentPatchRequest request, string id, CancellationToken ct)
+    private static async Task<IResult> PatchAsync(HttpContext http, AgentService agents, NodeInfoService nodes, AgentPatchRequest request, string id, CancellationToken ct)
     {
+        if (request.Isp is not null && request.Isp != "auto" && IspClassifier.NameOf(request.Isp) is null)
+        {
+            return Problems.From(http, ValidationError.Single("isp", "must be telecom, unicom, mobile, broadnet, other or auto"));
+        }
+
         Result<AgentView> result = await agents.PatchAsync(
             new NodeId(id), new AgentPatch { Name = request.Name, Labels = request.Labels, PublicHost = request.PublicHost, Ipv6Host = request.Ipv6Host, PublicHostAuto = request.PublicHostAuto, Ipv6HostAuto = request.Ipv6HostAuto, PublicVisible = request.PublicVisible }, Concurrency.ExpectedRowVersion(http), ct);
         if (!result.TryGet(out AgentView? view, out FleetError? error))
@@ -116,6 +103,11 @@ public static class AgentEndpoints
             return Problems.From(http, error);
         }
 
+        if (request.Isp is not null)
+        {
+            await nodes.SetIspAsync(id, request.Isp == "auto" ? null : request.Isp, ct);
+        }
+
         Concurrency.SetETag(http, view.Agent.RowVersion);
         return TypedResults.Json(Mappers.ToDto(view), ApiJsonContext.Default.AgentDto);
     }
@@ -182,62 +174,14 @@ public static class AgentEndpoints
         return TypedResults.NoContent();
     }
 
-    private static async Task<IResult> ListProbesAsync(ProbeService probes, CancellationToken ct) =>
-        TypedResults.Json(new PageDto<ProbeDto>([.. (await probes.ListAsync(ct)).Select(Mappers.ToDto)], null), ApiJsonContext.Default.PageDtoProbeDto);
-
-    private static async Task<IResult> GetProbeAsync(HttpContext http, ProbeService probes, string id, CancellationToken ct) =>
-        await probes.GetAsync(id, ct) is { } view
-            ? TypedResults.Json(Mappers.ToDto(view), ApiJsonContext.Default.ProbeDto)
-            : Problems.Create(http, MoShiroErrors.ProbeNotFound, "probe not found");
-
-    private static async Task<IResult> PatchProbeAsync(HttpContext http, ProbeService probes, NodeInfoService nodes, PatchProbeRequest request, string id, CancellationToken ct)
+    private static async Task<IResult> DisconnectDialerAsync(HttpContext http, AgentService agents, string id, string dialer_id, CancellationToken ct)
     {
-        if (request.Name is null && request.Isp is null)
-        {
-            return Problems.From(http, ValidationError.Single("name", "name or isp is required"));
-        }
-
-        if (request.Isp is not null && request.Isp != "auto" && IspClassifier.NameOf(request.Isp) is null)
-        {
-            return Problems.From(http, ValidationError.Single("isp", "must be telecom, unicom, mobile, broadnet, other or auto"));
-        }
-
-        Result<ProbeView> result = request.Name is null
-            ? (await probes.GetAsync(id, ct) is { } existing ? Result<ProbeView>.Ok(existing) : Result<ProbeView>.Fail(MoShiroErrors.ProbeNotFound, "probe not found"))
-            : await probes.RenameAsync(id, request.Name, ct);
-        if (!result.TryGet(out ProbeView? view, out FleetError? error))
-        {
-            return Problems.From(http, error);
-        }
-
-        if (request.Isp is not null)
-        {
-            await nodes.SetIspAsync(id, NodeKinds.Probe, request.Isp == "auto" ? null : request.Isp, ct);
-        }
-
-        return TypedResults.Json(Mappers.ToDto(view), ApiJsonContext.Default.ProbeDto);
-    }
-
-    private static async Task<IResult> RevokeProbeAsync(HttpContext http, ProbeService probes, string id, CancellationToken ct)
-    {
-        Result<ProbeView> result = await probes.RevokeAsync(id, ct);
-        return result.TryGet(out ProbeView? view, out FleetError? error) ? TypedResults.Json(Mappers.ToDto(view), ApiJsonContext.Default.ProbeDto) : Problems.From(http, error);
-    }
-
-    private static async Task<IResult> DeleteProbeAsync(ProbeService probes, string id, CancellationToken ct)
-    {
-        await probes.DeleteAsync(id, ct);
-        return TypedResults.NoContent();
-    }
-
-    private static async Task<IResult> DisconnectProbeAsync(HttpContext http, ProbeService probes, string id, string probe_id, CancellationToken ct)
-    {
-        Result<bool> result = await probes.DisconnectAsync(probe_id, new NodeId(id), ct);
+        Result<bool> result = await agents.DisconnectDialerAsync(new NodeId(id), new NodeId(dialer_id), ct);
         if (!result.TryGet(out bool dropped, out FleetError? error))
         {
             return Problems.From(http, error);
         }
 
-        return dropped ? TypedResults.NoContent() : Problems.Create(http, MoShiroErrors.ProbeOffline, "this probe has no session with this agent");
+        return dropped ? TypedResults.NoContent() : Problems.Create(http, MoShiroErrors.DialerOffline, "this dialer has no session with this node");
     }
 }

backend/src/MoShiro.Backend.Api/Admin/BuildEndpoints.cs

@@ -16,14 +16,14 @@ public static class BuildEndpoints
     public static void Map(RouteGroupBuilder group)
     {
         group.MapGet("/build-info", GetAsync)
-            .Api("build_info_get", "Version, tag, commit, build time and update state of the backend and every agent and probe", Tag)
+            .Api("build_info_get", "Version, tag, commit, build time and update state of the backend and every node", Tag)
             .Returns<BuildInfoDto>().ProducesProblems(401, 403)
             .Requires(Capability.UpdateRead);
         group.MapGet("/releases", ListReleasesAsync)
             .Api("releases_list", "The latest signed release manifest of each component", Tag).Returns<PageDto<ReleaseDto>>().ProducesProblems(401, 403)
             .Requires(Capability.UpdateRead);
         group.MapPost("/nodes/{id}/update", RequestUpdateAsync)
-            .Api("nodes_update", "Ask an online agent or probe to install the release it has been offered", Tag).Returns<object>(StatusCodes.Status204NoContent).ProducesProblems(401, 403, 409)
+            .Api("nodes_update", "Ask an online node to install the release it has been offered", Tag).Returns<object>(StatusCodes.Status204NoContent).ProducesProblems(401, 403, 409)
             .Requires(Capability.UpdateConfirm);
         group.MapGet("/backend/update", BackendUpdateAsync)
             .Api("backend_update_get", "Current channel and host-verified backend update", Tag).Returns<BackendUpdateDto>().ProducesProblems(401, 403)
@@ -65,9 +65,8 @@ public static class BuildEndpoints
     {
         IReadOnlyDictionary<string, IReadOnlyList<NodeOwner>> ownerOf = await owners.ListAsync(ct);
         var items = (await nodes.ListAsync(ct))
-            .OrderBy(n => n.Kind, StringComparer.Ordinal)
-            .ThenBy(n => n.NodeId, StringComparer.Ordinal)
-            .Select(n => new NodeBuildDto(n.NodeId, n.Kind, n.Os, n.OsName, n.Arch, n.Version, n.Tag, n.Commit, n.BuiltAt, ToDto(releases.StatusOf(new NodeId(n.NodeId))), ownerOf.TryGetValue(n.NodeId, out IReadOnlyList<NodeOwner>? list) ? [.. list.Select(o => new NodeOwnerDto(o.CredentialId, o.PasskeyName, o.Username))] : null))
+            .OrderBy(n => n.NodeId, StringComparer.Ordinal)
+            .Select(n => new NodeBuildDto(n.NodeId, n.Os, n.OsName, n.Arch, n.Version, n.Tag, n.Commit, n.BuiltAt, ToDto(releases.StatusOf(new NodeId(n.NodeId))), ownerOf.TryGetValue(n.NodeId, out IReadOnlyList<NodeOwner>? list) ? [.. list.Select(o => new NodeOwnerDto(o.CredentialId, o.PasskeyName, o.Username))] : null))
             .ToList();
         http.Response.Headers.CacheControl = "no-store";
         return TypedResults.Json(new BuildInfoDto(NodeEndpoints.Backend(withCommit: true), items, ToDto(await backendUpdates.GetAsync(ct))), ApiJsonContext.Default.BuildInfoDto);

backend/src/MoShiro.Backend.Api/Admin/LinkEndpoints.cs

@@ -1,4 +1,5 @@
 using Fleet.Core;
+using Fleet.Server;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
@@ -7,7 +8,10 @@ using MoShiro.Protocol;
 
 namespace MoShiro.Backend.Api;
 
-/// <summary>线路开关：哪些（Probe，Agent）要连。自动连接的总开关是设置 <c>fleet.auto_link</c>；这里看每一对的结果，并且手动强制开、关或取消手动设置。</summary>
+/// <summary>
+/// 线路开关：哪些（拨号方，监听方）要连。自动连接的总开关是设置 <c>fleet.auto_link</c>（不监听的节点自动拨所有监听节点）；
+/// 这里看每一对的结果，并且手动强制开、关或取消手动设置。把一个节点拖到另一个监听节点上建立线路，就是 <c>PUT</c> 一个 <c>enabled: true</c>。
+/// </summary>
 public static class LinkEndpoints
 {
     private const string Tag = "admin-links";
@@ -15,110 +19,139 @@ public static class LinkEndpoints
     public static void Map(RouteGroupBuilder group)
     {
         group.MapGet("/links", ListAsync)
-            .Api("links_list", "Every probe/agent pair: whether it is linked, the manual override and whether it is connected", Tag).Returns<LinkMatrixDto>().ProducesProblems(401, 403)
+            .Api("links_list", "Every possible dialer/listener pair: whether it is linked, the manual override and whether it is connected; plus the nodes and which of them listen", Tag).Returns<LinkMatrixDto>().ProducesProblems(401, 403)
             .Requires(Capability.FleetRead);
-        group.MapPut("/links/{probe_id}/{agent_id}", SetAsync)
-            .Api("links_set", "Force a link on or off, or give it back to the automatic setting (enabled: null)", Tag).Returns<LinkDto>().ProducesProblems(400, 401, 403, 404)
+        group.MapPut("/links/{dialer_id}/{listener_id}", SetAsync)
+            .Api("links_set", "Connect a node to a listening node (enabled: true), force the link off (false), or give it back to the automatic setting (null)", Tag).Returns<LinkDto>().ProducesProblems(400, 401, 403, 404, 409, 422)
             .Requires(Capability.FleetWrite);
-        group.MapPost("/links/{probe_id}/{agent_id}/retry", RetryAsync)
-            .Api("links_retry", "Enable and immediately retry the Probe-to-Agent connection", Tag).Returns<LinkRetryDto>().ProducesProblems(401, 403, 404)
+        group.MapPost("/links/{dialer_id}/{listener_id}/retry", RetryAsync)
+            .Api("links_retry", "Enable and immediately retry the dialer-to-listener connection", Tag).Returns<LinkRetryDto>().ProducesProblems(401, 403, 404, 409, 422)
             .Requires(Capability.FleetWrite);
     }
 
-    private static async Task<IResult> ListAsync(AgentService agents, ProbeService probes, LinkService links, ProbeQuicRuntime quic, TimeProvider time, CancellationToken ct)
+    private static async Task<IResult> ListAsync(AgentService agents, LinkService links, LinkRuntime runtime, TimeProvider time, CancellationToken ct)
     {
         LinkSnapshot snapshot = await links.SnapshotAsync(ct);
-        IReadOnlyList<AgentView> agentViews = await agents.ListAsync(ct);
+        AgentView[] nodes = [.. (await agents.ListAsync(ct)).Where(n => n.Agent.Status == NodeStatus.Active).OrderBy(n => n.Agent.Name, StringComparer.Ordinal)];
         var items = new List<LinkDto>();
-        foreach (ProbeView probe in (await probes.ListAsync(ct)).Where(p => !p.Revoked).OrderBy(p => p.Probe.Name, StringComparer.Ordinal))
+        foreach (AgentView dialer in nodes)
         {
-            foreach (AgentView agent in agentViews.OrderBy(a => a.Agent.Name, StringComparer.Ordinal))
+            foreach (AgentView listener in nodes.Where(n => n.Agent.Listens && n.Agent.Id != dialer.Agent.Id))
             {
-                items.Add(ToDto(snapshot, probe, agent, quic, time));
+                items.Add(ToDto(snapshot, dialer, listener, runtime, time));
             }
         }
 
-        return TypedResults.Json(new LinkMatrixDto(snapshot.Auto, items), ApiJsonContext.Default.LinkMatrixDto);
+        LinkNodeDto[] nodeItems = [.. nodes.Select(n => new LinkNodeDto(n.Agent.Id.Value, n.Agent.Name, n.Agent.Listens, n.Online, n.RuntimeStatus))];
+        return TypedResults.Json(new LinkMatrixDto(snapshot.Auto, nodeItems, items), ApiJsonContext.Default.LinkMatrixDto);
     }
 
-    private static async Task<IResult> SetAsync(HttpContext http, AgentService agents, ProbeService probes, LinkService links, ProbeQuicRuntime quic, TimeProvider time, string probe_id, string agent_id, SetLinkRequest request, CancellationToken ct)
+    private static async Task<IResult> SetAsync(HttpContext http, AgentService agents, LinkService links, LinkRuntime runtime, TimeProvider time, string dialer_id, string listener_id, SetLinkRequest request, CancellationToken ct)
     {
-        if (await probes.GetAsync(probe_id, ct) is not { Revoked: false } probe)
+        (AgentView? dialer, AgentView? listener, IResult? problem) = await ResolveAsync(http, agents, dialer_id, listener_id, request.Enabled == true, ct);
+        if (problem is not null)
         {
-            return Problems.Create(http, MoShiroErrors.ProbeNotFound, "probe not found");
+            return problem;
         }
 
-        if (await agents.GetAsync(new NodeId(agent_id), ct) is not { } agent)
-        {
-            return Problems.Create(http, MoShiroErrors.AgentNotFound, "agent not found");
-        }
-
-        await links.SetAsync(probe_id, agent_id, request.Enabled, ct);
-        await agents.AfterAgentSetChangedAsync(ct); // 重新下发：Probe 的 Agent 列表、Agent 允许的 Probe
+        await links.SetAsync(dialer_id, listener_id, request.Enabled, ct);
+        await agents.AfterAgentSetChangedAsync(ct); // 重新下发：拨号方的拨号目标、监听方允许的拨号方
         if (request.Enabled == true)
         {
-            await agents.NotifyProbeLinkRetryAsync(new NodeId(probe_id), agent.Agent.Id, ct);
+            await agents.NotifyLinkRetryAsync(dialer!.Agent.Id, listener!.Agent.Id, ct);
         }
-        return TypedResults.Json(ToDto(await links.SnapshotAsync(ct), probe, agent, quic, time), ApiJsonContext.Default.LinkDto);
+
+        return TypedResults.Json(ToDto(await links.SnapshotAsync(ct), dialer!, listener!, runtime, time), ApiJsonContext.Default.LinkDto);
     }
 
-    private static async Task<IResult> RetryAsync(HttpContext http, AgentService agents, ProbeService probes, LinkService links, ProbeQuicRuntime quic, TimeProvider time, string probe_id, string agent_id, CancellationToken ct)
+    private static async Task<IResult> RetryAsync(HttpContext http, AgentService agents, LinkService links, LinkRuntime runtime, TimeProvider time, string dialer_id, string listener_id, CancellationToken ct)
     {
-        if (await probes.GetAsync(probe_id, ct) is not { Revoked: false } probe)
+        (AgentView? dialer, AgentView? listener, IResult? problem) = await ResolveAsync(http, agents, dialer_id, listener_id, requireListening: true, ct);
+        if (problem is not null)
         {
-            return Problems.Create(http, MoShiroErrors.ProbeNotFound, "probe not found");
-        }
-        if (await agents.GetAsync(new NodeId(agent_id), ct) is not { } agent)
-        {
-            return Problems.Create(http, MoShiroErrors.AgentNotFound, "agent not found");
+            return problem;
         }
 
-        await links.SetAsync(probe_id, agent_id, true, ct);
+        await links.SetAsync(dialer_id, listener_id, true, ct);
         await agents.AfterAgentSetChangedAsync(ct);
-        bool queued = await agents.NotifyProbeLinkRetryAsync(new NodeId(probe_id), agent.Agent.Id, ct);
-        LinkDto link = ToDto(await links.SnapshotAsync(ct), probe, agent, quic, time);
+        bool queued = await agents.NotifyLinkRetryAsync(dialer!.Agent.Id, listener!.Agent.Id, ct);
+        LinkDto link = ToDto(await links.SnapshotAsync(ct), dialer, listener, runtime, time);
         return TypedResults.Json(new LinkRetryDto(queued, link), ApiJsonContext.Default.LinkRetryDto, statusCode: StatusCodes.Status202Accepted);
     }
 
-    private static LinkDto ToDto(LinkSnapshot snapshot, ProbeView probe, AgentView agent, ProbeQuicRuntime quicRuntime, TimeProvider time)
+    /// <summary>两端都得是存在且激活的节点，不能连自己；开线路时监听方必须在监听。</summary>
+    private static async Task<(AgentView? Dialer, AgentView? Listener, IResult? Problem)> ResolveAsync(HttpContext http, AgentService agents, string dialerId, string listenerId, bool requireListening, CancellationToken ct)
     {
-        bool linked = snapshot.IsLinked(probe.Probe.Id, agent.Agent.Id.Value);
-        ProbeQuicLinkSnapshot? quicSnapshot = quicRuntime.Get(probe.Probe.Id, agent.Agent.Id.Value, IpVersions.V4);
-        ProbeQuicLinkHealth? health = quicSnapshot?.Health;
-        bool fresh = quicSnapshot is not null && time.GetUtcNow().ToUnixTimeMilliseconds() - quicSnapshot.AtMs <= 30_000;
+        if (dialerId == listenerId)
+        {
+            return (null, null, Problems.Create(http, MoShiroErrors.SelfLink, "a node cannot connect to itself"));
+        }
+
+        if (await agents.GetAsync(new NodeId(dialerId), ct) is not { } dialer)
+        {
+            return (null, null, Problems.Create(http, MoShiroErrors.AgentNotFound, "dialer not found"));
+        }
+
+        if (await agents.GetAsync(new NodeId(listenerId), ct) is not { } listener)
+        {
+            return (null, null, Problems.Create(http, MoShiroErrors.AgentNotFound, "listener not found"));
+        }
+
+        if (requireListening && !listener.Agent.Listens)
+        {
+            return (null, null, Problems.Create(http, MoShiroErrors.NotListening, "the listener does not accept connections: only nodes that listen can be connected to"));
+        }
+
+        return (dialer, listener, null);
+    }
+
+    private static LinkDto ToDto(LinkSnapshot snapshot, AgentView dialer, AgentView listener, LinkRuntime runtime, TimeProvider time)
+    {
+        bool linked = snapshot.IsLinked(dialer.Agent, listener.Agent);
+        ReportedLink? reported = runtime.Get(dialer.Agent.Id.Value, listener.Agent.Id.Value, IpVersions.V4);
+        LinkHealth? health = reported?.Health;
+        bool fresh = reported is not null && time.GetUtcNow().ToUnixTimeMilliseconds() - reported.AtMs <= 30_000;
         string state;
         string? reason = null;
         if (!linked) { state = "disabled"; reason = "线路策略已关闭"; }
-        else if (probe.RuntimeStatus != NodeRuntimeStatus.Running) { state = "probe_unavailable"; reason = $"Probe 状态：{probe.RuntimeStatus}"; }
-        else if (agent.RuntimeStatus != NodeRuntimeStatus.Running) { state = "agent_unavailable"; reason = $"Agent 状态：{agent.RuntimeStatus}"; }
+        else if (dialer.RuntimeStatus != NodeRuntimeStatus.Running) { state = "dialer_unavailable"; reason = $"拨号节点状态：{dialer.RuntimeStatus}"; }
+        else if (listener.RuntimeStatus != NodeRuntimeStatus.Running) { state = "listener_unavailable"; reason = $"监听节点状态：{listener.RuntimeStatus}"; }
         else if (health is null || !fresh)
         {
             state = "waiting_report";
-            reason = health is null ? "Probe 尚未上报此线路的 QUIC 拨号状态" : "Probe 的线路状态上报已过期";
+            reason = health is null ? "拨号节点尚未上报此线路的状态" : "拨号节点的线路状态上报已过期";
         }
-        else if (health.Connected && agent.Probes.Any(p => p.Id == probe.Probe.Id))
+        else if (health.Control.State == ControlState.Backoff)
+        {
+            state = "control_down";
+            reason = health.Control.LastError is { } fault ? $"与监听节点失联：{fault}" : "与监听节点失联，等待自动重试";
+        }
+        else if (health.Control.State != ControlState.Up || listener.Dialers.All(d => d.Id != dialer.Agent.Id.Value))
+        {
+            state = "control_connecting";
+            reason = "正在建立到监听节点的控制连接";
+        }
+        else if (health.Task.Quic.State == QuicState.Ready)
         {
             state = "connected";
         }
-        else if (health.State == ProbeLinkAttemptState.RetryWait)
+        else if (health.Task.Quic.State == QuicState.Retrying)
         {
-            state = "retry_wait";
-            reason = health.LastError is { Length: > 0 } error ? $"QUIC 连接失败：{error}" : "QUIC 连接失败，等待自动重试";
-        }
-        else if (agent.Probes.All(p => p.Id != probe.Probe.Id))
-        {
-            state = "control_disconnected";
-            reason = health.LastError ?? "Probe 尚未建立到 Agent 的测量控制会话";
+            state = "task_retrying";
+            reason = health.Task.Quic.LastError is { } fault ? $"控制连接正常，QUIC 数据通道重试中：{fault}" : "控制连接正常，QUIC 数据通道重试中";
         }
         else
         {
-            state = "quic_connecting";
-            reason = health.LastError ?? "控制会话已建立，正在建立 QUIC 测量会话";
+            state = "task_connecting";
+            reason = "控制连接正常，正在建立 QUIC 数据通道";
         }
-        bool connected = state == "connected";
-        return new LinkDto(probe.Probe.Id, probe.Probe.Name, agent.Agent.Id.Value, agent.Agent.Name, linked,
-            snapshot.OverrideOf(probe.Probe.Id, agent.Agent.Id.Value), connected, probe.RuntimeStatus, agent.RuntimeStatus,
-            state, reason, health?.LastError, health?.RetryAttempt ?? 0, health?.RetryInMs);
+
+        bool inBackoff = health?.Control.State == ControlState.Backoff;
+        return new LinkDto(dialer.Agent.Id.Value, dialer.Agent.Name, listener.Agent.Id.Value, listener.Agent.Name, linked,
+            snapshot.OverrideOf(dialer.Agent.Id.Value, listener.Agent.Id.Value), state == "connected", dialer.RuntimeStatus, listener.RuntimeStatus,
+            state, reason, (inBackoff ? health!.Control.LastError : health?.Task.Quic.LastError)?.ToString(),
+            health is null ? 0 : inBackoff ? health.Control.RetryAttempt : health.Task.Quic.RetryAttempt,
+            health is null ? null : inBackoff ? health.Control.RetryInMs : health.Task.Quic.RetryInMs);
     }
 }
 

backend/src/MoShiro.Backend.Api/Admin/SystemEndpoints.cs

@@ -94,7 +94,7 @@ public static class SystemEndpoints
 
         if (result.IsSuccess && changes.ContainsKey(SettingsService.AutoLink))
         {
-            await agents.AfterAgentSetChangedAsync(http.RequestAborted); // 自动连接开关变了：重新下发各 Probe 的 Agent 列表和各 Agent 允许的 Probe
+            await agents.AfterAgentSetChangedAsync(http.RequestAborted); // 自动连接开关变了：重新下发各 拨号方 的 Agent 列表和各 Agent 允许的 拨号方
         }
 
         return result.TryGet(out IReadOnlyList<SettingView>? views, out FleetError? error)

backend/src/MoShiro.Backend.Api/Admin/TaskEndpoints.cs

@@ -117,7 +117,7 @@ public static class TaskEndpoints
             return Problems.From(http, lineError);
         }
 
-        Result<TestRecord> result = await tests.StartAsync(line.Key.Agent, line.Key.Probe, new StartTestRequest(request.Plan ?? "", request.Params), "api", line.IpVersion, ct);
+        Result<TestRecord> result = await tests.StartAsync(line.Key.Listener, line.Key.Dialer, new StartTestRequest(request.Plan ?? "", request.Params), "api", line.IpVersion, ct);
         if (!result.TryGet(out TestRecord? test, out FleetError? error))
         {
             return Problems.From(http, error);
@@ -129,14 +129,14 @@ public static class TaskEndpoints
 
     private static async Task<IResult> ListTestsAsync(HttpContext http, TestService tests, LineService lines, string line_id, int? limit, CancellationToken ct)
     {
-        // 只给 Agent id（并且有多个 Probe）时列出这个 Agent 上所有 Probe 的测试
+        // 只给监听方 id（并且有多条线路）时列出这个节点上所有线路的测试
         NodeId agent;
-        ProbeId? probe = null;
+        NodeId? dialer = null;
         string? ipVersion = null;
         if (LineKey.TryParse(line_id, out LineKey key))
         {
-            agent = key.Agent;
-            probe = key.Probe;
+            agent = key.Listener;
+            dialer = key.Dialer;
             ipVersion = key.IpVersion;
         }
         else
@@ -145,7 +145,7 @@ public static class TaskEndpoints
         }
 
         return TypedResults.Json(
-            new PageDto<TestDto>([.. (await tests.ListAsync(agent, probe, Math.Clamp(limit ?? 50, 1, 500), ipVersion, ct)).Select(Mappers.ToDto)], null),
+            new PageDto<TestDto>([.. (await tests.ListAsync(agent, dialer, Math.Clamp(limit ?? 50, 1, 500), ipVersion, ct)).Select(Mappers.ToDto)], null),
             ApiJsonContext.Default.PageDtoTestDto);
     }
 

backend/src/MoShiro.Backend.Api/Admin/TrustEndpoints.cs

@@ -39,7 +39,7 @@ public static class TrustEndpoints
     /// <summary>面板提供的脚本和 CI 签名的发布清单里记的哈希是否一致（清单由 CI 签名，节点和浏览器之外的人改不了）。没有清单或没记哈希时返回 null。</summary>
     private static async Task<bool?> MatchesReleaseAsync(ReleaseService releases, string sh, string ps1, CancellationToken ct)
     {
-        foreach (string component in new[] { JoinTokenService.AgentRole, JoinTokenService.ProbeRole })
+        foreach (string component in new[] { ReleaseService.AgentComponent })
         {
             if (await releases.GetAsync(component, ct) is not { } offer)
             {