airlock-bot 0.2.37 → 0.2.38

package/dist/security/secrets.js

@@ -0,0 +1,138 @@
+const secretRules = [
+    {
+        id: 'private-key',
+        description: 'Private key block marker',
+        regex: /-----BEGIN [A-Z0-9 ]*PRIVATE KEY-----/g,
+    },
+    {
+        id: 'aws-access-key',
+        description: 'AWS access key id',
+        regex: /\b(?:A3T[A-Z0-9]|AKIA|ASIA|AGPA|AIDA|AROA|AIPA|ANPA)[A-Z0-9]{16}\b/g,
+    },
+    {
+        id: 'github-token',
+        description: 'GitHub access token',
+        regex: /\b(?:gh[pousr]_[A-Za-z0-9_]{36,255}|github_pat_[A-Za-z0-9_]{20,255})\b/g,
+    },
+    {
+        id: 'openai-key',
+        description: 'OpenAI API key',
+        regex: /\bsk-(?:proj-)?[A-Za-z0-9_-]{20,}\b/g,
+    },
+    {
+        id: 'anthropic-key',
+        description: 'Anthropic API key',
+        regex: /\bsk-ant-[A-Za-z0-9_-]{20,}\b/g,
+    },
+    {
+        id: 'slack-token',
+        description: 'Slack token',
+        regex: /\bxox(?:a|b|p|r|s)-[A-Za-z0-9-]{20,}\b/g,
+    },
+    {
+        id: 'stripe-live-key',
+        description: 'Stripe live secret key',
+        regex: /\b(?:sk|rk)_live_[A-Za-z0-9]{20,}\b/g,
+    },
+    {
+        id: 'generic-secret-assignment',
+        description: 'High-entropy secret assignment',
+        regex: /\b(?:api[_-]?key|client[_-]?secret|private[_-]?key|password|passwd|pwd|secret|token)\b\s*[:=]\s*["']?([A-Za-z0-9_./+=-]{20,})["']?/gi,
+        secretGroup: 1,
+        entropyRequired: true,
+    },
+];
+const placeholderPatterns = [
+    /^\$\{[A-Z0-9_]+\}$/,
+    /^<[^>]+>$/,
+    /^(?:your|example|sample|test|dummy|fake|placeholder|changeme|replace-me)[-_]/i,
+    /^(?:secret-123|my-secret|supersecret|admin-secret|agent-secret|global-admin-secret|codex-secret|token123)$/i,
+];
+export function scanSecrets(file, text) {
+    const findings = [];
+    const seen = new Set();
+    const lines = text.split(/\r?\n/);
+    for (let lineIndex = 0; lineIndex < lines.length; lineIndex += 1) {
+        const line = lines[lineIndex] ?? '';
+        for (const rule of secretRules) {
+            rule.regex.lastIndex = 0;
+            let match;
+            while ((match = rule.regex.exec(line)) !== null) {
+                const secret = match[rule.secretGroup ?? 0];
+                if (!secret)
+                    continue;
+                const secretStart = match.index + match[0].indexOf(secret);
+                if (isAllowedPlaceholder(secret) ||
+                    (rule.id === 'generic-secret-assignment' && isLikelyCodeReference(secret)) ||
+                    (rule.entropyRequired && !looksHighEntropy(secret))) {
+                    continue;
+                }
+                const key = `${lineIndex}:${secretStart}:${secret}`;
+                if (seen.has(key))
+                    continue;
+                seen.add(key);
+                findings.push({
+                    file,
+                    line: lineIndex + 1,
+                    column: secretStart + 1,
+                    ruleId: rule.id,
+                    description: rule.description,
+                    redactedLine: redactLine(line, secretStart, secret.length),
+                });
+            }
+        }
+    }
+    return findings;
+}
+export function redactSecret(secret) {
+    if (secret.length <= 8)
+        return '[REDACTED]';
+    const prefixLength = Math.min(4, Math.max(0, secret.indexOf('-') + 1));
+    const prefix = secret.slice(0, prefixLength);
+    const suffix = secret.slice(-4);
+    return `${prefix}[REDACTED:${secret.length}]${suffix}`;
+}
+export function formatSecretFindings(findings) {
+    if (findings.length === 0)
+        return 'Secret scan passed.';
+    const lines = [
+        `Secret scan blocked ${findings.length} potential credential${findings.length === 1 ? '' : 's'}.`,
+        'The matching values are redacted below. Remove the secret, move it to env/config, or replace it with a placeholder.',
+        '',
+    ];
+    for (const finding of findings) {
+        lines.push(`${finding.file}:${finding.line}:${finding.column} ${finding.ruleId} - ${finding.description}`, `  ${finding.redactedLine}`);
+    }
+    return lines.join('\n');
+}
+function redactLine(line, start, length) {
+    return `${line.slice(0, start)}${redactSecret(line.slice(start, start + length))}${line.slice(start + length)}`;
+}
+function isAllowedPlaceholder(secret) {
+    return placeholderPatterns.some((pattern) => pattern.test(secret));
+}
+function isLikelyCodeReference(secret) {
+    return /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)+$/.test(secret);
+}
+function looksHighEntropy(secret) {
+    const classes = [
+        /[a-z]/.test(secret),
+        /[A-Z]/.test(secret),
+        /[0-9]/.test(secret),
+        /[_./+=-]/.test(secret),
+    ].filter(Boolean).length;
+    return classes >= 3 && shannonEntropy(secret) >= 3.5;
+}
+function shannonEntropy(value) {
+    const counts = new Map();
+    for (const char of value) {
+        counts.set(char, (counts.get(char) ?? 0) + 1);
+    }
+    let entropy = 0;
+    for (const count of counts.values()) {
+        const probability = count / value.length;
+        entropy -= probability * Math.log2(probability);
+    }
+    return entropy;
+}
+//# sourceMappingURL=secrets.js.map

