@akiojin/gwt 2.12.1 → 2.13.0

package/src/logging/logger.ts

@@ -0,0 +1,79 @@
+import fs from "node:fs";
+import path from "node:path";
+import os from "node:os";
+import pino, { type LoggerOptions, type Logger } from "pino";
+import { pruneOldLogs } from "./rotation.js";
+
+type Category = "cli" | "server" | "worker" | string;
+
+export interface LoggerConfig {
+  level?: string;
+  logDir?: string;
+  filename?: string;
+  category?: Category;
+  base?: Record<string, unknown>;
+  keepDays?: number;
+  /** For tests or sync writes use pino.destination sync */
+  sync?: boolean;
+}
+
+/** 
+ * Create a pino logger with unified structure and category field.
+ * - Writes to a single file stream (no per-component files)
+ * - Adds `category` to each log record
+ * - Prunes files older than keepDays at startup
+ */
+export function createLogger(config: LoggerConfig = {}): Logger {
+  const level = config.level ?? process.env.LOG_LEVEL ?? "info";
+  const cwdBase = path.basename(process.cwd()) || "workspace";
+  const defaultLogDir = path.join(os.homedir(), ".gwt", "logs", cwdBase);
+  const logDir = config.logDir ?? defaultLogDir;
+  const filename = config.filename ?? `${formatDate(new Date())}.jsonl`;
+  const category = config.category ?? "default";
+  const keepDays = config.keepDays ?? 7;
+
+  if (!fs.existsSync(logDir)) {
+    fs.mkdirSync(logDir, { recursive: true });
+  }
+
+  // Startup rotation
+  pruneOldLogs(logDir, keepDays);
+
+  const destination = path.join(logDir, filename);
+
+  const options: LoggerOptions = {
+    level,
+    base: {
+      category,
+      ...(config.base ?? {}),
+    },
+    timestamp: pino.stdTimeFunctions.isoTime,
+  };
+
+  if (config.sync) {
+    const destinationStream = pino.destination({ dest: destination, sync: true });
+    return pino(options, destinationStream);
+  }
+
+  const transport = pino.transport({
+    targets: [
+      {
+        target: "pino/file",
+        options: { destination, mkdir: true, append: true },
+        level,
+      },
+    ],
+  });
+
+  return pino(options, transport);
+}
+
+/** Convenience logger for quick use (category defaults to "default"). */
+export const logger = createLogger();
+
+export function formatDate(date: Date): string {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}

package/src/logging/rotation.ts

@@ -0,0 +1,25 @@
+import fs from "node:fs";
+import path from "node:path";
+
+/**
+ * Delete log files older than `keepDays` from the given directory.
+ * This is called at startup to enforce 7-day retention without size limits.
+ */
+export function pruneOldLogs(logDir: string, keepDays = 7): void {
+  if (!fs.existsSync(logDir)) return;
+
+  const cutoff = Date.now() - keepDays * 24 * 60 * 60 * 1000;
+
+  for (const entry of fs.readdirSync(logDir)) {
+    const full = path.join(logDir, entry);
+    try {
+      const stat = fs.statSync(full);
+      if (!stat.isFile()) continue;
+      if (stat.mtime.getTime() < cutoff) {
+        fs.unlinkSync(full);
+      }
+    } catch {
+      // Ignore individual file errors to avoid breaking startup
+    }
+  }
+}

package/src/web/server/index.ts

@@ -14,6 +14,8 @@ import { PTYManager } from "./pty/manager.js";
 import { WebSocketHandler } from "./websocket/handler.js";
 import { registerRoutes } from "./routes/index.js";
 import { importOsEnvIntoSharedConfig } from "./env/importer.js";
