@pugi/cli 0.1.0-beta.24 → 0.1.0-beta.26
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/core/checkpoint/resumer.js +149 -0
- package/dist/core/checkpoint/rewinder.js +291 -0
- package/dist/core/compact/summarizer.js +12 -0
- package/dist/core/dispatch/cache-cleanup.js +197 -0
- package/dist/core/dispatch/cache-handoff.js +295 -0
- package/dist/core/engine/native-pugi.js +67 -3
- package/dist/core/engine/tool-bridge.js +123 -3
- package/dist/core/hooks/events.js +44 -0
- package/dist/core/hooks/index.js +15 -0
- package/dist/core/hooks/registry.js +213 -0
- package/dist/core/hooks/runner.js +236 -0
- package/dist/core/lsp/cache.js +105 -0
- package/dist/core/lsp/language-detect.js +66 -0
- package/dist/core/lsp/post-edit-diagnostics.js +171 -0
- package/dist/core/memory-sync/queue.js +158 -0
- package/dist/core/memory-sync/queue.spec.js +105 -0
- package/dist/core/repl/session.js +73 -1
- package/dist/core/repl/slash-commands.js +20 -0
- package/dist/core/repl/store/session-store.js +31 -2
- package/dist/core/repo-map/build.js +125 -0
- package/dist/core/repo-map/cache.js +185 -0
- package/dist/core/repo-map/extractor.js +254 -0
- package/dist/core/repo-map/formatter.js +145 -0
- package/dist/core/repo-map/scanner.js +211 -0
- package/dist/core/session.js +44 -0
- package/dist/core/settings.js +9 -0
- package/dist/core/telemetry/emitter.js +229 -0
- package/dist/core/telemetry/queue.js +251 -0
- package/dist/runtime/cli.js +216 -0
- package/dist/runtime/commands/dispatch.js +126 -0
- package/dist/runtime/commands/hooks.js +184 -0
- package/dist/runtime/commands/lsp.js +25 -23
- package/dist/runtime/commands/memory.js +508 -0
- package/dist/runtime/commands/memory.spec.js +174 -0
- package/dist/runtime/commands/repo-map.js +95 -0
- package/dist/runtime/commands/resume.js +118 -0
- package/dist/runtime/commands/rewind.js +333 -0
- package/dist/runtime/commands/sessions.js +163 -0
- package/dist/runtime/version.js +1 -1
- package/dist/tools/agent-tool.js +23 -0
- package/package.json +2 -2
|
@@ -0,0 +1,213 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Pugi hooks MVP — registry (Leak L12, first pass).
|
|
3
|
+
*
|
|
4
|
+
* Reads `<home>/hooks-mvp.json` and validates its shape with Zod. The
|
|
5
|
+
* file uses the Claude Code-style nested config:
|
|
6
|
+
*
|
|
7
|
+
* {
|
|
8
|
+
* "hooks": {
|
|
9
|
+
* "SessionStart": [{ "command": "echo session-start" }],
|
|
10
|
+
* "PreToolUse": [{ "matcher": "bash", "command": "echo bash-pre", "blocking": true }]
|
|
11
|
+
* }
|
|
12
|
+
* }
|
|
13
|
+
*
|
|
14
|
+
* Schema constraints:
|
|
15
|
+
* - Each hook entry MUST have a `command` (non-empty string).
|
|
16
|
+
* - `matcher` is optional. Defaults to `*` (any tool / any payload).
|
|
17
|
+
* For tool events, `matcher` is compared against the tool name.
|
|
18
|
+
* For non-tool events (SessionStart), `matcher` is ignored.
|
|
19
|
+
* - `timeoutMs` is optional. Defaults to 30 000 ms (per task spec).
|
|
20
|
+
* Capped at 60 000 ms to prevent operator-defined deadlocks.
|
|
21
|
+
* - `blocking` is optional. When true AND the hook exits non-zero,
|
|
22
|
+
* the registry surfaces an `anyBlocked: true` outcome so the
|
|
23
|
+
* caller can refuse the originating action. Only honoured for
|
|
24
|
+
* `PreToolUse` in the MVP — other events log but do not block.
|
|
25
|
+
*
|
|
26
|
+
* Failure modes:
|
|
27
|
+
* - File missing -> the registry is `empty()`. `list()` returns []
|
|
28
|
+
* and `fire()` is a no-op. This matches the Claude Code default
|
|
29
|
+
* (hooks are opt-in).
|
|
30
|
+
* - File present but invalid JSON / fails schema -> `load()` throws.
|
|
31
|
+
* The CLI surface (`pugi hooks doctor`) reports the error
|
|
32
|
+
* verbatim so the operator can fix the config.
|
|
33
|
+
*
|
|
34
|
+
* Brand voice: ASCII only, no emoji, no em-dashes.
|
|
35
|
+
*/
|
|
36
|
+
import { existsSync, readFileSync } from 'node:fs';
|
|
37
|
+
import { homedir } from 'node:os';
|
|
38
|
+
import { resolve } from 'node:path';
|
|
39
|
+
import { z } from 'zod';
|
|
40
|
+
import { ALL_HOOK_EVENTS_V2 } from './events.js';
|
|
41
|
+
/** Default per-hook timeout when the operator does not set `timeoutMs`. */
|
|
42
|
+
export const DEFAULT_HOOK_TIMEOUT_MS = 30_000;
|
|
43
|
+
/** Hard upper bound on `timeoutMs`. Prevents config-defined deadlocks. */
|
|
44
|
+
export const MAX_HOOK_TIMEOUT_MS = 60_000;
|
|
45
|
+
const hookEntrySchema = z
|
|
46
|
+
.object({
|
|
47
|
+
/**
|
|
48
|
+
* Tool-name matcher. `*` matches any tool. Plain strings match
|
|
49
|
+
* exactly (no glob in the MVP — fast-follow widens to glob). Ignored
|
|
50
|
+
* for non-tool events such as `SessionStart`.
|
|
51
|
+
*/
|
|
52
|
+
matcher: z.string().min(1).optional(),
|
|
53
|
+
/** Shell command. Spawned via `/bin/sh -c <command>`. */
|
|
54
|
+
command: z.string().min(1),
|
|
55
|
+
/** Per-hook timeout override. Defaults to 30 000 ms. */
|
|
56
|
+
timeoutMs: z.number().int().positive().max(MAX_HOOK_TIMEOUT_MS).optional(),
|
|
57
|
+
/**
|
|
58
|
+
* When true, a non-zero exit code from this hook blocks the
|
|
59
|
+
* originating action (currently `PreToolUse` only). Other events
|
|
60
|
+
* log the exit but do not block.
|
|
61
|
+
*/
|
|
62
|
+
blocking: z.boolean().optional(),
|
|
63
|
+
})
|
|
64
|
+
.strict();
|
|
65
|
+
const hookEventEnum = z.enum([
|
|
66
|
+
'SessionStart',
|
|
67
|
+
'PreToolUse',
|
|
68
|
+
'PostToolUse',
|
|
69
|
+
'UserPromptSubmit',
|
|
70
|
+
'Stop',
|
|
71
|
+
'SubagentStop',
|
|
72
|
+
'PreCompact',
|
|
73
|
+
'Notification',
|
|
74
|
+
]);
|
|
75
|
+
const hooksFileSchema = z
|
|
76
|
+
.object({
|
|
77
|
+
hooks: z.record(hookEventEnum, z.array(hookEntrySchema)).default({}),
|
|
78
|
+
})
|
|
79
|
+
.strict();
|
|
80
|
+
/** Default config file location — `~/.pugi/hooks-mvp.json`. */
|
|
81
|
+
export function defaultHooksMvpPath(home) {
|
|
82
|
+
const root = home ?? process.env.PUGI_HOME ?? resolve(homedir(), '.pugi');
|
|
83
|
+
return resolve(root, 'hooks-mvp.json');
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* In-memory snapshot of the operator's `hooks-mvp.json`. Construct
|
|
87
|
+
* via `loadHooksConfig(path)` — `new HooksConfig()` is intentionally
|
|
88
|
+
* not exported so all production code paths go through the loader.
|
|
89
|
+
*/
|
|
90
|
+
export class HooksConfig {
|
|
91
|
+
path;
|
|
92
|
+
entries;
|
|
93
|
+
constructor(path, entries) {
|
|
94
|
+
this.path = path;
|
|
95
|
+
this.entries = entries;
|
|
96
|
+
}
|
|
97
|
+
/** Absolute path of the config file this snapshot was loaded from. */
|
|
98
|
+
configPath() {
|
|
99
|
+
return this.path;
|
|
100
|
+
}
|
|
101
|
+
/** All hooks declared for a given event. Returns [] when none. */
|
|
102
|
+
list(event) {
|
|
103
|
+
return this.entries[event] ?? [];
|
|
104
|
+
}
|
|
105
|
+
/**
|
|
106
|
+
* Hooks that match the (event, toolName?) tuple. For tool events
|
|
107
|
+
* (`PreToolUse`), `matcher` is compared against the tool name with
|
|
108
|
+
* `*` matching any. For non-tool events, all entries are returned
|
|
109
|
+
* regardless of `matcher`.
|
|
110
|
+
*/
|
|
111
|
+
listMatching(event, toolName) {
|
|
112
|
+
const all = this.list(event);
|
|
113
|
+
if (!isToolEvent(event))
|
|
114
|
+
return all;
|
|
115
|
+
return all.filter((entry) => matchesTool(entry.matcher, toolName));
|
|
116
|
+
}
|
|
117
|
+
/** Flat list of (event, entry) pairs across every configured event. */
|
|
118
|
+
flatten() {
|
|
119
|
+
const out = [];
|
|
120
|
+
for (const event of ALL_HOOK_EVENTS_V2) {
|
|
121
|
+
for (const entry of this.list(event)) {
|
|
122
|
+
out.push({ event, entry });
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
return out;
|
|
126
|
+
}
|
|
127
|
+
/** True iff at least one hook is registered for any event. */
|
|
128
|
+
isEmpty() {
|
|
129
|
+
return this.flatten().length === 0;
|
|
130
|
+
}
|
|
131
|
+
/** A no-op snapshot used when the config file is absent. */
|
|
132
|
+
static empty(path) {
|
|
133
|
+
return new HooksConfig(path, {});
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
/**
|
|
137
|
+
* Load + validate `hooks-mvp.json`. Returns a no-op snapshot when the
|
|
138
|
+
* file is absent. Throws on invalid JSON or schema violations — the
|
|
139
|
+
* caller is expected to surface the error to the operator via
|
|
140
|
+
* `pugi hooks doctor`.
|
|
141
|
+
*
|
|
142
|
+
* Contract (non-null invariant): this function ALWAYS returns a
|
|
143
|
+
* `HooksConfig` instance. It never returns `null` / `undefined`. When
|
|
144
|
+
* the config file is missing, callers receive `HooksConfig.empty(path)`
|
|
145
|
+
* — a truthy snapshot for which `isEmpty()` returns `true` and `list()`
|
|
146
|
+
* returns `[]`. Callers may safely chain `.isEmpty()` without a null
|
|
147
|
+
* guard. Asserted by `registry-empty.spec.ts`.
|
|
148
|
+
*/
|
|
149
|
+
export function loadHooksConfig(pathOverride) {
|
|
150
|
+
const path = pathOverride ?? defaultHooksMvpPath();
|
|
151
|
+
if (!existsSync(path)) {
|
|
152
|
+
return HooksConfig.empty(path);
|
|
153
|
+
}
|
|
154
|
+
let raw;
|
|
155
|
+
try {
|
|
156
|
+
raw = readFileSync(path, 'utf8');
|
|
157
|
+
}
|
|
158
|
+
catch (error) {
|
|
159
|
+
throw new Error(`pugi hooks: cannot read ${path}: ${error.message}`);
|
|
160
|
+
}
|
|
161
|
+
let parsed;
|
|
162
|
+
try {
|
|
163
|
+
parsed = JSON.parse(raw);
|
|
164
|
+
}
|
|
165
|
+
catch (error) {
|
|
166
|
+
throw new Error(`pugi hooks: ${path} is not valid JSON: ${error.message}`);
|
|
167
|
+
}
|
|
168
|
+
const result = hooksFileSchema.safeParse(parsed);
|
|
169
|
+
if (!result.success) {
|
|
170
|
+
const issues = result.error.issues
|
|
171
|
+
.map((issue) => `${issue.path.join('.') || '<root>'} ${issue.message}`)
|
|
172
|
+
.join('; ');
|
|
173
|
+
throw new Error(`pugi hooks: ${path} failed schema validation: ${issues}`);
|
|
174
|
+
}
|
|
175
|
+
// Zod's `z.record(enum, value)` returns `Partial<Record<...>>` shape
|
|
176
|
+
// — keys that the operator did not include are `undefined`. Coerce
|
|
177
|
+
// explicitly into the same shape `HooksConfig` expects.
|
|
178
|
+
const entries = {};
|
|
179
|
+
for (const event of ALL_HOOK_EVENTS_V2) {
|
|
180
|
+
const list = result.data.hooks[event];
|
|
181
|
+
if (list && list.length > 0) {
|
|
182
|
+
entries[event] = list;
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
return new HooksConfig(path, entries);
|
|
186
|
+
}
|
|
187
|
+
/**
|
|
188
|
+
* `isToolEvent(event)` -> true for events where `matcher` is compared
|
|
189
|
+
* against the tool name. SessionStart / Stop / Notification / etc. do
|
|
190
|
+
* not have an associated tool so matcher is ignored.
|
|
191
|
+
*/
|
|
192
|
+
export function isToolEvent(event) {
|
|
193
|
+
return event === 'PreToolUse' || event === 'PostToolUse';
|
|
194
|
+
}
|
|
195
|
+
/**
|
|
196
|
+
* Tool-name match grammar for the MVP. Intentionally narrow:
|
|
197
|
+
* - matcher missing or `*` -> matches any tool name (and the
|
|
198
|
+
* `bash`/`read`/... shape).
|
|
199
|
+
* - matcher === toolName -> exact match.
|
|
200
|
+
*
|
|
201
|
+
* Fast-follow widens this to glob via `picomatch` so operators can
|
|
202
|
+
* write `mcp__*` patterns. Deliberately not pulling in a glob lib for
|
|
203
|
+
* the MVP — the narrow grammar is enough to land the surface and the
|
|
204
|
+
* test matrix stays small.
|
|
205
|
+
*/
|
|
206
|
+
export function matchesTool(matcher, toolName) {
|
|
207
|
+
if (!matcher || matcher === '*')
|
|
208
|
+
return true;
|
|
209
|
+
if (!toolName)
|
|
210
|
+
return false;
|
|
211
|
+
return matcher === toolName;
|
|
212
|
+
}
|
|
213
|
+
//# sourceMappingURL=registry.js.map
|
|
@@ -0,0 +1,236 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Pugi hooks MVP — runner (Leak L12, first pass).
|
|
3
|
+
*
|
|
4
|
+
* Spawns the shell command declared in `hooks-mvp.json`, applies the
|
|
5
|
+
* timeout watchdog, captures stdout / stderr, and surfaces a
|
|
6
|
+
* structured result. Two events are wired in the MVP (SessionStart,
|
|
7
|
+
* PreToolUse); the runner itself is event-agnostic so the fast-follow
|
|
8
|
+
* PR can attach the remaining 6 events without changing this file.
|
|
9
|
+
*
|
|
10
|
+
* Safety properties:
|
|
11
|
+
* - 30 s default timeout (per task spec); SIGTERM then SIGKILL with
|
|
12
|
+
* a 2 s grace window.
|
|
13
|
+
* - 1 MiB output cap per stream — a misbehaving hook (`yes`) cannot
|
|
14
|
+
* OOM the parent CLI by buffering unbounded data.
|
|
15
|
+
* - Spawn failures are caught + logged; the session never crashes
|
|
16
|
+
* because of a missing binary or a syntax error in the command.
|
|
17
|
+
* - Hook errors are atomic-appended to `<workspaceRoot>/.pugi/logs/
|
|
18
|
+
* hooks.log`. Multiple sessions can write concurrently without
|
|
19
|
+
* interleaving because `appendFileSync` opens with O_APPEND.
|
|
20
|
+
*
|
|
21
|
+
* Brand voice: ASCII only.
|
|
22
|
+
*/
|
|
23
|
+
import { spawn } from 'node:child_process';
|
|
24
|
+
import { appendFileSync, existsSync, mkdirSync } from 'node:fs';
|
|
25
|
+
import { resolve } from 'node:path';
|
|
26
|
+
import { DEFAULT_HOOK_TIMEOUT_MS, isToolEvent, } from './registry.js';
|
|
27
|
+
const HOOK_STREAM_CAP_BYTES = 1024 * 1024;
|
|
28
|
+
const SIGKILL_GRACE_MS = 2_000;
|
|
29
|
+
/**
|
|
30
|
+
* Fire every matching hook for `event` sequentially. Sequential (not
|
|
31
|
+
* parallel) is the intentional default — operators frequently chain
|
|
32
|
+
* `git add` -> `eslint --fix` style hooks that would race otherwise.
|
|
33
|
+
* Returns a `HookFireOutcome` with the per-invocation results.
|
|
34
|
+
*/
|
|
35
|
+
export async function fireHooks(opts) {
|
|
36
|
+
const { config, event, payload, toolName, workspaceRoot, env } = opts;
|
|
37
|
+
const matching = config.listMatching(event, toolName);
|
|
38
|
+
if (matching.length === 0) {
|
|
39
|
+
return { event, results: [], anyBlocked: false };
|
|
40
|
+
}
|
|
41
|
+
const logger = workspaceRoot ? new HookLogger(workspaceRoot) : undefined;
|
|
42
|
+
const results = [];
|
|
43
|
+
let anyBlocked = false;
|
|
44
|
+
for (const entry of matching) {
|
|
45
|
+
const timeoutMs = entry.timeoutMs ?? DEFAULT_HOOK_TIMEOUT_MS;
|
|
46
|
+
const result = await executeOne(entry.command, payload, timeoutMs, env);
|
|
47
|
+
// Blocking semantics only honored for PreToolUse in the MVP.
|
|
48
|
+
// Other events can declare `blocking: true` but the runner just
|
|
49
|
+
// logs that intent — it does NOT short-circuit. The fast-follow
|
|
50
|
+
// PR threads PostToolUse + UserPromptSubmit blocking through.
|
|
51
|
+
const blockable = entry.blocking === true && event === 'PreToolUse';
|
|
52
|
+
const blocked = blockable && !result.ok;
|
|
53
|
+
if (blocked) {
|
|
54
|
+
anyBlocked = true;
|
|
55
|
+
result.blocked = true;
|
|
56
|
+
result.blockSentinel = `HOOK_BLOCKED: ${truncate(entry.command, 80)} exited ${result.exitCode}`;
|
|
57
|
+
}
|
|
58
|
+
if (logger && !result.ok) {
|
|
59
|
+
logger.recordFailure(event, entry.command, result);
|
|
60
|
+
}
|
|
61
|
+
results.push(result);
|
|
62
|
+
}
|
|
63
|
+
return { event, results, anyBlocked };
|
|
64
|
+
}
|
|
65
|
+
async function executeOne(command, payload, timeoutMs, env) {
|
|
66
|
+
const startedAt = Date.now();
|
|
67
|
+
return new Promise((resolvePromise) => {
|
|
68
|
+
const payloadJson = JSON.stringify(payload);
|
|
69
|
+
const childEnv = {
|
|
70
|
+
...(env ?? process.env),
|
|
71
|
+
PUGI_HOOK_PAYLOAD: payloadJson,
|
|
72
|
+
PUGI_HOOK_EVENT: payload.event,
|
|
73
|
+
PUGI_HOOK_SESSION_ID: payload.sessionId,
|
|
74
|
+
};
|
|
75
|
+
const child = spawn('/bin/sh', ['-c', command], {
|
|
76
|
+
env: childEnv,
|
|
77
|
+
stdio: ['pipe', 'pipe', 'pipe'],
|
|
78
|
+
});
|
|
79
|
+
const state = {
|
|
80
|
+
stdout: '',
|
|
81
|
+
stderr: '',
|
|
82
|
+
killedForTimeout: false,
|
|
83
|
+
killedForStreamCap: false,
|
|
84
|
+
};
|
|
85
|
+
const escalateKill = () => {
|
|
86
|
+
if (state.sigKillTimer)
|
|
87
|
+
return;
|
|
88
|
+
state.sigKillTimer = setTimeout(() => {
|
|
89
|
+
if (!child.killed)
|
|
90
|
+
child.kill('SIGKILL');
|
|
91
|
+
}, SIGKILL_GRACE_MS);
|
|
92
|
+
if (state.sigKillTimer.unref)
|
|
93
|
+
state.sigKillTimer.unref();
|
|
94
|
+
};
|
|
95
|
+
const enforceStreamCap = () => {
|
|
96
|
+
if (state.killedForStreamCap)
|
|
97
|
+
return;
|
|
98
|
+
if (state.stdout.length + state.stderr.length <= HOOK_STREAM_CAP_BYTES)
|
|
99
|
+
return;
|
|
100
|
+
state.killedForStreamCap = true;
|
|
101
|
+
child.kill('SIGTERM');
|
|
102
|
+
escalateKill();
|
|
103
|
+
};
|
|
104
|
+
child.stdout?.on('data', (chunk) => {
|
|
105
|
+
if (state.killedForStreamCap)
|
|
106
|
+
return;
|
|
107
|
+
state.stdout += chunk.toString('utf8');
|
|
108
|
+
enforceStreamCap();
|
|
109
|
+
});
|
|
110
|
+
child.stderr?.on('data', (chunk) => {
|
|
111
|
+
if (state.killedForStreamCap)
|
|
112
|
+
return;
|
|
113
|
+
state.stderr += chunk.toString('utf8');
|
|
114
|
+
enforceStreamCap();
|
|
115
|
+
});
|
|
116
|
+
// Best-effort stdin payload — hook scripts that want to read it can
|
|
117
|
+
// (e.g. `jq .`); scripts that ignore stdin will EPIPE on our write
|
|
118
|
+
// which we swallow because the env var carries the same data.
|
|
119
|
+
if (child.stdin) {
|
|
120
|
+
child.stdin.on('error', () => {
|
|
121
|
+
// EPIPE is benign — see above.
|
|
122
|
+
});
|
|
123
|
+
child.stdin.end(payloadJson);
|
|
124
|
+
}
|
|
125
|
+
const timer = setTimeout(() => {
|
|
126
|
+
state.killedForTimeout = true;
|
|
127
|
+
child.kill('SIGTERM');
|
|
128
|
+
escalateKill();
|
|
129
|
+
}, timeoutMs);
|
|
130
|
+
if (timer.unref)
|
|
131
|
+
timer.unref();
|
|
132
|
+
child.on('error', (error) => {
|
|
133
|
+
clearTimeout(timer);
|
|
134
|
+
if (state.sigKillTimer)
|
|
135
|
+
clearTimeout(state.sigKillTimer);
|
|
136
|
+
resolvePromise({
|
|
137
|
+
command: truncate(command, 200),
|
|
138
|
+
exitCode: -1,
|
|
139
|
+
stdoutBytes: state.stdout.length,
|
|
140
|
+
stderrBytes: state.stderr.length,
|
|
141
|
+
elapsedMs: Date.now() - startedAt,
|
|
142
|
+
ok: false,
|
|
143
|
+
blocked: false,
|
|
144
|
+
timedOut: false,
|
|
145
|
+
// No blockSentinel here — spawn errors are not the same as
|
|
146
|
+
// blocking-failure semantics. The caller logs them generically.
|
|
147
|
+
});
|
|
148
|
+
});
|
|
149
|
+
child.on('close', (code, signal) => {
|
|
150
|
+
clearTimeout(timer);
|
|
151
|
+
if (state.sigKillTimer)
|
|
152
|
+
clearTimeout(state.sigKillTimer);
|
|
153
|
+
let exitCode;
|
|
154
|
+
if (code !== null) {
|
|
155
|
+
exitCode = code;
|
|
156
|
+
}
|
|
157
|
+
else if (signal === 'SIGTERM') {
|
|
158
|
+
exitCode = -15;
|
|
159
|
+
}
|
|
160
|
+
else if (signal === 'SIGKILL') {
|
|
161
|
+
exitCode = -9;
|
|
162
|
+
}
|
|
163
|
+
else {
|
|
164
|
+
exitCode = -1;
|
|
165
|
+
}
|
|
166
|
+
const ok = exitCode === 0 &&
|
|
167
|
+
!state.killedForTimeout &&
|
|
168
|
+
!state.killedForStreamCap;
|
|
169
|
+
resolvePromise({
|
|
170
|
+
command: truncate(command, 200),
|
|
171
|
+
exitCode,
|
|
172
|
+
stdoutBytes: state.stdout.length,
|
|
173
|
+
stderrBytes: state.stderr.length,
|
|
174
|
+
elapsedMs: Date.now() - startedAt,
|
|
175
|
+
ok,
|
|
176
|
+
blocked: false,
|
|
177
|
+
timedOut: state.killedForTimeout,
|
|
178
|
+
});
|
|
179
|
+
});
|
|
180
|
+
});
|
|
181
|
+
}
|
|
182
|
+
/**
|
|
183
|
+
* Append-only failure log at `<workspaceRoot>/.pugi/logs/hooks.log`.
|
|
184
|
+
* Each line is a JSON record so log scrapers can `jq` over it.
|
|
185
|
+
*/
|
|
186
|
+
class HookLogger {
|
|
187
|
+
path;
|
|
188
|
+
prepared = false;
|
|
189
|
+
constructor(workspaceRoot) {
|
|
190
|
+
this.path = resolve(workspaceRoot, '.pugi', 'logs', 'hooks.log');
|
|
191
|
+
}
|
|
192
|
+
recordFailure(event, command, result) {
|
|
193
|
+
this.prepareDir();
|
|
194
|
+
const line = JSON.stringify({
|
|
195
|
+
ts: new Date().toISOString(),
|
|
196
|
+
event,
|
|
197
|
+
command: truncate(command, 200),
|
|
198
|
+
exitCode: result.exitCode,
|
|
199
|
+
timedOut: result.timedOut,
|
|
200
|
+
elapsedMs: result.elapsedMs,
|
|
201
|
+
stdoutBytes: result.stdoutBytes,
|
|
202
|
+
stderrBytes: result.stderrBytes,
|
|
203
|
+
toolEvent: isToolEvent(event),
|
|
204
|
+
});
|
|
205
|
+
try {
|
|
206
|
+
appendFileSync(this.path, `${line}\n`, 'utf8');
|
|
207
|
+
}
|
|
208
|
+
catch {
|
|
209
|
+
// Logging is best-effort — the session must not crash when the
|
|
210
|
+
// disk is full or the directory is read-only. The runner has
|
|
211
|
+
// already returned the result; dropping the log line is the
|
|
212
|
+
// safe fallback.
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
prepareDir() {
|
|
216
|
+
if (this.prepared)
|
|
217
|
+
return;
|
|
218
|
+
const dir = resolve(this.path, '..');
|
|
219
|
+
if (!existsSync(dir)) {
|
|
220
|
+
try {
|
|
221
|
+
mkdirSync(dir, { recursive: true });
|
|
222
|
+
}
|
|
223
|
+
catch {
|
|
224
|
+
// ignored — appendFileSync will surface a fresh error on the
|
|
225
|
+
// write path, which we also swallow.
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
this.prepared = true;
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
function truncate(value, max) {
|
|
232
|
+
if (value.length <= max)
|
|
233
|
+
return value;
|
|
234
|
+
return `${value.slice(0, max - 3)}...`;
|
|
235
|
+
}
|
|
236
|
+
//# sourceMappingURL=runner.js.map
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Per-process LSP client cache — Leak L15.
|
|
3
|
+
*
|
|
4
|
+
* The α7.7 `runtime/commands/lsp.ts` CLI surface spawns one LSP server
|
|
5
|
+
* per invocation and stops it at the end. That is correct for the
|
|
6
|
+
* one-shot `pugi lsp hover ...` shape but wrong for L15's
|
|
7
|
+
* post-edit auto-diagnostics: every successful `edit`/`write` would
|
|
8
|
+
* otherwise pay the ~2-3s cold-start of `typescript-language-server`,
|
|
9
|
+
* which is unusable inside an agent loop.
|
|
10
|
+
*
|
|
11
|
+
* This module owns a singleton map keyed by `LspLanguage` with lazy
|
|
12
|
+
* initialization (`getOrStart`). The first edit of a TS file in a
|
|
13
|
+
* session pays cold-start; every subsequent edit of any TS/TSX file
|
|
14
|
+
* in the same workspace reuses the warm client.
|
|
15
|
+
*
|
|
16
|
+
* Lifecycle:
|
|
17
|
+
* - `getOrStart(lang, cwd)` — spawn if missing, return cached otherwise.
|
|
18
|
+
* - `stopAll()` — graceful shutdown of every cached client. Called from
|
|
19
|
+
* `runCli` exit so a Ctrl-C never leaves zombie LSP processes behind.
|
|
20
|
+
* - `reset()` — test-only escape hatch, drops the cache without
|
|
21
|
+
* touching child processes (specs inject stubs that own their own
|
|
22
|
+
* lifecycle).
|
|
23
|
+
*
|
|
24
|
+
* Failure handling: a startup failure is NOT cached. The next call
|
|
25
|
+
* tries again. This keeps the cache from poisoning a session when the
|
|
26
|
+
* operator installs the missing LSP binary mid-session and re-edits.
|
|
27
|
+
*
|
|
28
|
+
* Brand voice: ASCII only, no emoji, no banned words.
|
|
29
|
+
*/
|
|
30
|
+
import { isLspLanguageDisabled, startLspClient, } from './client.js';
|
|
31
|
+
const cache = new Map();
|
|
32
|
+
/**
|
|
33
|
+
* Return a warm client for `lang`, starting one if needed. The
|
|
34
|
+
* workspace `cwd` is captured at cache-insert time; if a subsequent
|
|
35
|
+
* call asks for the same language with a different `cwd` we tear
|
|
36
|
+
* down the old client and start a fresh one. This handles the
|
|
37
|
+
* agent-worktree case where the same process hops between workspace
|
|
38
|
+
* roots inside one Node lifetime.
|
|
39
|
+
*/
|
|
40
|
+
export async function getOrStartLspClient(lang, opts) {
|
|
41
|
+
// β7 L9: respect the per-language disable toggle BEFORE we attempt to
|
|
42
|
+
// spawn. The check is cheap and keeps the disabled path from paying
|
|
43
|
+
// the `npx --yes` warmup cost on first use.
|
|
44
|
+
if (isLspLanguageDisabled(lang, opts.lspSettings)) {
|
|
45
|
+
return {
|
|
46
|
+
ok: false,
|
|
47
|
+
reason: 'lsp_disabled',
|
|
48
|
+
detail: `${lang} is disabled via .pugi/settings.json::lsp`,
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
const existing = cache.get(lang);
|
|
52
|
+
if (existing && existing.cwd === opts.cwd) {
|
|
53
|
+
return { ok: true, client: existing.client };
|
|
54
|
+
}
|
|
55
|
+
if (existing && existing.cwd !== opts.cwd) {
|
|
56
|
+
// Workspace switched — stop the old client and fall through to spawn.
|
|
57
|
+
try {
|
|
58
|
+
await existing.client.stop();
|
|
59
|
+
}
|
|
60
|
+
catch {
|
|
61
|
+
// best effort; stop() is idempotent + swallow-safe
|
|
62
|
+
}
|
|
63
|
+
cache.delete(lang);
|
|
64
|
+
}
|
|
65
|
+
const result = await startLspClient(lang, opts);
|
|
66
|
+
if (!result.ok) {
|
|
67
|
+
return { ok: false, reason: result.reason, detail: result.detail };
|
|
68
|
+
}
|
|
69
|
+
cache.set(lang, { client: result.value, cwd: opts.cwd });
|
|
70
|
+
return { ok: true, client: result.value };
|
|
71
|
+
}
|
|
72
|
+
/** Look up the cached client without starting one. Returns undefined when missing. */
|
|
73
|
+
export function peekLspClient(lang) {
|
|
74
|
+
return cache.get(lang)?.client;
|
|
75
|
+
}
|
|
76
|
+
/** Snapshot of currently-cached languages — used by `pugi lsp status` debug output. */
|
|
77
|
+
export function listCachedLanguages() {
|
|
78
|
+
return Array.from(cache.keys());
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Stop every cached client and clear the cache. Called from `runCli`
|
|
82
|
+
* exit and from specs that own the lifecycle of their stub servers.
|
|
83
|
+
*/
|
|
84
|
+
export async function stopAllLspClients() {
|
|
85
|
+
const snapshot = Array.from(cache.values());
|
|
86
|
+
cache.clear();
|
|
87
|
+
await Promise.all(snapshot.map(async (entry) => {
|
|
88
|
+
try {
|
|
89
|
+
await entry.client.stop();
|
|
90
|
+
}
|
|
91
|
+
catch {
|
|
92
|
+
// best effort — shutting down anyway
|
|
93
|
+
}
|
|
94
|
+
}));
|
|
95
|
+
}
|
|
96
|
+
/**
|
|
97
|
+
* Test-only: drop the cache map WITHOUT calling stop on the children.
|
|
98
|
+
* Specs that inject stub servers manage the stub lifecycle themselves;
|
|
99
|
+
* this lets a spec swap a stub mid-test without the cache holding a
|
|
100
|
+
* stale reference to a torn-down process.
|
|
101
|
+
*/
|
|
102
|
+
export function __resetLspCacheForTests() {
|
|
103
|
+
cache.clear();
|
|
104
|
+
}
|
|
105
|
+
//# sourceMappingURL=cache.js.map
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Language-from-extension detection — Leak L15.
|
|
3
|
+
*
|
|
4
|
+
* Single source of truth for "given a file path, which `LspLanguage`
|
|
5
|
+
* slug do we route to". The α7.7 `runtime/commands/lsp.ts` shipped its
|
|
6
|
+
* own inline `inferLanguage` switch; L15 (post-edit auto-diagnostics)
|
|
7
|
+
* needs the same lookup from `core/engine/tool-bridge.ts`, so we lift
|
|
8
|
+
* the table into a dedicated module to avoid a second copy drifting
|
|
9
|
+
* out of sync.
|
|
10
|
+
*
|
|
11
|
+
* Returning `undefined` is the calling code's signal to silently skip
|
|
12
|
+
* LSP — an unsupported extension is NOT an error, it just means "no
|
|
13
|
+
* diagnostics for this file". The tool-bridge hook treats this as a
|
|
14
|
+
* no-op envelope tail.
|
|
15
|
+
*
|
|
16
|
+
* Adding a new language requires THREE coordinated changes:
|
|
17
|
+
* 1. Add the `LspLanguage` slug + server descriptor in `client.ts`.
|
|
18
|
+
* 2. Map its extensions here.
|
|
19
|
+
* 3. Add a `lsp-language-matrix` spec row exercising the new ext.
|
|
20
|
+
*
|
|
21
|
+
* Brand voice: ASCII only, no emoji, no banned words.
|
|
22
|
+
*/
|
|
23
|
+
import { extname } from 'node:path';
|
|
24
|
+
/**
|
|
25
|
+
* Lower-case extension (including the dot) → LSP language slug.
|
|
26
|
+
* Mirror of the switch in `runtime/commands/lsp.ts::inferLanguage`.
|
|
27
|
+
* The table form lets tests assert coverage and lets new languages
|
|
28
|
+
* land with one edit instead of two.
|
|
29
|
+
*/
|
|
30
|
+
export const EXTENSION_TO_LANGUAGE = {
|
|
31
|
+
'.ts': 'ts',
|
|
32
|
+
'.tsx': 'ts',
|
|
33
|
+
'.mts': 'ts',
|
|
34
|
+
'.cts': 'ts',
|
|
35
|
+
'.js': 'js',
|
|
36
|
+
'.jsx': 'js',
|
|
37
|
+
'.mjs': 'js',
|
|
38
|
+
'.cjs': 'js',
|
|
39
|
+
'.py': 'py',
|
|
40
|
+
'.pyi': 'py',
|
|
41
|
+
'.go': 'go',
|
|
42
|
+
'.rs': 'rust',
|
|
43
|
+
};
|
|
44
|
+
/**
|
|
45
|
+
* Infer the `LspLanguage` for a workspace-relative or absolute path.
|
|
46
|
+
* Returns `undefined` for unmapped extensions — the caller decides
|
|
47
|
+
* whether that is silently skipped (post-edit hook) or surfaced as
|
|
48
|
+
* `language_unsupported` (`pugi lsp` CLI).
|
|
49
|
+
*/
|
|
50
|
+
export function languageForFile(file) {
|
|
51
|
+
const ext = extname(file).toLowerCase();
|
|
52
|
+
if (!ext)
|
|
53
|
+
return undefined;
|
|
54
|
+
return EXTENSION_TO_LANGUAGE[ext];
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* Return every extension currently mapped to the given language.
|
|
58
|
+
* Used by the matrix spec to assert coverage without re-typing the
|
|
59
|
+
* extension list.
|
|
60
|
+
*/
|
|
61
|
+
export function extensionsForLanguage(lang) {
|
|
62
|
+
return Object.entries(EXTENSION_TO_LANGUAGE)
|
|
63
|
+
.filter(([, value]) => value === lang)
|
|
64
|
+
.map(([ext]) => ext);
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=language-detect.js.map
|