alink-cli 0.11.9 → 0.11.11

package/README.md

@@ -24,4 +24,6 @@ alink
 
 `alink login` 会打开浏览器，支持使用 GitHub 或已有 AgentLink 账号登录并添加当前电脑。原命令 `alink-cli` 继续可用。
 
+脚本或排障时可用 `alink status --json` 和 `alink machines --json` 获取结构化的本机连接状态与账号机器数据。daemon 在网络中断、电脑唤醒或 Hub 更新后会自动退避重连，无需手动重启。
+
 [GitHub](https://github.com/baichen99/agentlink) · [提交问题](https://github.com/baichen99/agentlink/issues)

package/bin/agentlink-account.js

@@ -185,9 +185,13 @@ export async function listAgentLinkAccountMachinesFromHub({ hub, jwt, fetchFn =
     online: row.online === true,
     name: typeof row.name === "string" ? row.name : undefined,
     hostname: typeof row.hostname === "string" ? row.hostname : undefined,
+    daemonVersion: typeof row.daemonVersion === "string" ? row.daemonVersion : undefined,
     connectedAt: timestamp(row.connectedAt),
     createdAt: timestamp(row.createdAt),
     updatedAt: timestamp(row.updatedAt),
+    dirs: Array.isArray(row.dirs) ? row.dirs.filter((dir) => typeof dir === "string") : undefined,
+    agents: Array.isArray(row.agents) ? row.agents.filter((agent) => typeof agent === "string") : undefined,
+    e2e: typeof row.e2e === "boolean" ? row.e2e : undefined,
   })).filter((m) => m.machineId);
 }
 

package/bin/agentlink.js

