@akiojin/gwt 4.1.1 → 4.3.0

package/src/web/client/src/components/graph/graphUtils.ts

@@ -0,0 +1,265 @@
+/**
+ * Branch[] → React Flow Node/Edge 変換ユーティリティ
+ *
+ * D3-forceレイアウトと組み合わせてシナプス風配置を実現
+ */
+
+import {
+  forceSimulation,
+  forceLink,
+  forceManyBody,
+  forceCenter,
+  forceCollide,
+  type Simulation,
+  type SimulationNodeDatum,
+  type SimulationLinkDatum,
+} from "d3-force";
+import type { Node, Edge } from "@xyflow/react";
+import type { Branch } from "../../../../../types/api.js";
+
+/** グラフノードの拡張型 */
+export interface GraphNode extends Node {
+  data: {
+    branch: Branch | undefined;
+    isCluster: boolean;
+    clusterSize: number;
+    expanded: boolean;
+  };
+}
+
+/** グラフエッジの型 */
+export interface GraphEdge extends Edge {
+  data?: {
+    strength: number;
+  };
+}
+
+/** クラスタ情報 */
+export interface Cluster {
+  id: string;
+  baseBranch: string;
+  branches: Branch[];
+  isExpanded: boolean;
+}
+
+/** D3シミュレーション用ノード */
+interface SimNode extends SimulationNodeDatum {
+  id: string;
+  branch?: Branch;
+  isCluster: boolean;
+  clusterSize?: number;
+}
+
+/** D3シミュレーション用リンク */
+interface SimLink extends SimulationLinkDatum<SimNode> {
+  source: string | SimNode;
+  target: string | SimNode;
+}
+
+/**
+ * ブランチをクラスタにグループ化
+ */
+export function clusterBranches(branches: Branch[]): Cluster[] {
+  const clusterMap = new Map<string, Cluster>();
+
+  // ベースブランチごとにグループ化
+  for (const branch of branches) {
+    const baseKey = branch.baseBranch ?? "__root__";
+
+    if (!clusterMap.has(baseKey)) {
+      clusterMap.set(baseKey, {
+        id: `cluster-${baseKey}`,
+        baseBranch: baseKey,
+        branches: [],
+        isExpanded: false,
+      });
+    }
+
+    clusterMap.get(baseKey)?.branches.push(branch);
+  }
+
+  return Array.from(clusterMap.values()).sort((a, b) => {
+    // ルートクラスタを先頭に
+    if (a.baseBranch === "__root__") return -1;
+    if (b.baseBranch === "__root__") return 1;
+    // ブランチ数が多い順
+    return b.branches.length - a.branches.length;
+  });
+}
+
+/**
+ * D3-forceシミュレーションを実行してノード位置を計算
+ */
+export function calculateLayout(
+  nodes: SimNode[],
+  links: SimLink[],
+  width: number,
+  height: number,
+): Promise<SimNode[]> {
+  return new Promise((resolve) => {
+    const simulation: Simulation<SimNode, SimLink> = forceSimulation(nodes)
+      .force(
+        "link",
+        forceLink<SimNode, SimLink>(links)
+          .id((d) => d.id)
+          .distance(120)
+          .strength(0.8),
+      )
+      .force("charge", forceManyBody().strength(-400))
+      .force("center", forceCenter(width / 2, height / 2))
+      .force("collide", forceCollide().radius(60).strength(0.7));
+
+    // 100ティック分シミュレーションを進める
+    for (let i = 0; i < 100; i++) {
+      simulation.tick();
+    }
+
+    simulation.stop();
+    resolve(nodes);
+  });
+}
+
+/**
+ * Branch[] → GraphNode[] / GraphEdge[] 変換
+ */
+export async function branchesToGraph(
+  branches: Branch[],
+  expandedClusters: Set<string>,
+  canvasWidth: number,
+  canvasHeight: number,
+): Promise<{ nodes: GraphNode[]; edges: GraphEdge[] }> {
+  const clusters = clusterBranches(branches);
+  const _branchMap = new Map(branches.map((b) => [b.name, b]));
+
+  const simNodes: SimNode[] = [];
+  const simLinks: SimLink[] = [];
+
+  // ブランチ名からノードIDへのマッピング（クラスタ化されている場合はクラスタIDを返す）
+  const branchToNodeId = new Map<string, string>();
+
+  // 最初にノードIDマッピングを構築
+  for (const cluster of clusters) {
+    const isExpanded = expandedClusters.has(cluster.id);
+
+    if (cluster.branches.length === 1 || isExpanded) {
+      // 個別ノード: ブランチ名がそのままノードID
+      for (const branch of cluster.branches) {
+        branchToNodeId.set(branch.name, branch.name);
+      }
+    } else {
+      // クラスタノード: 全ブランチがクラスタIDにマッピング
+      for (const branch of cluster.branches) {
+        branchToNodeId.set(branch.name, cluster.id);
+      }
+    }
+  }
+
+  // クラスタとノードを生成
+  for (const cluster of clusters) {
+    const isExpanded = expandedClusters.has(cluster.id);
+
+    if (cluster.branches.length === 1 || isExpanded) {
+      // 単一ブランチまたは展開済み: 個別ノードとして追加
+      for (const branch of cluster.branches) {
+        simNodes.push({
+          id: branch.name,
+          branch,
+          isCluster: false,
+        });
+
+        // 親ブランチへのリンク（親がノードとして存在する場合のみ）
+        if (branch.baseBranch) {
+          const parentNodeId = branchToNodeId.get(branch.baseBranch);
+          if (parentNodeId && parentNodeId !== branch.name) {
+            simLinks.push({
+              source: parentNodeId,
+              target: branch.name,
+            });
+          }
+        }
+      }
+    } else {
+      // 折りたたみ状態: クラスタノードとして追加
+      simNodes.push({
+        id: cluster.id,
+        isCluster: true,
+        clusterSize: cluster.branches.length,
+      });
+
+      // クラスタから親ブランチへのリンク
+      if (cluster.baseBranch !== "__root__") {
+        const parentNodeId = branchToNodeId.get(cluster.baseBranch);
+        if (parentNodeId && parentNodeId !== cluster.id) {
+          simLinks.push({
+            source: parentNodeId,
+            target: cluster.id,
+          });
+        }
+      }
+    }
+  }
+
+  // D3-forceでレイアウト計算
+  const layoutNodes = await calculateLayout(
+    simNodes,
+    simLinks,
+    canvasWidth,
+    canvasHeight,
+  );
+
+  // React Flow形式に変換
+  const graphNodes: GraphNode[] = layoutNodes.map((node) => ({
+    id: node.id,
+    type: node.isCluster ? "cluster" : "branch",
+    position: { x: node.x ?? 0, y: node.y ?? 0 },
+    data: {
+      branch: node.branch,
+      isCluster: node.isCluster,
+      clusterSize: node.clusterSize ?? 0,
+      expanded: expandedClusters.has(node.id),
+    },
+  }));
+
+  const graphEdges: GraphEdge[] = simLinks.map((link, idx) => {
+    const sourceId =
+      typeof link.source === "string" ? link.source : link.source.id;
+    const targetId =
+      typeof link.target === "string" ? link.target : link.target.id;
+
+    return {
+      id: `edge-${idx}`,
+      source: sourceId,
+      target: targetId,
+      type: "synaptic",
+      animated: true,
+      data: { strength: 1 },
+    };
+  });
+
+  return { nodes: graphNodes, edges: graphEdges };
+}
+
+/**
+ * ノードの色を決定
+ */
+export function getNodeColor(branch: Branch): string {
+  if (branch.worktreePath) {
+    return "hsl(var(--success))";
+  }
+  if (branch.type === "local") {
+    return "hsl(var(--local))";
+  }
+  return "hsl(var(--remote))";
+}
+
+/**
+ * ノードサイズを決定（divergenceに基づく）
+ */
+export function getNodeSize(branch: Branch): number {
+  const base = 40;
+  if (!branch.divergence) return base;
+
+  const activity = branch.divergence.ahead + branch.divergence.behind;
+  // 活発なブランチは大きく表示
+  return Math.min(base + activity * 2, 80);
+}