+import { createLogger } from "../../logging/logger.js";
+import type { WebFastifyInstance } from "./types.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -22,10 +24,10 @@ const __dirname = dirname(__filename);
  * Webサーバーを起動
  */
 export async function startWebServer(): Promise<void> {
-  const fastify = Fastify({
-    logger: {
-      level: process.env.LOG_LEVEL || "info",
-    },
+  const serverLogger = createLogger({ category: "server" });
+
+  const fastify: WebFastifyInstance = Fastify({
+    loggerInstance: serverLogger,
   });
 
   // PTYマネージャーとWebSocketハンドラーを初期化

package/src/web/server/routes/branches.ts

@@ -4,7 +4,6 @@
  * ブランチ関連のREST APIエンドポイント。
  */
 
-import type { FastifyInstance } from "fastify";
 import {
   listBranches,
   getBranchByName,
@@ -16,12 +15,13 @@ import type {
   BranchSyncRequest,
   BranchSyncResult,
 } from "../../../types/api.js";
+import type { WebFastifyInstance } from "../types.js";
 
 /**
  * ブランチ関連のルートを登録
  */
 export async function registerBranchRoutes(
-  fastify: FastifyInstance,
+  fastify: WebFastifyInstance,
 ): Promise<void> {
   // GET /api/branches - すべてのブランチ一覧を取得
   fastify.get<{ Reply: ApiResponse<Branch[]> }>(

package/src/web/server/routes/config.ts

@@ -2,7 +2,6 @@
  * Config Routes
  */
 
-import type { FastifyInstance } from "fastify";
 import { loadToolsConfig, saveToolsConfig } from "../../../config/tools.js";
 import {
   loadEnvHistory,
@@ -17,6 +16,7 @@ import type {
 } from "../../../types/api.js";
 import type { CustomAITool as FileCustomAITool } from "../../../types/tools.js";
 import { getImportedEnvKeys } from "../env/importer.js";
+import type { WebFastifyInstance } from "../types.js";
 
 function normalizeEnv(
   env: Record<string, string> | undefined,
@@ -135,7 +135,7 @@ function diffEnvHistory(
 }
 
 export async function registerConfigRoutes(
-  fastify: FastifyInstance,
+  fastify: WebFastifyInstance,
 ): Promise<void> {
   fastify.get<{ Reply: ApiResponse<ConfigPayload> }>(
     "/api/config",

package/src/web/server/routes/index.ts

@@ -5,19 +5,19 @@
  * 仕様: specs/SPEC-d5e56259/contracts/rest-api.yaml
  */
 
-import type { FastifyInstance } from "fastify";
 import type { PTYManager } from "../pty/manager.js";
 import { registerBranchRoutes } from "./branches.js";
 import { registerWorktreeRoutes } from "./worktrees.js";
 import { registerSessionRoutes } from "./sessions.js";
 import { registerConfigRoutes } from "./config.js";
 import type { HealthResponse } from "../../../types/api.js";
+import type { WebFastifyInstance } from "../types.js";
 
 /**
  * すべてのルートを登録
  */
 export async function registerRoutes(
-  fastify: FastifyInstance,
+  fastify: WebFastifyInstance,
   ptyManager: PTYManager,
 ): Promise<void> {
   // ヘルスチェック

package/src/web/server/routes/sessions.ts

@@ -4,7 +4,6 @@
  * AI Toolセッション関連のREST APIエンドポイント。
  */
 
-import type { FastifyInstance } from "fastify";
 import type { PTYManager } from "../pty/manager.js";
 import type {
   ApiResponse,
@@ -13,12 +12,13 @@ import type {
 } from "../../../types/api.js";
 import { saveSession } from "../../../config/index.js";
 import { execa } from "execa";
+import type { WebFastifyInstance } from "../types.js";
 
 /**
  * セッション関連のルートを登録
  */
 export async function registerSessionRoutes(
-  fastify: FastifyInstance,
+  fastify: WebFastifyInstance,
   ptyManager: PTYManager,
 ): Promise<void> {
   // GET /api/sessions - すべてのセッション一覧を取得

package/src/web/server/routes/worktrees.ts

@@ -4,7 +4,6 @@
  * Worktree関連のREST APIエンドポイント。
  */
 
-import type { FastifyInstance } from "fastify";
 import {
   listWorktrees,
   getWorktreeByPath,
@@ -16,12 +15,13 @@ import type {
   Worktree,
   CreateWorktreeRequest,
 } from "../../../types/api.js";
+import type { WebFastifyInstance } from "../types.js";
 
 /**
  * Worktree関連のルートを登録
  */
 export async function registerWorktreeRoutes(
-  fastify: FastifyInstance,
+  fastify: WebFastifyInstance,
 ): Promise<void> {
   // GET /api/worktrees - すべてのWorktree一覧を取得
   fastify.get<{ Reply: ApiResponse<Worktree[]> }>(

package/src/web/server/types.ts

@@ -0,0 +1,14 @@
+import type {
+  FastifyInstance,
+  RawReplyDefaultExpression,
+  RawRequestDefaultExpression,
+  RawServerDefault,
+} from "fastify";
+import type { Logger } from "pino";
+
+export type WebFastifyInstance = FastifyInstance<
+  RawServerDefault,
+  RawRequestDefaultExpression<RawServerDefault>,
+  RawReplyDefaultExpression<RawServerDefault>,
+  Logger
+>;

package/src/worktree.ts

@@ -110,6 +110,7 @@ export interface WorktreeInfo {
   head: string;
   isAccessible?: boolean;
   invalidReason?: string;
+  hasUncommittedChanges?: boolean;
 }
 
 async function listWorktrees(): Promise<WorktreeInfo[]> {