@cybedefend/vibedefend 1.4.1 → 1.4.3
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/README.md +13 -1
- package/dist/clients/claude-code.js +4 -1
- package/dist/clients/claude-code.js.map +1 -1
- package/dist/clients/codex.js +4 -2
- package/dist/clients/codex.js.map +1 -1
- package/dist/custom-regions.js +68 -0
- package/dist/custom-regions.js.map +1 -1
- package/dist/guards-evaluator/preprocess.js +114 -3
- package/dist/guards-evaluator/preprocess.js.map +1 -1
- package/dist/hook-runner.js +5446 -591
- package/dist/hooks/runtime/emit.js +25 -12
- package/dist/hooks/runtime/emit.js.map +1 -1
- package/dist/hooks/runtime/fetch-rules.js +38 -12
- package/dist/hooks/runtime/fetch-rules.js.map +1 -1
- package/dist/hooks/runtime/guard-rules-cache.js +109 -28
- package/dist/hooks/runtime/guard-rules-cache.js.map +1 -1
- package/dist/hooks/runtime/resolve.js +20 -2
- package/dist/hooks/runtime/resolve.js.map +1 -1
- package/dist/hooks/runtime/rule-schema.js +113 -0
- package/dist/hooks/runtime/rule-schema.js.map +1 -0
- package/dist/hooks/runtime/self-update-check.js +36 -2
- package/dist/hooks/runtime/self-update-check.js.map +1 -1
- package/dist/hooks/runtime/session-start.js +5 -1
- package/dist/hooks/runtime/session-start.js.map +1 -1
- package/dist/hooks/runtime/shell-writes.js +311 -0
- package/dist/hooks/runtime/shell-writes.js.map +1 -0
- package/dist/hooks/runtime/sniff.js +84 -5
- package/dist/hooks/runtime/sniff.js.map +1 -1
- package/dist/hooks/runtime/trusted-api-base.js +194 -0
- package/dist/hooks/runtime/trusted-api-base.js.map +1 -0
- package/dist/link.js +29 -3
- package/dist/link.js.map +1 -1
- package/package.json +16 -9
|
@@ -20,6 +20,34 @@ const PACKAGE_NAME = '@cybedefend/vibedefend';
|
|
|
20
20
|
const REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
|
|
21
21
|
const THROTTLE_MS = 24 * 60 * 60 * 1000;
|
|
22
22
|
const FETCH_TIMEOUT_MS = 3000;
|
|
23
|
+
/**
|
|
24
|
+
* `major.minor.patch` with an optional `v` prefix and an optional prerelease
|
|
25
|
+
* tag — the shapes npm actually publishes, and nothing else.
|
|
26
|
+
*/
|
|
27
|
+
const VERSION_RE = /^v?\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/;
|
|
28
|
+
/** Longest version string we will look at, before even testing the regex. */
|
|
29
|
+
const MAX_VERSION_LEN = 64;
|
|
30
|
+
/**
|
|
31
|
+
* Gate on the version string coming from the npm registry.
|
|
32
|
+
*
|
|
33
|
+
* A `typeof === 'string'` check was NOT enough. The value is interpolated into
|
|
34
|
+
* a package spec (`@cybedefend/vibedefend@<version>`) that the background
|
|
35
|
+
* updater hands to a package manager spawned with `shell: true` on Windows
|
|
36
|
+
* (see {@link buildUpdateWrapperScript}). And `isNewer`/`parseVersion` are
|
|
37
|
+
* deliberately tolerant — `Number.parseInt('9 & calc')` is `9` — so
|
|
38
|
+
* `1.9.9 & calc` passed the newness gate and became a Windows command
|
|
39
|
+
* injection primitive for anyone who could answer for the registry (hostile
|
|
40
|
+
* response, MITM, or a compromised mirror in a corporate proxy).
|
|
41
|
+
*
|
|
42
|
+
* POSIX is inert (argv arrays, no shell), but the value is rejected on every
|
|
43
|
+
* platform: it is also echoed into the notice the agent reads.
|
|
44
|
+
*/
|
|
45
|
+
export function isValidRegistryVersion(value) {
|
|
46
|
+
return (typeof value === 'string' &&
|
|
47
|
+
value.length > 0 &&
|
|
48
|
+
value.length <= MAX_VERSION_LEN &&
|
|
49
|
+
VERSION_RE.test(value));
|
|
50
|
+
}
|
|
23
51
|
export async function selfUpdateCheck(deps) {
|
|
24
52
|
const now = deps.now ?? (() => Date.now());
|
|
25
53
|
const dir = deps.cybeDir ?? join(process.env.CYBEDEFEND_HOME ?? homedir(), '.cybedefend');
|
|
@@ -45,7 +73,11 @@ export async function selfUpdateCheck(deps) {
|
|
|
45
73
|
// Stamp the check time regardless of fetch outcome so a flaky registry
|
|
46
74
|
// doesn't make every session hammer npm.
|
|
47
75
|
writeThrottle(throttlePath, { lastCheckedAt: now() });
|
|
48
|
-
|
|
76
|
+
// Validate BEFORE `isNewer` (which is tolerant by design) and before the
|
|
77
|
+
// value can reach a package spec or the agent-visible notice. A malformed
|
|
78
|
+
// version is treated exactly like "no update available": silent, throttle
|
|
79
|
+
// already stamped, retried in 24h.
|
|
80
|
+
if (!isValidRegistryVersion(latest) || !isNewer(latest, deps.installedVersion)) {
|
|
49
81
|
return priorFailure;
|
|
50
82
|
}
|
|
51
83
|
const updateNotice = applyOrNotify(deps, installMode, latest, logPath);
|
|
@@ -125,7 +157,9 @@ async function defaultFetchLatest() {
|
|
|
125
157
|
if (!res.ok)
|
|
126
158
|
return null;
|
|
127
159
|
const body = (await res.json());
|
|
128
|
-
|
|
160
|
+
// Belt and braces: `selfUpdateCheck` re-validates whatever `fetchLatest`
|
|
161
|
+
// returns, but a bad version never leaves this function either.
|
|
162
|
+
return isValidRegistryVersion(body.version) ? body.version : null;
|
|
129
163
|
}
|
|
130
164
|
catch {
|
|
131
165
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"self-update-check.js","sourceRoot":"","sources":["../../../src/hooks/runtime/self-update-check.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,GAEb,MAAM,sBAAsB,CAAC;AAE9B,MAAM,YAAY,GAAG,wBAAwB,CAAC;AAC9C,MAAM,YAAY,GAAG,8BAA8B,YAAY,SAAS,CAAC;AACzE,MAAM,WAAW,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACxC,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAqC9B,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,IAAyB;IAEzB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC3C,MAAM,GAAG,GACP,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,OAAO,EAAE,EAAE,aAAa,CAAC,CAAC;IAChF,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IAC7C,6DAA6D;IAC7D,6EAA6E;IAC7E,0EAA0E;IAC1E,oEAAoE;IACpE,MAAM,WAAW,GACf,IAAI,CAAC,WAAW;QAChB,CAAC,IAAI,CAAC,YAAY;YAChB,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC;YACtC,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;IAE9C,wEAAwE;IACxE,kEAAkE;IAClE,MAAM,YAAY,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAElD,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAC5C,IAAI,QAAQ,IAAI,GAAG,EAAE,GAAG,QAAQ,CAAC,aAAa,GAAG,WAAW,EAAE,CAAC;QAC7D,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,kBAAkB,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,WAAW,EAAE,CAAC;IAEnC,uEAAuE;IACvE,yCAAyC;IACzC,aAAa,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAEtD,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"self-update-check.js","sourceRoot":"","sources":["../../../src/hooks/runtime/self-update-check.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,10 @@ import { emitContext } from './emit.js';
|
|
|
15
15
|
import { loadRuntimeConfig, readStdinJson } from './config.js';
|
|
16
16
|
import { selfUpdateCheck } from './self-update-check.js';
|
|
17
17
|
import { pkg } from '../../version.js';
|
|
18
|
+
/** Production emitter — the envelope's `hookEventName` must name THIS hook. */
|
|
19
|
+
function emitSessionStartContext(body, client) {
|
|
20
|
+
emitContext(body, client, 'SessionStart');
|
|
21
|
+
}
|
|
18
22
|
export async function sessionStartHook(deps = {}) {
|
|
19
23
|
const readStdin = deps.readStdin ?? readStdinJson;
|
|
20
24
|
const loadConfig = deps.loadConfig ?? loadRuntimeConfig;
|
|
@@ -25,7 +29,7 @@ export async function sessionStartHook(deps = {}) {
|
|
|
25
29
|
// SessionStart context goes through `emitContext`, not `emit`, so the
|
|
26
30
|
// body lands inside Codex's `additionalContext` JSON envelope (and as
|
|
27
31
|
// plain markdown for everyone else). See emit.ts for the rationale.
|
|
28
|
-
const emitFn = deps.emitFn ??
|
|
32
|
+
const emitFn = deps.emitFn ?? emitSessionStartContext;
|
|
29
33
|
const stdin = await readStdin();
|
|
30
34
|
const event = sniff(stdin);
|
|
31
35
|
const config = loadConfig();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-start.js","sourceRoot":"","sources":["../../../src/hooks/runtime/session-start.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EACL,uBAAuB,EACvB,YAAY,GAEb,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"session-start.js","sourceRoot":"","sources":["../../../src/hooks/runtime/session-start.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,311 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Which files does a shell command WRITE?
|
|
3
|
+
*
|
|
4
|
+
* BACK-173 follow-up. The `fetch-rules` hook injected business/security rules
|
|
5
|
+
* only for the agent's file-edit tools (Edit / Write / MultiEdit /
|
|
6
|
+
* apply_patch). An agent that writes through the shell — `cat > f <<EOF`,
|
|
7
|
+
* `sed -i`, `tee`, `cp` — never triggered it, so the rules for the files it
|
|
8
|
+
* was actually changing were never fetched. In the field that is the
|
|
9
|
+
* common case, not the exception: control arms of the evaluation study did
|
|
10
|
+
* every write through the shell.
|
|
11
|
+
*
|
|
12
|
+
* This module turns a shell command string into the list of paths it will
|
|
13
|
+
* write to, so the Bash / shell PreToolUse envelope can drive the same
|
|
14
|
+
* rules fetch as a file-edit tool. It is deliberately a RECALL-oriented
|
|
15
|
+
* heuristic: a false positive costs one extra rules lookup, a false
|
|
16
|
+
* negative is a silent bypass.
|
|
17
|
+
*
|
|
18
|
+
* Covered:
|
|
19
|
+
* - output redirections `>`, `>>`, `&>`, `N>` (heredoc bodies are stripped
|
|
20
|
+
* first so a `>` inside the data does not count);
|
|
21
|
+
* - `tee [-a] file...`;
|
|
22
|
+
* - in-place `sed -i` / `sed -i.bak` / `sed -i ''` (macOS) and `perl -pi`;
|
|
23
|
+
* - `cp` / `mv` / `install` destination;
|
|
24
|
+
* - `dd of=`;
|
|
25
|
+
* - `bash|sh|zsh -c '<inner command>'` — recursed once.
|
|
26
|
+
*
|
|
27
|
+
* Not covered (documented limits): inline interpreters (`python -c`,
|
|
28
|
+
* `node -e`), `git apply` / `patch` (targets live inside the patch text),
|
|
29
|
+
* and commands behind `xargs` / `find -exec`.
|
|
30
|
+
*
|
|
31
|
+
* Pure string in, string[] out. Uses `shell-quote`, the same tokenizer the
|
|
32
|
+
* Action Guards preprocessor relies on, so quoting and operators are parsed
|
|
33
|
+
* once, consistently.
|
|
34
|
+
*/
|
|
35
|
+
import { parse as shellParse } from 'shell-quote';
|
|
36
|
+
/** Operators that end a simple command. `|` included: `a | tee f` is two commands. */
|
|
37
|
+
const SEGMENT_OPS = new Set([';', '&&', '||', '|', '|&', '&', '(', ')']);
|
|
38
|
+
/** Interpreters whose `-c` argument is itself a shell command. */
|
|
39
|
+
const SHELL_INTERPRETERS = new Set(['bash', 'sh', 'zsh', 'dash', 'ksh']);
|
|
40
|
+
/** Wrappers that prefix a command without changing what it writes. */
|
|
41
|
+
const TRANSPARENT_PREFIXES = new Set(['sudo', 'doas', 'nohup', 'command', 'time', 'nice', 'env']);
|
|
42
|
+
const HEREDOC_OPEN = /<<-?\s*(['"]?)([A-Za-z_][A-Za-z0-9_]*)\1/;
|
|
43
|
+
function isOp(tok, op) {
|
|
44
|
+
return typeof tok === 'object' && 'op' in tok && (op === undefined || tok.op === op);
|
|
45
|
+
}
|
|
46
|
+
function tokenText(tok) {
|
|
47
|
+
if (typeof tok === 'string')
|
|
48
|
+
return tok;
|
|
49
|
+
if (typeof tok === 'object' && 'pattern' in tok)
|
|
50
|
+
return tok.pattern;
|
|
51
|
+
return null;
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* Remove heredoc BODIES (`<<EOF` … `EOF`) so their content is never parsed
|
|
55
|
+
* as shell. The opener line is kept intact — `cat > f <<'EOF'` and
|
|
56
|
+
* `cat <<EOF > f` both keep their redirect target.
|
|
57
|
+
*/
|
|
58
|
+
export function stripHeredocBodies(command) {
|
|
59
|
+
const lines = command.split('\n');
|
|
60
|
+
const out = [];
|
|
61
|
+
let i = 0;
|
|
62
|
+
while (i < lines.length) {
|
|
63
|
+
const line = lines[i];
|
|
64
|
+
out.push(line);
|
|
65
|
+
const m = HEREDOC_OPEN.exec(line);
|
|
66
|
+
i++;
|
|
67
|
+
if (!m)
|
|
68
|
+
continue;
|
|
69
|
+
const delimiter = m[2];
|
|
70
|
+
// Skip body lines up to and including the terminator. An unterminated
|
|
71
|
+
// heredoc swallows the rest of the command — that is what the shell
|
|
72
|
+
// would do too.
|
|
73
|
+
while (i < lines.length) {
|
|
74
|
+
const body = lines[i];
|
|
75
|
+
i++;
|
|
76
|
+
if (body.trim() === delimiter)
|
|
77
|
+
break;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
return out.join('\n');
|
|
81
|
+
}
|
|
82
|
+
function isNoiseTarget(target) {
|
|
83
|
+
if (target.length === 0)
|
|
84
|
+
return true;
|
|
85
|
+
if (target === '-')
|
|
86
|
+
return true;
|
|
87
|
+
if (target.startsWith('/dev/'))
|
|
88
|
+
return true;
|
|
89
|
+
if (/^&?\d+$/.test(target))
|
|
90
|
+
return true; // fd numbers (`>&2`, `2>&1`)
|
|
91
|
+
return false;
|
|
92
|
+
}
|
|
93
|
+
/** Targets of a single simple command (no operators), from its argv. */
|
|
94
|
+
function targetsFromArgv(argv, depth) {
|
|
95
|
+
// Peel `VAR=value` assignments and transparent wrappers.
|
|
96
|
+
let i = 0;
|
|
97
|
+
while (i < argv.length) {
|
|
98
|
+
const tok = argv[i];
|
|
99
|
+
if (/^[A-Za-z_][A-Za-z0-9_]*=/.test(tok)) {
|
|
100
|
+
i++;
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
103
|
+
if (TRANSPARENT_PREFIXES.has(tok)) {
|
|
104
|
+
i++;
|
|
105
|
+
// `env -u VAR cmd`, `env VAR=x cmd`: drop env's own options too.
|
|
106
|
+
if (tok === 'env') {
|
|
107
|
+
while (i < argv.length && (argv[i].startsWith('-') || /^[A-Za-z_][A-Za-z0-9_]*=/.test(argv[i]))) {
|
|
108
|
+
if (argv[i] === '-u' || argv[i] === '--unset')
|
|
109
|
+
i++;
|
|
110
|
+
i++;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
continue;
|
|
114
|
+
}
|
|
115
|
+
break;
|
|
116
|
+
}
|
|
117
|
+
const cmd = argv[i] ?? '';
|
|
118
|
+
const args = argv.slice(i + 1);
|
|
119
|
+
const base = cmd.split('/').pop() ?? cmd;
|
|
120
|
+
if (SHELL_INTERPRETERS.has(base)) {
|
|
121
|
+
const c = args.indexOf('-c');
|
|
122
|
+
if (c >= 0 && typeof args[c + 1] === 'string' && depth < 1) {
|
|
123
|
+
return extractShellWriteTargetsAt(args[c + 1], depth + 1);
|
|
124
|
+
}
|
|
125
|
+
return [];
|
|
126
|
+
}
|
|
127
|
+
if (base === 'tee') {
|
|
128
|
+
return args.filter((a) => !a.startsWith('-') && !isNoiseTarget(a));
|
|
129
|
+
}
|
|
130
|
+
if (base === 'sed' || base === 'gsed') {
|
|
131
|
+
return sedTargets(args);
|
|
132
|
+
}
|
|
133
|
+
if (base === 'perl') {
|
|
134
|
+
return perlTargets(args);
|
|
135
|
+
}
|
|
136
|
+
if (base === 'cp' || base === 'mv' || base === 'install') {
|
|
137
|
+
const positional = args.filter((a) => !a.startsWith('-') || a === '-');
|
|
138
|
+
if (positional.length >= 2) {
|
|
139
|
+
const tFlag = args.findIndex((a) => a === '-t' || a === '--target-directory');
|
|
140
|
+
if (tFlag >= 0 && args[tFlag + 1])
|
|
141
|
+
return [args[tFlag + 1]];
|
|
142
|
+
return [positional[positional.length - 1]];
|
|
143
|
+
}
|
|
144
|
+
return [];
|
|
145
|
+
}
|
|
146
|
+
if (base === 'dd') {
|
|
147
|
+
return args.filter((a) => a.startsWith('of=')).map((a) => a.slice(3)).filter((a) => !isNoiseTarget(a));
|
|
148
|
+
}
|
|
149
|
+
return [];
|
|
150
|
+
}
|
|
151
|
+
/**
|
|
152
|
+
* `sed`: only in-place edits write. GNU `-i[SUFFIX]` / `--in-place[=SUFFIX]`,
|
|
153
|
+
* BSD/macOS `-i ''` (empty suffix as a separate token) and `-i .bak`.
|
|
154
|
+
* Files are the positional args once the script (`-e`, `-f`, or the first
|
|
155
|
+
* bare arg) is accounted for.
|
|
156
|
+
*/
|
|
157
|
+
function sedTargets(args) {
|
|
158
|
+
let inPlace = false;
|
|
159
|
+
let scriptGiven = false;
|
|
160
|
+
const files = [];
|
|
161
|
+
let i = 0;
|
|
162
|
+
while (i < args.length) {
|
|
163
|
+
const a = args[i];
|
|
164
|
+
if (a === '--') {
|
|
165
|
+
files.push(...args.slice(i + 1).filter((f) => f.length > 0));
|
|
166
|
+
break;
|
|
167
|
+
}
|
|
168
|
+
if (a === '-i' || a === '--in-place') {
|
|
169
|
+
inPlace = true;
|
|
170
|
+
// BSD sed: the suffix is the NEXT token (possibly '').
|
|
171
|
+
const next = args[i + 1];
|
|
172
|
+
if (typeof next === 'string' && (next === '' || /^\.[A-Za-z0-9_-]+$/.test(next)))
|
|
173
|
+
i++;
|
|
174
|
+
i++;
|
|
175
|
+
continue;
|
|
176
|
+
}
|
|
177
|
+
if (/^-i/.test(a) || a.startsWith('--in-place=')) {
|
|
178
|
+
inPlace = true;
|
|
179
|
+
i++;
|
|
180
|
+
continue;
|
|
181
|
+
}
|
|
182
|
+
if (a === '-e' || a === '--expression' || a === '-f' || a === '--file') {
|
|
183
|
+
scriptGiven = true;
|
|
184
|
+
i += 2;
|
|
185
|
+
continue;
|
|
186
|
+
}
|
|
187
|
+
if (a.startsWith('--expression=') || a.startsWith('--file=')) {
|
|
188
|
+
scriptGiven = true;
|
|
189
|
+
i++;
|
|
190
|
+
continue;
|
|
191
|
+
}
|
|
192
|
+
if (a.startsWith('-') && a.length > 1) {
|
|
193
|
+
// Combined short flags such as `-ni`, `-Ei`, `-E`.
|
|
194
|
+
if (/^-[A-Za-z]*i/.test(a))
|
|
195
|
+
inPlace = true;
|
|
196
|
+
i++;
|
|
197
|
+
continue;
|
|
198
|
+
}
|
|
199
|
+
if (!scriptGiven) {
|
|
200
|
+
scriptGiven = true; // first bare arg is the script
|
|
201
|
+
i++;
|
|
202
|
+
continue;
|
|
203
|
+
}
|
|
204
|
+
if (a.length > 0)
|
|
205
|
+
files.push(a);
|
|
206
|
+
i++;
|
|
207
|
+
}
|
|
208
|
+
return inPlace ? files : [];
|
|
209
|
+
}
|
|
210
|
+
/** `perl -pi -e '...' files` / `perl -i.bak -pe '...' files`. */
|
|
211
|
+
function perlTargets(args) {
|
|
212
|
+
let inPlace = false;
|
|
213
|
+
const files = [];
|
|
214
|
+
let i = 0;
|
|
215
|
+
while (i < args.length) {
|
|
216
|
+
const a = args[i];
|
|
217
|
+
if (a === '-e' || a === '-E') {
|
|
218
|
+
i += 2;
|
|
219
|
+
continue;
|
|
220
|
+
}
|
|
221
|
+
if (a.startsWith('-')) {
|
|
222
|
+
// Clusters may carry digits: `-0pi` (slurp mode, observed on Codex),
|
|
223
|
+
// `-00pe`. The `i` anywhere in the cluster means in-place.
|
|
224
|
+
if (/^-[A-Za-z0-9]*i/.test(a))
|
|
225
|
+
inPlace = true;
|
|
226
|
+
// `-pe '...'`, `-ne '...'`: the e is inside the cluster, script follows.
|
|
227
|
+
if (/e$/.test(a) && !/^-i/.test(a))
|
|
228
|
+
i++;
|
|
229
|
+
i++;
|
|
230
|
+
continue;
|
|
231
|
+
}
|
|
232
|
+
files.push(a);
|
|
233
|
+
i++;
|
|
234
|
+
}
|
|
235
|
+
return inPlace ? files : [];
|
|
236
|
+
}
|
|
237
|
+
function extractShellWriteTargetsAt(command, depth) {
|
|
238
|
+
let tokens;
|
|
239
|
+
try {
|
|
240
|
+
tokens = shellParse(stripHeredocBodies(command), (key) => `$${key}`);
|
|
241
|
+
}
|
|
242
|
+
catch {
|
|
243
|
+
return [];
|
|
244
|
+
}
|
|
245
|
+
const targets = [];
|
|
246
|
+
let argv = [];
|
|
247
|
+
const flush = () => {
|
|
248
|
+
if (argv.length > 0)
|
|
249
|
+
targets.push(...targetsFromArgv(argv, depth));
|
|
250
|
+
argv = [];
|
|
251
|
+
};
|
|
252
|
+
for (let i = 0; i < tokens.length; i++) {
|
|
253
|
+
const tok = tokens[i];
|
|
254
|
+
if (isOp(tok)) {
|
|
255
|
+
// `&>` arrives as `&` immediately followed by `>` — that is a redirect,
|
|
256
|
+
// not a background operator.
|
|
257
|
+
if (tok.op === '&' && isOp(tokens[i + 1], '>'))
|
|
258
|
+
continue;
|
|
259
|
+
if (tok.op === '>' || tok.op === '>>') {
|
|
260
|
+
const next = tokens[i + 1];
|
|
261
|
+
const text = next === undefined ? null : tokenText(next);
|
|
262
|
+
if (text !== null) {
|
|
263
|
+
if (!isNoiseTarget(text))
|
|
264
|
+
targets.push(text);
|
|
265
|
+
i++;
|
|
266
|
+
}
|
|
267
|
+
// A lone fd number before the redirect (`2> err`) is not an argument.
|
|
268
|
+
if (/^\d+$/.test(argv[argv.length - 1] ?? ''))
|
|
269
|
+
argv.pop();
|
|
270
|
+
continue;
|
|
271
|
+
}
|
|
272
|
+
if (tok.op === '>&') {
|
|
273
|
+
i++; // skip the fd
|
|
274
|
+
if (/^\d+$/.test(argv[argv.length - 1] ?? ''))
|
|
275
|
+
argv.pop();
|
|
276
|
+
continue;
|
|
277
|
+
}
|
|
278
|
+
if (tok.op === '<') {
|
|
279
|
+
// `<file` input redirect or half of a stripped `<<`: skip the operand
|
|
280
|
+
// only when it is a real input file (`<<` leaves the delimiter word).
|
|
281
|
+
const next = tokens[i + 1];
|
|
282
|
+
if (!isOp(next, '<') && !isOp(tokens[i - 1], '<'))
|
|
283
|
+
i++;
|
|
284
|
+
else if (isOp(tokens[i - 1], '<'))
|
|
285
|
+
i++; // heredoc delimiter word
|
|
286
|
+
continue;
|
|
287
|
+
}
|
|
288
|
+
if (SEGMENT_OPS.has(tok.op)) {
|
|
289
|
+
flush();
|
|
290
|
+
continue;
|
|
291
|
+
}
|
|
292
|
+
continue;
|
|
293
|
+
}
|
|
294
|
+
const text = tokenText(tok);
|
|
295
|
+
if (text !== null)
|
|
296
|
+
argv.push(text);
|
|
297
|
+
}
|
|
298
|
+
flush();
|
|
299
|
+
return Array.from(new Set(targets));
|
|
300
|
+
}
|
|
301
|
+
/**
|
|
302
|
+
* Paths a shell command writes to, in order of appearance, de-duplicated.
|
|
303
|
+
* Relative paths are returned as-is — the caller resolves them against the
|
|
304
|
+
* agent's cwd.
|
|
305
|
+
*/
|
|
306
|
+
export function extractShellWriteTargets(command) {
|
|
307
|
+
if (typeof command !== 'string' || command.trim().length === 0)
|
|
308
|
+
return [];
|
|
309
|
+
return extractShellWriteTargetsAt(command, 0);
|
|
310
|
+
}
|
|
311
|
+
//# sourceMappingURL=shell-writes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shell-writes.js","sourceRoot":"","sources":["../../../src/hooks/runtime/shell-writes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,OAAO,EAAE,KAAK,IAAI,UAAU,EAAE,MAAM,aAAa,CAAC;AAQlD,sFAAsF;AACtF,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AAEzE,kEAAkE;AAClE,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;AAEzE,sEAAsE;AACtE,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;AAElG,MAAM,YAAY,GAAG,0CAA0C,CAAC;AAEhE,SAAS,IAAI,CAAC,GAAe,EAAE,EAAW;IACxC,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,IAAI,IAAI,GAAG,IAAI,CAAC,EAAE,KAAK,SAAS,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;AACvF,CAAC;AAED,SAAS,SAAS,CAAC,GAAe;IAChC,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,GAAG,CAAC;IACxC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,SAAS,IAAI,GAAG;QAAE,OAAO,GAAG,CAAC,OAAO,CAAC;IACpE,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,MAAM,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC,EAAE,CAAC;QACJ,IAAI,CAAC,CAAC;YAAE,SAAS;QACjB,MAAM,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACvB,sEAAsE;QACtE,oEAAoE;QACpE,gBAAgB;QAChB,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,CAAC,EAAE,CAAC;YACJ,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,SAAS;gBAAE,MAAM;QACvC,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,aAAa,CAAC,MAAc;IACnC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACrC,IAAI,MAAM,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IAChC,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IAC5C,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC,CAAC,6BAA6B;IACtE,OAAO,KAAK,CAAC;AACf,CAAC;AAED,wEAAwE;AACxE,SAAS,eAAe,CAAC,IAAc,EAAE,KAAa;IACpD,yDAAyD;IACzD,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,0BAA0B,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACzC,CAAC,EAAE,CAAC;YACJ,SAAS;QACX,CAAC;QACD,IAAI,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAClC,CAAC,EAAE,CAAC;YACJ,iEAAiE;YACjE,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;gBAClB,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAChG,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS;wBAAE,CAAC,EAAE,CAAC;oBACnD,CAAC,EAAE,CAAC;gBACN,CAAC;YACH,CAAC;YACD,SAAS;QACX,CAAC;QACD,MAAM;IACR,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/B,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,GAAG,CAAC;IAEzC,IAAI,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACjC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,QAAQ,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YAC3D,OAAO,0BAA0B,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACtC,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACzD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACvE,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,oBAAoB,CAAC,CAAC;YAC9E,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;gBAAE,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;YAC5D,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IACzG,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;;GAKG;AACH,SAAS,UAAU,CAAC,IAAc;IAChC,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YACf,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;YAC7D,MAAM;QACR,CAAC;QACD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,YAAY,EAAE,CAAC;YACrC,OAAO,GAAG,IAAI,CAAC;YACf,uDAAuD;YACvD,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACzB,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,KAAK,EAAE,IAAI,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAAE,CAAC,EAAE,CAAC;YACtF,CAAC,EAAE,CAAC;YACJ,SAAS;QACX,CAAC;QACD,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YACjD,OAAO,GAAG,IAAI,CAAC;YACf,CAAC,EAAE,CAAC;YACJ,SAAS;QACX,CAAC;QACD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,cAAc,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;YACvE,WAAW,GAAG,IAAI,CAAC;YACnB,CAAC,IAAI,CAAC,CAAC;YACP,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7D,WAAW,GAAG,IAAI,CAAC;YACnB,CAAC,EAAE,CAAC;YACJ,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,mDAAmD;YACnD,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;gBAAE,OAAO,GAAG,IAAI,CAAC;YAC3C,CAAC,EAAE,CAAC;YACJ,SAAS;QACX,CAAC;QACD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,WAAW,GAAG,IAAI,CAAC,CAAC,+BAA+B;YACnD,CAAC,EAAE,CAAC;YACJ,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC,EAAE,CAAC;IACN,CAAC;IACD,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9B,CAAC;AAED,iEAAiE;AACjE,SAAS,WAAW,CAAC,IAAc;IACjC,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAC7B,CAAC,IAAI,CAAC,CAAC;YACP,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,qEAAqE;YACrE,2DAA2D;YAC3D,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;gBAAE,OAAO,GAAG,IAAI,CAAC;YAC9C,yEAAyE;YACzE,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;gBAAE,CAAC,EAAE,CAAC;YACxC,CAAC,EAAE,CAAC;YACJ,SAAS;QACX,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACd,CAAC,EAAE,CAAC;IACN,CAAC;IACD,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9B,CAAC;AAED,SAAS,0BAA0B,CAAC,OAAe,EAAE,KAAa;IAChE,IAAI,MAAoB,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,GAAG,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAiB,CAAC;IAC/F,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,IAAI,GAAa,EAAE,CAAC;IAExB,MAAM,KAAK,GAAG,GAAS,EAAE;QACvB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;QACnE,IAAI,GAAG,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACd,wEAAwE;YACxE,6BAA6B;YAC7B,IAAI,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC;gBAAE,SAAS;YACzD,IAAI,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,GAAG,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;gBACtC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC3B,MAAM,IAAI,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBACzD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;oBAClB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;wBAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC7C,CAAC,EAAE,CAAC;gBACN,CAAC;gBACD,sEAAsE;gBACtE,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;oBAAE,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC1D,SAAS;YACX,CAAC;YACD,IAAI,GAAG,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;gBACpB,CAAC,EAAE,CAAC,CAAC,cAAc;gBACnB,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;oBAAE,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC1D,SAAS;YACX,CAAC;YACD,IAAI,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,CAAC;gBACnB,sEAAsE;gBACtE,sEAAsE;gBACtE,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC3B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC;oBAAE,CAAC,EAAE,CAAC;qBAClD,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC;oBAAE,CAAC,EAAE,CAAC,CAAC,yBAAyB;gBACjE,SAAS;YACX,CAAC;YACD,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC5B,KAAK,EAAE,CAAC;gBACR,SAAS;YACX,CAAC;YACD,SAAS;QACX,CAAC;QACD,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,IAAI,KAAK,IAAI;YAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IACD,KAAK,EAAE,CAAC;IAER,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;AACtC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,OAAe;IACtD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAC1E,OAAO,0BAA0B,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;AAChD,CAAC"}
|
|
@@ -1,3 +1,34 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Universal stdin schema sniffer.
|
|
3
|
+
*
|
|
4
|
+
* Each of the 5 supported agents sends a different JSON shape on stdin
|
|
5
|
+
* when they invoke a hook. This module detects the calling agent and
|
|
6
|
+
* normalises the fields we care about into a single `NormalizedEvent`.
|
|
7
|
+
*
|
|
8
|
+
* Schema cheat sheet:
|
|
9
|
+
* - Windsurf: `.agent_action_name` + `.tool_info.{file_path, edits}`
|
|
10
|
+
* - VS Code: `.hookEventName` (camelCase field) + `.tool_input.…`
|
|
11
|
+
* - Cursor: `.hook_event_name` with **camelCase** value (`preToolUse`)
|
|
12
|
+
* - Codex: `.hook_event_name` with PascalCase value + `tool_name`
|
|
13
|
+
* `apply_patch` carrying a unified diff in `tool_input.patch`
|
|
14
|
+
* - Claude Code: `.hook_event_name` with PascalCase value (default fallback)
|
|
15
|
+
*/
|
|
16
|
+
import { homedir } from 'node:os';
|
|
17
|
+
import { isAbsolute, resolve as resolvePath } from 'node:path';
|
|
18
|
+
import { extractShellWriteTargets } from './shell-writes.js';
|
|
19
|
+
/**
|
|
20
|
+
* Make a shell write target absolute against the agent's cwd. `~` expands
|
|
21
|
+
* to the home directory; a token still carrying a `$VAR` is left untouched
|
|
22
|
+
* (guessing would produce a path that exists nowhere).
|
|
23
|
+
*/
|
|
24
|
+
export function resolveWriteTarget(cwd, target) {
|
|
25
|
+
if (target.includes('$'))
|
|
26
|
+
return target;
|
|
27
|
+
if (target === '~' || target.startsWith('~/')) {
|
|
28
|
+
return resolvePath(homedir(), target.slice(2));
|
|
29
|
+
}
|
|
30
|
+
return isAbsolute(target) ? resolvePath(target) : resolvePath(cwd, target);
|
|
31
|
+
}
|
|
1
32
|
/** Extract a file path from a unified-diff patch (Codex `apply_patch`). */
|
|
2
33
|
export function filePathFromPatch(patch) {
|
|
3
34
|
const lines = patch.split('\n');
|
|
@@ -44,7 +75,14 @@ export function sniff(input) {
|
|
|
44
75
|
else if (action === 'pre_read_code' || action === 'post_read_code') {
|
|
45
76
|
toolName = 'Read';
|
|
46
77
|
}
|
|
47
|
-
return {
|
|
78
|
+
return {
|
|
79
|
+
client: 'windsurf',
|
|
80
|
+
toolName,
|
|
81
|
+
filePath,
|
|
82
|
+
filePaths: filePath ? [filePath] : [],
|
|
83
|
+
newContent,
|
|
84
|
+
raw: input,
|
|
85
|
+
};
|
|
48
86
|
}
|
|
49
87
|
// ── VS Code Copilot ──────────────────────────────────────────────────
|
|
50
88
|
// VS Code uses camelCase field name `hookEventName` (distinct from
|
|
@@ -62,9 +100,15 @@ export function sniff(input) {
|
|
|
62
100
|
}
|
|
63
101
|
else {
|
|
64
102
|
// Codex emits `apply_patch` as a tool name (with patch payload);
|
|
65
|
-
// Claude Code uses Edit/Write/MultiEdit.
|
|
103
|
+
// Claude Code uses Edit/Write/MultiEdit. Both send `Bash` for shell
|
|
104
|
+
// commands, so tool_name alone cannot tell them apart there — Codex's
|
|
105
|
+
// envelope carries a `turn_id` (its documented extension), Claude
|
|
106
|
+
// Code's does not (observed on Codex 0.142 / Claude Code 2.1.267).
|
|
66
107
|
const toolName = typeof input.tool_name === 'string' ? input.tool_name : '';
|
|
67
|
-
client =
|
|
108
|
+
client =
|
|
109
|
+
toolName === 'apply_patch' || 'turn_id' in input
|
|
110
|
+
? 'codex'
|
|
111
|
+
: 'claude-code';
|
|
68
112
|
}
|
|
69
113
|
return extractToolInputShape(input, client);
|
|
70
114
|
}
|
|
@@ -73,6 +117,7 @@ export function sniff(input) {
|
|
|
73
117
|
client: 'unknown',
|
|
74
118
|
toolName: '',
|
|
75
119
|
filePath: '',
|
|
120
|
+
filePaths: [],
|
|
76
121
|
newContent: '',
|
|
77
122
|
raw: input,
|
|
78
123
|
};
|
|
@@ -86,8 +131,23 @@ function extractToolInputShape(input, client) {
|
|
|
86
131
|
const toolName = typeof input.tool_name === 'string' ? input.tool_name : '';
|
|
87
132
|
const toolInput = input.tool_input ?? {};
|
|
88
133
|
let filePath = typeof toolInput.file_path === 'string' ? toolInput.file_path : '';
|
|
134
|
+
let filePaths = [];
|
|
89
135
|
let newContent = '';
|
|
90
136
|
switch (toolName) {
|
|
137
|
+
case 'Bash': {
|
|
138
|
+
// Shell writes (BACK-173 follow-up): `cat > f <<EOF`, `sed -i`, `tee`,
|
|
139
|
+
// `cp`… An agent that edits through the shell must trigger the same
|
|
140
|
+
// rules fetch as one using the edit tool — in the field that is the
|
|
141
|
+
// common path, not the exception. The command text is the intent.
|
|
142
|
+
const command = typeof toolInput.command === 'string' ? toolInput.command : '';
|
|
143
|
+
newContent = command;
|
|
144
|
+
const cwd = typeof input.cwd === 'string' && input.cwd.length > 0
|
|
145
|
+
? input.cwd
|
|
146
|
+
: process.cwd();
|
|
147
|
+
filePaths = extractShellWriteTargets(command).map((t) => resolveWriteTarget(cwd, t));
|
|
148
|
+
filePath = filePaths[0] ?? '';
|
|
149
|
+
break;
|
|
150
|
+
}
|
|
91
151
|
case 'Write':
|
|
92
152
|
newContent =
|
|
93
153
|
typeof toolInput.content === 'string' ? toolInput.content : '';
|
|
@@ -100,13 +160,32 @@ function extractToolInputShape(input, client) {
|
|
|
100
160
|
newContent = joinMultiEditNewStrings(toolInput.edits);
|
|
101
161
|
break;
|
|
102
162
|
case 'apply_patch': {
|
|
103
|
-
|
|
163
|
+
// Codex hands the patch text in `tool_input.command` (its docs: "for
|
|
164
|
+
// Bash and apply_patch: tool_input.command"; observed on 0.142 —
|
|
165
|
+
// BACK-173). Older builds used `tool_input.patch`. Accept both — with
|
|
166
|
+
// only `.patch` read, current Codex yielded an empty file path and
|
|
167
|
+
// fetch-rules exited before ever calling the gateway.
|
|
168
|
+
const patch = typeof toolInput.patch === 'string'
|
|
169
|
+
? toolInput.patch
|
|
170
|
+
: typeof toolInput.command === 'string'
|
|
171
|
+
? toolInput.command
|
|
172
|
+
: '';
|
|
104
173
|
newContent = patch;
|
|
105
174
|
if (!filePath)
|
|
106
175
|
filePath = filePathFromPatch(patch);
|
|
107
176
|
break;
|
|
108
177
|
}
|
|
109
178
|
}
|
|
110
|
-
|
|
179
|
+
// Relative paths (Codex `*** Update File: src/x.ts`, observed on 0.142)
|
|
180
|
+
// are resolved against the agent's cwd when the envelope carries one, so
|
|
181
|
+
// the rules fetch targets the same absolute file the agent is editing.
|
|
182
|
+
if (typeof input.cwd === 'string' && input.cwd.length > 0) {
|
|
183
|
+
if (filePath)
|
|
184
|
+
filePath = resolveWriteTarget(input.cwd, filePath);
|
|
185
|
+
filePaths = filePaths.map((f) => resolveWriteTarget(input.cwd, f));
|
|
186
|
+
}
|
|
187
|
+
if (filePaths.length === 0 && filePath)
|
|
188
|
+
filePaths = [filePath];
|
|
189
|
+
return { client, toolName, filePath, filePaths, newContent, raw: input };
|
|
111
190
|
}
|
|
112
191
|
//# sourceMappingURL=sniff.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sniff.js","sourceRoot":"","sources":["../../../src/hooks/runtime/sniff.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sniff.js","sourceRoot":"","sources":["../../../src/hooks/runtime/sniff.ts"],"names":[],"mappings":"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"}
|