sentinelayer-cli 0.4.5 → 0.8.0
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 +16 -18
- package/package.json +7 -6
- package/src/agents/jules/config/definition.js +13 -62
- package/src/agents/jules/config/system-prompt.js +8 -1
- package/src/agents/jules/fix-cycle.js +12 -372
- package/src/agents/jules/loop.js +116 -26
- package/src/agents/jules/pulse.js +10 -327
- package/src/agents/jules/stream.js +13 -12
- package/src/agents/jules/swarm/orchestrator.js +3 -3
- package/src/agents/jules/swarm/sub-agent.js +6 -3
- package/src/agents/jules/tools/aidenid-email.js +189 -0
- package/src/agents/jules/tools/auth-audit.js +1187 -45
- package/src/agents/jules/tools/dispatch.js +25 -12
- package/src/agents/jules/tools/file-edit.js +2 -180
- package/src/agents/jules/tools/file-read.js +2 -100
- package/src/agents/jules/tools/glob.js +2 -168
- package/src/agents/jules/tools/grep.js +2 -228
- package/src/agents/jules/tools/path-guards.js +2 -161
- package/src/agents/jules/tools/runtime-audit.js +6 -2
- package/src/agents/jules/tools/shell.js +2 -383
- package/src/agents/persona-visuals.js +64 -0
- package/src/agents/shared-tools/dispatch-core.js +320 -0
- package/src/agents/shared-tools/file-edit.js +180 -0
- package/src/agents/shared-tools/file-read.js +100 -0
- package/src/agents/shared-tools/glob.js +168 -0
- package/src/agents/shared-tools/grep.js +228 -0
- package/src/agents/shared-tools/index.js +46 -0
- package/src/agents/shared-tools/path-guards.js +161 -0
- package/src/agents/shared-tools/shell.js +383 -0
- package/src/ai/aidenid.js +56 -7
- package/src/ai/client.js +45 -0
- package/src/ai/proxy.js +137 -0
- package/src/auth/gate.js +290 -16
- package/src/auth/http.js +450 -39
- package/src/auth/service.js +262 -47
- package/src/auth/session-store.js +475 -21
- package/src/cli.js +5 -0
- package/src/commands/audit.js +13 -8
- package/src/commands/auth.js +53 -9
- package/src/commands/omargate.js +10 -2
- package/src/commands/scan.js +10 -4
- package/src/commands/session.js +590 -0
- package/src/commands/spec.js +62 -0
- package/src/commands/watch.js +3 -2
- package/src/daemon/assignment-ledger.js +196 -0
- package/src/daemon/error-worker.js +599 -16
- package/src/daemon/fix-cycle.js +384 -0
- package/src/daemon/ingest-refresh.js +10 -9
- package/src/daemon/jira-lifecycle.js +135 -0
- package/src/daemon/pulse.js +327 -0
- package/src/daemon/scope-engine.js +1068 -0
- package/src/events/schema.js +190 -0
- package/src/interactive/index.js +18 -16
- package/src/legacy-cli.js +606 -37
- package/src/prompt/generator.js +19 -1
- package/src/review/ai-review.js +11 -1
- package/src/review/local-review.js +75 -19
- package/src/review/omargate-interactive.js +68 -0
- package/src/review/omargate-orchestrator.js +404 -0
- package/src/review/persona-prompts.js +296 -0
- package/src/review/scan-modes.js +48 -0
- package/src/scan/generator.js +1 -1
- package/src/session/agent-registry.js +352 -0
- package/src/session/daemon.js +801 -0
- package/src/session/paths.js +33 -0
- package/src/session/runtime-bridge.js +739 -0
- package/src/session/store.js +388 -0
- package/src/session/stream.js +325 -0
- package/src/spec/generator.js +100 -0
- package/src/telemetry/session-tracker.js +148 -32
- package/src/telemetry/sync.js +6 -2
- package/src/ui/command-hints.js +13 -0
|
@@ -0,0 +1,383 @@
|
|
|
1
|
+
import { execSync } from "node:child_process";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
|
|
4
|
+
const DEFAULT_TIMEOUT_MS = 120_000;
|
|
5
|
+
const MAX_OUTPUT_CHARS = 30_000;
|
|
6
|
+
const DEFAULT_ALLOWED_FETCH_HOSTS = [
|
|
7
|
+
"github.com",
|
|
8
|
+
"api.github.com",
|
|
9
|
+
"raw.githubusercontent.com",
|
|
10
|
+
"*.githubusercontent.com",
|
|
11
|
+
"registry.npmjs.org",
|
|
12
|
+
"registry.yarnpkg.com",
|
|
13
|
+
"pypi.org",
|
|
14
|
+
"files.pythonhosted.org",
|
|
15
|
+
"rubygems.org",
|
|
16
|
+
"crates.io",
|
|
17
|
+
"static.crates.io",
|
|
18
|
+
];
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Patterns that are BLOCKED unconditionally.
|
|
22
|
+
* Sourced from review/local-review.js security rules + src bash security patterns.
|
|
23
|
+
*/
|
|
24
|
+
const BLOCKED_PATTERNS = [
|
|
25
|
+
{ pattern: /rm\s+(-[rR]f?|--recursive)\s+\/($|\s)/, desc: "rm -rf /" },
|
|
26
|
+
{ pattern: /:\(\)\s*\{[^}]*\}\s*;?\s*:/, desc: "fork bomb" },
|
|
27
|
+
{ pattern: /\beval\s*\(/, desc: "eval injection" },
|
|
28
|
+
{ pattern: /curl[^|]*\|\s*(ba)?sh/, desc: "pipe to shell" },
|
|
29
|
+
{ pattern: /wget[^|]*\|\s*(ba)?sh/, desc: "wget pipe to shell" },
|
|
30
|
+
{ pattern: />\s*\/dev\/sd[a-z]/, desc: "write to raw device" },
|
|
31
|
+
{ pattern: /mkfs\./, desc: "filesystem format" },
|
|
32
|
+
{ pattern: /dd\s+.*of=\/dev\//, desc: "dd to device" },
|
|
33
|
+
{ pattern: /chmod\s+777\s+\//, desc: "chmod 777 root" },
|
|
34
|
+
{ pattern: />\s*\/etc\//, desc: "write to /etc" },
|
|
35
|
+
{ pattern: /rm\s+-rf?\s+~/, desc: "rm home directory" },
|
|
36
|
+
{ pattern: /git\s+push\s+.*--force\s+.*main/, desc: "force push to main" },
|
|
37
|
+
{ pattern: /git\s+reset\s+--hard/, desc: "git reset hard" },
|
|
38
|
+
{ pattern: /DROP\s+TABLE|DROP\s+DATABASE/i, desc: "SQL drop" },
|
|
39
|
+
{ pattern: /TRUNCATE\s+TABLE/i, desc: "SQL truncate" },
|
|
40
|
+
];
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Patterns that trigger a WARNING but are allowed.
|
|
44
|
+
*/
|
|
45
|
+
const WARN_PATTERNS = [
|
|
46
|
+
{ pattern: /npm\s+install|yarn\s+add|pnpm\s+add/, desc: "package install" },
|
|
47
|
+
{ pattern: /git\s+push/, desc: "git push" },
|
|
48
|
+
{ pattern: /curl\s|wget\s|fetch\(/, desc: "network request" },
|
|
49
|
+
{ pattern: /rm\s+-/, desc: "file deletion" },
|
|
50
|
+
{ pattern: /sudo\s/, desc: "elevated privileges" },
|
|
51
|
+
];
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* Environment variables to strip from child process env.
|
|
55
|
+
* Prevents credential leakage to spawned commands.
|
|
56
|
+
*/
|
|
57
|
+
const EXACT_ENV_KEYS_TO_STRIP = new Set([
|
|
58
|
+
"ANTHROPIC_API_KEY",
|
|
59
|
+
"OPENAI_API_KEY",
|
|
60
|
+
"GOOGLE_API_KEY",
|
|
61
|
+
"GEMINI_API_KEY",
|
|
62
|
+
"SENTINELAYER_TOKEN",
|
|
63
|
+
"AIDENID_API_KEY",
|
|
64
|
+
"AIDENID_TOKEN",
|
|
65
|
+
"AWS_ACCESS_KEY_ID",
|
|
66
|
+
"AWS_SECRET_ACCESS_KEY",
|
|
67
|
+
"AWS_SESSION_TOKEN",
|
|
68
|
+
"AWS_WEB_IDENTITY_TOKEN_FILE",
|
|
69
|
+
"AZURE_CLIENT_SECRET",
|
|
70
|
+
"GOOGLE_APPLICATION_CREDENTIALS",
|
|
71
|
+
"GITHUB_TOKEN",
|
|
72
|
+
"GH_TOKEN",
|
|
73
|
+
"GITLAB_TOKEN",
|
|
74
|
+
"BITBUCKET_TOKEN",
|
|
75
|
+
"NPM_TOKEN",
|
|
76
|
+
"NODE_AUTH_TOKEN",
|
|
77
|
+
"PYPI_API_TOKEN",
|
|
78
|
+
"RUBYGEMS_API_KEY",
|
|
79
|
+
"CARGO_REGISTRY_TOKEN",
|
|
80
|
+
"ACTIONS_ID_TOKEN_REQUEST_TOKEN",
|
|
81
|
+
"ACTIONS_RUNTIME_TOKEN",
|
|
82
|
+
"CI_JOB_TOKEN",
|
|
83
|
+
"CI_JOB_JWT",
|
|
84
|
+
"STRIPE_SECRET_KEY",
|
|
85
|
+
"SLACK_BOT_TOKEN",
|
|
86
|
+
"TELEGRAM_BOT_TOKEN",
|
|
87
|
+
"DISCORD_BOT_TOKEN",
|
|
88
|
+
"TWILIO_AUTH_TOKEN",
|
|
89
|
+
"SENDGRID_API_KEY",
|
|
90
|
+
"RESEND_API_KEY",
|
|
91
|
+
"DATABASE_URL",
|
|
92
|
+
"REDIS_URL",
|
|
93
|
+
"MONGODB_URI",
|
|
94
|
+
"SSH_SIGNING_KEY",
|
|
95
|
+
"SSH_PRIVATE_KEY",
|
|
96
|
+
"KUBECONFIG",
|
|
97
|
+
"KUBE_CONFIG_DATA",
|
|
98
|
+
]);
|
|
99
|
+
|
|
100
|
+
const ENV_KEY_PREFIX_PATTERNS = [
|
|
101
|
+
/^AIDENID_/i,
|
|
102
|
+
/^SENTINELAYER_/i,
|
|
103
|
+
/^OPENAI_/i,
|
|
104
|
+
/^ANTHROPIC_/i,
|
|
105
|
+
/^GOOGLE_/i,
|
|
106
|
+
/^GITHUB_/i,
|
|
107
|
+
/^GH_/i,
|
|
108
|
+
/^AWS_/i,
|
|
109
|
+
/^AZURE_/i,
|
|
110
|
+
/^SLACK_/i,
|
|
111
|
+
/^STRIPE_/i,
|
|
112
|
+
/^TELEGRAM_/i,
|
|
113
|
+
/^DISCORD_/i,
|
|
114
|
+
/^TWILIO_/i,
|
|
115
|
+
/^SENDGRID_/i,
|
|
116
|
+
/^RESEND_/i,
|
|
117
|
+
];
|
|
118
|
+
|
|
119
|
+
const ENV_KEY_SUFFIX_PATTERNS = [
|
|
120
|
+
/_TOKEN$/i,
|
|
121
|
+
/_API_KEY$/i,
|
|
122
|
+
/_SECRET$/i,
|
|
123
|
+
/_SECRET_KEY$/i,
|
|
124
|
+
/_PASSWORD$/i,
|
|
125
|
+
/_PRIVATE_KEY$/i,
|
|
126
|
+
/_ACCESS_KEY$/i,
|
|
127
|
+
/_AUTH_TOKEN$/i,
|
|
128
|
+
/_SESSION_TOKEN$/i,
|
|
129
|
+
];
|
|
130
|
+
|
|
131
|
+
/**
|
|
132
|
+
* Execute a shell command with security analysis, timeout, and env scrubbing.
|
|
133
|
+
*
|
|
134
|
+
* @param {object} input
|
|
135
|
+
* @param {string} input.command - The shell command to execute.
|
|
136
|
+
* @param {string} [input.cwd] - Working directory (default: process.cwd()).
|
|
137
|
+
* @param {number} [input.timeout] - Timeout in ms (default: 120000).
|
|
138
|
+
* @returns {{ stdout, stderr, exitCode, durationMs, command, security }}
|
|
139
|
+
*/
|
|
140
|
+
export function shell(input) {
|
|
141
|
+
if (!input.command || typeof input.command !== "string") {
|
|
142
|
+
throw new ShellError("command is required and must be a non-empty string.");
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
const command = input.command.trim();
|
|
146
|
+
const cwd = input.cwd ? path.resolve(input.cwd) : process.cwd();
|
|
147
|
+
const timeout = input.timeout ?? DEFAULT_TIMEOUT_MS;
|
|
148
|
+
|
|
149
|
+
// Security analysis
|
|
150
|
+
const security = analyzeCommand(command);
|
|
151
|
+
if (security.risk === "blocked") {
|
|
152
|
+
throw new ShellBlockedError(
|
|
153
|
+
`Command blocked: ${security.patterns[0].desc}`,
|
|
154
|
+
security,
|
|
155
|
+
);
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
// Build scrubbed environment
|
|
159
|
+
const env = buildScrubbedEnv();
|
|
160
|
+
|
|
161
|
+
const startMs = Date.now();
|
|
162
|
+
let stdout = "";
|
|
163
|
+
let stderr = "";
|
|
164
|
+
let exitCode = 0;
|
|
165
|
+
|
|
166
|
+
try {
|
|
167
|
+
stdout = execSync(command, {
|
|
168
|
+
cwd,
|
|
169
|
+
encoding: "utf-8",
|
|
170
|
+
timeout,
|
|
171
|
+
env,
|
|
172
|
+
maxBuffer: 10 * 1024 * 1024,
|
|
173
|
+
stdio: ["pipe", "pipe", "pipe"],
|
|
174
|
+
});
|
|
175
|
+
} catch (err) {
|
|
176
|
+
exitCode = err.status ?? 1;
|
|
177
|
+
stdout = err.stdout ?? "";
|
|
178
|
+
stderr = err.stderr ?? "";
|
|
179
|
+
if (err.killed) {
|
|
180
|
+
stderr += `\n[Process killed: timeout after ${timeout}ms]`;
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
const durationMs = Date.now() - startMs;
|
|
185
|
+
|
|
186
|
+
// Truncate large outputs
|
|
187
|
+
if (stdout.length > MAX_OUTPUT_CHARS) {
|
|
188
|
+
stdout = stdout.slice(0, MAX_OUTPUT_CHARS) + "\n[... truncated]";
|
|
189
|
+
}
|
|
190
|
+
if (stderr.length > MAX_OUTPUT_CHARS) {
|
|
191
|
+
stderr = stderr.slice(0, MAX_OUTPUT_CHARS) + "\n[... truncated]";
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
return { stdout, stderr, exitCode, durationMs, command, security };
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
/**
|
|
198
|
+
* Analyze a command for security risks.
|
|
199
|
+
* @param {object} [options]
|
|
200
|
+
* @param {Record<string, string|undefined>} [options.env]
|
|
201
|
+
* @returns {{ risk: "safe"|"warn"|"blocked", patterns: Array<{desc}>, networkPolicy?: object }}
|
|
202
|
+
*/
|
|
203
|
+
export function analyzeCommand(command, options = {}) {
|
|
204
|
+
const networkPolicy = evaluateNetworkPolicy(command, options.env);
|
|
205
|
+
if (networkPolicy.blocking) {
|
|
206
|
+
return {
|
|
207
|
+
risk: "blocked",
|
|
208
|
+
patterns: [{ desc: networkPolicy.reason }],
|
|
209
|
+
networkPolicy,
|
|
210
|
+
};
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
for (const rule of BLOCKED_PATTERNS) {
|
|
214
|
+
if (rule.pattern.test(command)) {
|
|
215
|
+
return { risk: "blocked", patterns: [rule], networkPolicy };
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
const warnings = [];
|
|
220
|
+
for (const rule of WARN_PATTERNS) {
|
|
221
|
+
if (rule.pattern.test(command)) {
|
|
222
|
+
warnings.push(rule);
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
if (warnings.length > 0) {
|
|
227
|
+
return { risk: "warn", patterns: warnings, networkPolicy };
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
return { risk: "safe", patterns: [], networkPolicy };
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
export function buildScrubbedEnv(sourceEnv = process.env) {
|
|
234
|
+
const env = { ...sourceEnv };
|
|
235
|
+
for (const key of Object.keys(env)) {
|
|
236
|
+
if (shouldStripEnvKey(key)) {
|
|
237
|
+
delete env[key];
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
return env;
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
function shouldStripEnvKey(key) {
|
|
244
|
+
if (!key) {
|
|
245
|
+
return false;
|
|
246
|
+
}
|
|
247
|
+
|
|
248
|
+
const upperKey = String(key).toUpperCase();
|
|
249
|
+
if (EXACT_ENV_KEYS_TO_STRIP.has(upperKey)) {
|
|
250
|
+
return true;
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
if (upperKey.startsWith("INPUT_")) {
|
|
254
|
+
const baseKey = upperKey.slice("INPUT_".length);
|
|
255
|
+
if (EXACT_ENV_KEYS_TO_STRIP.has(baseKey)) {
|
|
256
|
+
return true;
|
|
257
|
+
}
|
|
258
|
+
if (ENV_KEY_PREFIX_PATTERNS.some((pattern) => pattern.test(baseKey))) {
|
|
259
|
+
return true;
|
|
260
|
+
}
|
|
261
|
+
if (ENV_KEY_SUFFIX_PATTERNS.some((pattern) => pattern.test(baseKey))) {
|
|
262
|
+
return true;
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
|
|
266
|
+
if (ENV_KEY_PREFIX_PATTERNS.some((pattern) => pattern.test(upperKey))) {
|
|
267
|
+
return true;
|
|
268
|
+
}
|
|
269
|
+
|
|
270
|
+
return ENV_KEY_SUFFIX_PATTERNS.some((pattern) => pattern.test(upperKey));
|
|
271
|
+
}
|
|
272
|
+
|
|
273
|
+
function evaluateNetworkPolicy(command, sourceEnv = process.env) {
|
|
274
|
+
if (!/\b(curl|wget)\b/i.test(command)) {
|
|
275
|
+
return {
|
|
276
|
+
blocking: false,
|
|
277
|
+
hosts: [],
|
|
278
|
+
deniedHosts: [],
|
|
279
|
+
};
|
|
280
|
+
}
|
|
281
|
+
|
|
282
|
+
const hosts = extractNetworkHosts(command);
|
|
283
|
+
if (hosts.length === 0) {
|
|
284
|
+
return {
|
|
285
|
+
blocking: true,
|
|
286
|
+
hosts: [],
|
|
287
|
+
deniedHosts: [],
|
|
288
|
+
reason: "network command requires explicit URL host",
|
|
289
|
+
};
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
const allowlist = resolveAllowedFetchHosts(sourceEnv);
|
|
293
|
+
const deniedHosts = hosts.filter((host) => !isAllowedHost(host, allowlist));
|
|
294
|
+
if (deniedHosts.length > 0) {
|
|
295
|
+
return {
|
|
296
|
+
blocking: true,
|
|
297
|
+
hosts,
|
|
298
|
+
deniedHosts,
|
|
299
|
+
reason: `network host not allowlisted: ${deniedHosts.join(", ")}`,
|
|
300
|
+
};
|
|
301
|
+
}
|
|
302
|
+
|
|
303
|
+
return {
|
|
304
|
+
blocking: false,
|
|
305
|
+
hosts,
|
|
306
|
+
deniedHosts: [],
|
|
307
|
+
};
|
|
308
|
+
}
|
|
309
|
+
|
|
310
|
+
function resolveAllowedFetchHosts(sourceEnv = process.env) {
|
|
311
|
+
const configured = String(sourceEnv.SENTINELAYER_ALLOWED_FETCH_HOSTS || "")
|
|
312
|
+
.split(",")
|
|
313
|
+
.map((item) => normalizeHostPattern(item))
|
|
314
|
+
.filter(Boolean);
|
|
315
|
+
|
|
316
|
+
const allPatterns = [...DEFAULT_ALLOWED_FETCH_HOSTS, ...configured]
|
|
317
|
+
.map((item) => normalizeHostPattern(item))
|
|
318
|
+
.filter(Boolean);
|
|
319
|
+
return Array.from(new Set(allPatterns));
|
|
320
|
+
}
|
|
321
|
+
|
|
322
|
+
function extractNetworkHosts(command) {
|
|
323
|
+
const matches = command.matchAll(/\bhttps?:\/\/([^\s"'`]+)/gi);
|
|
324
|
+
const hosts = new Set();
|
|
325
|
+
for (const match of matches) {
|
|
326
|
+
const candidate = match?.[0];
|
|
327
|
+
if (!candidate) {
|
|
328
|
+
continue;
|
|
329
|
+
}
|
|
330
|
+
try {
|
|
331
|
+
const parsed = new URL(candidate);
|
|
332
|
+
const host = normalizeHostPattern(parsed.hostname);
|
|
333
|
+
if (host) {
|
|
334
|
+
hosts.add(host);
|
|
335
|
+
}
|
|
336
|
+
} catch {
|
|
337
|
+
// Skip malformed URL segments.
|
|
338
|
+
}
|
|
339
|
+
}
|
|
340
|
+
return Array.from(hosts);
|
|
341
|
+
}
|
|
342
|
+
|
|
343
|
+
function isAllowedHost(host, allowlist) {
|
|
344
|
+
const normalizedHost = normalizeHostPattern(host);
|
|
345
|
+
if (!normalizedHost) {
|
|
346
|
+
return false;
|
|
347
|
+
}
|
|
348
|
+
|
|
349
|
+
return allowlist.some((pattern) => {
|
|
350
|
+
if (!pattern) {
|
|
351
|
+
return false;
|
|
352
|
+
}
|
|
353
|
+
|
|
354
|
+
if (pattern.startsWith("*.")) {
|
|
355
|
+
const suffix = pattern.slice(2);
|
|
356
|
+
return normalizedHost === suffix || normalizedHost.endsWith(`.${suffix}`);
|
|
357
|
+
}
|
|
358
|
+
|
|
359
|
+
return normalizedHost === pattern;
|
|
360
|
+
});
|
|
361
|
+
}
|
|
362
|
+
|
|
363
|
+
function normalizeHostPattern(value) {
|
|
364
|
+
return String(value || "")
|
|
365
|
+
.trim()
|
|
366
|
+
.toLowerCase()
|
|
367
|
+
.replace(/\.$/, "");
|
|
368
|
+
}
|
|
369
|
+
|
|
370
|
+
export class ShellError extends Error {
|
|
371
|
+
constructor(message) {
|
|
372
|
+
super(message);
|
|
373
|
+
this.name = "ShellError";
|
|
374
|
+
}
|
|
375
|
+
}
|
|
376
|
+
|
|
377
|
+
export class ShellBlockedError extends ShellError {
|
|
378
|
+
constructor(message, security) {
|
|
379
|
+
super(message);
|
|
380
|
+
this.name = "ShellBlockedError";
|
|
381
|
+
this.security = security;
|
|
382
|
+
}
|
|
383
|
+
}
|
package/src/ai/aidenid.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import process from "node:process";
|
|
2
|
+
import { authLoginHint } from "../ui/command-hints.js";
|
|
2
3
|
|
|
3
4
|
export const DEFAULT_AIDENID_API_URL = "https://api.aidenid.com";
|
|
4
5
|
|
|
@@ -158,16 +159,55 @@ export function buildChildIdentityPayload({
|
|
|
158
159
|
};
|
|
159
160
|
}
|
|
160
161
|
|
|
162
|
+
async function resolveSessionCredentialContext({
|
|
163
|
+
env,
|
|
164
|
+
session,
|
|
165
|
+
fetchCredentials,
|
|
166
|
+
autoResolveSession = true,
|
|
167
|
+
}) {
|
|
168
|
+
let resolvedSession = session;
|
|
169
|
+
let resolvedFetcher = typeof fetchCredentials === "function" ? fetchCredentials : null;
|
|
170
|
+
|
|
171
|
+
if (!autoResolveSession) {
|
|
172
|
+
return { session: resolvedSession, fetchCredentials: resolvedFetcher };
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
try {
|
|
176
|
+
const { resolveActiveAuthSession, fetchAidenIdCredentials } = await import("../auth/service.js");
|
|
177
|
+
const activeSession = await resolveActiveAuthSession({
|
|
178
|
+
cwd: process.cwd(),
|
|
179
|
+
env,
|
|
180
|
+
autoRotate: false,
|
|
181
|
+
});
|
|
182
|
+
if (activeSession && activeSession.token) {
|
|
183
|
+
resolvedSession = activeSession;
|
|
184
|
+
}
|
|
185
|
+
if (resolvedSession && resolvedSession.token && (!resolvedFetcher || activeSession?.token)) {
|
|
186
|
+
resolvedFetcher = () =>
|
|
187
|
+
fetchAidenIdCredentials({
|
|
188
|
+
apiUrl: resolvedSession.apiUrl || "https://api.sentinelayer.com",
|
|
189
|
+
token: resolvedSession.token,
|
|
190
|
+
});
|
|
191
|
+
}
|
|
192
|
+
} catch {
|
|
193
|
+
// Auth context resolution is best-effort.
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
return { session: resolvedSession, fetchCredentials: resolvedFetcher };
|
|
197
|
+
}
|
|
198
|
+
|
|
161
199
|
/**
|
|
162
200
|
* Resolve AIdenID credentials with precedence:
|
|
163
201
|
* 1. Explicit flags (--api-key, --org-id, --project-id)
|
|
164
202
|
* 2. Environment vars (AIDENID_API_KEY, AIDENID_ORG_ID, AIDENID_PROJECT_ID)
|
|
165
|
-
* 3. Session metadata (org_id, project_id
|
|
203
|
+
* 3. Session metadata (org_id, project_id) + lazy-fetch secret from SL API
|
|
204
|
+
* using active auth source resolution (env -> config -> stored session)
|
|
166
205
|
* 4. Error with guidance
|
|
167
206
|
*
|
|
168
207
|
* @param {object} options
|
|
169
208
|
* @param {object} [options.session] - Stored session from readStoredSession(), may contain aidenid metadata
|
|
170
209
|
* @param {Function} [options.fetchCredentials] - Async function to lazy-fetch secret from SL API
|
|
210
|
+
* @param {boolean} [options.autoResolveSession] - Auto-discover active SL auth session from local context
|
|
171
211
|
*/
|
|
172
212
|
export async function resolveAidenIdCredentials(
|
|
173
213
|
{
|
|
@@ -178,19 +218,28 @@ export async function resolveAidenIdCredentials(
|
|
|
178
218
|
requireAll = true,
|
|
179
219
|
session = null,
|
|
180
220
|
fetchCredentials = null,
|
|
221
|
+
autoResolveSession = true,
|
|
181
222
|
} = {}
|
|
182
223
|
) {
|
|
183
|
-
const
|
|
184
|
-
|
|
224
|
+
const sessionContext = await resolveSessionCredentialContext({
|
|
225
|
+
env,
|
|
226
|
+
session,
|
|
227
|
+
fetchCredentials,
|
|
228
|
+
autoResolveSession,
|
|
229
|
+
});
|
|
230
|
+
const activeSession = sessionContext.session;
|
|
231
|
+
const activeFetchCredentials = sessionContext.fetchCredentials;
|
|
232
|
+
const sessionAidenId = activeSession && activeSession.aidenid ? activeSession.aidenid : null;
|
|
233
|
+
const hasSessionToken = Boolean(String(activeSession && activeSession.token ? activeSession.token : "").trim());
|
|
185
234
|
|
|
186
235
|
let resolvedApiKey = String(apiKey || env.AIDENID_API_KEY || "").trim();
|
|
187
236
|
let resolvedOrgId = String(orgId || env.AIDENID_ORG_ID || (sessionAidenId && sessionAidenId.orgId) || "").trim();
|
|
188
237
|
let resolvedProjectId = String(projectId || env.AIDENID_PROJECT_ID || (sessionAidenId && sessionAidenId.projectId) || "").trim();
|
|
189
238
|
|
|
190
239
|
// Lazy-fetch secret from SentinelLayer API when a CLI session token is available.
|
|
191
|
-
if (!resolvedApiKey && hasSessionToken && typeof
|
|
240
|
+
if (!resolvedApiKey && hasSessionToken && typeof activeFetchCredentials === "function") {
|
|
192
241
|
try {
|
|
193
|
-
const fetched = await
|
|
242
|
+
const fetched = await activeFetchCredentials();
|
|
194
243
|
if (fetched && fetched.apiKey) {
|
|
195
244
|
resolvedApiKey = String(fetched.apiKey).trim();
|
|
196
245
|
if (!resolvedOrgId && fetched.orgId) resolvedOrgId = String(fetched.orgId).trim();
|
|
@@ -208,8 +257,8 @@ export async function resolveAidenIdCredentials(
|
|
|
208
257
|
|
|
209
258
|
if (requireAll && missing.length > 0) {
|
|
210
259
|
const hint = hasSessionToken
|
|
211
|
-
?
|
|
212
|
-
:
|
|
260
|
+
? ` (session token exists but AIdenID credential fetch failed — check network or run '${authLoginHint()}' again)`
|
|
261
|
+
: ` (run '${authLoginHint()}' to auto-provision, or set env vars manually)`;
|
|
213
262
|
throw new Error(`Missing AIdenID credentials: ${missing.join(", ")}.${hint}`);
|
|
214
263
|
}
|
|
215
264
|
|
package/src/ai/client.js
CHANGED
|
@@ -1,13 +1,17 @@
|
|
|
1
|
+
import { invokeViaProxy, DEFAULT_PROXY_MODEL } from "./proxy.js";
|
|
2
|
+
|
|
1
3
|
const PROVIDER_ENV_KEYS = Object.freeze({
|
|
2
4
|
openai: "OPENAI_API_KEY",
|
|
3
5
|
anthropic: "ANTHROPIC_API_KEY",
|
|
4
6
|
google: "GOOGLE_API_KEY",
|
|
7
|
+
sentinelayer: "SENTINELAYER_TOKEN",
|
|
5
8
|
});
|
|
6
9
|
|
|
7
10
|
const DEFAULT_MODELS = Object.freeze({
|
|
8
11
|
openai: "gpt-4o",
|
|
9
12
|
anthropic: "claude-sonnet-4",
|
|
10
13
|
google: "gemini-2.5-pro",
|
|
14
|
+
sentinelayer: DEFAULT_PROXY_MODEL,
|
|
11
15
|
});
|
|
12
16
|
|
|
13
17
|
const SUPPORTED_PROVIDERS = Object.freeze(Object.keys(PROVIDER_ENV_KEYS));
|
|
@@ -308,6 +312,30 @@ export function resolveProvider({ provider, configProvider, env = process.env }
|
|
|
308
312
|
return "openai";
|
|
309
313
|
}
|
|
310
314
|
|
|
315
|
+
/**
|
|
316
|
+
* Async version of resolveProvider that also checks for stored sentinelayer session.
|
|
317
|
+
* Use this when you can await (e.g., in command handlers).
|
|
318
|
+
*/
|
|
319
|
+
export async function resolveProviderAsync({ provider, configProvider, env = process.env } = {}) {
|
|
320
|
+
const sync = resolveProvider({ provider, configProvider, env });
|
|
321
|
+
if (sync !== "openai" || provider || configProvider) {
|
|
322
|
+
return sync; // explicit or env-detected, no need to check session
|
|
323
|
+
}
|
|
324
|
+
|
|
325
|
+
// No explicit provider and no env keys — check for stored session
|
|
326
|
+
try {
|
|
327
|
+
const { readStoredSessionMetadata } = await import("../auth/session-store.js");
|
|
328
|
+
const meta = await readStoredSessionMetadata();
|
|
329
|
+
if (meta && meta.tokenId) {
|
|
330
|
+
return "sentinelayer";
|
|
331
|
+
}
|
|
332
|
+
} catch {
|
|
333
|
+
// No session — fall through
|
|
334
|
+
}
|
|
335
|
+
|
|
336
|
+
return sync;
|
|
337
|
+
}
|
|
338
|
+
|
|
311
339
|
/**
|
|
312
340
|
* Resolve model precedence for a provider: explicit -> config -> provider default.
|
|
313
341
|
*
|
|
@@ -401,6 +429,23 @@ export class MultiProviderApiClient {
|
|
|
401
429
|
} = {}) {
|
|
402
430
|
const resolvedProvider = resolveProvider({ provider, env });
|
|
403
431
|
const resolvedModel = resolveModel({ provider: resolvedProvider, model });
|
|
432
|
+
|
|
433
|
+
// SentinelLayer proxy: delegate to proxy.js instead of direct API call
|
|
434
|
+
if (resolvedProvider === "sentinelayer") {
|
|
435
|
+
const result = await invokeViaProxy({
|
|
436
|
+
prompt,
|
|
437
|
+
systemPrompt: "",
|
|
438
|
+
model: resolvedModel,
|
|
439
|
+
maxTokens: 4096,
|
|
440
|
+
});
|
|
441
|
+
return {
|
|
442
|
+
text: result.text,
|
|
443
|
+
usage: result.usage,
|
|
444
|
+
provider: "sentinelayer",
|
|
445
|
+
model: resolvedModel,
|
|
446
|
+
};
|
|
447
|
+
}
|
|
448
|
+
|
|
404
449
|
const resolvedApiKey = resolveApiKey({
|
|
405
450
|
provider: resolvedProvider,
|
|
406
451
|
explicitApiKey: apiKey,
|
package/src/ai/proxy.js
ADDED
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* SentinelLayer LLM proxy provider.
|
|
3
|
+
*
|
|
4
|
+
* Routes LLM calls through POST /api/v1/proxy/llm using the stored
|
|
5
|
+
* sentinelayer_token. Users never need their own OpenAI/Anthropic key.
|
|
6
|
+
*
|
|
7
|
+
* Request: { model, system_prompt, user_content, max_tokens, temperature }
|
|
8
|
+
* Response: { content, usage: { model, provider, tokens_in, tokens_out, cost_usd, latency_ms } }
|
|
9
|
+
*/
|
|
10
|
+
|
|
11
|
+
import { resolveActiveAuthSession } from "../auth/service.js";
|
|
12
|
+
import { authLoginHint } from "../ui/command-hints.js";
|
|
13
|
+
|
|
14
|
+
const DEFAULT_PROXY_MODEL = "gpt-5.3-codex";
|
|
15
|
+
const PROXY_TIMEOUT_MS = 120_000;
|
|
16
|
+
const PROXY_MAX_RETRIES = 2;
|
|
17
|
+
const PROXY_RETRY_STATUSES = new Set([429, 502, 503, 504]);
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* Invoke LLM via SentinelLayer proxy.
|
|
21
|
+
*
|
|
22
|
+
* @param {object} options
|
|
23
|
+
* @param {string} options.prompt - The user content / prompt text
|
|
24
|
+
* @param {string} [options.systemPrompt] - System prompt
|
|
25
|
+
* @param {string} [options.model] - Model ID (default: gpt-5.3-codex)
|
|
26
|
+
* @param {number} [options.maxTokens] - Max output tokens (default: 4096)
|
|
27
|
+
* @param {number} [options.temperature] - Temperature (default: 0.1)
|
|
28
|
+
* @param {string} [options.apiUrl] - Override API URL
|
|
29
|
+
* @param {string} [options.token] - Override Bearer token
|
|
30
|
+
* @returns {Promise<{ text: string, usage: { inputTokens: number, outputTokens: number, costUsd: number, model: string, provider: string, latencyMs: number } }>}
|
|
31
|
+
*/
|
|
32
|
+
export async function invokeViaProxy({
|
|
33
|
+
prompt,
|
|
34
|
+
systemPrompt = "",
|
|
35
|
+
model = DEFAULT_PROXY_MODEL,
|
|
36
|
+
maxTokens = 4096,
|
|
37
|
+
temperature = 0.1,
|
|
38
|
+
apiUrl = "",
|
|
39
|
+
token = "",
|
|
40
|
+
} = {}) {
|
|
41
|
+
// Resolve credentials from session if not provided
|
|
42
|
+
let resolvedApiUrl = String(apiUrl || "").trim();
|
|
43
|
+
let resolvedToken = String(token || "").trim();
|
|
44
|
+
|
|
45
|
+
if (!resolvedApiUrl || !resolvedToken) {
|
|
46
|
+
const session = await resolveActiveAuthSession({
|
|
47
|
+
cwd: process.cwd(),
|
|
48
|
+
env: process.env,
|
|
49
|
+
autoRotate: false,
|
|
50
|
+
});
|
|
51
|
+
if (!session || !session.token) {
|
|
52
|
+
throw new Error(
|
|
53
|
+
`SentinelLayer LLM proxy requires authentication. Run '${authLoginHint()}' first.`
|
|
54
|
+
);
|
|
55
|
+
}
|
|
56
|
+
if (!resolvedApiUrl) resolvedApiUrl = String(session.apiUrl || "https://api.sentinelayer.com").trim();
|
|
57
|
+
if (!resolvedToken) resolvedToken = String(session.token).trim();
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
const url = `${resolvedApiUrl.replace(/\/+$/, "")}/api/v1/proxy/llm`;
|
|
61
|
+
|
|
62
|
+
const body = JSON.stringify({
|
|
63
|
+
model,
|
|
64
|
+
system_prompt: systemPrompt || "You are a code reviewer.",
|
|
65
|
+
user_content: String(prompt || ""),
|
|
66
|
+
max_tokens: maxTokens,
|
|
67
|
+
temperature,
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
let response = null;
|
|
71
|
+
let lastError = null;
|
|
72
|
+
|
|
73
|
+
for (let attempt = 0; attempt <= PROXY_MAX_RETRIES; attempt++) {
|
|
74
|
+
try {
|
|
75
|
+
const controller = new AbortController();
|
|
76
|
+
const timeoutHandle = setTimeout(() => controller.abort(), PROXY_TIMEOUT_MS);
|
|
77
|
+
try {
|
|
78
|
+
response = await fetch(url, {
|
|
79
|
+
method: "POST",
|
|
80
|
+
headers: {
|
|
81
|
+
"Content-Type": "application/json",
|
|
82
|
+
Authorization: `Bearer ${resolvedToken}`,
|
|
83
|
+
Accept: "application/json",
|
|
84
|
+
},
|
|
85
|
+
body,
|
|
86
|
+
signal: controller.signal,
|
|
87
|
+
});
|
|
88
|
+
} finally {
|
|
89
|
+
clearTimeout(timeoutHandle);
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
if (PROXY_RETRY_STATUSES.has(response.status) && attempt < PROXY_MAX_RETRIES) {
|
|
93
|
+
const retryAfter = response.headers.get("Retry-After");
|
|
94
|
+
const delay = retryAfter && !isNaN(retryAfter) ? Math.min(Number(retryAfter), 5) * 1000 : 500 * (attempt + 1);
|
|
95
|
+
await new Promise((r) => setTimeout(r, delay));
|
|
96
|
+
continue;
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
break;
|
|
100
|
+
} catch (err) {
|
|
101
|
+
lastError = err;
|
|
102
|
+
if (attempt >= PROXY_MAX_RETRIES) break;
|
|
103
|
+
await new Promise((r) => setTimeout(r, 500 * (attempt + 1)));
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
if (!response) {
|
|
108
|
+
throw new Error(`SentinelLayer LLM proxy request failed: ${lastError?.message || "no response"}`);
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
if (!response.ok) {
|
|
112
|
+
let detail = "";
|
|
113
|
+
try {
|
|
114
|
+
const errBody = await response.json();
|
|
115
|
+
detail = errBody?.error?.message || errBody?.detail || JSON.stringify(errBody).slice(0, 200);
|
|
116
|
+
} catch {
|
|
117
|
+
detail = await response.text().catch(() => "");
|
|
118
|
+
}
|
|
119
|
+
throw new Error(`SentinelLayer LLM proxy error (${response.status}): ${detail}`);
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
const result = await response.json();
|
|
123
|
+
|
|
124
|
+
return {
|
|
125
|
+
text: String(result.content || ""),
|
|
126
|
+
usage: {
|
|
127
|
+
inputTokens: result.usage?.tokens_in || 0,
|
|
128
|
+
outputTokens: result.usage?.tokens_out || 0,
|
|
129
|
+
costUsd: result.usage?.cost_usd || 0,
|
|
130
|
+
model: result.usage?.model || model,
|
|
131
|
+
provider: result.usage?.provider || "sentinelayer",
|
|
132
|
+
latencyMs: result.usage?.latency_ms || 0,
|
|
133
|
+
},
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
export { DEFAULT_PROXY_MODEL };
|