Merge branch 'develop' into release

src/pages/RestoredPages.tsx

@@ -1,4 +1,4 @@
-import { ChevronDown, ChevronUp, MoreHorizontal, Plus, RefreshCcw, Settings2 } from 'lucide-react';
+import { ChevronDown, ChevronUp, MoreHorizontal, Plus, RefreshCcw, Settings2, Trash2 } from 'lucide-react';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { DataTableCard, type DataTableColumn } from '../components/data-table';
 import { Badge, Button, Card, CardHeader, Modal, Progress } from '../components/ui';
@@ -331,6 +331,8 @@ export function TailscaleStatusPage() {
   const [source, setSource] = useState('');
   const [error, setError] = useState('');
   const [loading, setLoading] = useState(false);
+  const [deleteTarget, setDeleteTarget] = useState<TailscaleNode | null>(null);
+  const [deleting, setDeleting] = useState(false);
   const online = nodes.filter((node) => node.status === '활성' || node.online).length;
   const subnetRouters = nodes.filter((node) => node.routes && node.routes !== '-').length;
 
@@ -353,6 +355,20 @@ export function TailscaleStatusPage() {
     refresh();
   }, []);
 
+  const deleteNode = () => {
+    if (!deleteTarget) return;
+    setDeleting(true);
+    setError('');
+    apiRequest<{ deleted: boolean }>(`/tailscale/nodes/${encodeURIComponent(deleteTarget.id)}`, { method: 'DELETE' })
+      .then(() => {
+        setNodes((current) => current.filter((node) => node.id !== deleteTarget.id));
+        setDeleteTarget(null);
+        refresh();
+      })
+      .catch((requestError: Error) => setError(requestError.message))
+      .finally(() => setDeleting(false));
+  };
+
   return (
     <>
       <PageTitle
@@ -385,13 +401,30 @@ export function TailscaleStatusPage() {
         </Card>
       ) : null}
       <div className="mt-4">
-        <TailscaleNodeTable nodes={nodes} loading={loading} />
+        <TailscaleNodeTable nodes={nodes} loading={loading} onDelete={setDeleteTarget} />
       </div>
+      <Modal
+        open={Boolean(deleteTarget)}
+        title="노드 삭제"
+        onClose={() => !deleting && setDeleteTarget(null)}
+        footer={
+          <>
+            <Button variant="outline" disabled={deleting} onClick={() => setDeleteTarget(null)}>취소</Button>
+            <Button className="bg-rose-600 text-white hover:bg-rose-500" disabled={deleting} onClick={deleteNode}>
+              {deleting ? '삭제 중...' : '삭제'}
+            </Button>
+          </>
+        }
+      >
+        <p className="text-sm text-muted-foreground">
+          <strong className="text-foreground">{deleteTarget?.name}</strong> 노드를 Headscale에서 삭제합니다. 연결된 기기의 VPN 연결은 즉시 끊기며, 다시 사용하려면 재등록해야 합니다.
+        </p>
+      </Modal>
     </>
   );
 }
 