package/dist/security/secrets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"secrets.js","sourceRoot":"","sources":["../../src/security/secrets.ts"],"names":[],"mappings":"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"}

package/dist/setup-openclaw/cli.js

@@ -43,7 +43,7 @@ Override with environment variables if needed:
 
   export AIRLOCK_URL=http://localhost:4111
   export AIRLOCK_AGENT=openclaw
-  export AIRLOCK_SECRET=your-api-secret
+  export AIRLOCK_SECRET=your-agent-token
 `);
 }
 //# sourceMappingURL=cli.js.map

package/dist/stdio-mode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stdio-mode.d.ts","sourceRoot":"","sources":["../src/stdio-mode.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAQjD,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CA0Jf"}
+{"version":3,"file":"stdio-mode.d.ts","sourceRoot":"","sources":["../src/stdio-mode.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAUjD,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CAgNf"}

package/dist/stdio-mode.js

@@ -1,3 +1,5 @@
+import { randomUUID } from 'crypto';
+import Fastify from 'fastify';
 import { ClientPool } from './pool/pool.js';
 import { requiredMcpsForAgent } from './pool/required-mcps.js';
 import { ToolRegistry } from './registry/registry.js';
@@ -5,11 +7,18 @@ import { AllowlistEngine } from './allowlist/engine.js';
 import { HitlEngine } from './hitl/engine.js';
 import { HitlBatcher } from './hitl/batcher.js';
 import { AuditLogger } from './audit/logger.js';
+import { hitlApiPlugin } from './hitl/api.js';
+import { auditApiPlugin } from './audit/api.js';
+import { mobileApiPlugin } from './mobile/api.js';
+import { ApprovalStreamHub } from './hitl/approval-stream.js';
 import { createHitlProvider } from './hitl/provider-factory.js';
+import { CompositeHitlProvider } from './hitl/providers/composite.js';
 import { runStdioServer } from './transport/stdio-server.js';
 import { ConfigWatcher } from './config/watcher.js';
 import { getMcpConfigs } from './config/schema.js';
 import { buildAdapters } from './backend/factory.js';
+import { ActivityStream } from './activity/stream.js';
+import { checkRequestSecurity } from './security/request.js';
 import { childLogger } from './util/logger.js';
 const log = childLogger('stdio-mode');
 export async function runStdioMode(config, agentId, configPath) {
@@ -27,6 +36,7 @@ export async function runStdioMode(config, agentId, configPath) {
             'provider would read from stdin. Use "telegram", "slack", "webhook", or "openclaw" instead.');
     }
     log.info({ agentId }, 'Starting Airlock in stdio mode');
+    const downstreamSessionId = randomUUID();
     let currentAgentConfig = agentConfig;
     // Audit
     const auditLogger = new AuditLogger(config.audit);
@@ -35,15 +45,30 @@ export async function runStdioMode(config, agentId, configPath) {
     // eslint-disable-next-line prefer-const
     let hitlEngine;
     const approvalForwarder = {
-        approve: (code) => hitlEngine.approve(code),
-        deny: (code, reason) => hitlEngine.deny(code, reason),
+        approve: (id) => hitlEngine.approve(id),
+        deny: (id, reason) => hitlEngine.deny(id, reason),
+        approveByCode: (code) => hitlEngine.approveByCode(code),
+        denyByCode: (code, reason) => hitlEngine.denyByCode(code, reason),
     };
     const hitlBatcher = new HitlBatcher(config.approvals.batch_window_ms);
-    const hitlProvider = createHitlProvider(config.approvals.provider, approvalForwarder);
+    const activityStream = new ActivityStream();
+    const approvalStream = new ApprovalStreamHub({ activityStream });
+    const configuredHitlProvider = createHitlProvider(config.approvals.provider, approvalForwarder, {
+        configPath,
+        auditLogger,
+        approvalStream,
+    });
+    const hitlProvider = new CompositeHitlProvider([configuredHitlProvider, approvalStream]);
+    const unsubscribeActivityNotifications = activityStream.subscribe((event) => {
+        void hitlProvider
+            .notifyActivity?.(event)
+            .catch((err) => log.error({ err }, 'Failed to send activity notification'));
+    });
     hitlEngine = new HitlEngine(auditLogger, hitlProvider, config.approvals.timeout_ms);
     hitlBatcher.onBatchReady((_agentId, requests) => {
+        const badgeCount = hitlEngine.getPending().length;
         void hitlProvider
-            .notify(requests)
+            .notify(requests.map((request) => ({ ...request, badgeCount })))
             .catch((err) => log.error({ err }, 'Failed to send approval notification'));
     });
     await hitlProvider.init();
@@ -57,7 +82,9 @@ export async function runStdioMode(config, agentId, configPath) {
     const pool = new ClientPool(filteredMcps);
     await pool.initialize();
     // Build adapters from config (MCP, builtins, CLIs, APIs)
-    const adapters = buildAdapters(config, pool);
+    const adapters = buildAdapters(config, pool, {
+        airlock: { hitlEngine, hitlBatcher, activityStream },
+    });
     const allowlist = new AllowlistEngine(config.agents);
     const registry = new ToolRegistry(adapters, allowlist, config.agents);
     // Register callback for late-connecting MCPs (after registry exists)
@@ -68,6 +95,20 @@ export async function runStdioMode(config, agentId, configPath) {
             .catch((err) => log.error({ err }, 'Failed to refresh registry after MCP ready'));
     });
     await registry.refresh();
+    const managementRequestSecurity = {};
+    updateManagementRequestSecurity(config, managementRequestSecurity);
+    let managementApp;
+    if (config.server.management_api?.enabled) {
+        managementApp = await startManagementApi({
+            config,
+            auditLogger,
+            hitlEngine,
+            activityStream,
+            configPath,
+            approvalStream,
+            getRequestSecurity: () => managementRequestSecurity,
+        });
+    }
     // Hot reload — allowlists, agent config, security (not MCP connections or approval provider)
     const watcher = new ConfigWatcher(configPath);
     watcher.on('reload', (newConfig) => {
@@ -75,13 +116,16 @@ export async function runStdioMode(config, agentId, configPath) {
             if (newConfig.agents[agentId]) {
                 currentAgentConfig = newConfig.agents[agentId];
             }
+            updateManagementRequestSecurity(newConfig, managementRequestSecurity);
             const newMcpConfigs = getMcpConfigs(newConfig.providers);
             pool
                 .reload(newMcpConfigs)
                 .then(() => {
                 allowlist.reload(newConfig.agents);
                 registry.reloadAgents(newConfig.agents);
-                const newAdapters = buildAdapters(newConfig, pool);
+                const newAdapters = buildAdapters(newConfig, pool, {
+                    airlock: { hitlEngine, hitlBatcher, activityStream },
+                });
                 registry.setAdapters(newAdapters);
                 return registry.refresh();
             })
@@ -99,6 +143,19 @@ export async function runStdioMode(config, agentId, configPath) {
     watcher.start();
     // Graceful shutdown
     let shuttingDown = false;
+    let cleanedUp = false;
+    const cleanup = async () => {
+        if (cleanedUp)
+            return;
+        cleanedUp = true;
+        watcher.stop();
+        await managementApp?.close().catch(() => { });
+        await pool.stop();
+        await registry.stopAll();
+        await hitlProvider.stop();
+        unsubscribeActivityNotifications();
+        auditLogger.stop();
+    };
     const shutdown = async () => {
         if (shuttingDown)
             return;
@@ -118,31 +175,75 @@ export async function runStdioMode(config, agentId, configPath) {
         }, 5000);
         forceExit.unref();
         try {
-            watcher.stop();
-            await pool.stop();
-            await registry.stopAll();
-            await hitlProvider.stop();
-            auditLogger.stop();
+            await cleanup();
         }
         catch (err) {
             log.error({ err }, 'Error during stdio shutdown');
         }
         process.exit(0);
     };
-    process.on('SIGTERM', () => void shutdown());
-    process.on('SIGINT', () => void shutdown());
-    // No HTTP server — stdio only
-    await runStdioServer({
-        agentId,
-        agentConfig,
-        getAgentConfig: () => currentAgentConfig,
-        registry,
-        allowlist,
-        hitlEngine,
-        hitlBatcher,
-        hitlProvider,
+    const handleSigterm = () => void shutdown();
+    const handleSigint = () => void shutdown();
+    process.on('SIGTERM', handleSigterm);
+    process.on('SIGINT', handleSigint);
+    try {
+        await runStdioServer({
+            agentId,
+            downstreamSessionId,
+            agentConfig,
+            getAgentConfig: () => currentAgentConfig,
+            registry,
+            allowlist,
+            hitlEngine,
+            hitlBatcher,
+            hitlProvider,
+            auditLogger,
+            securityConfig: config.security,
+        });
+    }
+    finally {
+        process.off('SIGTERM', handleSigterm);
+        process.off('SIGINT', handleSigint);
+        if (!shuttingDown) {
+            await cleanup();
+        }
+    }
+}
+function updateManagementRequestSecurity(config, target) {
+    target.secret = config.server.management_api?.api_secret ?? config.server.api_secret;
+    target.authRequired = true;
+    target.allowedOrigins = config.server.allowed_origins;
+}
+async function startManagementApi(opts) {
+    const app = Fastify({ logger: false });
+    const { auditLogger, hitlEngine, activityStream, configPath, approvalStream, getRequestSecurity, } = opts;
+    await app.register(hitlApiPlugin, {
+        engine: hitlEngine,
+        getRequestSecurity,
+    });
+    await app.register(auditApiPlugin, {
         auditLogger,
-        securityConfig: config.security,
+        getRequestSecurity,
+    });
+    await app.register(mobileApiPlugin, {
+        auditLogger,
+        engine: hitlEngine,
+        activityStream,
+        configPath,
+        getRequestSecurity,
+        approvalStream,
+    });
+    app.get('/health', async (request, reply) => {
+        if (!checkRequestSecurity(request, reply, getRequestSecurity()))
+            return;
+        return {
+            status: 'ok',
+            pendingApprovals: hitlEngine.getPending().length,
+        };
     });
+    const { port, host } = opts.config.server.management_api;
+    await app.listen({ port, host });
+    log.info({ port, host }, 'Airlock stdio management API listening');
+    return app;
 }
 //# sourceMappingURL=stdio-mode.js.map

package/dist/stdio-mode.js.map

@@ -1 +1 @@
-{"version":3,"file":"stdio-mode.js","sourceRoot":"","sources":["../src/stdio-mode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stdio-mode.js","sourceRoot":"","sources":["../src/stdio-mode.ts"],"names":[],"mappings":"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"}

package/dist/tools/api.d.ts

@@ -1,10 +1,13 @@
 import type { FastifyInstance } from 'fastify';
 import type { AgentServerDeps } from '../transport/agent-server.js';
+import { type RequestSecurityOptions } from '../security/request.js';
 export interface ToolsApiOpts {
-    getDeps: (agentId: string) => AgentServerDeps | undefined;
+    getDeps: (agentId: string, downstreamSessionKey?: string) => AgentServerDeps | undefined;
+    requiresSessionId?: (agentId: string, tool: string) => boolean;
     secret?: string;
     authRequired?: boolean;
     allowedOrigins?: string[];
+    getRequestSecurity?: () => RequestSecurityOptions;
 }
 export declare function toolsApiPlugin(app: FastifyInstance, opts: ToolsApiOpts): Promise<void>;
 //# sourceMappingURL=api.d.ts.map

package/dist/tools/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/tools/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AASpE,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,eAAe,GAAG,SAAS,CAAC;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAGD,wBAAsB,cAAc,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAgG5F"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/tools/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAKpE,OAAO,EAAwD,KAAK,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAI3H,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,MAAM,KAAK,eAAe,GAAG,SAAS,CAAC;IACzF,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IAC/D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,sBAAsB,CAAC;CACnD;AAWD,wBAAsB,cAAc,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAuJ5F"}

package/dist/tools/api.js

@@ -1,22 +1,43 @@
 import { buildMiddlewareChain } from '../middleware/chain-builder.js';
 import { generateId } from '../util/id.js';
 import { childLogger } from '../util/logger.js';
-import { checkRequestSecurity } from '../security/request.js';
+import { checkBearerAuth, checkOrigin, currentRequestSecurity } from '../security/request.js';
 const log = childLogger('tools-api');
+function nonEmptyString(value) {
+    return typeof value === 'string' && value.trim().length > 0;
+}
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
 // eslint-disable-next-line @typescript-eslint/require-await
 export async function toolsApiPlugin(app, opts) {
     const { getDeps } = opts;
-    app.addHook('preHandler', async (request, reply) => {
-        if (!checkRequestSecurity(request, reply, opts)) {
-            return;
+    function downstreamSessionKey(agentId, explicitSessionId) {
+        if (!nonEmptyString(explicitSessionId))
+            return undefined;
+        return `${agentId}:${explicitSessionId}`;
+    }
+    function checkAgentAuth(request, reply, deps) {
+        const requestSecurity = currentRequestSecurity(opts);
+        if (!checkOrigin(request, reply, requestSecurity.allowedOrigins))
+            return false;
+        const token = deps.agentConfig.token;
+        if (token) {
+            return checkBearerAuth(request, reply, { secret: token, authRequired: true });
         }
-    });
+        return checkBearerAuth(request, reply, {
+            secret: requestSecurity.secret,
+            authRequired: requestSecurity.authRequired,
+        });
+    }
     app.get('/agents/:agentId/tools', async (request, reply) => {
         const { agentId } = request.params;
         const deps = getDeps(agentId);
         if (!deps) {
             return reply.status(404).send({ error: `Unknown agent: ${agentId}` });
         }
+        if (!checkAgentAuth(request, reply, deps))
+            return;
         const tools = deps.registry.getFiltered(agentId);
         return reply.send({ tools });
     });
@@ -27,12 +48,36 @@ export async function toolsApiPlugin(app, opts) {
             return reply.status(400).send({ error: 'Missing required field: tool' });
         }
         const { tool, args = {} } = body;
-        const deps = getDeps(agentId);
+        if (!isRecord(args)) {
+            return reply.status(400).send({ error: 'Field "args" must be a JSON object' });
+        }
+        const headerSessionId = request.headers['x-airlock-session-id'];
+        const explicitSessionId = body.session_id ?? (Array.isArray(headerSessionId) ? headerSessionId[0] : headerSessionId);
+        const sessionKey = downstreamSessionKey(agentId, explicitSessionId);
+        const authDeps = getDeps(agentId);
+        if (!authDeps) {
+            return reply.status(404).send({ error: `Unknown agent: ${agentId}` });
+        }
+        if (!checkAgentAuth(request, reply, authDeps))
+            return;
+        const deps = getDeps(agentId, sessionKey);
         if (!deps) {
             return reply.status(404).send({ error: `Unknown agent: ${agentId}` });
         }
+        if (!sessionKey) {
+            if (opts.requiresSessionId?.(agentId, tool)) {
+                return reply.status(400).send({
+                    error: 'Missing required field: session_id. REST invocations of downstream MCP tools require a stable session_id; pass session_id in the JSON body or X-Airlock-Session-Id header.',
+                });
+            }
+            log.warn({ agentId, tool }, 'REST tool invocation missing session_id; downstream MCP freshness identity will not be stamped');
+        }
         const getConfig = deps.getAgentConfig ?? (() => deps.agentConfig);
         const agentConfig = getConfig();
+        const ac = new AbortController();
+        const abort = () => ac.abort();
+        request.raw.once('aborted', abort);
+        reply.raw.once('close', abort);
         const chain = buildMiddlewareChain(agentConfig, {
             registry: deps.registry,
             allowlist: deps.allowlist,
@@ -41,13 +86,14 @@ export async function toolsApiPlugin(app, opts) {
             auditLogger: deps.auditLogger,
             securityConfig: deps.securityConfig ?? { blocked_hosts: [], allowed_local: [] },
         });
+        const downstreamSessionId = deps.downstreamSessionId ?? sessionKey;
         const ctx = {
             callId: generateId(),
             agentId,
             agentConfig,
             toolName: tool,
             args,
-            meta: {},
+            meta: downstreamSessionId ? { downstreamSessionId } : {},
             deps: {
                 registry: deps.registry,
                 allowlist: deps.allowlist,
@@ -57,6 +103,7 @@ export async function toolsApiPlugin(app, opts) {
                 securityConfig: deps.securityConfig ?? { blocked_hosts: [], allowed_local: [] },
             },
             startedAt: Date.now(),
+            signal: ac.signal,
         };
         try {
             const response = await chain(ctx, () => {
@@ -88,6 +135,10 @@ export async function toolsApiPlugin(app, opts) {
                 metadata: { duration_ms },
             });
         }
+        finally {
+            request.raw.off('aborted', abort);
+            reply.raw.off('close', abort);
+        }
     });
 }
 //# sourceMappingURL=api.js.map

package/dist/tools/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/tools/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/tools/api.ts"],"names":[],"mappings":"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"}

package/dist/tools/exec.d.ts

@@ -13,7 +13,8 @@ export type ExecDecision = 'allow' | 'ask' | 'deny';
 export declare function buildExecTool(): Tool;
 /**
  * Reject commands containing shell metacharacters that could bypass
- * the prefix-based allow/deny matching (e.g. chaining via ; && || | $()).
+ * the prefix-based allow/deny matching (e.g. chaining via ; && || | $(),
+ * newlines, or redirection).
  */
 export declare function containsShellInjection(command: string): boolean;
 export declare function evaluateExecCommand(command: string, agentConfig: AgentConfig): ExecDecision;

package/dist/tools/exec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/tools/exec.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAE/D,OAAO,EAA0B,KAAK,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAEzF,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,CAAC;AAOpD,wBAAgB,aAAa,IAAI,IAAI,CAcpC;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,GAAG,YAAY,CAS3F;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,WAAW,EACxB,GAAG,CAAC,EAAE,MAAM,EACZ,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,UAAU,CAAC,CAsErB"}
+{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/tools/exec.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAE/D,OAAO,EAA0B,KAAK,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAEzF,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,CAAC;AAOpD,wBAAgB,aAAa,IAAI,IAAI,CAcpC;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,GAAG,YAAY,CAS3F;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,WAAW,EACxB,GAAG,CAAC,EAAE,MAAM,EACZ,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,UAAU,CAAC,CAsErB"}

package/dist/tools/exec.js

@@ -2,8 +2,8 @@ import { spawn } from 'child_process';
 import { matchesCommand } from '../allowlist/pattern.js';
 import { wrapCommandWithSandbox } from '../sandbox/index.js';
 const MAX_OUTPUT_BYTES = 10 * 1024 * 1024; // 10MB cap on stdout/stderr
-/** Shell metacharacters that allow command chaining / injection */
-const SHELL_INJECTION_RE = /[;|&`$(){}]/;
+/** Shell metacharacters that allow command chaining, redirection, or injection. */
+const SHELL_INJECTION_RE = /[;|&`$(){}<>\n\r]/;
 export function buildExecTool() {
     return {
         name: 'exec/run',
@@ -21,7 +21,8 @@ export function buildExecTool() {
 }
 /**
  * Reject commands containing shell metacharacters that could bypass
- * the prefix-based allow/deny matching (e.g. chaining via ; && || | $()).
+ * the prefix-based allow/deny matching (e.g. chaining via ; && || | $(),
+ * newlines, or redirection).
  */
 export function containsShellInjection(command) {
     return SHELL_INJECTION_RE.test(command);