@winspan/claude-forge 8.50.6 → 8.51.1

package/src/daemon/handlers/stop.ts

@@ -16,10 +16,13 @@ import type { SQLiteStorage } from '../../core/storage/sqlite.js';
 import type { InvocationGuard } from '../../skills/invocation-guard.js';
 import type { UserPromptHandler } from './user-prompt.js';
 import { logger } from '../../core/utils/logger.js';
-import { execFileSync } from 'node:child_process';
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
 import { formatError, truncateString } from '../../core/utils/format.js';
 import { truncateSessionId } from '../../core/utils/session.js';
 
+const execFileAsync = promisify(execFile);
+
 export class StopHandler {
   constructor(
     private exporter: HistoryExporter,
@@ -80,8 +83,9 @@ export class StopHandler {
         }
       }
 
-      // 6. Write session_id to git note on HEAD commit
-      this.writeGitNote(event);
+      // 6. Write session_id to git note on HEAD commit (fire-and-forget, async)
+      // 不 await：git 操作不影响 handler 响应，失败已在内部 catch
+      void this.writeGitNote(event);
 
       return { allow: true };
     } catch (err) {
@@ -96,36 +100,40 @@ export class StopHandler {
    * Write session_id into a git note on the current HEAD commit.
    * Uses `git notes append` so multiple sessions can be associated with one commit.
    * Silently ignores failures (no git repo, no commits, etc.).
+   *
+   * 异步实现：3 个 git 调用有序依赖（rev-parse HEAD 依赖 work-tree 检查通过；
+   * notes append 依赖 HEAD hash），因此 rev-parse 串行；但整体 fire-and-forget，
+   * 不阻塞 handler 主响应。
    */
-  private writeGitNote(event: StopEvent): void {
+  private async writeGitNote(event: StopEvent): Promise<void> {
     const projectPath = event.project_path;
     if (!projectPath) return;
 
+    const opts = {
+      cwd: projectPath,
+      timeout: 5000,
+    };
+
     try {
       // Check if inside a git work tree
-      execFileSync('git', ['rev-parse', '--is-inside-work-tree'], {
-        cwd: projectPath,
-        stdio: 'pipe',
-        timeout: 5000,
-      });
+      await execFileAsync('git', ['rev-parse', '--is-inside-work-tree'], opts);
 
       // Get HEAD commit hash
-      const head = execFileSync('git', ['rev-parse', 'HEAD'], {
-        cwd: projectPath,
-        stdio: 'pipe',
-        timeout: 5000,
-      }).toString().trim();
+      const { stdout: headStdout } = await execFileAsync('git', ['rev-parse', 'HEAD'], opts);
+      const head = headStdout.toString().trim();
 
       if (!head) return;
 
       // Append session_id to git note on HEAD
-      execFileSync('git', ['notes', 'append', '-m', `forge-session: ${event.session_id}`, head], {
-        cwd: projectPath,
-        stdio: 'pipe',
-        timeout: 5000,
-      });
+      await execFileAsync(
+        'git',
+        ['notes', 'append', '-m', `forge-session: ${event.session_id}`, head],
+        opts,
+      );
 
-      logger.debug(`[Stop] Git note appended: forge-session: ${truncateSessionId(event.session_id)} on ${truncateString(head, 8)}`);
+      logger.debug(
+        `[Stop] Git note appended: forge-session: ${truncateSessionId(event.session_id)} on ${truncateString(head, 8)}`,
+      );
     } catch (err) {
       logger.debug(`[Stop] Git note write skipped: ${formatError(err)}`);
     }
@@ -140,36 +148,21 @@ export class StopHandler {
     if (!this.storage) return null;
 
     try {
-      const db = this.storage.getDatabase();
+      // H2 Phase 3: 改用 facade 聚合方法，消除 db.prepare 直写。
 
       // 1. Tool usage stats
-      const toolStats = db.prepare(`
-        SELECT tool_name, COUNT(*) as count FROM events
-        WHERE session_id = ? AND tool_name IS NOT NULL
-        GROUP BY tool_name ORDER BY count DESC
-      `).all(sessionId) as Array<{ tool_name: string; count: number }>;
-
+      const toolStats = this.storage.aggregateToolUsageBySession(sessionId);
       const totalToolCalls = toolStats.reduce((sum, row) => sum + row.count, 0);
 
       // 2. Agent/Task delegation stats
-      const agentStats = db.prepare(`
-        SELECT json_extract(tool_input, '$.subagent_type') as agent_type, COUNT(*) as count
-        FROM events
-        WHERE session_id = ? AND tool_name IN ('Agent', 'Task') AND tool_input IS NOT NULL
-        GROUP BY agent_type
-      `).all(sessionId) as Array<{ agent_type: string | null; count: number }>;
-
+      const agentStats = this.storage.aggregateAgentTypeBySession(sessionId);
       const totalAgentCalls = agentStats.reduce((sum, row) => sum + row.count, 0);
       const agentNames = agentStats
         .filter(row => row.agent_type)
         .map(row => row.agent_type as string);
 
       // 3. Skill invocation count
-      const skillRow = db.prepare(`
-        SELECT COUNT(*) as count FROM skill_invocations WHERE session_id = ?
-      `).get(sessionId) as { count: number } | undefined;
-
-      const skillCount = skillRow?.count ?? 0;
+      const skillCount = this.storage.countSkillInvocationsBySession(sessionId);
 
       // Build summary
       if (totalToolCalls === 0) return null;

package/src/daemon/handlers/user-prompt.ts

@@ -14,11 +14,15 @@ import type { SkillRegistry } from '../../skills/registry.js';
 import { logger } from '../../core/utils/logger.js';
 import { randomUUID } from 'node:crypto';
 import { truncateString } from '../../core/utils/format.js';
+import { LRUCache } from '../../core/utils/lru-cache.js';
 
 export class UserPromptHandler {
-  private resumeInjected = new Map<string, number>();
-  private conventionInjected = new Map<string, number>();
   private static readonly MAX_INJECTION_KEYS = 1000;
+  // Two independent caches: resume vs convention have separate inject-once
+  // semantics, so we keep them as separate LRU instances rather than merging
+  // their key spaces. Both store sessionKey → injection timestamp.
+  private resumeInjected = new LRUCache<string, number>(UserPromptHandler.MAX_INJECTION_KEYS);
+  private conventionInjected = new LRUCache<string, number>(UserPromptHandler.MAX_INJECTION_KEYS);
 
   constructor(
     private resume: ResumeManager | null = null,
@@ -137,31 +141,17 @@ export class UserPromptHandler {
   }
   // ── Private: Injection tracking helpers ────────────────────────────────
 
-  /** Check if a sessionKey has been injected in the given map. */
-  private hasInjected(map: Map<string, number>, key: string): boolean {
-    return map.has(key);
+  /** Check if a sessionKey has been injected in the given cache. */
+  private hasInjected(cache: LRUCache<string, number>, key: string): boolean {
+    return cache.has(key);
   }
 
   /**
    * Mark a sessionKey as injected, recording the current timestamp.
-   * If map size reaches MAX_INJECTION_KEYS, evict the oldest entry (LRU cap).
+   * LRUCache transparently evicts the oldest entry when capacity is reached.
    */
-  private markInjected(map: Map<string, number>, key: string): void {
-    if (map.size >= UserPromptHandler.MAX_INJECTION_KEYS) {
-      // Evict the entry with the smallest timestamp (oldest)
-      let oldestKey: string | undefined;
-      let oldestTs = Infinity;
-      for (const [k, ts] of map) {
-        if (ts < oldestTs) {
-          oldestTs = ts;
-          oldestKey = k;
-        }
-      }
-      if (oldestKey !== undefined) {
-        map.delete(oldestKey);
-      }
-    }
-    map.set(key, Date.now());
+  private markInjected(cache: LRUCache<string, number>, key: string): void {
+    cache.set(key, Date.now());
   }
 
   // ── Public: Session cleanup ──────────────────────────────────────────────

package/src/daemon/hook-sync.ts

@@ -0,0 +1,91 @@
+import { existsSync, readFileSync, copyFileSync, chmodSync } from 'node:fs';
+import { createHash } from 'node:crypto';
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { FORGE_PATHS } from '../core/constants.js';
+import { logger } from '../core/utils/logger.js';
+
+// All hook files to sync (5 hooks + shared lib)
+const HOOK_FILES = [
+  'pre-tool-use.sh',
+  'post-tool-use.sh',
+  'user-prompt-submit.sh',
+  'notification.sh',
+  'stop.sh',
+  'hook-lib.sh',
+];
+
+function sha256(content: Buffer): string {
+  return createHash('sha256').update(content).digest('hex');
+}
+
+function getSourceHooksDir(): string {
+  // Compiled: dist/daemon/hook-sync.js → dist/hooks
+  // Dev (vitest): src/daemon/hook-sync.ts → src/hooks
+  return join(dirname(fileURLToPath(import.meta.url)), '..', 'hooks');
+}
+
+export interface SyncResult {
+  copied: number;
+  checked: number;
+  skipped: number;
+}
+
+/**
+ * Sync hooks from the package source (dist/hooks) to ~/.claude-forge/hooks/.
+ * Uses SHA-256 comparison to skip identical files.
+ *
+ * Accepts optional overrides for source/target dirs — used in unit tests.
+ * Any failure logs a warning and continues; never throws.
+ */
+export function syncHooks(opts?: { sourceDir?: string; targetDir?: string }): SyncResult {
+  const result: SyncResult = { copied: 0, checked: 0, skipped: 0 };
+  const sourceDir = opts?.sourceDir ?? getSourceHooksDir();
+  const targetDir = opts?.targetDir ?? FORGE_PATHS.hooks();
+
+  if (!existsSync(sourceDir)) {
+    logger.warn(`[HookSync] source hooks dir not found at ${sourceDir}, skipping`);
+    return result;
+  }
+
+  if (!existsSync(targetDir)) {
+    // User has not run `claude-forge init` yet — skip silently
+    logger.debug(`[HookSync] target dir not found: ${targetDir} (user may not have run \`claude-forge init\`)`);
+    return result;
+  }
+
+  for (const file of HOOK_FILES) {
+    const src = join(sourceDir, file);
+    const dest = join(targetDir, file);
+
+    if (!existsSync(src)) {
+      result.skipped++;
+      continue;
+    }
+
+    result.checked++;
+
+    try {
+      const srcContent = readFileSync(src);
+      if (existsSync(dest)) {
+        const destContent = readFileSync(dest);
+        if (sha256(srcContent) === sha256(destContent)) {
+          continue; // identical — no copy needed
+        }
+      }
+
+      copyFileSync(src, dest);
+      chmodSync(dest, 0o755);
+      result.copied++;
+      logger.info(`[HookSync] updated ${file}`);
+    } catch (err) {
+      logger.warn(`[HookSync] failed to sync ${file}: ${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
+
+  if (result.copied > 0) {
+    logger.info(`[HookSync] synced ${result.copied}/${result.checked} hook files`);
+  }
+
+  return result;
+}

package/src/daemon/index.ts

@@ -20,7 +20,7 @@ import {
   removeAuthToken,
 } from './lifecycle.js';
 import { routeEvent, type Handlers } from './router.js';
-import { logger, setLogLevel, LogLevel } from '../core/utils/logger.js';
+import { logger } from '../core/utils/logger.js';
 import { ConfigManager } from '../core/config.js';
 import { SQLiteStorage } from '../core/storage/sqlite.js';
 import { expandPath } from '../core/utils/path.js';
@@ -34,8 +34,11 @@ import { ConventionExtractor } from '../claudemd/convention-extractor.js';
 import { UserPromptHandler } from './handlers/user-prompt.js';
 import { PostToolUseHandler } from './handlers/post-tool-use.js';
 import { StopHandler } from './handlers/stop.js';
+import { syncHooks } from './hook-sync.js';
 import { replayQueue } from '../core/queue/index.js';
+import { DEFAULTS } from '../core/constants.js';
 import type { ForgeEvent } from '../core/types.js';
+import { getUserPrompt } from '../core/event-fields.js';
 import type { HookResponse } from './server.js';
 
 export interface DaemonOptions {
@@ -56,13 +59,8 @@ export async function startDaemon(foreground: boolean = false, options: DaemonOp
   });
 
   // ── 1. Config & Logging ────────────────────────────────────────────────────
+  // Log level is auto-parsed from LOG_LEVEL env var at logger module load time.
   const config = new ConfigManager().get();
-
-  const envLevel = (process.env.LOG_LEVEL ?? '').toLowerCase();
-  const levelMap: Record<string, LogLevel> = {
-    debug: LogLevel.DEBUG, info: LogLevel.INFO, warn: LogLevel.WARN, error: LogLevel.ERROR,
-  };
-  setLogLevel(levelMap[envLevel] ?? LogLevel.INFO);
   logger.info('Claude Forge daemon starting...');
 
   // ── 2. Lifecycle (PID, socket, auth token) ─────────────────────────────────
@@ -70,13 +68,22 @@ export async function startDaemon(foreground: boolean = false, options: DaemonOp
   writePidFile();
   const authToken = writeAuthToken();
   logger.info('[Security] Auth token generated');
-  syncMcpToken(authToken, config.web?.port ?? 3721);
+  syncMcpToken(authToken, config.web?.port ?? DEFAULTS.WEB_PORT);
 
   // ── 3. Storage ─────────────────────────────────────────────────────────────
   const dbPath = expandPath(config.storage.path);
   const storage = new SQLiteStorage(dbPath);
   logger.info(`Storage initialized: ${dbPath}`);
 
+  // ── 3.5. Auto-sync hooks ────────────────────────────────────────────────
+  // npm upgrade 不会自动更新 ~/.claude-forge/hooks/，每次 daemon 启动
+  // 用 SHA-256 比对源 dist/hooks 与本地副本，不一致则覆盖。
+  try {
+    syncHooks();
+  } catch (err) {
+    logger.warn(`[HookSync] unexpected error: ${err}`);
+  }
+
   // ── 4. AI Provider ─────────────────────────────────────────────────────────
   const apiKey = config.ai.api_key || process.env.ANTHROPIC_API_KEY || '';
   if (!apiKey) {
@@ -108,7 +115,7 @@ export async function startDaemon(foreground: boolean = false, options: DaemonOp
   // ── 5.5. Schedule daily maintenance ────────────────────────────────────────
   // Clean old events every 24 hours
   const MAINTENANCE_INTERVAL = 24 * 60 * 60 * 1000; // 24 hours
-  setInterval(() => {
+  const maintenanceInterval = setInterval(() => {
     logger.info('[Daemon] Running daily maintenance: cleaning old events');
     try {
       storage.cleanOldEvents(30);
@@ -118,6 +125,21 @@ export async function startDaemon(foreground: boolean = false, options: DaemonOp
   }, MAINTENANCE_INTERVAL);
   logger.info('[Daemon] Scheduled daily maintenance (clean events older than 30 days)');
 
+  // ── 5.6. Stale task GC (every 5 minutes) ──────────────────────────────────
+  const STALE_TASK_GC_INTERVAL = 5 * 60 * 1000; // 5 分钟
+  const STALE_TASK_IDLE_MINUTES = 10;            // idle 超 10 分钟视为滞留
+
+  const staleTaskGcInterval = setInterval(() => {
+    try {
+      const closed = storage.completeStaleActiveTasks(STALE_TASK_IDLE_MINUTES);
+      if (closed > 0) {
+        logger.info(`[Maintenance] Auto-completed ${closed} stale active task(s)`);
+      }
+    } catch (err) {
+      logger.error(`[Maintenance] Stale task GC failed: ${err}`);
+    }
+  }, STALE_TASK_GC_INTERVAL);
+
   // ── 6. Create handlers ─────────────────────────────────────────────────────
   const userPromptHandler = new UserPromptHandler(
     resume,
@@ -157,7 +179,7 @@ export async function startDaemon(foreground: boolean = false, options: DaemonOp
       logger.debug(`[Event] ${event.hook_type} | tool=${event.tool_name ?? 'N/A'}`);
 
       // Task segmentation: UserPromptSubmit starts/continues tasks
-      const prompt = event.user_prompt || (event.tool_input as any)?.user_prompt;
+      const prompt = getUserPrompt(event);
       if (event.hook_type === 'UserPromptSubmit' && prompt) {
         taskSegmenter.processPrompt(event.session_id, prompt, event.timestamp, event.event_id);
       } else if (event.event_id) {
@@ -250,6 +272,8 @@ export async function startDaemon(foreground: boolean = false, options: DaemonOp
 
     if (ai) logger.info(`[AI Stats] ${ai.formatStats()}`);
 
+    clearInterval(maintenanceInterval);
+    clearInterval(staleTaskGcInterval);
     if (webServer) await webServer.stop();
     await server.close();
     storage.close();

package/src/daemon/lifecycle.ts

@@ -6,8 +6,8 @@ import { logger } from '../core/utils/logger.js';
 import { FORGE_PATHS } from '../core/constants.js';
 
 const FORGE_HOME = FORGE_PATHS.home();
-const TOKEN_FILE = path.join(FORGE_HOME, 'daemon.token');
-const PID_FILE = path.join(FORGE_HOME, 'daemon.pid');
+const TOKEN_FILE = FORGE_PATHS.daemonToken();
+const PID_FILE = FORGE_PATHS.daemonPid();
 
 export function writePidFile(): void {
   if (!fs.existsSync(FORGE_HOME)) {
@@ -49,7 +49,7 @@ export function isRunning(): boolean {
 }
 
 export function getSocketPath(): string {
-  return path.join(FORGE_HOME, 'daemon.sock');
+  return FORGE_PATHS.daemonSocket();
 }
 
 export function cleanSocket(): void {

package/src/daemon/server.ts

@@ -72,61 +72,39 @@ export class SocketServer {
         return;
       }
 
-      try {
-        // 认证检查：在 EventParser 之前提取 _auth 字段（zod 会剥离未知字段）
-        if (this.authToken) {
-          try {
-            const raw = JSON.parse(buffer);
-            if (raw._auth !== this.authToken) {
-              logger.warn('[Socket] 认证失败，关闭连接');
-              buffer = '';
-              if (connectionTimeout) clearTimeout(connectionTimeout);
-              socket.destroy();
-              return;
-            }
-          } catch {
-            // JSON 解析失败，交给下面的 EventParser 处理
-          }
-        }
-
-        const event = this.parser.parse(buffer);
-        buffer = '';
-        if (connectionTimeout) clearTimeout(connectionTimeout);
-
-        const result = await this.handler(event);
+      // 性能修复（L3）：hook 端用 `echo` 发送 JSON，结尾自带换行符。
+      // 只在 buffer 中遇到换行符时才尝试解析，避免大事件（接近 512KB）
+      // 在分片到达时每个 chunk 都跑一次完整 JSON.parse 造成的 N² 行为。
+      // 兼容：如果数据无换行（旧客户端、其他来源），等到 socket 关闭时
+      // 由 'end' 事件做最后一次解析尝试。
+      const newlineIdx = buffer.indexOf('\n');
+      if (newlineIdx === -1) {
+        // 尚未收到完整消息，继续等待
+        return;
+      }
 
-        // 双向通信：如果 handler 返回了结果，写回给 hook 脚本
-        if (result) {
-          // 清理无意义内容，避免 Claude Code 注入干扰上下文
-          const cleaned = { ...result } as Record<string, unknown>;
-          if (cleaned['additionalContext'] && !this.isValidContent(cleaned['additionalContext'] as string)) {
-            delete cleaned['additionalContext'];
-          }
-          if (cleaned['systemMessage'] && !this.isValidContent(cleaned['systemMessage'] as string)) {
-            delete cleaned['systemMessage'];
-          }
+      // 取换行前的完整消息；忽略行后可能存在的多余数据（hook 单连接一事件）
+      const message = buffer.slice(0, newlineIdx);
+      buffer = '';
 
-          const payload = JSON.stringify(cleaned);
-          socket.write(payload, () => socket.end());
-        } else {
-          socket.end();
-        }
-      } catch (err) {
-        // 区分"JSON 不完整"和"格式错误"
-        if (err instanceof SyntaxError) {
-          const trimmed = buffer.trim();
-          if (trimmed.startsWith('{') && !this.isCompleteJSON(trimmed)) {
-            // JSON 不完整，继续等待
-            logger.debug(`缓冲区不完整（${buffer.length} 字节），等待更多数据`);
-            return;
-          }
-        }
+      try {
+        await this.processMessage(socket, message);
+      } finally {
+        if (connectionTimeout) clearTimeout(connectionTimeout);
+      }
+    });
 
-        logger.error(`事件解析失败：${formatError(err)}`);
-        logger.debug(`无效缓冲区内容：${truncateString(buffer, 500)}`);
-        buffer = '';
+    // 兜底：连接关闭时若 buffer 仍有内容（无换行结尾的旧客户端），尝试解析一次
+    socket.on('end', async () => {
+      const remaining = buffer.trim();
+      buffer = '';
+      if (remaining.length === 0) return;
+      try {
+        await this.processMessage(socket, remaining);
+      } catch {
+        // processMessage 内部已记录错误
+      } finally {
         if (connectionTimeout) clearTimeout(connectionTimeout);
-        socket.destroy();
       }
     });
 
@@ -140,6 +118,53 @@ export class SocketServer {
     });
   }
 
+  /**
+   * 解析单条完整消息（一次性，无 N² 行为）并执行 handler。
+   *
+   * 注意：调用方需确保 message 是一条完整的 JSON 文本（已根据换行符切分）。
+   */
+  private async processMessage(socket: net.Socket, message: string): Promise<void> {
+    try {
+      // 认证检查：在 EventParser 之前提取 _auth 字段（zod 会剥离未知字段）
+      if (this.authToken) {
+        try {
+          const raw = JSON.parse(message);
+          if (raw._auth !== this.authToken) {
+            logger.warn('[Socket] 认证失败，关闭连接');
+            socket.destroy();
+            return;
+          }
+        } catch {
+          // JSON 解析失败，交给下面的 EventParser 处理
+        }
+      }
+
+      const event = this.parser.parse(message);
+      const result = await this.handler(event);
+
+      // 双向通信：如果 handler 返回了结果，写回给 hook 脚本
+      if (result) {
+        // 清理无意义内容，避免 Claude Code 注入干扰上下文
+        const cleaned = { ...result } as Record<string, unknown>;
+        if (cleaned['additionalContext'] && !this.isValidContent(cleaned['additionalContext'] as string)) {
+          delete cleaned['additionalContext'];
+        }
+        if (cleaned['systemMessage'] && !this.isValidContent(cleaned['systemMessage'] as string)) {
+          delete cleaned['systemMessage'];
+        }
+
+        const payload = JSON.stringify(cleaned);
+        socket.write(payload, () => socket.end());
+      } else {
+        socket.end();
+      }
+    } catch (err) {
+      logger.error(`事件解析失败：${formatError(err)}`);
+      logger.debug(`无效消息内容：${truncateString(message, 500)}`);
+      socket.destroy();
+    }
+  }
+
   /**
    * 判断内容是否有意义，过滤空字符串、纯标点/符号等
    */
@@ -160,44 +185,6 @@ export class SocketServer {
     return true;
   }
 
-  /**
-   * 简单检查 JSON 是否完整（启发式方法）
-   */
-  private isCompleteJSON(str: string): boolean {
-    let braceCount = 0;
-    let bracketCount = 0;
-    let inString = false;
-    let escaped = false;
-
-    for (let i = 0; i < str.length; i++) {
-      const char = str[i];
-
-      if (escaped) {
-        escaped = false;
-        continue;
-      }
-
-      if (char === '\\') {
-        escaped = true;
-        continue;
-      }
-
-      if (char === '"') {
-        inString = !inString;
-        continue;
-      }
-
-      if (inString) continue;
-
-      if (char === '{') braceCount++;
-      else if (char === '}') braceCount--;
-      else if (char === '[') bracketCount++;
-      else if (char === ']') bracketCount--;
-    }
-
-    return braceCount === 0 && bracketCount === 0 && !inString;
-  }
-
   close(): Promise<void> {
     return new Promise((resolve) => {
       this.server.close(() => {

package/src/daemon/services/task-segmenter.ts

@@ -75,7 +75,7 @@ export class TaskSegmenter {
   }
 
   completeCurrentTask(sessionId: string, timestamp: string): void {
-    const current = this.currentTasks.get(sessionId);
+    const current = this.currentTasks.get(sessionId) ?? this.recoverActiveTask(sessionId);
     if (!current) return;
     this.storage.updateTask(current.id, {
       status: 'completed',

package/src/hooks/hook-lib.sh

@@ -10,6 +10,43 @@
 SOCKET_PATH="${CLAUDE_FORGE_SOCKET:-$HOME/.claude-forge/daemon.sock}"
 QUEUE_DIR="$HOME/.claude-forge/queue"
 
+# resolve_project_path <input_cwd>
+#
+# Walk up the directory tree from <input_cwd> to find the nearest ancestor that
+# contains a `.git` entry (directory for normal clones, file for worktrees /
+# submodules). Print the resolved git-root path on stdout.
+#
+# Fallback rules:
+#   - Empty input → start from $PWD
+#   - Relative input → prefixed with $PWD to absolutise
+#   - No .git found within 64 levels → print original input unchanged
+#
+# POSIX-only: uses `dirname` and `case`; does NOT depend on `realpath` or any
+# GNU coreutils extensions, so it works on macOS BSD and Linux alike.
+resolve_project_path() {
+  local input="${1:-}"
+  local dir="${input:-$PWD}"
+
+  # Absolutise: prefix relative paths with $PWD (no realpath dependency)
+  case "$dir" in
+    /*) ;;
+    *)  dir="$PWD/$dir" ;;
+  esac
+
+  local guard=0
+  while [ "$dir" != "/" ] && [ "$dir" != "." ] && [ $guard -lt 64 ]; do
+    if [ -d "$dir/.git" ] || [ -f "$dir/.git" ]; then
+      printf '%s' "$dir"
+      return 0
+    fi
+    dir=$(dirname "$dir")
+    guard=$((guard + 1))
+  done
+
+  # No git ancestor found → fall back to the caller's original cwd
+  printf '%s' "${input:-$PWD}"
+}
+
 # send_event_or_enqueue <event_json> [timeout_seconds]
 #
 # 1. If socket file does not exist → enqueue in background → return empty string

package/src/hooks/notification.sh

@@ -10,8 +10,8 @@ AUTH_TOKEN=$(cat "$HOME/.claude-forge/daemon.token" 2>/dev/null || echo '')
 INPUT=$(cat)
 
 # 提取 cwd（jq 替代 python3）
-PROJECT_PATH=$(echo "$INPUT" | jq -r '.cwd // ""')
-PROJECT_PATH="${PROJECT_PATH:-${PWD}}"
+RAW_CWD=$(echo "$INPUT" | jq -r '.cwd // ""')
+PROJECT_PATH=$(resolve_project_path "${RAW_CWD:-$PWD}")
 SESSION_ID=$(echo "$INPUT" | jq -r '.session_id // .sessionId // ""')
 SESSION_ID="${SESSION_ID:-${CLAUDE_CODE_SESSION_ID:-cli}}"
 

package/src/hooks/post-tool-use.sh

@@ -14,8 +14,8 @@ INPUT=$(cat)
 TOOL_NAME="${CLAUDE_TOOL_NAME:-$(echo "$INPUT" | jq -r '.tool_name // ""')}"
 TOOL_INPUT=$(echo "$INPUT" | jq -c '.tool_input // {}')
 TOOL_OUTPUT=$(echo "$INPUT" | jq -c '.tool_response // {}')
-PROJECT_PATH=$(echo "$INPUT" | jq -r '.cwd // ""')
-PROJECT_PATH="${PROJECT_PATH:-${PWD}}"
+RAW_CWD=$(echo "$INPUT" | jq -r '.cwd // ""')
+PROJECT_PATH=$(resolve_project_path "${RAW_CWD:-$PWD}")
 SESSION_ID=$(echo "$INPUT" | jq -r '.session_id // .sessionId // ""')
 SESSION_ID="${SESSION_ID:-${CLAUDE_CODE_SESSION_ID:-cli}}"