-function TailscaleNodeTable({ nodes, loading }: { nodes: TailscaleNode[]; loading: boolean }) {
+function TailscaleNodeTable({ nodes, loading, onDelete }: { nodes: TailscaleNode[]; loading: boolean; onDelete: (node: TailscaleNode) => void }) {
   const pageSize = 10;
   const [page, setPage] = useState(1);
   const totalPages = Math.max(1, Math.ceil(nodes.length / pageSize));
@@ -420,17 +453,18 @@ function TailscaleNodeTable({ nodes, loading }: { nodes: TailscaleNode[]; loadin
               <th className="px-5 py-3 font-medium">Routes</th>
               <th className="px-5 py-3 font-medium">Last Seen</th>
               <th className="px-5 py-3 font-medium">상태</th>
+              <th className="px-5 py-3 font-medium"><span className="sr-only">관리</span></th>
             </tr>
           </thead>
           <tbody className="divide-y divide-border">
             {loading && nodes.length === 0 ? (
               <tr>
-                <td colSpan={7} className="px-5 py-10 text-center text-muted-foreground">노드 정보를 불러오는 중입니다.</td>
+                <td colSpan={8} className="px-5 py-10 text-center text-muted-foreground">노드 정보를 불러오는 중입니다.</td>
               </tr>
             ) : null}
             {!loading && nodes.length === 0 ? (
               <tr>
-                <td colSpan={7} className="px-5 py-10 text-center text-muted-foreground">표시할 노드가 없습니다.</td>
+                <td colSpan={8} className="px-5 py-10 text-center text-muted-foreground">표시할 노드가 없습니다.</td>
               </tr>
             ) : null}
             {pageNodes.map((node) => (
@@ -442,6 +476,17 @@ function TailscaleNodeTable({ nodes, loading }: { nodes: TailscaleNode[]; loadin
                 <td className="px-5 py-3 text-muted-foreground">{node.routes}</td>
                 <td className="px-5 py-3 text-muted-foreground">{formatTailscaleLastSeen(node.lastSeen)}</td>
                 <td className="px-5 py-3"><StatusBadge status={node.status} /></td>
+                <td className="px-5 py-3 text-right">
+                  <Button
+                    variant="ghost"
+                    className="size-8 p-0 text-muted-foreground hover:text-rose-600"
+                    title="노드 삭제"
+                    aria-label={`${node.name} 노드 삭제`}
+                    onClick={() => onDelete(node)}
+                  >
+                    <Trash2 className="size-4" />
+                  </Button>
+                </td>
               </tr>
             ))}
           </tbody>

src/pages/agents/platform-api.ts

@@ -11,6 +11,9 @@ export type PlatformDevice = {
   os?: string | null;
   arch?: string | null;
   distro?: string | null;
+  agentVersion?: string | null;
+  agentUpdatedAt?: string | null;
+  agentLastSeenAt?: string | null;
   installedAt: string;
   lastProvisionedAt: string;
   status: string;

src/pages/applications/DeploymentManagementPage.tsx

@@ -38,7 +38,9 @@ type ImageTags = {
 
 function releaseArtifacts(release?: AppRelease | null) {
   const imageTags = release?.imageTags as ImageTags | null | undefined;
-  const entries = Object.entries(imageTags?.images ?? {});
+  const entries = Object.entries(imageTags?.images ?? {}).filter(([, image]) => (
+    !/^(postgres|mysql|mariadb|mongo)(:|@)/i.test(image.trim())
+  ));
   if (entries.length) return entries;
   if (release?.artifact) return [[release.app.name, release.artifact]];
   return [];

src/pages/operations/OrganizationsPage.tsx

@@ -136,6 +136,7 @@ export function OrganizationsPage() {
       },
       { key: 'type', header: '유형', className: 'w-32 px-5 py-3', cell: (row) => <StatusBadge status={organizationTypeLabel(row.type)} tone="blue" /> },
       { key: 'license', header: '라이센스', className: 'w-36 px-5 py-3', cell: (row) => row.defaultLicenseCode ? <StatusBadge status={row.defaultLicenseName ?? row.defaultLicenseCode} tone="green" /> : <span className="text-xs text-muted-foreground">-</span> },
+      { key: 'instructorInviteCode', header: '강사 가입 코드', className: 'w-40 px-5 py-3', cell: (row) => <span className="font-mono text-sm font-semibold tracking-[0.08em] text-foreground">{row.instructorInviteCode}</span> },
       { key: 'domain', header: '도메인', className: 'w-56 px-5 py-3', cell: (row) => <span className="font-mono text-xs text-muted-foreground">{row.domain || '-'}</span> },
       { key: 'createdAt', header: '생성', className: 'w-48 px-5 py-3', cell: (row) => <OrganizationCreator organization={row} /> },
       {

src/pages/operations/UserSessionsPage.tsx

@@ -13,6 +13,7 @@ import {
   lockUser,
   terminateUserSession,
   unlockUser,
+  updateLmsInstructor,
   type LicensePlan,
   type Organization,
   type UserSession
@@ -45,6 +46,7 @@ export function UserSessionsPage() {
   const [createSaving, setCreateSaving] = useState(false);
   const [menuSession, setMenuSession] = useState<{ id: string; x: number; y: number } | null>(null);
   const [detailSession, setDetailSession] = useState<UserSession | null>(null);
+  const [lmsRoleSaving, setLmsRoleSaving] = useState(false);
   const loadingVisible = useMinimumLoading(loading);
 
   const refresh = () => {
@@ -183,6 +185,24 @@ export function UserSessionsPage() {
       .finally(() => setCreateSaving(false));
   };
 
+  const setLmsInstructor = (isInstructor: boolean) => {
+    if (!detailSession) return;
+
+    setLmsRoleSaving(true);
+    updateLmsInstructor(detailSession.userId, isInstructor)
+      .then(() => {
+        setDetailSession((current) => current ? { ...current, isLmsInstructor: isInstructor } : current);
+        setSessions((current) => current.map((session) => (
+          session.userId === detailSession.userId ? { ...session, isLmsInstructor: isInstructor } : session
+        )));
+        toast({ type: 'success', title: 'LMS 역할 변경', message: isInstructor ? '강사 권한을 부여했습니다.' : '강사 권한을 해제했습니다.' });
+      })
+      .catch((error: Error) => {
+        toast({ type: 'error', title: 'LMS 역할 변경 실패', message: error.message });
+      })
+      .finally(() => setLmsRoleSaving(false));
+  };
+
   return (
     <>
       <PageTitle
@@ -289,8 +309,20 @@ export function UserSessionsPage() {
               </div>
               <StatusBadge status={detailSession.state} />
             </div>
-            <div className="grid gap-3 text-sm">
+            <div className="grid gap-3 text-sm sm:grid-cols-2">
               <DetailItem label="사용자 ID" value={detailSession.userId} mono />
+              <label className="block min-w-0">
+                <span className="text-xs font-medium text-muted-foreground">LMS</span>
+                <select
+                  className="mt-2 h-9 w-full rounded-md border border-input bg-background px-3 text-sm font-medium text-foreground outline-none focus:ring-2 focus:ring-ring"
+                  value={detailSession.isLmsInstructor ? 'INSTRUCTOR' : 'STUDENT'}
+                  disabled={lmsRoleSaving}
+                  onChange={(event) => setLmsInstructor(event.target.value === 'INSTRUCTOR')}
+                >
+                  <option value="STUDENT">수강생</option>
+                  <option value="INSTRUCTOR">강사</option>
+                </select>
+              </label>
               <DetailItem label="조직" value={detailSession.primaryAffiliation?.organizationName ?? '-'} />
               <DetailItem label="조직 유형" value={organizationTypeLabel(detailSession.primaryAffiliation?.organizationType)} />
               <DetailItem label="부서" value={detailSession.primaryAffiliation?.department ?? '-'} />

src/pages/operations/operations-api.ts

@@ -70,6 +70,7 @@ export type UserSession = {
   expiresAt?: string | null;
   lastSeen?: string | null;
   state: string;
+  isLmsInstructor?: boolean;
   primaryAffiliation?: {
     id: string;
     organizationId: string;
@@ -90,6 +91,7 @@ export type Organization = {
   domain?: string | null;
   defaultLicenseCode?: string | null;
   defaultLicenseName?: string | null;
+  instructorInviteCode: string;
   createdById?: string | null;
   createdByName?: string | null;
   createdByEmail?: string | null;
@@ -257,6 +259,13 @@ export function unlockUser(userId: string) {
   });
 }
 
+export function updateLmsInstructor(userId: string, isInstructor: boolean) {
+  return apiRequest<{ userId: string; isInstructor: boolean }>(`/users/${userId}/lms-instructor`, {
+    method: 'PATCH',
+    body: JSON.stringify({ isInstructor })
+  });
+}
+
 export function terminateUserSession(sessionId: string) {
   return apiRequest(`/users/sessions/${sessionId}`, {
     method: 'DELETE'

src/pages/runtime/RuntimeDeviceControlPage.tsx

@@ -22,6 +22,8 @@ type HeadscaleNode = {
 type AclRule = { id: string; action: string; sources: string[]; destinations: string[] };
 type PlatformRow = HeadscaleNode & { device?: PlatformDevice; controllers: string[]; no: number };
 
+type DeviceKind = 'agent' | 'launcher' | 'unknown';
+
 function normalize(value?: string | null) {
   return (value ?? '').toLowerCase().replace(/[^a-z0-9]/g, '');
 }
@@ -41,6 +43,17 @@ function findControllers(node: HeadscaleNode, rules: AclRule[]) {
     .flatMap((rule) => rule.sources))];
 }
 
+function getDeviceKind(row: PlatformRow): DeviceKind {
+  if (!row.device) return 'unknown';
+  return row.device.agentVersion || row.device.agentLastSeenAt ? 'agent' : 'launcher';
+}
+
+function formatDateTime(value?: string | null) {
+  if (!value) return '-';
+  const date = new Date(value);
+  return Number.isNaN(date.getTime()) ? '-' : date.toLocaleString('ko-KR', { hour12: false });
+}
+
 export function RuntimeDeviceControlPage() {
   const [rows, setRows] = useState<PlatformRow[]>([]);
   const [loading, setLoading] = useState(true);
@@ -91,6 +104,19 @@ export function RuntimeDeviceControlPage() {
         width: 180,
         cell: (row) => <span className="font-mono text-xs text-muted-foreground">{row.ip || '-'}</span>,
       },
+      {
+        key: 'deviceKind',
+        header: '유형',
+        width: 150,
+        cell: (row) => {
+          const kind = getDeviceKind(row);
+          if (kind === 'agent') {
+            return <Badge tone="green">에이전트</Badge>;
+          }
+          if (kind === 'launcher') return <Badge tone="neutral">런처 클라이언트</Badge>;
+          return <Badge tone="neutral">미확인</Badge>;
+        },
+      },
       {
         key: 'controllers',
         header: '제어 사용자',
@@ -155,6 +181,9 @@ export function RuntimeDeviceControlPage() {
           <dt className="text-muted-foreground">Workspace</dt><dd className="min-w-0 break-all">{selected?.device?.workspaceRoot || '-'}</dd>
           <dt className="text-muted-foreground">SSH 사용자</dt><dd>{selected?.device?.sshUser || '-'}</dd>
           <dt className="text-muted-foreground">사용 유형</dt><dd>{selected?.device?.usageType || '-'}</dd>
+          <dt className="text-muted-foreground">장비 유형</dt><dd>{selected ? ({ agent: '에이전트', launcher: '런처 클라이언트', unknown: '미확인' }[getDeviceKind(selected)]) : '-'}</dd>
+          <dt className="text-muted-foreground">에이전트 버전</dt><dd>{selected?.device?.agentVersion || '-'}</dd>
+          <dt className="text-muted-foreground">마지막 에이전트 확인</dt><dd>{formatDateTime(selected?.device?.agentLastSeenAt)}</dd>
         </dl>
       </Modal>
     </>

src/types/application.ts

@@ -21,6 +21,7 @@ export type BuildJob = {
   branch: string;
   commitSha?: string | null;
   artifact?: string | null;
+  artifactSha256?: string | null;
   image?: string | null;
   status: JobStatus;
   logs?: string | null;