Skip to content

Commit f5364e3

Browse files
peyton-altclaude
peyton-alt
and
claude
committed
Merge origin/main into fix/refs-backfill-fetch-probe
Conflict resolutions, all combining rather than choosing: - remote/util.go: keep this branch's authoritative-bool return on the provider-URL path AND main's ctx param on resolveProviderCheckpointURL. - refs_store.go: keep the fetch-failure memo fields alongside main's remoteRefLister (List remote discovery); imports gain both sync and time. - remote/git.go: take main's formatGitCommandError for ls-remote errors — it subsumes this branch's manual stderr fold/redaction and adds deadline classification. - refs_store_test.go: both-added test blocks kept (backfill fetch-probe suite + main's List remote-discovery suite). - go.mod/go.sum: go mod tidy on the merged graph. PR #1811 is still open, so its doc-comment reconciliation note does not apply yet. Full suite, golangci-lint, and gofmt green on the merge. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Entire-Checkpoint: 01KYT5NQYDB60570R4QK6P0TDG
2 parents 4fdb8aa + 279b988 commit f5364e3

218 files changed

Lines changed: 14358 additions & 2408 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.claude/settings.json‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
{
2+
"enabledPlugins": {
3+
"e2e@entire-dev-tools": true,
4+
"agent-integration@entire-dev-tools": true
5+
},
26
"extraKnownMarketplaces": {
37
"entire-dev-tools": {
48
"source": {
@@ -7,86 +11,83 @@
711
}
812
}
913
},
10-
"enabledPlugins": {
11-
"e2e@entire-dev-tools": true,
12-
"agent-integration@entire-dev-tools": true
13-
},
1414
"hooks": {
15-
"SessionStart": [
15+
"PostToolUse": [
1616
{
17-
"matcher": "",
17+
"matcher": "Agent",
1818
"hooks": [
1919
{
2020
"type": "command",
21-
"command": "bash ${CLAUDE_PROJECT_DIR}/.claude/scripts/remote-setup.sh"
22-
},
23-
{
24-
"type": "command",
25-
"command": "${CLAUDE_PROJECT_DIR}/scripts/entire-dev hooks claude-code session-start"
21+
"command": "${CLAUDE_PROJECT_DIR}/scripts/entire-dev hooks claude-code post-task"
2622
}
2723
]
28-
}
29-
],
30-
"SessionEnd": [
24+
},
3125
{
32-
"matcher": "",
26+
"matcher": "TaskCreate|TaskUpdate",
3327
"hooks": [
3428
{
3529
"type": "command",
36-
"command": "${CLAUDE_PROJECT_DIR}/scripts/entire-dev hooks claude-code session-end"
30+
"command": "${CLAUDE_PROJECT_DIR}/scripts/entire-dev hooks claude-code post-todo"
3731
}
3832
]
3933
}
4034
],
41-
"UserPromptSubmit": [
35+
"PreToolUse": [
4236
{
43-
"matcher": "",
37+
"matcher": "Agent",
4438
"hooks": [
4539
{
4640
"type": "command",
47-
"command": "${CLAUDE_PROJECT_DIR}/scripts/entire-dev hooks claude-code user-prompt-submit"
41+
"command": "${CLAUDE_PROJECT_DIR}/scripts/entire-dev hooks claude-code pre-task"
4842
}
4943
]
5044
}
5145
],
52-
"Stop": [
46+
"SessionEnd": [
5347
{
5448
"matcher": "",
5549
"hooks": [
5650
{
5751
"type": "command",
58-
"command": "${CLAUDE_PROJECT_DIR}/scripts/entire-dev hooks claude-code stop"
52+
"command": "${CLAUDE_PROJECT_DIR}/scripts/entire-dev hooks claude-code session-end",
53+
"timeout": 60
5954
}
6055
]
6156
}
6257
],
63-
"PreToolUse": [
58+
"SessionStart": [
6459
{
65-
"matcher": "Task",
60+
"matcher": "",
6661
"hooks": [
6762
{
6863
"type": "command",
69-
"command": "${CLAUDE_PROJECT_DIR}/scripts/entire-dev hooks claude-code pre-task"
64+
"command": "bash ${CLAUDE_PROJECT_DIR}/.claude/scripts/remote-setup.sh"
65+
},
66+
{
67+
"type": "command",
68+
"command": "${CLAUDE_PROJECT_DIR}/scripts/entire-dev hooks claude-code session-start"
7069
}
7170
]
7271
}
7372
],
74-
"PostToolUse": [
73+
"Stop": [
7574
{
76-
"matcher": "Task",
75+
"matcher": "",
7776
"hooks": [
7877
{
7978
"type": "command",
80-
"command": "${CLAUDE_PROJECT_DIR}/scripts/entire-dev hooks claude-code post-task"
79+
"command": "${CLAUDE_PROJECT_DIR}/scripts/entire-dev hooks claude-code stop"
8180
}
8281
]
83-
},
82+
}
83+
],
84+
"UserPromptSubmit": [
8485
{
85-
"matcher": "TodoWrite",
86+
"matcher": "",
8687
"hooks": [
8788
{
8889
"type": "command",
89-
"command": "${CLAUDE_PROJECT_DIR}/scripts/entire-dev hooks claude-code post-todo"
90+
"command": "${CLAUDE_PROJECT_DIR}/scripts/entire-dev hooks claude-code user-prompt-submit"
9091
}
9192
]
9293
}

‎.codex/hooks.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"hooks": [
77
{
88
"type": "command",
9-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks codex post-tool-use",
9+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks codex post-tool-use",
1010
"timeout": 30
1111
}
1212
]
@@ -18,7 +18,7 @@
1818
"hooks": [
1919
{
2020
"type": "command",
21-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks codex session-start",
21+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks codex session-start",
2222
"timeout": 30
2323
}
2424
]
@@ -30,7 +30,7 @@
3030
"hooks": [
3131
{
3232
"type": "command",
33-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks codex stop",
33+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks codex stop",
3434
"timeout": 30
3535
}
3636
]
@@ -42,7 +42,7 @@
4242
"hooks": [
4343
{
4444
"type": "command",
45-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks codex user-prompt-submit",
45+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks codex user-prompt-submit",
4646
"timeout": 30
4747
}
4848
]

‎.cursor/hooks.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,37 @@
22
"hooks": {
33
"beforeSubmitPrompt": [
44
{
5-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks cursor before-submit-prompt"
5+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks cursor before-submit-prompt"
66
}
77
],
88
"preCompact": [
99
{
10-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks cursor pre-compact"
10+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks cursor pre-compact"
1111
}
1212
],
1313
"sessionEnd": [
1414
{
15-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks cursor session-end"
15+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks cursor session-end"
1616
}
1717
],
1818
"sessionStart": [
1919
{
20-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks cursor session-start"
20+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks cursor session-start"
2121
}
2222
],
2323
"stop": [
2424
{
25-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks cursor stop"
25+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks cursor stop"
2626
}
2727
],
2828
"subagentStart": [
2929
{
30-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks cursor subagent-start"
30+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks cursor subagent-start"
3131
}
3232
],
3333
"subagentStop": [
3434
{
35-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks cursor subagent-stop"
35+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks cursor subagent-stop"
3636
}
3737
]
3838
},

‎.gemini/settings.json‎

Lines changed: 46 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,40 @@
11
{
22
"context": {
3-
"fileName": ["AGENTS.md"]
3+
"fileName": [
4+
"AGENTS.md"
5+
]
46
},
57
"hooks": {
6-
"SessionStart": [
8+
"AfterAgent": [
79
{
810
"hooks": [
911
{
10-
"name": "entire-session-start",
12+
"name": "entire-after-agent",
1113
"type": "command",
12-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks gemini session-start"
14+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks gemini after-agent"
1315
}
1416
]
1517
}
1618
],
17-
"SessionEnd": [
19+
"AfterModel": [
1820
{
19-
"matcher": "exit",
2021
"hooks": [
2122
{
22-
"name": "entire-session-end-exit",
23+
"name": "entire-after-model",
2324
"type": "command",
24-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks gemini session-end"
25+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks gemini after-model"
2526
}
2627
]
27-
},
28+
}
29+
],
30+
"AfterTool": [
2831
{
29-
"matcher": "logout",
32+
"matcher": "*",
3033
"hooks": [
3134
{
32-
"name": "entire-session-end-logout",
35+
"name": "entire-after-tool",
3336
"type": "command",
34-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks gemini session-end"
37+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks gemini after-tool"
3538
}
3639
]
3740
}
@@ -42,102 +45,104 @@
4245
{
4346
"name": "entire-before-agent",
4447
"type": "command",
45-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks gemini before-agent"
48+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks gemini before-agent"
4649
}
4750
]
4851
}
4952
],
50-
"AfterAgent": [
53+
"BeforeModel": [
5154
{
5255
"hooks": [
5356
{
54-
"name": "entire-after-agent",
57+
"name": "entire-before-model",
5558
"type": "command",
56-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks gemini after-agent"
59+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks gemini before-model"
5760
}
5861
]
5962
}
6063
],
61-
"BeforeModel": [
64+
"BeforeTool": [
6265
{
66+
"matcher": "*",
6367
"hooks": [
6468
{
65-
"name": "entire-before-model",
69+
"name": "entire-before-tool",
6670
"type": "command",
67-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks gemini before-model"
71+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks gemini before-tool"
6872
}
6973
]
7074
}
7175
],
72-
"AfterModel": [
76+
"BeforeToolSelection": [
7377
{
7478
"hooks": [
7579
{
76-
"name": "entire-after-model",
80+
"name": "entire-before-tool-selection",
7781
"type": "command",
78-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks gemini after-model"
82+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks gemini before-tool-selection"
7983
}
8084
]
8185
}
8286
],
83-
"BeforeToolSelection": [
87+
"Notification": [
8488
{
8589
"hooks": [
8690
{
87-
"name": "entire-before-tool-selection",
91+
"name": "entire-notification",
8892
"type": "command",
89-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks gemini before-tool-selection"
93+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks gemini notification"
9094
}
9195
]
9296
}
9397
],
94-
"BeforeTool": [
98+
"PreCompress": [
9599
{
96-
"matcher": "*",
97100
"hooks": [
98101
{
99-
"name": "entire-before-tool",
102+
"name": "entire-pre-compress",
100103
"type": "command",
101-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks gemini before-tool"
104+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks gemini pre-compress"
102105
}
103106
]
104107
}
105108
],
106-
"AfterTool": [
109+
"SessionEnd": [
107110
{
108-
"matcher": "*",
111+
"matcher": "exit",
109112
"hooks": [
110113
{
111-
"name": "entire-after-tool",
114+
"name": "entire-session-end-exit",
112115
"type": "command",
113-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks gemini after-tool"
116+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks gemini session-end"
114117
}
115118
]
116-
}
117-
],
118-
"PreCompress": [
119+
},
119120
{
121+
"matcher": "logout",
120122
"hooks": [
121123
{
122-
"name": "entire-pre-compress",
124+
"name": "entire-session-end-logout",
123125
"type": "command",
124-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks gemini pre-compress"
126+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks gemini session-end"
125127
}
126128
]
127129
}
128130
],
129-
"Notification": [
131+
"SessionStart": [
130132
{
131133
"hooks": [
132134
{
133-
"name": "entire-notification",
135+
"name": "entire-session-start",
134136
"type": "command",
135-
"command": "go run \"$(git rev-parse --show-toplevel)\"/cmd/entire/main.go hooks gemini notification"
137+
"command": "\"$(git rev-parse --show-toplevel)\"/scripts/entire-dev hooks gemini session-start"
136138
}
137139
]
138140
}
139141
]
140142
},
143+
"hooksConfig": {
144+
"enabled": true
145+
},
141146
"tools": {
142147
"enableHooks": true
143148
}

0 commit comments

Comments
 (0)