package/src/web/client/src/components/graph/index.ts

@@ -0,0 +1,10 @@
+/**
+ * グラフコンポーネント エクスポート
+ */
+
+export { SynapticCanvas } from "./SynapticCanvas";
+export { BranchNode } from "./BranchNode";
+export { ClusterNode } from "./ClusterNode";
+export { SynapticEdge } from "./SynapticEdge";
+export { BranchDetailPanel } from "./BranchDetailPanel";
+export * from "./graphUtils";

package/src/web/client/src/index.css

@@ -1,49 +1,57 @@
 @import "tailwindcss";
 
 /* ===================================
-   Vercel/Next.js風 Design Tokens
+   Bioluminescent Neural Network Theme
+   Deep oceanic void with living light
    =================================== */
 
 @theme {
-  /* Background colors */
-  --color-background: hsl(0 0% 4%);
-  --color-foreground: hsl(0 0% 98%);
+  /* Void - the deep abyss */
+  --color-background: hsl(220 25% 3%);
+  --color-foreground: hsl(180 20% 95%);
 
-  /* Card colors */
-  --color-card: hsl(0 0% 9%);
-  --color-card-foreground: hsl(0 0% 95%);
+  /* Card - membrane surfaces */
+  --color-card: hsl(220 30% 7%);
+  --color-card-foreground: hsl(180 15% 92%);
 
-  /* Muted colors */
-  --color-muted: hsl(0 0% 15%);
-  --color-muted-foreground: hsl(0 0% 64%);
+  /* Muted - shadow depths */
+  --color-muted: hsl(220 25% 12%);
+  --color-muted-foreground: hsl(200 10% 55%);
 
-  /* Border */
-  --color-border: hsl(0 0% 18%);
+  /* Border - membrane edges */
+  --color-border: hsl(200 30% 18%);
 
-  /* Primary (white-based for Vercel style) */
-  --color-primary: hsl(0 0% 100%);
-  --color-primary-foreground: hsl(0 0% 9%);
+  /* Primary - bioluminescent cyan */
+  --color-primary: hsl(185 100% 65%);
+  --color-primary-foreground: hsl(220 30% 5%);
 
-  /* Secondary */
-  --color-secondary: hsl(0 0% 15%);
-  --color-secondary-foreground: hsl(0 0% 100%);
+  /* Secondary - deep tissue */
+  --color-secondary: hsl(220 35% 15%);
+  --color-secondary-foreground: hsl(180 20% 90%);
 
-  /* Accent */
-  --color-accent: hsl(0 0% 15%);
+  /* Accent - synaptic magenta */
+  --color-accent: hsl(310 85% 60%);
   --color-accent-foreground: hsl(0 0% 100%);
 
   /* Destructive */
-  --color-destructive: hsl(0 84% 60%);
+  --color-destructive: hsl(0 75% 55%);
   --color-destructive-foreground: hsl(0 0% 100%);
 
-  /* Status colors */
-  --color-success: hsl(142 76% 36%);
-  --color-warning: hsl(38 92% 50%);
-  --color-error: hsl(0 84% 60%);
+  /* Status - neural signals */
+  --color-success: hsl(160 90% 45%);
+  --color-warning: hsl(45 95% 55%);
+  --color-error: hsl(0 80% 55%);
 
-  /* Branch colors */
-  --color-local: hsl(270 91% 65%);
-  --color-remote: hsl(217 91% 60%);
+  /* Branch colors - neuron types */
+  --color-local: hsl(280 85% 65%);
+  --color-remote: hsl(200 90% 55%);
+
+  /* Neural-specific colors */
+  --color-synapse-glow: hsl(185 100% 70%);
+  --color-synapse-pulse: hsl(310 90% 65%);
+  --color-dendrite: hsl(190 80% 50%);
+  --color-axon: hsl(175 70% 45%);
+  --color-vesicle: hsl(300 80% 70%);
 
   /* Radius */
   --radius-sm: 4px;
@@ -53,7 +61,7 @@
   --radius-full: 9999px;
 }
 