@@ -283,7 +283,7 @@ async function pair(hub) {
 
 async function showHelp() {
   console.log(
-    `用法:\n  alink-cli                 打开 AgentLink\n  alink-cli login           登录账号\n  alink-cli status          查看连接状态\n  alink-cli machines        查看账号下的机器\n  alink-cli logout          退出账号\n  alink-cli help            查看帮助`,
+    `用法:\n  alink-cli                 打开 AgentLink\n  alink-cli login           登录账号\n  alink-cli status [--json] 查看连接状态\n  alink-cli machines [--json] 查看账号下的机器\n  alink-cli logout          退出账号\n  alink-cli help            查看帮助`,
   );
 }
 
@@ -317,6 +317,20 @@ async function showStatus() {
     typeof status.hub !== "string" || normalizeHub(status.hub) === normalizeHub(hub);
   const hubStatus =
     !running || !statusMatchesHub ? "未连接" : status.hubConnected ? "已连接" : "连接中";
+  if (args.includes("--json")) {
+    console.log(JSON.stringify({
+      loggedIn: Boolean(savedCredential(hub)),
+      running,
+      hubConnected: hubStatus === "已连接",
+      hubStatus,
+      hub: normalizeHub(hub),
+      ...(typeof status.machineId === "string" ? { machineId: status.machineId } : {}),
+      ...(typeof status.daemonVersion === "string" ? { daemonVersion: status.daemonVersion } : {}),
+      ...(typeof status.startedAt === "number" ? { startedAt: status.startedAt } : {}),
+      ...(typeof status.ts === "number" ? { updatedAt: status.ts } : {}),
+    }, null, 2));
+    return;
+  }
   console.log(`[agentlink] 登录状态：${savedCredential(hub) ? "已登录" : "未登录"}`);
   console.log(`[agentlink] 本机服务：${running ? "运行中" : "已停止"}`);
   console.log(`[agentlink] Hub 连接：${hubStatus}`);
@@ -381,13 +395,21 @@ async function doMachines() {
     saveSessionJwt(jwt, hub);
   }
   const machines = await listAgentLinkAccountMachinesFromHub({ hub, jwt });
+  if (args.includes("--json")) {
+    console.log(JSON.stringify(machines, null, 2));
+    return;
+  }
   if (machines.length === 0) console.log("[agentlink] 账号下还没有机器。");
   else {
     console.log(`[agentlink] 账号下共 ${machines.length} 台机器：`);
     for (const machine of machines) {
       const onlineMarker = machine.online ? "●" : "○";
       const label = machine.name || machine.hostname || machine.machineId;
-      console.log(`  ${onlineMarker} ${label} (${machine.machineId})`);
+      const details = [
+        machine.daemonVersion ? `v${machine.daemonVersion}` : undefined,
+        machine.connectedAt ? `连接于 ${new Date(machine.connectedAt).toLocaleString()}` : undefined,
+      ].filter(Boolean).join(" · ");
+      console.log(`  ${onlineMarker} ${label} (${machine.machineId})${details ? ` · ${details}` : ""}`);
     }
   }
 }

package/dist/bin.mjs

@@ -11747,6 +11747,7 @@ const AuthAccessReadScope = "access:read";
 const AuthAccessWriteScope = "access:write";
 const AuthRelayReadScope = "relay:read";
 const AuthRelayWriteScope = "relay:write";
+const AuthPortProxyOperateScope = "port-proxy:operate";
 const AuthEnvironmentScope = Literals([
 	AuthOrchestrationReadScope,
 	AuthOrchestrationOperateScope,
@@ -11755,7 +11756,8 @@ const AuthEnvironmentScope = Literals([
 	AuthAccessReadScope,
 	AuthAccessWriteScope,
 	AuthRelayReadScope,
-	AuthRelayWriteScope
+	AuthRelayWriteScope,
+	AuthPortProxyOperateScope
 ]);
 const AuthEnvironmentScopes = ArraySchema(AuthEnvironmentScope);
 const AuthStandardClientScopes = [
@@ -11763,7 +11765,8 @@ const AuthStandardClientScopes = [
 	AuthOrchestrationOperateScope,
 	AuthTerminalOperateScope,
 	AuthReviewWriteScope,
-	AuthRelayReadScope
+	AuthRelayReadScope,
+	AuthPortProxyOperateScope
 ];
 const AuthAdministrativeScopes = [
 	...AuthStandardClientScopes,
@@ -22506,6 +22509,11 @@ const ReviewDiffPreviewResult = Struct({
 	sources: ArraySchema(ReviewDiffPreviewSource)
 });
 const ReviewDiffPreviewError = Union([VcsError, GitCommandError]);
+//#endregion
+//#region ../t3-contracts/src/portProxy.ts
+const PortProxyPort = PortSchema.pipe(brand("PortProxyPort"));
+const PortProxyListResult = Struct({ ports: ArraySchema(PortProxyPort) });
+const PortProxyPortInput = Struct({ port: PortProxyPort });
 const ResourceTelemetryIoSemantics = Literals([
 	"storage",
 	"logical",
@@ -23272,6 +23280,9 @@ const WS_METHODS = {
 	serverReportClientActivity: "server.reportClientActivity",
 	serverReportHostPowerState: "server.reportHostPowerState",
 	serverGetBackgroundPolicy: "server.getBackgroundPolicy",
+	portProxyList: "portProxy.list",
+	portProxyAuthorize: "portProxy.authorize",
+	portProxyRevoke: "portProxy.revoke",
 	cloudGetRelayClientStatus: "cloud.getRelayClientStatus",
 	cloudInstallRelayClient: "cloud.installRelayClient",
 	sourceControlLookupRepository: "sourceControl.lookupRepository",
@@ -23345,6 +23356,21 @@ const WsServerGetSettingsRpc = make$52(WS_METHODS.serverGetSettings, {
 	success: ServerSettings,
 	error: Union([ServerSettingsError, EnvironmentAuthorizationError])
 });
+const WsPortProxyListRpc = make$52(WS_METHODS.portProxyList, {
+	payload: Struct({}),
+	success: PortProxyListResult,
+	error: EnvironmentAuthorizationError
+});
+const WsPortProxyAuthorizeRpc = make$52(WS_METHODS.portProxyAuthorize, {
+	payload: PortProxyPortInput,
+	success: PortProxyListResult,
+	error: EnvironmentAuthorizationError
+});
+const WsPortProxyRevokeRpc = make$52(WS_METHODS.portProxyRevoke, {
+	payload: PortProxyPortInput,
+	success: PortProxyListResult,
+	error: EnvironmentAuthorizationError
+});
 const WsServerUpdateSettingsRpc = make$52(WS_METHODS.serverUpdateSettings, {
 	payload: Struct({ patch: ServerSettingsPatch }),
 	success: ServerSettings,
@@ -23670,7 +23696,7 @@ const WsOrchestrationSubscribeThreadRpc = make$52(ORCHESTRATION_WS_METHODS.subsc
 	error: Union([OrchestrationGetSnapshotError, EnvironmentAuthorizationError]),
 	stream: true
 });
-const WsRpcGroup = make$51(WsServerProbeRpc, WsServerGetConfigRpc, WsServerRefreshProvidersRpc, WsServerUpdateProviderRpc, WsServerUpdateServerRpc, WsServerUpdateServerWithProgressRpc, WsServerUpsertKeybindingRpc, WsServerRemoveKeybindingRpc, WsServerGetSettingsRpc, WsServerUpdateSettingsRpc, WsServerDiscoverSourceControlRpc, WsServerGetTraceDiagnosticsRpc, WsServerGetProcessDiagnosticsRpc, WsServerGetProcessResourceHistoryRpc, WsServerGetResourceTelemetryHistoryRpc, WsServerRetryResourceTelemetryRpc, WsServerSignalProcessRpc, WsServerReportClientActivityRpc, WsServerReportHostPowerStateRpc, WsServerGetBackgroundPolicyRpc, WsCloudGetRelayClientStatusRpc, WsCloudInstallRelayClientRpc, WsSourceControlLookupRepositoryRpc, WsSourceControlCloneRepositoryRpc, WsSourceControlPublishRepositoryRpc, WsProjectsListEntriesRpc, WsProjectsReadFileRpc, WsProjectsSearchContentsRpc, WsProjectsSearchEntriesRpc, WsProjectsWriteFileRpc, WsShellOpenInEditorRpc, WsFilesystemBrowseRpc, WsAssetsCreateUrlRpc, WsSubscribeVcsStatusRpc, WsVcsPullRpc, WsVcsRefreshStatusRpc, WsGitRunStackedActionRpc, WsGitResolvePullRequestRpc, WsGitPreparePullRequestThreadRpc, WsVcsListRefsRpc, WsVcsCreateWorktreeRpc, WsVcsRemoveWorktreeRpc, WsVcsCreateRefRpc, WsVcsSwitchRefRpc, WsVcsInitRpc, WsReviewGetDiffPreviewRpc, WsReviewGetDiffFileContentsRpc, WsTerminalOpenRpc, WsTerminalAttachRpc, WsTerminalWriteRpc, WsTerminalResizeRpc, WsTerminalClearRpc, WsTerminalRestartRpc, WsTerminalCloseRpc, make$52(WS_METHODS.subscribeTerminalEvents, {
+const WsRpcGroup = make$51(WsServerProbeRpc, WsServerGetConfigRpc, WsServerRefreshProvidersRpc, WsServerUpdateProviderRpc, WsServerUpdateServerRpc, WsServerUpdateServerWithProgressRpc, WsServerUpsertKeybindingRpc, WsServerRemoveKeybindingRpc, WsServerGetSettingsRpc, WsServerUpdateSettingsRpc, WsServerDiscoverSourceControlRpc, WsServerGetTraceDiagnosticsRpc, WsServerGetProcessDiagnosticsRpc, WsServerGetProcessResourceHistoryRpc, WsServerGetResourceTelemetryHistoryRpc, WsServerRetryResourceTelemetryRpc, WsServerSignalProcessRpc, WsServerReportClientActivityRpc, WsServerReportHostPowerStateRpc, WsServerGetBackgroundPolicyRpc, WsPortProxyListRpc, WsPortProxyAuthorizeRpc, WsPortProxyRevokeRpc, WsCloudGetRelayClientStatusRpc, WsCloudInstallRelayClientRpc, WsSourceControlLookupRepositoryRpc, WsSourceControlCloneRepositoryRpc, WsSourceControlPublishRepositoryRpc, WsProjectsListEntriesRpc, WsProjectsReadFileRpc, WsProjectsSearchContentsRpc, WsProjectsSearchEntriesRpc, WsProjectsWriteFileRpc, WsShellOpenInEditorRpc, WsFilesystemBrowseRpc, WsAssetsCreateUrlRpc, WsSubscribeVcsStatusRpc, WsVcsPullRpc, WsVcsRefreshStatusRpc, WsGitRunStackedActionRpc, WsGitResolvePullRequestRpc, WsGitPreparePullRequestThreadRpc, WsVcsListRefsRpc, WsVcsCreateWorktreeRpc, WsVcsRemoveWorktreeRpc, WsVcsCreateRefRpc, WsVcsSwitchRefRpc, WsVcsInitRpc, WsReviewGetDiffPreviewRpc, WsReviewGetDiffFileContentsRpc, WsTerminalOpenRpc, WsTerminalAttachRpc, WsTerminalWriteRpc, WsTerminalResizeRpc, WsTerminalClearRpc, WsTerminalRestartRpc, WsTerminalCloseRpc, make$52(WS_METHODS.subscribeTerminalEvents, {
 	payload: Struct({}),
 	success: TerminalEvent,
 	error: EnvironmentAuthorizationError,
@@ -51040,6 +51066,60 @@ const observeRpcStreamEffect = (method, effect, traceAttributes) => {
 	return withRpcStreamTracing(method, instrumented, traceAttributes);
 };
 //#endregion
+//#region src/portProxy.ts
+const ports = /* @__PURE__ */ new Set();
+const methods = /* @__PURE__ */ new Set([
+	"GET",
+	"HEAD",
+	"POST",
+	"PUT",
+	"PATCH",
+	"DELETE",
+	"OPTIONS"
+]);
+const requestHeaders = /* @__PURE__ */ new Set([
+	"authorization",
+	"cookie",
+	"host",
+	"connection",
+	"upgrade",
+	"proxy-authorization",
+	"proxy-connection"
+]);
+const responseHeaders = /* @__PURE__ */ new Set([
+	"set-cookie",
+	"connection",
+	"upgrade",
+	"proxy-authenticate",
+	"transfer-encoding"
+]);
+function listAuthorizedPorts() {
+	return [...ports].sort((a, b) => a - b);
+}
+function authorizePort(port) {
+	ports.add(port);
+	return listAuthorizedPorts();
+}
+function revokePort(port) {
+	ports.delete(port);
+	return listAuthorizedPorts();
+}
+function isPortAuthorized(port) {
+	return ports.has(port);
+}
+function authorizedPortBaseUrl(port) {
+	return isPortAuthorized(port) ? `http://127.0.0.1:${port}` : null;
+}
+function isPortProxyMethodAllowed(method) {
+	return methods.has(method.toUpperCase());
+}
+function isPortProxyRequestHeaderAllowed(header) {
+	return !requestHeaders.has(header.toLowerCase());
+}
+function isPortProxyResponseHeaderAllowed(header) {
+	return !responseHeaders.has(header.toLowerCase());
+}
+//#endregion
 //#region ../t3-shared/src/searchRanking.ts
 function normalizeSearchQuery(input, options) {
 	const trimmed = input.trim();
@@ -52379,6 +52459,9 @@ const RPC_REQUIRED_SCOPES = {
 	[WS_METHODS.serverReportClientActivity]: AuthOrchestrationReadScope,
 	[WS_METHODS.serverReportHostPowerState]: AuthOrchestrationOperateScope,
 	[WS_METHODS.serverGetBackgroundPolicy]: AuthOrchestrationReadScope,
+	[WS_METHODS.portProxyList]: AuthOrchestrationOperateScope,
+	[WS_METHODS.portProxyAuthorize]: AuthOrchestrationOperateScope,
+	[WS_METHODS.portProxyRevoke]: AuthOrchestrationOperateScope,
 	[WS_METHODS.cloudGetRelayClientStatus]: AuthRelayReadScope,
 	[WS_METHODS.cloudInstallRelayClient]: AuthRelayWriteScope,
 	[WS_METHODS.sourceControlLookupRepository]: AuthOrchestrationReadScope,
@@ -52885,6 +52968,9 @@ const makeWsRpcLayer = (currentSession) => WsRpcGroup.toLayer(gen(function* () {
 		}), { "rpc.aggregate": "orchestration" }),
 		[WS_METHODS.serverProbe]: (_input) => observeRpcEffect$1(WS_METHODS.serverProbe, succeed$1({}), { "rpc.aggregate": "server" }),
 		[WS_METHODS.serverGetConfig]: (_input) => observeRpcEffect$1(WS_METHODS.serverGetConfig, loadServerConfig, { "rpc.aggregate": "server" }),
+		[WS_METHODS.portProxyList]: (_input) => observeRpcEffect$1(WS_METHODS.portProxyList, sync(() => ({ ports: listAuthorizedPorts() })), { "rpc.aggregate": "port-proxy" }),
+		[WS_METHODS.portProxyAuthorize]: ({ port }) => observeRpcEffect$1(WS_METHODS.portProxyAuthorize, sync(() => ({ ports: authorizePort(port) })), { "rpc.aggregate": "port-proxy" }),
+		[WS_METHODS.portProxyRevoke]: ({ port }) => observeRpcEffect$1(WS_METHODS.portProxyRevoke, sync(() => ({ ports: revokePort(port) })), { "rpc.aggregate": "port-proxy" }),
 		[WS_METHODS.serverRefreshProviders]: (input) => observeRpcEffect$1(WS_METHODS.serverRefreshProviders, (input.instanceId !== void 0 ? providerRegistry.refreshInstance(input.instanceId) : providerRegistry.refresh()).pipe(map$4((providers) => ({ providers }))), { "rpc.aggregate": "server" }),
 		[WS_METHODS.serverUpdateProvider]: (input) => observeRpcEffect$1(WS_METHODS.serverUpdateProvider, providerMaintenanceRunner.updateProvider(input), { "rpc.aggregate": "server" }),
 		[WS_METHODS.serverUpdateSettings]: ({ patch }) => observeRpcEffect$1(WS_METHODS.serverUpdateSettings, serverSettings.updateSettings(patch).pipe(map$4(redactServerSettingsForClient)), { "rpc.aggregate": "server" }),
@@ -53185,7 +53271,8 @@ function makeAgentLinkFrameAssembler() {
 const TUNNEL_SCOPES = [
 	AuthOrchestrationReadScope,
 	AuthOrchestrationOperateScope,
-	AuthTerminalOperateScope
+	AuthTerminalOperateScope,
+	AuthPortProxyOperateScope
 ];
 function machineIdFromToken(token) {
 	const parts = token.split(".");
@@ -53322,7 +53409,7 @@ const splitHubFrame = (text) => {
 	};
 };
 function isHttpTunnelRequestFrame(value) {
-	return typeof value === "object" && value !== null && value._tag === "HttpRequest" && typeof value.id === "string" && typeof value.method === "string" && typeof value.path === "string" && Array.isArray(value.headers) && (value.body === null || typeof value.body === "string");
+	return typeof value === "object" && value !== null && value._tag === "HttpRequest" && typeof value.id === "string" && typeof value.method === "string" && typeof value.path === "string" && Array.isArray(value.headers) && (value.body === null || typeof value.body === "string") && (value.targetPort === void 0 || Number.isInteger(value.targetPort) && Number(value.targetPort) >= 1 && Number(value.targetPort) <= 65535);
 }
 function encodeHttpTunnelResponseFrame(frame) {
 	return JSON.stringify(frame);
@@ -53455,7 +53542,7 @@ const runHubTunnel = (config) => gen(function* () {
 			});
 			yield* addFinalizer(() => sessionsStore.markDisconnected(issued.sessionId).pipe(andThen(serverAuth.revokeSession(issued.sessionId)), ignore$1));
 			yield* sessionsStore.markConnected(issued.sessionId);
-			const localBaseUrl = `http://127.0.0.1:${serverConfig.port}`;
+			const daemonBaseUrl = `http://127.0.0.1:${serverConfig.port}`;
 			const sendEncrypted = (frame) => {
 				try {
 					for (const part of chunkAgentLinkFrame(encodeHttpTunnelResponseFrame(frame))) {
@@ -53496,12 +53583,35 @@ const runHubTunnel = (config) => gen(function* () {
 					});
 					return;
 				}
+				const portProxyBaseUrl = requestFrame.targetPort === void 0 ? void 0 : authorizedPortBaseUrl(requestFrame.targetPort);
+				if (portProxyBaseUrl === null) {
+					sendEncrypted({
+						_tag: "HttpResponse",
+						id: requestFrame.id,
+						status: 403,
+						statusText: "Forbidden",
+						headers: [["content-type", "text/plain; charset=utf-8"]],
+						body: Buffer.from("This port has not been authorized in AgentLink settings.").toString("base64")
+					});
+					return;
+				}
+				if (portProxyBaseUrl !== void 0 && !isPortProxyMethodAllowed(requestFrame.method)) {
+					sendEncrypted({
+						_tag: "HttpResponse",
+						id: requestFrame.id,
+						status: 405,
+						statusText: "Method Not Allowed",
+						headers: [["content-type", "text/plain; charset=utf-8"]],
+						body: Buffer.from("Unsupported port proxy method.").toString("base64")
+					});
+					return;
+				}
 				runFork(gen(function* () {
-					const targetUrl = `${localBaseUrl}${requestFrame.path}`;
-					const headers = { authorization: `Bearer ${issued.token}` };
+					const targetUrl = `${portProxyBaseUrl ?? daemonBaseUrl}${requestFrame.path}`;
+					const headers = requestFrame.targetPort === void 0 ? { authorization: `Bearer ${issued.token}` } : {};
 					for (const [key, value] of requestFrame.headers) {
 						const lower = key.toLowerCase();
-						if (lower === "authorization" || lower === "cookie") continue;
+						if (requestFrame.targetPort === void 0 ? lower === "authorization" || lower === "cookie" : !isPortProxyRequestHeaderAllowed(lower)) continue;
 						headers[lower] = value;
 					}
 					let request = make$65(requestFrame.method)(targetUrl).pipe(setHeaders(headers));
@@ -53509,7 +53619,7 @@ const runHubTunnel = (config) => gen(function* () {
 					const response = yield* httpClient.execute(request);
 					const responseBody = yield* response.arrayBuffer;
 					const responseHeaders = [];
-					for (const [key, value] of Object.entries(response.headers)) if (typeof value === "string") responseHeaders.push([key, value]);
+					for (const [key, value] of Object.entries(response.headers)) if (typeof value === "string" && (requestFrame.targetPort === void 0 || isPortProxyResponseHeaderAllowed(key))) responseHeaders.push([key, value]);
 					return {
 						_tag: "HttpResponse",
 						id: requestFrame.id,