genaicode 2.36.0 → 2.37.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agents/mcp-server.d.ts +2 -0
- package/dist/agents/mcp-server.js +6 -2
- package/dist/agents/mcp-server.js.map +1 -1
- package/dist/agents/mcp-tools.d.ts +1 -0
- package/dist/agents/mcp-tools.js +4 -1
- package/dist/agents/mcp-tools.js.map +1 -1
- package/dist/agents/sessions/answer.d.ts +53 -0
- package/dist/agents/sessions/answer.js +225 -0
- package/dist/agents/sessions/answer.js.map +1 -0
- package/dist/agents/sessions/archive.d.ts +26 -0
- package/dist/agents/sessions/archive.js +71 -0
- package/dist/agents/sessions/archive.js.map +1 -0
- package/dist/agents/sessions/files.js +2 -1
- package/dist/agents/sessions/files.js.map +1 -1
- package/dist/agents/sessions/group.d.ts +12 -0
- package/dist/agents/sessions/group.js +22 -0
- package/dist/agents/sessions/group.js.map +1 -1
- package/dist/agents/sessions/hook-input.d.ts +17 -0
- package/dist/agents/sessions/hook-input.js +110 -0
- package/dist/agents/sessions/hook-input.js.map +1 -0
- package/dist/agents/sessions/hooks.d.ts +19 -4
- package/dist/agents/sessions/hooks.js +113 -29
- package/dist/agents/sessions/hooks.js.map +1 -1
- package/dist/agents/sessions/index.d.ts +11 -4
- package/dist/agents/sessions/index.js +12 -5
- package/dist/agents/sessions/index.js.map +1 -1
- package/dist/agents/sessions/live.d.ts +6 -0
- package/dist/agents/sessions/live.js +14 -2
- package/dist/agents/sessions/live.js.map +1 -1
- package/dist/agents/sessions/notify.d.ts +34 -0
- package/dist/agents/sessions/notify.js +87 -0
- package/dist/agents/sessions/notify.js.map +1 -0
- package/dist/agents/sessions/tools.d.ts +7 -0
- package/dist/agents/sessions/tools.js +11 -2
- package/dist/agents/sessions/tools.js.map +1 -1
- package/dist/agents/sessions/types.d.ts +7 -0
- package/dist/agents.d.ts +2 -2
- package/dist/agents.js +1 -1
- package/dist/agents.js.map +1 -1
- package/dist/cli/args.d.ts +28 -0
- package/dist/cli/args.js +85 -6
- package/dist/cli/args.js.map +1 -1
- package/dist/cli/hook.d.ts +13 -1
- package/dist/cli/hook.js +54 -8
- package/dist/cli/hook.js.map +1 -1
- package/dist/cli/main.d.ts +4 -1
- package/dist/cli/main.js +215 -20
- package/dist/cli/main.js.map +1 -1
- package/dist/cli.js +15 -2
- package/dist/cli.js.map +1 -1
- package/dist/ui/index.js +96 -85
- package/dist/ui/sessions.d.ts +10 -2
- package/dist/ui/sessions.js +16 -1
- package/dist/ui/sessions.js.map +1 -1
- package/dist/ui/web-client.js +15 -15
- package/docs/CHANGELOG.md +20 -0
- package/docs/agents.md +79 -7
- package/docs/cli.md +15 -1
- package/package.json +1 -1
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The hooks of Gemini CLI, GitHub Copilot CLI and Cursor say what Claude Code's and Codex's say,
|
|
3
|
+
* in their own words. `hookInput` puts a hook's input in the words `liveEvent` reads: Claude
|
|
4
|
+
* Code's `hook_event_name`, `session_id`, `cwd`, `tool_name`, `tool_input`.
|
|
5
|
+
*/
|
|
6
|
+
const isObject = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
7
|
+
const text = (value) => (typeof value === 'string' && value ? value : undefined);
|
|
8
|
+
/** Event names, per agent, as Claude Code calls them. Events not named here change nothing. */
|
|
9
|
+
const EVENT_NAMES = {
|
|
10
|
+
gemini: {
|
|
11
|
+
SessionStart: 'SessionStart',
|
|
12
|
+
BeforeAgent: 'UserPromptSubmit',
|
|
13
|
+
AfterTool: 'PostToolUse',
|
|
14
|
+
AfterAgent: 'Stop',
|
|
15
|
+
SessionEnd: 'SessionEnd',
|
|
16
|
+
},
|
|
17
|
+
// Copilot's own (camelCase) events carry no event name: the hook's command line gives it.
|
|
18
|
+
copilot: {
|
|
19
|
+
sessionStart: 'SessionStart',
|
|
20
|
+
userPromptSubmitted: 'UserPromptSubmit',
|
|
21
|
+
permissionRequest: 'PermissionRequest',
|
|
22
|
+
postToolUse: 'PostToolUse',
|
|
23
|
+
postToolUseFailure: 'PostToolUseFailure',
|
|
24
|
+
agentStop: 'Stop',
|
|
25
|
+
sessionEnd: 'SessionEnd',
|
|
26
|
+
},
|
|
27
|
+
cursor: {
|
|
28
|
+
sessionStart: 'SessionStart',
|
|
29
|
+
beforeSubmitPrompt: 'UserPromptSubmit',
|
|
30
|
+
postToolUse: 'PostToolUse',
|
|
31
|
+
postToolUseFailure: 'PostToolUseFailure',
|
|
32
|
+
stop: 'Stop',
|
|
33
|
+
sessionEnd: 'SessionEnd',
|
|
34
|
+
},
|
|
35
|
+
};
|
|
36
|
+
/** The events genaicode's hook is installed for, per agent, in the agent's own words. */
|
|
37
|
+
export const AGENT_EVENTS = {
|
|
38
|
+
gemini: [...Object.keys(EVENT_NAMES.gemini), 'Notification'],
|
|
39
|
+
copilot: Object.keys(EVENT_NAMES.copilot),
|
|
40
|
+
cursor: Object.keys(EVENT_NAMES.cursor),
|
|
41
|
+
};
|
|
42
|
+
/** Copilot hands a tool's arguments over as JSON text: the same call reads the same either way. */
|
|
43
|
+
function args(value) {
|
|
44
|
+
if (typeof value !== 'string')
|
|
45
|
+
return value;
|
|
46
|
+
try {
|
|
47
|
+
return JSON.parse(value);
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
return value;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* `input` as Claude Code would have put it; as it is for an agent that already does (Claude Code,
|
|
55
|
+
* Codex). `event`: the event the hook was installed for, when the input does not name it.
|
|
56
|
+
*/
|
|
57
|
+
export function hookInput(agent, input, event) {
|
|
58
|
+
const names = EVENT_NAMES[agent];
|
|
59
|
+
if (!names || !isObject(input))
|
|
60
|
+
return input;
|
|
61
|
+
const own = event ?? text(input.hook_event_name);
|
|
62
|
+
if (!own)
|
|
63
|
+
return undefined;
|
|
64
|
+
const id = text(input.session_id) ?? text(input.sessionId) ?? text(input.conversation_id);
|
|
65
|
+
const roots = Array.isArray(input.workspace_roots) ? input.workspace_roots : [];
|
|
66
|
+
const cwd = text(input.cwd) ?? text(roots[0]);
|
|
67
|
+
const tool = text(input.tool_name) ?? text(input.toolName);
|
|
68
|
+
// Copilot's `permissionRequest` names it `toolInput`, its tool hooks `toolArgs`.
|
|
69
|
+
const toolInput = 'tool_input' in input ? input.tool_input : 'toolInput' in input ? args(input.toolInput) : args(input.toolArgs);
|
|
70
|
+
const base = {
|
|
71
|
+
...(id ? { session_id: id } : {}),
|
|
72
|
+
...(cwd ? { cwd } : {}),
|
|
73
|
+
...(tool ? { tool_name: tool, tool_input: toolInput } : {}),
|
|
74
|
+
};
|
|
75
|
+
// Gemini tells of a question only in a notification, which names no tool the way its other hooks do.
|
|
76
|
+
if (agent === 'gemini' && own === 'Notification') {
|
|
77
|
+
if (input.notification_type !== 'ToolPermission')
|
|
78
|
+
return undefined;
|
|
79
|
+
return {
|
|
80
|
+
session_id: id,
|
|
81
|
+
...(cwd ? { cwd } : {}),
|
|
82
|
+
hook_event_name: 'Notification',
|
|
83
|
+
notification_type: 'permission_prompt',
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
const name = names[own];
|
|
87
|
+
if (!name)
|
|
88
|
+
return undefined;
|
|
89
|
+
if (name === 'SessionStart') {
|
|
90
|
+
// Copilot and Gemini start a session over after a compaction or /clear: still the same one at work.
|
|
91
|
+
const source = text(input.source);
|
|
92
|
+
return { ...base, hook_event_name: name, ...(source === 'compact' ? { source } : {}) };
|
|
93
|
+
}
|
|
94
|
+
return { ...base, hook_event_name: name };
|
|
95
|
+
}
|
|
96
|
+
/**
|
|
97
|
+
* What the hook prints for `agent` after `event`. Cursor blocks a prompt whose hook answers
|
|
98
|
+
* nothing it can read, so it gets "go on"; Gemini reads every hook's output as JSON.
|
|
99
|
+
*/
|
|
100
|
+
export function hookOutput(agent, event) {
|
|
101
|
+
// Not knowing the event, it lets the prompt through all the same.
|
|
102
|
+
if (agent === 'cursor')
|
|
103
|
+
return event === undefined || event === 'beforeSubmitPrompt' ? '{"continue":true}\n' : '{}\n';
|
|
104
|
+
if (agent === 'gemini')
|
|
105
|
+
return '{}\n';
|
|
106
|
+
if (event === 'Stop' || event === 'agentStop')
|
|
107
|
+
return '{}\n';
|
|
108
|
+
return undefined;
|
|
109
|
+
}
|
|
110
|
+
//# sourceMappingURL=hook-input.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hook-input.js","sourceRoot":"","sources":["../../../src/agents/sessions/hook-input.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
/** The agents whose hooks can report what a session is doing. */
|
|
2
|
-
export declare const HOOK_AGENTS: readonly ["claude", "codex"];
|
|
2
|
+
export declare const HOOK_AGENTS: readonly ["claude", "codex", "gemini", "copilot", "cursor"];
|
|
3
3
|
export type HookAgent = (typeof HOOK_AGENTS)[number];
|
|
4
4
|
export interface HooksOptions {
|
|
5
5
|
env?: NodeJS.ProcessEnv;
|
|
6
6
|
/** The command a hook runs, without the agent: default `"<node>" "<this genaicode's cli.js>" hook`. */
|
|
7
7
|
command?: string;
|
|
8
|
+
/**
|
|
9
|
+
* Also hold each question open so it can be answered from the tower (`genaicode sessions
|
|
10
|
+
* approve`, the browser): Claude Code only. Its dialog shows as before; the first answer counts.
|
|
11
|
+
*/
|
|
12
|
+
answer?: boolean;
|
|
8
13
|
}
|
|
9
14
|
export interface HooksStatus {
|
|
10
15
|
agent: HookAgent;
|
|
@@ -16,11 +21,21 @@ export interface HooksStatus {
|
|
|
16
21
|
installed: boolean;
|
|
17
22
|
/** The installed command, when there is one. */
|
|
18
23
|
command?: string;
|
|
24
|
+
/** Whether questions can be answered from the tower too (`--answer`). */
|
|
25
|
+
answer: boolean;
|
|
19
26
|
}
|
|
20
|
-
/**
|
|
27
|
+
/**
|
|
28
|
+
* The file `agent` reads its user-level hooks from. Copilot reads every file in
|
|
29
|
+
* `~/.copilot/hooks`, so genaicode's are in one of their own.
|
|
30
|
+
*/
|
|
21
31
|
export declare function hooksFile(agent: HookAgent, env?: NodeJS.ProcessEnv): string;
|
|
22
|
-
/**
|
|
23
|
-
|
|
32
|
+
/**
|
|
33
|
+
* The command line of the hook for `agent`; `answer`: the one that holds a question open;
|
|
34
|
+
* `event`: for Copilot, whose hooks are not told which event they run for.
|
|
35
|
+
*/
|
|
36
|
+
export declare function hookCommand(agent: HookAgent, command: string, answer?: boolean, event?: string): string;
|
|
37
|
+
/** The agents whose dialog stays open while a hook holds the question: Codex would wait instead. */
|
|
38
|
+
export declare const ANSWER_AGENTS: readonly HookAgent[];
|
|
24
39
|
/** What is installed for `agent` now. */
|
|
25
40
|
export declare function hooksStatus(agent: HookAgent, options?: HooksOptions): Promise<HooksStatus>;
|
|
26
41
|
/**
|
|
@@ -2,11 +2,17 @@ import { promises as fs } from 'node:fs';
|
|
|
2
2
|
import { homedir } from 'node:os';
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import { fileURLToPath } from 'node:url';
|
|
5
|
+
import { AGENT_EVENTS } from './hook-input.js';
|
|
5
6
|
/** The agents whose hooks can report what a session is doing. */
|
|
6
|
-
export const HOOK_AGENTS = ['claude', 'codex'];
|
|
7
|
+
export const HOOK_AGENTS = ['claude', 'codex', 'gemini', 'copilot', 'cursor'];
|
|
7
8
|
/** Ends every hook command genaicode installs: how its own entries are told from the user's. */
|
|
8
9
|
const MARKER = '--genaicode-live';
|
|
9
|
-
/**
|
|
10
|
+
/** Marks the hook that holds a question open for the tower (`--answer`). */
|
|
11
|
+
const ANSWER = '--answer';
|
|
12
|
+
/**
|
|
13
|
+
* The events reported, per agent, in the agent's own words. Claude Code and Codex wait for
|
|
14
|
+
* `SessionEnd` and run the rest in the background; the others run hooks as they come.
|
|
15
|
+
*/
|
|
10
16
|
const EVENTS = {
|
|
11
17
|
claude: [
|
|
12
18
|
'SessionStart',
|
|
@@ -21,20 +27,52 @@ const EVENTS = {
|
|
|
21
27
|
'SessionEnd',
|
|
22
28
|
],
|
|
23
29
|
codex: ['SessionStart', 'UserPromptSubmit', 'PermissionRequest', 'PostToolUse', 'Stop', 'Interrupt', 'SessionEnd'],
|
|
30
|
+
...AGENT_EVENTS,
|
|
24
31
|
};
|
|
25
|
-
/**
|
|
32
|
+
/**
|
|
33
|
+
* The file `agent` reads its user-level hooks from. Copilot reads every file in
|
|
34
|
+
* `~/.copilot/hooks`, so genaicode's are in one of their own.
|
|
35
|
+
*/
|
|
26
36
|
export function hooksFile(agent, env = process.env) {
|
|
27
37
|
const home = env.HOME ?? env.USERPROFILE ?? homedir();
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
38
|
+
switch (agent) {
|
|
39
|
+
case 'claude':
|
|
40
|
+
return path.join(env.CLAUDE_CONFIG_DIR ?? path.join(home, '.claude'), 'settings.json');
|
|
41
|
+
case 'codex':
|
|
42
|
+
return path.join(env.CODEX_HOME ?? path.join(home, '.codex'), 'hooks.json');
|
|
43
|
+
case 'gemini':
|
|
44
|
+
return path.join(env.GEMINI_CLI_HOME ?? home, '.gemini', 'settings.json');
|
|
45
|
+
case 'copilot':
|
|
46
|
+
return path.join(env.COPILOT_HOME ?? path.join(home, '.copilot'), 'hooks', 'genaicode.json');
|
|
47
|
+
case 'cursor':
|
|
48
|
+
return path.join(home, '.cursor', 'hooks.json');
|
|
49
|
+
}
|
|
31
50
|
}
|
|
32
|
-
/**
|
|
33
|
-
|
|
34
|
-
|
|
51
|
+
/**
|
|
52
|
+
* The command line of the hook for `agent`; `answer`: the one that holds a question open;
|
|
53
|
+
* `event`: for Copilot, whose hooks are not told which event they run for.
|
|
54
|
+
*/
|
|
55
|
+
export function hookCommand(agent, command, answer = false, event) {
|
|
56
|
+
return `${command} ${agent}${event ? ` ${event}` : ''}${answer ? ` ${ANSWER}` : ''} ${MARKER}`;
|
|
35
57
|
}
|
|
58
|
+
/** The hook's command for `event` of `agent`. */
|
|
59
|
+
const commandFor = (agent, command, event) => hookCommand(agent, command, false, agent === 'copilot' ? event : undefined);
|
|
60
|
+
/** Copilot and Cursor list handlers under each event; the others list groups of them (`{ hooks: [...] }`). */
|
|
61
|
+
const FLAT = ['copilot', 'cursor'];
|
|
62
|
+
/** The agents whose dialog stays open while a hook holds the question: Codex would wait instead. */
|
|
63
|
+
export const ANSWER_AGENTS = ['claude'];
|
|
64
|
+
/** How long Claude Code waits for that hook, seconds; it gives up a minute before. */
|
|
65
|
+
const ANSWER_TIMEOUT = 600;
|
|
36
66
|
const isObject = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
37
|
-
|
|
67
|
+
/** A handler's command line: Copilot's is under `bash` (and `powershell`). */
|
|
68
|
+
const commandOf = (handler) => !isObject(handler)
|
|
69
|
+
? undefined
|
|
70
|
+
: typeof handler.command === 'string'
|
|
71
|
+
? handler.command
|
|
72
|
+
: typeof handler.bash === 'string'
|
|
73
|
+
? handler.bash
|
|
74
|
+
: undefined;
|
|
75
|
+
const ours = (handler) => commandOf(handler)?.endsWith(MARKER) === true;
|
|
38
76
|
async function readConfig(file) {
|
|
39
77
|
let source;
|
|
40
78
|
try {
|
|
@@ -76,6 +114,8 @@ function without(config) {
|
|
|
76
114
|
continue;
|
|
77
115
|
}
|
|
78
116
|
const kept = groups.flatMap((group) => {
|
|
117
|
+
if (ours(group))
|
|
118
|
+
return [];
|
|
79
119
|
if (!isObject(group) || !Array.isArray(group.hooks) || !group.hooks.some(ours))
|
|
80
120
|
return [group];
|
|
81
121
|
const handlers = group.hooks.filter((handler) => !ours(handler));
|
|
@@ -88,6 +128,10 @@ function without(config) {
|
|
|
88
128
|
delete rest.hooks;
|
|
89
129
|
return Object.keys(hooks).length ? { ...rest, hooks } : rest;
|
|
90
130
|
}
|
|
131
|
+
/** The handlers declared for one event: in groups, or listed as they are (Copilot, Cursor). */
|
|
132
|
+
function handlersOf(groups) {
|
|
133
|
+
return (Array.isArray(groups) ? groups : []).flatMap((group) => isObject(group) && Array.isArray(group.hooks) ? group.hooks : [group]);
|
|
134
|
+
}
|
|
91
135
|
/** This package's own `cli.js`, whoever calls: the CLI or an app that imports `installHooks`. */
|
|
92
136
|
function defaultCommand() {
|
|
93
137
|
const script = fileURLToPath(new URL('../../cli.js', import.meta.url));
|
|
@@ -95,29 +139,35 @@ function defaultCommand() {
|
|
|
95
139
|
}
|
|
96
140
|
function found(config) {
|
|
97
141
|
const events = [];
|
|
98
|
-
|
|
142
|
+
const commands = new Map();
|
|
143
|
+
let answer;
|
|
99
144
|
for (const [event, groups] of Object.entries(isObject(config.hooks) ? config.hooks : {})) {
|
|
100
|
-
for (const
|
|
101
|
-
const
|
|
102
|
-
if (
|
|
145
|
+
for (const handler of handlersOf(groups).filter(ours)) {
|
|
146
|
+
const command = commandOf(handler);
|
|
147
|
+
if (command.endsWith(`${ANSWER} ${MARKER}`)) {
|
|
148
|
+
answer = command;
|
|
103
149
|
continue;
|
|
104
|
-
|
|
105
|
-
|
|
150
|
+
}
|
|
151
|
+
if (!events.includes(event))
|
|
152
|
+
events.push(event);
|
|
153
|
+
commands.set(event, command);
|
|
106
154
|
}
|
|
107
155
|
}
|
|
108
|
-
return { events, ...(
|
|
156
|
+
return { events, commands, ...(answer ? { answer } : {}) };
|
|
109
157
|
}
|
|
110
158
|
/** What is installed for `agent` now. */
|
|
111
159
|
export async function hooksStatus(agent, options = {}) {
|
|
112
160
|
const file = hooksFile(agent, options.env);
|
|
113
|
-
const { events,
|
|
114
|
-
const
|
|
161
|
+
const { events, commands, answer } = found(await readConfig(file));
|
|
162
|
+
const base = options.command ?? defaultCommand();
|
|
163
|
+
const command = [...commands.values()].pop();
|
|
115
164
|
return {
|
|
116
165
|
agent,
|
|
117
166
|
file,
|
|
118
167
|
events,
|
|
119
|
-
installed:
|
|
168
|
+
installed: EVENTS[agent].every((event) => commands.get(event) === commandFor(agent, base, event)),
|
|
120
169
|
...(command ? { command } : {}),
|
|
170
|
+
answer: answer === hookCommand(agent, base, true),
|
|
121
171
|
};
|
|
122
172
|
}
|
|
123
173
|
/**
|
|
@@ -127,29 +177,63 @@ export async function hooksStatus(agent, options = {}) {
|
|
|
127
177
|
export async function installHooks(agent, options = {}) {
|
|
128
178
|
const file = hooksFile(agent, options.env);
|
|
129
179
|
const config = without(await readConfig(file));
|
|
130
|
-
const
|
|
180
|
+
const base = options.command ?? defaultCommand();
|
|
131
181
|
const hooks = isObject(config.hooks) ? { ...config.hooks } : {};
|
|
132
182
|
for (const event of EVENTS[agent]) {
|
|
133
183
|
const groups = Array.isArray(hooks[event]) ? hooks[event] : [];
|
|
134
|
-
|
|
184
|
+
const handler = handlerFor(agent, commandFor(agent, base, event), event);
|
|
185
|
+
hooks[event] = [...groups, FLAT.includes(agent) ? handler : { hooks: [handler] }];
|
|
186
|
+
}
|
|
187
|
+
if (options.answer && ANSWER_AGENTS.includes(agent)) {
|
|
188
|
+
// Waited for: it holds the question while the agent's dialog shows it too.
|
|
135
189
|
const handler = {
|
|
136
190
|
type: 'command',
|
|
137
|
-
command,
|
|
138
|
-
timeout:
|
|
139
|
-
...(event === 'SessionEnd' ? {} : { async: true }),
|
|
191
|
+
command: hookCommand(agent, options.command ?? defaultCommand(), true),
|
|
192
|
+
timeout: ANSWER_TIMEOUT,
|
|
140
193
|
};
|
|
141
|
-
hooks
|
|
194
|
+
hooks.PermissionRequest = [...hooks.PermissionRequest, { hooks: [handler] }];
|
|
142
195
|
}
|
|
143
|
-
|
|
196
|
+
// Copilot and Cursor want to know which version of the file's format they read.
|
|
197
|
+
await writeConfig(file, { ...(FLAT.includes(agent) ? { version: 1 } : {}), ...config, hooks });
|
|
144
198
|
return hooksStatus(agent, options);
|
|
145
199
|
}
|
|
200
|
+
/** One handler, in the agent's own format. */
|
|
201
|
+
function handlerFor(agent, command, event) {
|
|
202
|
+
switch (agent) {
|
|
203
|
+
case 'claude':
|
|
204
|
+
case 'codex':
|
|
205
|
+
// Codex gives an `Interrupt` hook three seconds at most.
|
|
206
|
+
return {
|
|
207
|
+
type: 'command',
|
|
208
|
+
command,
|
|
209
|
+
timeout: event === 'Interrupt' ? 3 : 10,
|
|
210
|
+
...(event === 'SessionEnd' ? {} : { async: true }),
|
|
211
|
+
};
|
|
212
|
+
case 'gemini':
|
|
213
|
+
// Milliseconds; the name is how `/hooks` lists it.
|
|
214
|
+
return { type: 'command', name: 'genaicode', command, timeout: 10_000 };
|
|
215
|
+
case 'copilot':
|
|
216
|
+
return { type: 'command', bash: command, powershell: `& ${command}`, timeoutSec: 10 };
|
|
217
|
+
case 'cursor':
|
|
218
|
+
return { command, timeout: 10 };
|
|
219
|
+
}
|
|
220
|
+
}
|
|
146
221
|
/** Take genaicode's hook out of the hooks of `agent`. Resolves to whether there was one. */
|
|
147
222
|
export async function uninstallHooks(agent, options = {}) {
|
|
148
223
|
const file = hooksFile(agent, options.env);
|
|
149
224
|
const config = await readConfig(file);
|
|
150
|
-
|
|
225
|
+
const { events, answer } = found(config);
|
|
226
|
+
if (!events.length && !answer)
|
|
151
227
|
return false;
|
|
152
|
-
|
|
228
|
+
const left = without(config);
|
|
229
|
+
// A file only genaicode's hooks were in goes with them, and so does Copilot's folder for them.
|
|
230
|
+
if (Object.keys(left).every((key) => key === 'version')) {
|
|
231
|
+
await fs.rm(file, { force: true });
|
|
232
|
+
if (agent === 'copilot')
|
|
233
|
+
await fs.rmdir(path.dirname(file)).catch(() => undefined);
|
|
234
|
+
}
|
|
235
|
+
else
|
|
236
|
+
await writeConfig(file, left);
|
|
153
237
|
return true;
|
|
154
238
|
}
|
|
155
239
|
//# sourceMappingURL=hooks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../../src/agents/sessions/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../../src/agents/sessions/hooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import type { CodingAgent } from '../types.js';
|
|
|
2
2
|
import type { SessionListing } from './group.js';
|
|
3
3
|
import type { SessionTurn } from '../session.js';
|
|
4
4
|
import type { SessionInfo, SessionQuery, SessionReadOptions, SessionSource } from './types.js';
|
|
5
|
-
export { groupSessions } from './group.js';
|
|
5
|
+
export { groupSessions, waitingSessions } from './group.js';
|
|
6
6
|
export type { SessionListing, SessionProject } from './group.js';
|
|
7
7
|
export { claudeSessions, claudeTranscript, readClaudeSession } from './claude.js';
|
|
8
8
|
export type { ClaudeSessionsOptions } from './claude.js';
|
|
@@ -12,13 +12,20 @@ export { codexThreads, codexTurns, openCodexServer, readCodexThread } from './co
|
|
|
12
12
|
export type { CodexServer, CodexServerOptions } from './codex-api.js';
|
|
13
13
|
export { antigravitySessions, copilotSessions, copilotTranscript, cursorSessions, geminiSessions, geminiTranscript, museTranscript, antigravityTranscript, vibeTranscript, museSessions, vibeSessions, } from './stores.js';
|
|
14
14
|
export type { StoreOptions } from './stores.js';
|
|
15
|
-
export { liveDir, liveEvent, readLive, recordHook, withLive } from './live.js';
|
|
15
|
+
export { liveDir, liveEvent, liveRecord, readLive, recordHook, withLive } from './live.js';
|
|
16
|
+
export { hookInput } from './hook-input.js';
|
|
17
|
+
export { archiveFile, archiveKey, archiveSessions, isArchived, readArchive, STALE_MS, staleSessions, withArchive, } from './archive.js';
|
|
18
|
+
export type { SessionArchive } from './archive.js';
|
|
19
|
+
export { answerAsk, askPreview, asksDir, pendingAsks, waitForAnswer } from './answer.js';
|
|
20
|
+
export type { AskDecision, PendingAsk, WaitOptions } from './answer.js';
|
|
21
|
+
export { noticeFor, notifyFile, readNotify, sendNotice, writeNotify } from './notify.js';
|
|
22
|
+
export type { Notice, NotifySettings, SendOptions } from './notify.js';
|
|
16
23
|
export type { LiveRecord, LiveState } from './live.js';
|
|
17
|
-
export { HOOK_AGENTS, hookCommand, hooksFile, hooksStatus, installHooks, uninstallHooks } from './hooks.js';
|
|
24
|
+
export { ANSWER_AGENTS, HOOK_AGENTS, hookCommand, hooksFile, hooksStatus, installHooks, uninstallHooks, } from './hooks.js';
|
|
18
25
|
export type { HookAgent, HooksOptions, HooksStatus } from './hooks.js';
|
|
19
26
|
export { checkSessions, cliVersion } from './doctor.js';
|
|
20
27
|
export type { SessionCheck, SessionCheckOptions } from './doctor.js';
|
|
21
|
-
export { serveMcpStdio, sessionTools } from './tools.js';
|
|
28
|
+
export { serveMcpStdio, SESSION_TOOLS_INSTRUCTIONS, sessionTools } from './tools.js';
|
|
22
29
|
export type { SessionToolsOptions } from './tools.js';
|
|
23
30
|
export type { SessionInfo, SessionQuery, SessionReadOptions, SessionSource, SessionActivity } from './types.js';
|
|
24
31
|
/**
|
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
import { readLive, withLive } from './live.js';
|
|
2
|
-
|
|
2
|
+
import { readArchive, withArchive } from './archive.js';
|
|
3
|
+
export { groupSessions, waitingSessions } from './group.js';
|
|
3
4
|
export { claudeSessions, claudeTranscript, readClaudeSession } from './claude.js';
|
|
4
5
|
export { codexSessions, codexTranscript, readCodexSession } from './codex.js';
|
|
5
6
|
export { codexThreads, codexTurns, openCodexServer, readCodexThread } from './codex-api.js';
|
|
6
7
|
export { antigravitySessions, copilotSessions, copilotTranscript, cursorSessions, geminiSessions, geminiTranscript, museTranscript, antigravityTranscript, vibeTranscript, museSessions, vibeSessions, } from './stores.js';
|
|
7
|
-
export { liveDir, liveEvent, readLive, recordHook, withLive } from './live.js';
|
|
8
|
-
export {
|
|
8
|
+
export { liveDir, liveEvent, liveRecord, readLive, recordHook, withLive } from './live.js';
|
|
9
|
+
export { hookInput } from './hook-input.js';
|
|
10
|
+
export { archiveFile, archiveKey, archiveSessions, isArchived, readArchive, STALE_MS, staleSessions, withArchive, } from './archive.js';
|
|
11
|
+
export { answerAsk, askPreview, asksDir, pendingAsks, waitForAnswer } from './answer.js';
|
|
12
|
+
export { noticeFor, notifyFile, readNotify, sendNotice, writeNotify } from './notify.js';
|
|
13
|
+
export { ANSWER_AGENTS, HOOK_AGENTS, hookCommand, hooksFile, hooksStatus, installHooks, uninstallHooks, } from './hooks.js';
|
|
9
14
|
export { checkSessions, cliVersion } from './doctor.js';
|
|
10
|
-
export { serveMcpStdio, sessionTools } from './tools.js';
|
|
15
|
+
export { serveMcpStdio, SESSION_TOOLS_INSTRUCTIONS, sessionTools } from './tools.js';
|
|
11
16
|
/**
|
|
12
17
|
* The session sources of `agents`, one per store: `codex()` and `codexLive()` share theirs.
|
|
13
18
|
* Agents that keep no readable sessions (`sessions: null`) add nothing.
|
|
@@ -40,7 +45,9 @@ export async function listSessions(sources, query = {}) {
|
|
|
40
45
|
// A session counts from its latest news, which may be a hook's.
|
|
41
46
|
found = withLive(found, live).filter((session) => query.since === undefined || session.updatedAt >= query.since);
|
|
42
47
|
}
|
|
43
|
-
|
|
48
|
+
// Sessions put away (`genaicode sessions archive`) say so.
|
|
49
|
+
const archive = await readArchive(query.env);
|
|
50
|
+
const sessions = withArchive(found, archive).sort((a, b) => b.updatedAt - a.updatedAt);
|
|
44
51
|
return { sessions: query.limit === undefined ? sessions : sessions.slice(0, query.limit), errors };
|
|
45
52
|
}
|
|
46
53
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/agents/sessions/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAmB,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/agents/sessions/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,13 @@ export interface LiveEvent {
|
|
|
56
56
|
export declare function recordHook(agent: string, input: unknown, options?: {
|
|
57
57
|
env?: NodeJS.ProcessEnv;
|
|
58
58
|
now?: number;
|
|
59
|
+
/** Told what the record was and what it is now, once it is written (`genaicode notify`). */
|
|
60
|
+
onRecord?(before: LiveRecord | undefined, after: LiveRecord): void;
|
|
59
61
|
}): Promise<LiveRecord | undefined>;
|
|
62
|
+
/** What the hooks of `agent` last said about session `id`, also that it ended; undefined when nothing. */
|
|
63
|
+
export declare function liveRecord(agent: string, id: string, env?: NodeJS.ProcessEnv): Promise<(Omit<LiveRecord, 'state'> & {
|
|
64
|
+
state: LiveState | 'ended';
|
|
65
|
+
}) | undefined>;
|
|
60
66
|
/** Every record kept, by `agent:id`. Records too old to mean anything are removed on the way. */
|
|
61
67
|
export declare function readLive(env?: NodeJS.ProcessEnv, now?: number): Promise<Map<string, LiveRecord>>;
|
|
62
68
|
/**
|
|
@@ -211,6 +211,9 @@ export async function recordHook(agent, input, options = {}) {
|
|
|
211
211
|
const temporary = `${file}.${process.pid}.tmp`;
|
|
212
212
|
await fs.writeFile(temporary, `${JSON.stringify(record)}\n`, { mode: 0o600 });
|
|
213
213
|
await fs.rename(temporary, file);
|
|
214
|
+
if (record.state !== 'ended') {
|
|
215
|
+
options.onRecord?.(before && before.state !== 'ended' ? before : undefined, record);
|
|
216
|
+
}
|
|
214
217
|
return changed && record.state !== 'ended' ? record : undefined;
|
|
215
218
|
}
|
|
216
219
|
finally {
|
|
@@ -245,6 +248,10 @@ async function lock(lockDir) {
|
|
|
245
248
|
// Better a rare lost update than a hook that hangs.
|
|
246
249
|
return async () => undefined;
|
|
247
250
|
}
|
|
251
|
+
/** What the hooks of `agent` last said about session `id`, also that it ended; undefined when nothing. */
|
|
252
|
+
export async function liveRecord(agent, id, env = process.env) {
|
|
253
|
+
return readRecord(fileOf(liveDir(env), agent, id));
|
|
254
|
+
}
|
|
248
255
|
/** Every record kept, by `agent:id`. Records too old to mean anything are removed on the way. */
|
|
249
256
|
export async function readLive(env = process.env, now = Date.now()) {
|
|
250
257
|
const dir = liveDir(env);
|
|
@@ -271,6 +278,8 @@ export async function readLive(env = process.env, now = Date.now()) {
|
|
|
271
278
|
}));
|
|
272
279
|
return records;
|
|
273
280
|
}
|
|
281
|
+
/** `heardAt` when the hooks' latest report is later than the session's shown time. */
|
|
282
|
+
const heard = (updatedAt, seen) => (seen > updatedAt ? { heardAt: seen } : {});
|
|
274
283
|
/**
|
|
275
284
|
* `sessions` with what the agents' hooks reported put over what the files suggest: `state`, and
|
|
276
285
|
* `waitingFor` (`approval` with the tool asked for, or `reply`). A record the session's file has
|
|
@@ -291,15 +300,18 @@ export function withLive(sessions, live, now = Date.now()) {
|
|
|
291
300
|
return session;
|
|
292
301
|
if (now - Math.max(seen, session.updatedAt) > WORKING_MS)
|
|
293
302
|
return session;
|
|
294
|
-
|
|
303
|
+
const updatedAt = Math.max(session.updatedAt, record.at);
|
|
304
|
+
return { ...session, state: 'active', updatedAt, ...heard(updatedAt, seen) };
|
|
295
305
|
}
|
|
296
306
|
// Written to after the agent stopped: something the hooks did not see went on.
|
|
297
307
|
if (session.updatedAt > seen + LAG_MS)
|
|
298
308
|
return session;
|
|
309
|
+
const updatedAt = Math.max(session.updatedAt, record.at);
|
|
299
310
|
return {
|
|
300
311
|
...session,
|
|
301
312
|
state: 'waiting',
|
|
302
|
-
updatedAt
|
|
313
|
+
updatedAt,
|
|
314
|
+
...heard(updatedAt, seen),
|
|
303
315
|
waitingFor: record.state === 'approval' ? 'approval' : 'reply',
|
|
304
316
|
...(record.state === 'approval' && record.tool ? { waitingTool: record.tool } : {}),
|
|
305
317
|
};
|