-/* Base styles for shadcn/ui integration */
+/* Base styles */
 * {
   border-color: var(--color-border);
 }
@@ -61,4 +69,281 @@
 body {
   background-color: var(--color-background);
   color: var(--color-foreground);
+  font-feature-settings: "cv02", "cv03", "cv04", "cv11";
+}
+
+/* ===================================
+   Synaptic Graph - Living Animations
+   =================================== */
+
+/* Neural membrane breathing */
+@keyframes membrane-breathe {
+  0%, 100% {
+    transform: scale(1);
+    filter: brightness(1);
+  }
+  50% {
+    transform: scale(1.02);
+    filter: brightness(1.1);
+  }
+}
+
+/* Soma (cell body) pulse */
+@keyframes soma-pulse {
+  0%, 100% {
+    box-shadow:
+      0 0 0 0 hsl(185 100% 65% / 0.4),
+      0 0 20px 0 hsl(185 100% 65% / 0.2),
+      inset 0 0 15px hsl(185 100% 65% / 0.1);
+  }
+  50% {
+    box-shadow:
+      0 0 0 8px hsl(185 100% 65% / 0),
+      0 0 30px 5px hsl(185 100% 65% / 0.3),
+      inset 0 0 20px hsl(185 100% 65% / 0.2);
+  }
+}
+
+/* Worktree active state - stronger signal */
+@keyframes active-synapse {
+  0%, 100% {
+    box-shadow:
+      0 0 0 0 hsl(160 90% 45% / 0.6),
+      0 0 25px 0 hsl(160 90% 45% / 0.4),
+      0 0 50px 0 hsl(185 100% 65% / 0.2);
+  }
+  50% {
+    box-shadow:
+      0 0 0 12px hsl(160 90% 45% / 0),
+      0 0 40px 10px hsl(160 90% 45% / 0.5),
+      0 0 60px 5px hsl(185 100% 65% / 0.3);
+  }
+}
+
+/* Vesicle release - particle burst */
+@keyframes vesicle-release {
+  0% {
+    transform: scale(0.8);
+    opacity: 0.3;
+  }
+  50% {
+    transform: scale(1.3);
+    opacity: 1;
+  }
+  100% {
+    transform: scale(0.8);
+    opacity: 0.3;
+  }
+}
+
+/* Dendrite growth pulse */
+@keyframes dendrite-pulse {
+  0%, 100% {
+    stroke-dashoffset: 0;
+    filter: drop-shadow(0 0 2px hsl(185 100% 65% / 0.5));
+  }
+  50% {
+    stroke-dashoffset: -10;
+    filter: drop-shadow(0 0 6px hsl(185 100% 65% / 0.8));
+  }
+}
+
+/* Cluster nucleus orbit */
+@keyframes nucleus-orbit {
+  0% {
+    transform: rotate(0deg) translateX(8px) rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg) translateX(8px) rotate(-360deg);
+  }
+}
+
+/* Cluster membrane morph */
+@keyframes membrane-morph {
+  0%, 100% {
+    border-radius: 30% 70% 70% 30% / 30% 30% 70% 70%;
+  }
+  25% {
+    border-radius: 58% 42% 75% 25% / 76% 46% 54% 24%;
+  }
+  50% {
+    border-radius: 50% 50% 33% 67% / 55% 27% 73% 45%;
+  }
+  75% {
+    border-radius: 33% 67% 58% 42% / 63% 68% 32% 37%;
+  }
+}
+
+/* Flowing particle along path */
+@keyframes flow-particle {
+  0% {
+    offset-distance: 0%;
+    opacity: 0;
+  }
+  10% {
+    opacity: 1;
+  }
+  90% {
+    opacity: 1;
+  }
+  100% {
+    offset-distance: 100%;
+    opacity: 0;
+  }
+}
+
+/* Synapse spark */
+@keyframes synapse-spark {
+  0%, 100% {
+    transform: scale(1);
+    opacity: 0.6;
+    filter: blur(0px);
+  }
+  50% {
+    transform: scale(1.5);
+    opacity: 1;
+    filter: blur(1px);
+  }
+}
+
+/* Utility classes */
+.animate-membrane-breathe {
+  animation: membrane-breathe 4s ease-in-out infinite;
+}
+
+.animate-soma-pulse {
+  animation: soma-pulse 3s ease-in-out infinite;
+}
+
+.animate-active-synapse {
+  animation: active-synapse 2s ease-in-out infinite;
+}
+
+.animate-vesicle-release {
+  animation: vesicle-release 2s ease-in-out infinite;
+}
+
+.animate-dendrite-pulse {
+  animation: dendrite-pulse 3s ease-in-out infinite;
+}
+
+.animate-nucleus-orbit {
+  animation: nucleus-orbit 8s linear infinite;
+}
+
+.animate-membrane-morph {
+  animation: membrane-morph 12s ease-in-out infinite;
+}
+
+.animate-synapse-spark {
+  animation: synapse-spark 2.5s ease-in-out infinite;
+}
+
+/* Neural glow effects */
+.neural-glow {
+  filter: drop-shadow(0 0 10px hsl(185 100% 65% / 0.5));
+}
+
+.neural-glow-strong {
+  filter: drop-shadow(0 0 15px hsl(185 100% 65% / 0.7))
+          drop-shadow(0 0 30px hsl(185 100% 65% / 0.3));
+}
+
+/* Gradient overlays for depth */
+.neural-gradient {
+  background: radial-gradient(
+    ellipse at center,
+    hsl(185 100% 65% / 0.15) 0%,
+    transparent 70%
+  );
+}
+
+/* ===================================
+   React Flow Customization
+   =================================== */
+
+.react-flow__node {
+  cursor: pointer;
+}
+
+.react-flow__pane {
+  background: radial-gradient(
+    ellipse 80% 50% at 50% 50%,
+    hsl(220 30% 8%) 0%,
+    hsl(220 25% 3%) 100%
+  );
+}
+
+.react-flow__background {
+  opacity: 0.3;
+}
+
+.react-flow__controls {
+  box-shadow: 0 4px 20px hsl(220 30% 0% / 0.5) !important;
+  border: 1px solid hsl(200 30% 20%) !important;
+  border-radius: 8px !important;
+  overflow: hidden;
+}
+
+.react-flow__controls button {
+  background: hsl(220 30% 10%) !important;
+  border-color: hsl(200 30% 18%) !important;
+  color: hsl(185 100% 65%) !important;
+  transition: all 0.2s ease;
+}
+
+.react-flow__controls button:hover {
+  background: hsl(220 30% 15%) !important;
+  box-shadow: inset 0 0 20px hsl(185 100% 65% / 0.1);
+}
+
+.react-flow__controls button svg {
+  fill: hsl(185 100% 65%) !important;
+}
+
+.react-flow__minimap {
+  background: hsl(220 30% 5%) !important;
+  border: 1px solid hsl(200 30% 18%) !important;
+  border-radius: 8px !important;
+  box-shadow: 0 4px 20px hsl(220 30% 0% / 0.5) !important;
+}
+
+.react-flow__minimap-mask {
+  fill: hsl(220 25% 3% / 0.85) !important;
+}
+
+/* ===================================
+   Detail Panel Animation
+   =================================== */
+
+@keyframes slide-in-neural {
+  from {
+    transform: translateX(100%);
+    opacity: 0;
+    filter: blur(10px);
+  }
+  to {
+    transform: translateX(0);
+    opacity: 1;
+    filter: blur(0);
+  }
+}
+
+.animate-in.slide-in-from-right {
+  animation: slide-in-neural 0.4s cubic-bezier(0.16, 1, 0.3, 1);
+}
+
+/* Scanline effect for sci-fi feel */
+.scanlines::after {
+  content: "";
+  position: absolute;
+  inset: 0;
+  background: repeating-linear-gradient(
+    0deg,
+    transparent,
+    transparent 2px,
+    hsl(185 100% 65% / 0.02) 2px,
+    hsl(185 100% 65% / 0.02) 4px
+  );
+  pointer-events: none;
 }

