@handsupmin/gc-tree 1.1.1 → 1.1.2

package/dist/src/integration-files.js

@@ -65,14 +65,15 @@ export async function removeManagedMarkdownBlock({ filePath, marker, }) {
     await writeFile(filePath, next, 'utf8');
     return 'removed';
 }
-function buildHookEntry(event) {
+function buildHookEntry(event, target) {
     return {
         type: 'command',
         command: `gctree __hook --event ${event}`,
         metadata: {
             owner: 'gctree',
+            managed_by: '@handsupmin/gc-tree',
         },
-        ...(event === 'UserPromptSubmit' ? { timeout: 10 } : {}),
+        ...(target === 'claude-code' || event === 'UserPromptSubmit' ? { timeout: 10 } : {}),
     };
 }
 function ensureObject(value) {
@@ -95,21 +96,29 @@ function mergeHookJson(raw, target) {
     };
     const upsertGroup = (event, matcher) => {
         const groups = ensureEventArray(event);
-        let group = groups.find((candidate) => {
-            const hooksArr = Array.isArray(candidate?.hooks) ? candidate.hooks : [];
-            return hooksArr.some((entry) => isGcTreeHook(ensureObject(entry), event));
+        hooks[event] = groups
+            .map((candidate) => {
+            const group = ensureObject(candidate);
+            const hooksArr = Array.isArray(group.hooks) ? group.hooks : [];
+            const nextHooks = hooksArr.filter((entry) => !isGcTreeHook(ensureObject(entry), event));
+            return nextHooks.length > 0 ? { ...group, hooks: nextHooks } : null;
+        })
+            .filter(Boolean);
+        let group = hooks[event].find((candidate) => {
+            if (matcher === undefined)
+                return candidate.matcher === undefined;
+            return String(candidate.matcher ?? '') === matcher;
         });
         if (!group) {
-            group = matcher ? { matcher, hooks: [] } : { hooks: [] };
-            groups.push(group);
+            group = matcher !== undefined ? { matcher, hooks: [] } : { hooks: [] };
+            hooks[event].push(group);
         }
         if (!Array.isArray(group.hooks))
             group.hooks = [];
-        group.hooks = group.hooks.filter((entry) => !isGcTreeHook(ensureObject(entry), event));
-        group.hooks.push(buildHookEntry(event));
+        group.hooks.push(buildHookEntry(event, target));
     };
-    upsertGroup(sessionEvent, target === 'codex' ? 'startup|resume' : '*');
-    upsertGroup(promptEvent, target === 'codex' ? undefined : '*');
+    upsertGroup(sessionEvent, target === 'codex' ? 'startup|resume' : '');
+    upsertGroup(promptEvent, target === 'codex' ? undefined : '');
     return `${JSON.stringify({ ...parsed, hooks }, null, 2)}\n`;
 }
 function unmergeHookJson(raw, events) {
@@ -166,7 +175,7 @@ export function gctreeManagedMarkdownTargets(targetDir) {
 export function gctreeHookJsonTargets(targetDir) {
     return {
         codex: join(targetDir, '.codex', 'hooks.json'),
-        claude: join(targetDir, '.claude', 'hooks', 'hooks.json'),
+        claude: join(targetDir, '.claude', 'settings.json'),
     };
 }
 export function gctreeGlobalRoot(host) {
@@ -177,5 +186,11 @@ export function gctreeGlobalRoot(host) {
 }
 export function gctreeGlobalHookJsonTarget(host) {
     const root = gctreeGlobalRoot(host);
-    return host === 'codex' ? join(root, 'hooks.json') : join(root, 'hooks', 'hooks.json');
+    return host === 'codex' ? join(root, 'hooks.json') : join(root, 'settings.json');
+}
+export function gctreeLegacyClaudeHooksJsonTarget(targetDir) {
+    return join(targetDir, 'hooks', 'hooks.json');
+}
+export function gctreeLegacyLocalClaudeHooksJsonTarget(targetDir) {
+    return join(targetDir, '.claude', 'hooks', 'hooks.json');
 }

package/dist/src/scaffold.js

@@ -1,6 +1,6 @@
 import { access, mkdir, writeFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
-import { gctreeGlobalHookJsonTarget, gctreeGlobalRoot, gctreeHookJsonTargets, gctreeManagedMarkdownTargets, mergeGcTreeHooksJson, unmergeGcTreeHooksJson, upsertManagedMarkdownBlock, } from './integration-files.js';
+import { gctreeGlobalHookJsonTarget, gctreeGlobalRoot, gctreeHookJsonTargets, gctreeLegacyClaudeHooksJsonTarget, gctreeLegacyLocalClaudeHooksJsonTarget, gctreeManagedMarkdownTargets, mergeGcTreeHooksJson, unmergeGcTreeHooksJson, upsertManagedMarkdownBlock, } from './integration-files.js';
 import { onboardingCompletionLines, onboardingProtocolLines } from './onboarding-protocol.js';
 function renderCodexAgentsSnippet() {
     return [
@@ -181,11 +181,15 @@ function renderClaudeHooksJson() {
         hooks: {
             SessionStart: [
                 {
-                    matcher: '*',
+                    matcher: '',
                     hooks: [
                         {
                             type: 'command',
                             command: 'gctree __hook --event SessionStart',
+                            metadata: {
+                                owner: 'gctree',
+                                managed_by: '@handsupmin/gc-tree',
+                            },
                             timeout: 10,
                         },
                     ],
@@ -193,11 +197,15 @@ function renderClaudeHooksJson() {
             ],
             UserPromptSubmit: [
                 {
-                    matcher: '*',
+                    matcher: '',
                     hooks: [
                         {
                             type: 'command',
                             command: 'gctree __hook --event UserPromptSubmit',
+                            metadata: {
+                                owner: 'gctree',
+                                managed_by: '@handsupmin/gc-tree',
+                            },
                             timeout: 10,
                         },
                     ],
@@ -272,7 +280,7 @@ export function scaffoldFiles(host, scope = 'local') {
     }
     if (scope === 'global') {
         return [
-            { path: 'hooks/hooks.json', content: renderClaudeHooksJson() },
+            { path: 'settings.json', content: renderClaudeHooksJson() },
             { path: 'hooks/gctree-session-start.md', content: renderClaudeSessionStartHook() },
             { path: 'commands/gc-resolve-context.md', content: renderClaudeResolveCommand() },
             { path: 'commands/gc-onboard.md', content: renderClaudeOnboardCommand() },
@@ -281,7 +289,7 @@ export function scaffoldFiles(host, scope = 'local') {
     }
     return [
         { path: 'CLAUDE.md', content: renderClaudeSnippet() },
-        { path: '.claude/hooks/hooks.json', content: renderClaudeHooksJson() },
+        { path: '.claude/settings.json', content: renderClaudeHooksJson() },
         { path: '.claude/hooks/gctree-session-start.md', content: renderClaudeSessionStartHook() },
         { path: '.claude/commands/gc-resolve-context.md', content: renderClaudeResolveCommand() },
         { path: '.claude/commands/gc-onboard.md', content: renderClaudeOnboardCommand() },
@@ -309,15 +317,21 @@ export async function scaffoldHostIntegration({ host, targetDir, force = false,
         written.push(managedMarkdownPath);
         hookPath = isCodex ? hookTargets.codex : hookTargets.claude;
         if (!isCodex) {
-            const oldHooksPath = join(resolvedTargetDir, '.claude', 'settings.json');
-            await unmergeGcTreeHooksJson(oldHooksPath);
+            const legacyHooksPath = gctreeLegacyLocalClaudeHooksJsonTarget(resolvedTargetDir);
+            const legacyStatus = await unmergeGcTreeHooksJson(legacyHooksPath);
+            if (legacyStatus !== 'missing') {
+                written.push(legacyHooksPath);
+            }
         }
     }
     else {
         hookPath = gctreeGlobalHookJsonTarget(host);
         if (!isCodex) {
-            const oldHooksPath = join(resolvedTargetDir, 'settings.json');
-            await unmergeGcTreeHooksJson(oldHooksPath);
+            const legacyHooksPath = gctreeLegacyClaudeHooksJsonTarget(resolvedTargetDir);
+            const legacyStatus = await unmergeGcTreeHooksJson(legacyHooksPath);
+            if (legacyStatus !== 'missing') {
+                written.push(legacyHooksPath);
+            }
         }
     }
     if (scope === 'local') {

package/dist/src/uninstall.js

@@ -1,6 +1,6 @@
 import { readdir, rm } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
-import { gctreeGlobalHookJsonTarget, gctreeGlobalRoot, gctreeHookJsonTargets, gctreeManagedMarkdownTargets, pathExists, removeManagedMarkdownBlock, unmergeGcTreeHooksJson, } from './integration-files.js';
+import { gctreeGlobalHookJsonTarget, gctreeGlobalRoot, gctreeHookJsonTargets, gctreeLegacyClaudeHooksJsonTarget, gctreeLegacyLocalClaudeHooksJsonTarget, gctreeManagedMarkdownTargets, pathExists, removeManagedMarkdownBlock, unmergeGcTreeHooksJson, } from './integration-files.js';
 import { scaffoldFiles } from './scaffold.js';
 async function pathHasEntries(path) {
     const entries = await readdir(path).catch(() => []);
@@ -26,6 +26,14 @@ async function uninstallHostScaffold({ host, scope, targetDir, removed, }) {
     const hookPath = scope === 'local'
         ? (isCodex ? gctreeHookJsonTargets(targetDir).codex : gctreeHookJsonTargets(targetDir).claude)
         : gctreeGlobalHookJsonTarget(host);
+    const hookPaths = isCodex
+        ? [hookPath]
+        : [
+            hookPath,
+            scope === 'local'
+                ? gctreeLegacyLocalClaudeHooksJsonTarget(targetDir)
+                : gctreeLegacyClaudeHooksJsonTarget(targetDir),
+        ];
     if (managedMarkdownPath) {
         const markdownStatus = await removeManagedMarkdownBlock({
             filePath: managedMarkdownPath,
@@ -36,14 +44,16 @@ async function uninstallHostScaffold({ host, scope, targetDir, removed, }) {
             await pruneEmptyParents(managedMarkdownPath, targetDir);
         }
     }
-    const hookStatus = await unmergeGcTreeHooksJson(hookPath);
-    if (hookStatus !== 'missing') {
-        removed.push(hookPath);
-        await pruneEmptyParents(hookPath, targetDir);
+    for (const candidate of [...new Set(hookPaths)]) {
+        const hookStatus = await unmergeGcTreeHooksJson(candidate);
+        if (hookStatus !== 'missing') {
+            removed.push(candidate);
+            await pruneEmptyParents(candidate, targetDir);
+        }
     }
     const extraTargets = scaffoldFiles(host, scope)
         .map((file) => join(targetDir, file.path))
-        .filter((path) => path !== hookPath && path !== managedMarkdownPath);
+        .filter((path) => !hookPaths.includes(path) && path !== managedMarkdownPath);
     for (const target of [...new Set(extraTargets)]) {
         if (!(await pathExists(target)))
             continue;

package/docs/usage.es.md

@@ -181,7 +181,7 @@ AGENTS.md                                  ← fragmento de gctree añadido a la
 **Archivos globales de Claude Code (`gctree init`):**
 
 ```
-~/.claude/hooks/hooks.json                         ← hooks de auto-resolve para SessionStart/UserPromptSubmit
+~/.claude/settings.json                            ← bloque de hooks de auto-resolve para SessionStart/UserPromptSubmit
 ~/.claude/hooks/gctree-session-start.md            ← nota fallback de inicio de sesión
 ~/.claude/commands/gc-resolve-context.md           ← comando slash de resolve
 ~/.claude/commands/gc-onboard.md                   ← comando slash de onboard
@@ -190,9 +190,10 @@ AGENTS.md                                  ← fragmento de gctree añadido a la
 
 **Archivos de override local para `gctree scaffold --host claude-code`:**
 
+Los hooks de Claude Code permanecen en el `~/.claude/settings.json` global; el scaffold local no escribe un archivo de hooks duplicado.
+
 ```
 CLAUDE.md                                        ← fragmento de gctree añadido
-.claude/hooks/hooks.json                         ← hooks de auto-resolve para SessionStart/UserPromptSubmit
 .claude/hooks/gctree-session-start.md            ← nota fallback de inicio de sesión
 .claude/commands/gc-resolve-context.md           ← comando slash de resolve
 .claude/commands/gc-onboard.md                   ← comando slash de onboard

package/docs/usage.ja.md

@@ -181,7 +181,7 @@ AGENTS.md                                  ← gctree のスニペットがエ
 **Claude Code のグローバルファイル（`gctree init`）:**
 
 ```
-~/.claude/hooks/hooks.json                         ← SessionStart / UserPromptSubmit の自動 resolve フック
+~/.claude/settings.json                            ← SessionStart / UserPromptSubmit の自動 resolve フックブロック
 ~/.claude/hooks/gctree-session-start.md            ← セッション開始のフォールバックメモ
 ~/.claude/commands/gc-resolve-context.md           ← resolve スラッシュコマンド
 ~/.claude/commands/gc-onboard.md                   ← onboard スラッシュコマンド
@@ -190,9 +190,10 @@ AGENTS.md                                  ← gctree のスニペットがエ
 
 **`gctree scaffold --host claude-code` のローカル override ファイル:**
 
+Claude Code のフックはグローバルの `~/.claude/settings.json` に残ります。ローカル scaffold は重複するフックファイルを書きません。
+
 ```
 CLAUDE.md                                        ← gctree のスニペットが追記される
-.claude/hooks/hooks.json                         ← SessionStart / UserPromptSubmit の自動 resolve フック
 .claude/hooks/gctree-session-start.md            ← セッション開始のフォールバックメモ
 .claude/commands/gc-resolve-context.md           ← resolve スラッシュコマンド
 .claude/commands/gc-onboard.md                   ← onboard スラッシュコマンド

package/docs/usage.ko.md

@@ -181,7 +181,7 @@ AGENTS.md                                  ← 에이전트 지시사항에 gctr
 **Claude Code 전역 파일 (`gctree init`):**
 
 ```
-~/.claude/hooks/hooks.json                         ← SessionStart/UserPromptSubmit 자동 resolve 훅
+~/.claude/settings.json                            ← SessionStart/UserPromptSubmit 자동 resolve 훅 블록
 ~/.claude/hooks/gctree-session-start.md            ← 세션 시작 fallback 메모
 ~/.claude/commands/gc-resolve-context.md           ← resolve 슬래시 명령
 ~/.claude/commands/gc-onboard.md                   ← onboard 슬래시 명령
@@ -190,9 +190,10 @@ AGENTS.md                                  ← 에이전트 지시사항에 gctr
 
 **`gctree scaffold --host claude-code` 로컬 override 파일:**
 
+Claude Code 훅은 전역 `~/.claude/settings.json`에 유지됩니다. 로컬 scaffold는 중복 훅 파일을 쓰지 않습니다.
+
 ```
 CLAUDE.md                                        ← gctree 스니펫 추가
-.claude/hooks/hooks.json                         ← SessionStart/UserPromptSubmit 자동 resolve 훅
 .claude/hooks/gctree-session-start.md            ← 세션 시작 fallback 메모
 .claude/commands/gc-resolve-context.md           ← resolve 슬래시 명령
 .claude/commands/gc-onboard.md                   ← onboard 슬래시 명령

package/docs/usage.md

@@ -181,7 +181,7 @@ AGENTS.md                                  ← gctree snippet appended to agent
 **Global files for Claude Code (`gctree init`):**
 
 ```
-~/.claude/hooks/hooks.json                         ← SessionStart/UserPromptSubmit auto-resolve hooks
+~/.claude/settings.json                            ← SessionStart/UserPromptSubmit auto-resolve hooks block
 ~/.claude/hooks/gctree-session-start.md            ← session-start fallback note
 ~/.claude/commands/gc-resolve-context.md           ← resolve slash command
 ~/.claude/commands/gc-onboard.md                   ← onboard slash command
@@ -190,9 +190,10 @@ AGENTS.md                                  ← gctree snippet appended to agent
 
 **Local override files for `gctree scaffold --host claude-code`:**
 
+Claude Code hooks remain in the global `~/.claude/settings.json`; local scaffolding does not write a duplicate hook file.
+
 ```
 CLAUDE.md                                        ← gctree snippet appended
-.claude/hooks/hooks.json                         ← SessionStart/UserPromptSubmit auto-resolve hooks
 .claude/hooks/gctree-session-start.md            ← session-start fallback note
 .claude/commands/gc-resolve-context.md           ← resolve slash command
 .claude/commands/gc-onboard.md                   ← onboard slash command

package/docs/usage.zh.md

@@ -181,7 +181,7 @@ AGENTS.md                                  ← gctree 代码片段追加到 agen
 **Claude Code 全局文件（`gctree init`）：**
 
 ```
-~/.claude/hooks/hooks.json                         ← SessionStart / UserPromptSubmit 自动 resolve hook
+~/.claude/settings.json                            ← SessionStart / UserPromptSubmit 自动 resolve hook 块
 ~/.claude/hooks/gctree-session-start.md            ← 会话启动 fallback 说明
 ~/.claude/commands/gc-resolve-context.md           ← resolve 斜杠命令
 ~/.claude/commands/gc-onboard.md                   ← onboard 斜杠命令
@@ -190,9 +190,10 @@ AGENTS.md                                  ← gctree 代码片段追加到 agen
 
 **`gctree scaffold --host claude-code` 的本地 override 文件：**
 
+Claude Code hook 保留在全局 `~/.claude/settings.json` 中；本地 scaffold 不写入重复的 hook 文件。
+
 ```
 CLAUDE.md                                        ← gctree 代码片段追加
-.claude/hooks/hooks.json                         ← SessionStart / UserPromptSubmit 自动 resolve hook
 .claude/hooks/gctree-session-start.md            ← 会话启动 fallback 说明
 .claude/commands/gc-resolve-context.md           ← resolve 斜杠命令
 .claude/commands/gc-onboard.md                   ← onboard 斜杠命令

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@handsupmin/gc-tree",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Global Context Tree, a lightweight branch-aware global context orchestrator for AI coding tools",
   "type": "module",
   "private": false,