@akiojin/gwt 2.13.0 → 2.14.0

package/src/web/server/websocket/handler.ts

@@ -5,7 +5,7 @@
  * 仕様: specs/SPEC-d5e56259/contracts/websocket.md
  */
 
-import type { FastifyRequest } from "fastify";
+import type { FastifyRequest, FastifyBaseLogger } from "fastify";
 import type { WebSocket } from "@fastify/websocket";
 import type { PTYManager } from "../pty/manager.js";
 import type {
@@ -22,17 +22,18 @@ import type {
  * WebSocketハンドラー
  */
 export class WebSocketHandler {
-  constructor(private ptyManager: PTYManager) {}
+  private cleanupTimers: Map<string, NodeJS.Timeout> = new Map();
+
+  constructor(
+    private ptyManager: PTYManager,
+    private logger: FastifyBaseLogger,
+  ) {}
 
   /**
    * WebSocket接続を処理
    */
   public handle(connection: WebSocket, request: FastifyRequest): void {
-    const url = new URL(
-      request.url,
-      `http://${request.hostname || "localhost"}`,
-    );
-    const sessionId = url.searchParams.get("sessionId");
+    const sessionId = resolveSessionId(request);
 
     if (!sessionId) {
       this.sendError(connection, "Missing sessionId parameter");
@@ -47,7 +48,14 @@ export class WebSocketHandler {
       return;
     }
 
+    this.logger.info(
+      `WebSocket connection established for session ${sessionId} (pid=${instance.ptyProcess.pid})`,
+    );
+
+    this.clearCleanupTimer(sessionId);
+
     const { ptyProcess } = instance;
+    let hasExited = false;
 
     // セッションステータスを更新
     this.ptyManager.updateStatus(sessionId, "running");
@@ -59,6 +67,8 @@ export class WebSocketHandler {
 
     // PTYプロセス終了時の処理
     ptyProcess.onExit(({ exitCode, signal }) => {
+      hasExited = true;
+      this.clearCleanupTimer(sessionId);
       this.ptyManager.updateStatus(sessionId, "completed", exitCode);
       this.sendExit(connection, exitCode, signal);
       connection.close();
@@ -66,6 +76,10 @@ export class WebSocketHandler {
 
     // クライアントからのメッセージを処理
     connection.on("message", (rawMessage) => {
+      if (hasExited) {
+        this.sendError(connection, "Session already exited");
+        return;
+      }
       try {
         const message: ClientMessage = JSON.parse(rawMessage.toString());
         this.handleClientMessage(message, ptyProcess, connection);
@@ -77,7 +91,10 @@ export class WebSocketHandler {
 
     // 接続エラー時の処理
     connection.on("error", (error) => {
-      console.error(`WebSocket error for session ${sessionId}:`, error);
+      this.logger.error(
+        { err: error, sessionId },
+        `WebSocket error for session ${sessionId}`,
+      );
       this.ptyManager.updateStatus(
         sessionId,
         "failed",
@@ -87,9 +104,17 @@ export class WebSocketHandler {
     });
 
     // 接続クローズ時の処理
-    connection.on("close", () => {
-      console.log(`WebSocket closed for session ${sessionId}`);
-      // PTYプロセスは残す（バックグラウンドで実行継続）
+    connection.on("close", (code, reason) => {
+      const reasonText = reason?.toString()?.trim();
+      this.logger.info(
+        `WebSocket closed for session ${sessionId} (code=${code}${reasonText ? `, reason=${reasonText}` : ""})`,
+      );
+
+      if (hasExited) {
+        return;
+      }
+
+      this.scheduleCleanup(sessionId);
     });
   }
 
@@ -104,12 +129,22 @@ export class WebSocketHandler {
     switch (message.type) {
       case "input": {
         const inputMsg = message as InputMessage;
-        ptyProcess.write(inputMsg.data);
+        try {
+          ptyProcess.write(inputMsg.data);
+        } catch (error) {
+          const reason = error instanceof Error ? error.message : String(error);
+          this.sendError(connection, `Failed to write to session: ${reason}`);
+        }
         break;
       }
       case "resize": {
         const resizeMsg = message as ResizeMessage;
-        ptyProcess.resize(resizeMsg.data.cols, resizeMsg.data.rows);
+        try {
+          ptyProcess.resize(resizeMsg.data.cols, resizeMsg.data.rows);
+        } catch (error) {
+          const reason = error instanceof Error ? error.message : String(error);
+          this.sendError(connection, `Failed to resize terminal: ${reason}`);
+        }
         break;
       }
       case "ping": {
@@ -177,4 +212,75 @@ export class WebSocketHandler {
     };
     connection.send(JSON.stringify(message));
   }
+
+  private scheduleCleanup(sessionId: string): void {
+    this.clearCleanupTimer(sessionId);
+    const timer = setTimeout(() => {
+      this.cleanupTimers.delete(sessionId);
+      const tracked = this.ptyManager.get(sessionId);
+      if (!tracked) {
+        return;
+      }
+
+      if (
+        tracked.session.status === "running" ||
+        tracked.session.status === "pending"
+      ) {
+        this.logger.warn(
+          `Auto-cleaning session ${sessionId} after unexpected client disconnect`,
+        );
+        this.ptyManager.updateStatus(
+          sessionId,
+          "failed",
+          undefined,
+          "Client disconnected",
+        );
+        this.ptyManager.delete(sessionId);
+      }
+    }, CLEANUP_GRACE_PERIOD_MS);
+    this.cleanupTimers.set(sessionId, timer);
+  }
+
+  private clearCleanupTimer(sessionId: string): void {
+    const timer = this.cleanupTimers.get(sessionId);
+    if (timer) {
+      clearTimeout(timer);
+      this.cleanupTimers.delete(sessionId);
+      this.logger.info(`Cleared cleanup timer for session ${sessionId}`);
+    }
+  }
+}
+
+const CLEANUP_GRACE_PERIOD_MS = Number(process.env.WS_CLEANUP_GRACE_MS ?? 3000);
+
+interface RequestLike {
+  params?: { sessionId?: string } | undefined;
+  url: string;
+  hostname?: string;
+  headers?: { host?: string | undefined };
+}
+
+export function resolveSessionId(
+  request: FastifyRequest | RequestLike,
+): string | null {
+  const paramsId = (request as RequestLike).params?.sessionId;
+  if (typeof paramsId === "string" && paramsId.length > 0) {
+    return paramsId;
+  }
+
+  try {
+    const host =
+      (request as FastifyRequest).headers?.host ??
+      (request as RequestLike).hostname ??
+      "localhost";
+    const parsed = new URL(request.url, `http://${host}`);
+    const queryId = parsed.searchParams.get("sessionId");
+    if (queryId && queryId.length > 0) {
+      return queryId;
+    }
+  } catch {
+    // ignore
+  }
+
+  return null;
 }

package/dist/client/assets/index-DeNwPosA.css

@@ -1 +0,0 @@
-.xterm{cursor:text;position:relative;user-select:none;-ms-user-select:none;-webkit-user-select:none}.xterm.focus,.xterm:focus{outline:none}.xterm .xterm-helpers{position:absolute;top:0;z-index:5}.xterm .xterm-helper-textarea{padding:0;border:0;margin:0;position:absolute;opacity:0;left:-9999em;top:0;width:0;height:0;z-index:-5;white-space:nowrap;overflow:hidden;resize:none}.xterm .composition-view{background:#000;color:#fff;display:none;position:absolute;white-space:nowrap;z-index:1}.xterm .composition-view.active{display:block}.xterm .xterm-viewport{background-color:#000;overflow-y:scroll;cursor:default;position:absolute;inset:0}.xterm .xterm-screen{position:relative}.xterm .xterm-screen canvas{position:absolute;left:0;top:0}.xterm .xterm-scroll-area{visibility:hidden}.xterm-char-measure-element{display:inline-block;visibility:hidden;position:absolute;top:0;left:-9999em;line-height:normal}.xterm.enable-mouse-events{cursor:default}.xterm.xterm-cursor-pointer,.xterm .xterm-cursor-pointer{cursor:pointer}.xterm.column-select.focus{cursor:crosshair}.xterm .xterm-accessibility,.xterm .xterm-message{position:absolute;inset:0;z-index:10;color:transparent;pointer-events:none}.xterm .live-region{position:absolute;left:-9999px;width:1px;height:1px;overflow:hidden}.xterm-dim{opacity:1!important}.xterm-underline-1{text-decoration:underline}.xterm-underline-2{text-decoration:double underline}.xterm-underline-3{text-decoration:wavy underline}.xterm-underline-4{text-decoration:dotted underline}.xterm-underline-5{text-decoration:dashed underline}.xterm-overline{text-decoration:overline}.xterm-overline.xterm-underline-1{text-decoration:overline underline}.xterm-overline.xterm-underline-2{text-decoration:overline double underline}.xterm-overline.xterm-underline-3{text-decoration:overline wavy underline}.xterm-overline.xterm-underline-4{text-decoration:overline dotted underline}.xterm-overline.xterm-underline-5{text-decoration:overline dashed underline}.xterm-strikethrough{text-decoration:line-through}.xterm-screen .xterm-decoration-container .xterm-decoration{z-index:6;position:absolute}.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer{z-index:7}.xterm-decoration-overview-ruler{z-index:8;position:absolute;top:0;right:0;pointer-events:none}.xterm-decoration-top{z-index:2;position:relative}:root{--color-background: #050912;--color-surface: #0f172a;--color-surface-muted: #111c30;--color-card: rgba(15, 23, 42, .92);--color-border: rgba(148, 163, 184, .2);--color-border-strong: rgba(148, 163, 184, .45);--color-text: #e2e8f0;--color-muted: #94a3b8;--color-accent: #5eead4;--color-accent-strong: #2dd4bf;--color-warning: #fbbf24;--color-error: #fb7185;--color-success: #34d399;--color-remote: #60a5fa;--color-local: #c084fc;--shadow-card: 0 20px 45px rgba(2, 6, 23, .55);--shadow-soft: 0 10px 25px rgba(15, 23, 42, .45);--radius-lg: 24px;--radius-md: 16px;--radius-pill: 999px;font-family:Inter,Noto Sans JP,-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica Neue,Arial,sans-serif}*{box-sizing:border-box;margin:0;padding:0}body{font-family:Inter,Noto Sans JP,-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica Neue,Arial,sans-serif;background:radial-gradient(circle at top,#0b1221,#050912 55%);color:var(--color-text);min-height:100vh;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#root{min-height:100vh}a{color:var(--color-accent);text-decoration:none}a:hover{color:var(--color-accent-strong)}button{font:inherit}.app-shell{min-height:100vh;padding:2.5rem 1.75rem 3rem;background:linear-gradient(135deg,#17255473,#0891b214)}@media(max-width:768px){.app-shell{padding:1.5rem 1rem 2rem}}.page-hero{background:radial-gradient(circle at 15% 20%,rgba(94,234,212,.25),transparent 55%),radial-gradient(circle at 80% 0%,rgba(14,165,233,.2),transparent 45%),var(--color-card);border:1px solid var(--color-border);border-radius:var(--radius-lg);padding:2rem;margin-bottom:2rem;box-shadow:var(--shadow-card)}.page-hero--compact{padding:1.75rem 2rem}.page-hero__eyebrow{letter-spacing:.3em;text-transform:uppercase;color:var(--color-muted);font-size:.8rem;margin-bottom:.75rem}.page-hero h1{font-size:clamp(1.8rem,3vw,2.8rem);margin-bottom:.5rem}.page-hero__subtitle,.page-hero__meta{color:var(--color-muted);margin-top:.5rem;font-size:.95rem}.page-hero__actions{display:flex;flex-wrap:wrap;gap:.8rem;margin-top:1.5rem}.page-content{width:min(1400px,100%);margin:0 auto;display:flex;flex-direction:column;gap:1.5rem}.page-content--wide{width:min(1600px,100%)}.page-content--narrow{max-width:960px}.metrics-grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(180px,1fr));gap:1rem}.metric-card{background:var(--color-card);border:1px solid var(--color-border);border-radius:var(--radius-md);padding:1.25rem;box-shadow:var(--shadow-soft)}.metric-card__label{font-size:.85rem;text-transform:uppercase;letter-spacing:.1em;color:var(--color-muted)}.metric-card__value{font-size:2rem;font-weight:600;margin-top:.25rem}.metric-card__hint{margin-top:.35rem;color:var(--color-muted);font-size:.85rem}.page-layout{display:flex;flex-direction:column;gap:1rem}.page-layout--split{display:grid;grid-template-columns:minmax(320px,420px) minmax(0,1fr);gap:1.5rem;align-items:start}@media(max-width:1024px){.page-layout--split{grid-template-columns:1fr}}.info-stack{display:flex;flex-direction:column;gap:1rem}.terminal-column{position:relative;min-height:100%}.toolbar{display:flex;gap:1rem;align-items:center;flex-wrap:wrap}.toolbar__field{flex:1;display:flex;align-items:center;gap:.5rem;background:var(--color-surface);border-radius:var(--radius-md);border:1px solid var(--color-border);padding:.75rem 1rem;color:var(--color-muted)}.toolbar__icon{font-size:1rem}.search-input{flex:1;border:none;background:transparent;color:var(--color-text);font-size:1rem}.search-input:focus{outline:none}.toolbar__count{color:var(--color-muted);font-size:.9rem}.page-state{background:var(--color-card);border:1px solid var(--color-border);border-radius:var(--radius-lg);padding:2rem;box-shadow:var(--shadow-soft)}.page-state h1,.page-state h2,.page-state h3{margin-bottom:.5rem}.page-state--card{text-align:left}.page-state--centered{text-align:center}.empty-state{text-align:center;padding:2.5rem 2rem;border-radius:var(--radius-lg);border:1px dashed var(--color-border-strong);background:#0f172ab3}.branch-grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(320px,1fr));gap:1.25rem}.branch-card{background:var(--color-card);border:1px solid var(--color-border);border-radius:var(--radius-lg);padding:1.5rem;display:flex;flex-direction:column;gap:1rem;box-shadow:var(--shadow-soft)}.branch-card__header{display:flex;justify-content:space-between;gap:1rem;flex-wrap:wrap}.branch-card__header h2{font-size:1.2rem;word-break:break-all}.branch-card__eyebrow{color:var(--color-muted);text-transform:uppercase;letter-spacing:.1em;font-size:.75rem;margin-bottom:.35rem}.branch-card__commit{color:var(--color-muted);line-height:1.5}.branch-card__actions{display:flex;justify-content:space-between;gap:.75rem;flex-wrap:wrap;align-items:center}.badge-group{display:flex;gap:.4rem;flex-wrap:wrap}.status-badge{padding:.25rem .75rem;border-radius:var(--radius-pill);font-size:.8rem;font-weight:600;border:1px solid transparent}.status-badge--local{color:#fdf4ff;background:#c084fc26;border-color:#c084fc59}.status-badge--remote{color:#dbeafe;background:#60a5fa1f;border-color:#60a5fa59}.status-badge--success{color:#042f2e;background:#34d399d9;border:none}.status-badge--warning{color:#451a03;background:#fbbf24e6;border:none}.status-badge--muted{color:var(--color-muted);background:#94a3b826;border-color:#94a3b866}.pill-group{display:flex;gap:.5rem;flex-wrap:wrap}.pill{padding:.25rem .85rem;border-radius:var(--radius-pill);background:#94a3b81f;color:var(--color-muted);font-size:.85rem}.pill--success{background:#34d39926;color:var(--color-success)}.pill--warning{background:#fbbf242e;color:var(--color-warning)}.info-pill{font-size:.85rem;padding:.3rem .85rem;border-radius:var(--radius-pill);border:1px solid var(--color-border);background:#0f172aa6;color:var(--color-muted)}.info-pill--success{border-color:#34d39973;color:var(--color-success)}.info-pill--warning{border-color:#fbbf2473;color:var(--color-warning)}.section-card{background:var(--color-card);border:1px solid var(--color-border);border-radius:var(--radius-lg);padding:1.75rem;box-shadow:var(--shadow-soft);display:flex;flex-direction:column;gap:.85rem}.section-card__body{color:var(--color-muted);line-height:1.6}.metadata-grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(180px,1fr));gap:1rem}.metadata-grid--compact{grid-template-columns:repeat(auto-fit,minmax(140px,1fr))}.metadata-grid dt{font-size:.8rem;text-transform:uppercase;letter-spacing:.08em;color:var(--color-muted)}.metadata-grid dd{font-weight:600;margin-top:.25rem}.list-muted{list-style:none;color:var(--color-muted);line-height:1.7}.inline-banner{margin-top:1rem;padding:.85rem 1.25rem;border-radius:var(--radius-md);font-weight:500}.inline-banner--success{background:#34d39926;color:var(--color-success)}.inline-banner--error{background:#fb71852e;color:var(--color-error)}.inline-banner--info{background:#5eead41f;color:var(--color-accent)}.terminal-section{gap:1rem}.terminal-surface{border-radius:var(--radius-md);border:1px solid var(--color-border);background:#050912;min-height:clamp(380px,70vh,85vh);height:clamp(380px,70vh,85vh);overflow:hidden}.button{border-radius:var(--radius-pill);padding:.65rem 1.5rem;border:1px solid transparent;font-weight:600;cursor:pointer;transition:transform .15s ease,box-shadow .15s ease}.button--primary{background:linear-gradient(135deg,var(--color-accent),var(--color-accent-strong));color:#04121a;box-shadow:0 10px 25px #2dd4bf66}.button--secondary{border-color:#5eead480;color:var(--color-accent);background:transparent}.button--ghost{border-color:var(--color-border);background:transparent;color:var(--color-text)}.button:disabled{opacity:.55;cursor:not-allowed;transform:none;box-shadow:none}.button:not(:disabled):hover{transform:translateY(-1px)}.link-back{display:inline-flex;align-items:center;font-size:.9rem;color:var(--color-muted);margin-bottom:.75rem}.session-hint{border-style:dashed;border-color:#5eead459}.terminal-section__header{display:flex;justify-content:space-between;gap:1rem;flex-wrap:wrap;align-items:flex-start}.terminal-section__controls{display:flex;gap:.5rem}.terminal-overlay-backdrop{position:fixed;inset:0;background:#020617bf;-webkit-backdrop-filter:blur(4px);backdrop-filter:blur(4px);z-index:900}.terminal-section--fullscreen{position:fixed;inset:2rem;z-index:1000;width:calc(100vw - 4rem);max-width:calc(100vw - 4rem);height:calc(100vh - 4rem);box-shadow:0 30px 60px #020617b3;display:flex;flex-direction:column}@media(max-width:768px){.terminal-section--fullscreen{inset:1rem;width:calc(100vw - 2rem);max-width:calc(100vw - 2rem);height:calc(100vh - 2rem)}}.terminal-section--fullscreen .terminal-surface{flex:1;height:auto;min-height:unset}.terminal-section__close{position:absolute;top:1rem;right:1rem;width:2.5rem;height:2.5rem;border-radius:50%;border:1px solid rgba(255,255,255,.2);background:#0f172acc;color:var(--color-text);font-size:1.25rem;cursor:pointer}.terminal-section__close:hover{background:#0f172af2}.branch-graph-panel{background:var(--color-card);border:1px solid var(--color-border);border-radius:var(--radius-lg);padding:1.75rem 2rem;box-shadow:var(--shadow-card)}.branch-graph-panel+.metrics-grid{margin-top:1.5rem}.branch-graph-panel__header{display:flex;justify-content:space-between;gap:1.5rem;flex-wrap:wrap;margin-bottom:1.5rem}.branch-graph-panel__eyebrow{letter-spacing:.3em;text-transform:uppercase;color:var(--color-muted);font-size:.8rem;margin-bottom:.25rem}.branch-graph-panel__legend{display:flex;flex-wrap:wrap;gap:.5rem;align-items:center}.branch-graph-panel__empty{text-align:center;color:var(--color-muted)}.graph-chip{font-size:.75rem;letter-spacing:.1em;text-transform:uppercase;padding:.35rem .75rem;border-radius:var(--radius-pill);border:1px solid var(--color-border);background:#0f172ab3}.graph-chip--base{border-color:var(--color-accent);color:var(--color-accent)}.graph-chip--local{border-color:var(--color-local);color:var(--color-local)}.graph-chip--remote{border-color:var(--color-remote);color:var(--color-remote)}.graph-chip--worktree{border-color:var(--color-success);color:var(--color-success)}.branch-graph{display:flex;flex-direction:column;gap:1.25rem}.branch-graph__lane{display:flex;flex-direction:column;gap:.75rem;padding-bottom:.75rem;border-bottom:1px solid rgba(148,163,184,.2)}.branch-graph__lane:last-child{border-bottom:none;padding-bottom:0}.branch-graph__lane-heading{display:flex;justify-content:space-between;align-items:baseline;gap:1rem;flex-wrap:wrap}.branch-graph__lane-label{font-weight:600}.branch-graph__lane-meta{margin-left:.5rem;font-size:.75rem;letter-spacing:.1em;color:var(--color-muted)}.lane-meta--muted{color:#94a3b899}.branch-graph__lane-count{color:var(--color-muted);font-size:.85rem}.branch-graph__track{display:flex;align-items:center;gap:1rem;overflow-x:auto;padding-bottom:.5rem}.branch-graph__node-link{position:relative;text-decoration:none;min-width:180px;flex-shrink:0}.branch-graph__node{position:relative;border:1px solid var(--color-border);border-radius:var(--radius-md);padding:.85rem 1rem;background:var(--color-surface-muted);box-shadow:var(--shadow-soft)}.branch-graph__node:before{content:"";position:absolute;width:28px;height:2px;background:var(--color-border-strong);left:-22px;top:50%;transform:translateY(-50%);opacity:.6}.branch-graph__node--base:before{display:none}.branch-graph__node--local{border-color:#c084fccc;box-shadow:0 15px 35px #9449ff40}.branch-graph__node--remote{border-color:#60a5facc;box-shadow:0 15px 35px #0ea5e940}.branch-graph__node--merged{background:#2563eb40}.branch-graph__node--active{background:#0891b240}.branch-graph__node-label{font-weight:600;display:block}.branch-graph__node-meta{font-size:.75rem;color:var(--color-muted)}.branch-graph__tooltip{position:absolute;bottom:calc(100% + .5rem);left:0;background:var(--color-surface);border:1px solid var(--color-border-strong);border-radius:var(--radius-md);padding:.75rem;width:min(260px,60vw);box-shadow:var(--shadow-card);opacity:0;pointer-events:none;transform:translateY(.4rem);transition:opacity .15s ease,transform .15s ease;z-index:5}.branch-graph__tooltip p{font-size:.8rem;color:var(--color-text)}.branch-graph__tooltip p+p{margin-top:.25rem;color:var(--color-muted)}.branch-graph__node:hover .branch-graph__tooltip,.branch-graph__node:focus-within .branch-graph__tooltip{opacity:1;transform:translateY(0)}@media(max-width:768px){.branch-graph__track{flex-direction:column;align-items:flex-start}.branch-graph__node:before{width:2px;height:24px;left:50%;top:-18px}.branch-graph__node-link{width:100%}}