package/src/web/client/src/lib/websocket.ts

@@ -71,7 +71,8 @@ export class PTYWebSocket {
 
     this.ws.onerror = (event) => {
       console.error("WebSocket error:", event);
-      this.handlers.onError?.("WebSocket connection error");
+      // エラーは再接続が全て失敗した後にのみ表示する
+      // scheduleReconnect内でMAX_WEBSOCKET_RETRIESを超えた場合にonErrorが呼ばれる
       this.scheduleReconnect();
     };
 

package/src/web/client/vite.config.ts

@@ -19,7 +19,7 @@ export default defineConfig({
     port: 5173,
     proxy: {
       "/api": {
-        target: "http://localhost:3000",
+        target: "http://localhost:3001",
         changeOrigin: true,
         ws: true,
       },

package/src/web/server/env/importer.ts

@@ -1,6 +1,9 @@
 import { loadToolsConfig, saveToolsConfig } from "../../../config/tools.js";
 import { recordEnvHistory } from "../../../config/env-history.js";
 import type { EnvironmentHistoryEntry } from "../../../types/api.js";
+import { createLogger } from "../../../logging/logger.js";
+
+const logger = createLogger({ category: "env" });
 
 const IMPORTABLE_KEYS = [
   "OPENAI_API_KEY",
@@ -29,6 +32,7 @@ export async function importOsEnvIntoSharedConfig(): Promise<string[]> {
   }
 
   if (!importedKeys.length) {
+    logger.debug({ reason: "no new keys" }, "Env import skipped");
     return [];
   }
 
@@ -46,6 +50,7 @@ export async function importOsEnvIntoSharedConfig(): Promise<string[]> {
   }));
   await recordEnvHistory(historyEntries);
 
+  logger.info({ importedKeys }, "Environment variables imported");
   return importedKeys;
 }