@dirgha/code 1.20.25 → 1.20.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth/keypool.js +40 -26
- package/dist/auth/keypool.js.map +1 -1
- package/dist/auth/keystore.js +16 -11
- package/dist/auth/keystore.js.map +1 -1
- package/dist/cli/config.js +23 -2
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/first-run.js +40 -24
- package/dist/cli/first-run.js.map +1 -1
- package/dist/cli/flows/wizard.js +12 -18
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.d.ts +4 -0
- package/dist/cli/interactive.js +29 -1
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +59 -17
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/slash/fleet.js +19 -1
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/models.js +4 -2
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash.js +26 -10
- package/dist/cli/slash.js.map +1 -1
- package/dist/cli/subcommands/telemetry.d.ts +2 -1
- package/dist/cli/subcommands/telemetry.js +47 -34
- package/dist/cli/subcommands/telemetry.js.map +1 -1
- package/dist/context/branch.d.ts +2 -2
- package/dist/context/branch.js +40 -23
- package/dist/context/branch.js.map +1 -1
- package/dist/context/compaction.js +38 -18
- package/dist/context/compaction.js.map +1 -1
- package/dist/context/git-state.js +31 -18
- package/dist/context/git-state.js.map +1 -1
- package/dist/context/knowledge.js +31 -20
- package/dist/context/knowledge.js.map +1 -1
- package/dist/context/memory.js +7 -0
- package/dist/context/memory.js.map +1 -1
- package/dist/context/mode-enforcement.js +11 -1
- package/dist/context/mode-enforcement.js.map +1 -1
- package/dist/context/mode.js +67 -30
- package/dist/context/mode.js.map +1 -1
- package/dist/context/primer.js +15 -3
- package/dist/context/primer.js.map +1 -1
- package/dist/fleet/apply-back.js +5 -1
- package/dist/fleet/apply-back.js.map +1 -1
- package/dist/fleet/cli-command.d.ts +2 -0
- package/dist/fleet/cli-command.js +15 -1
- package/dist/fleet/cli-command.js.map +1 -1
- package/dist/fleet/runner.js +35 -2
- package/dist/fleet/runner.js.map +1 -1
- package/dist/fleet/scratchpad.js +1 -2
- package/dist/fleet/scratchpad.js.map +1 -1
- package/dist/fleet/state.d.ts +4 -0
- package/dist/fleet/state.js +11 -2
- package/dist/fleet/state.js.map +1 -1
- package/dist/fleet/templates.d.ts +4 -0
- package/dist/fleet/templates.js.map +1 -1
- package/dist/fleet/types.d.ts +4 -0
- package/dist/fleet/types.js.map +1 -1
- package/dist/intelligence/prices.d.ts +6 -4
- package/dist/intelligence/prices.js +36 -10
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/kernel/agent-loop.js +49 -15
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/lsp/client.js +29 -16
- package/dist/lsp/client.js.map +1 -1
- package/dist/lsp/detector.js +7 -6
- package/dist/lsp/detector.js.map +1 -1
- package/dist/mcp/client.d.ts +1 -1
- package/dist/mcp/client.js +19 -16
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/transport.js +46 -38
- package/dist/mcp/transport.js.map +1 -1
- package/dist/providers/dispatch.js +15 -1
- package/dist/providers/dispatch.js.map +1 -1
- package/dist/providers/index.d.ts +11 -0
- package/dist/providers/index.js +29 -2
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/openai-compat.js +4 -2
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/safety/audit-log.d.ts +15 -0
- package/dist/safety/audit-log.js +21 -0
- package/dist/safety/audit-log.js.map +1 -1
- package/dist/telemetry/gateway-push.d.ts +17 -0
- package/dist/telemetry/gateway-push.js +48 -0
- package/dist/telemetry/gateway-push.js.map +1 -0
- package/dist/telemetry/index.d.ts +9 -0
- package/dist/telemetry/index.js +9 -0
- package/dist/telemetry/index.js.map +1 -0
- package/dist/tools/browser.js +24 -16
- package/dist/tools/browser.js.map +1 -1
- package/dist/tools/checkpoint.d.ts +6 -1
- package/dist/tools/checkpoint.js +79 -62
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/cron.js +1 -3
- package/dist/tools/cron.js.map +1 -1
- package/dist/tools/diff.js +25 -21
- package/dist/tools/diff.js.map +1 -1
- package/dist/tools/exec.d.ts +2 -0
- package/dist/tools/exec.js +13 -0
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/fs-edit.d.ts +3 -5
- package/dist/tools/fs-edit.js +8 -23
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-ls.js +6 -8
- package/dist/tools/fs-ls.js.map +1 -1
- package/dist/tools/fs-read.d.ts +1 -1
- package/dist/tools/fs-read.js +37 -28
- package/dist/tools/fs-read.js.map +1 -1
- package/dist/tools/fs-write.d.ts +1 -1
- package/dist/tools/fs-write.js +33 -33
- package/dist/tools/fs-write.js.map +1 -1
- package/dist/tools/git.js +12 -6
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/github.d.ts +13 -0
- package/dist/tools/github.js +257 -0
- package/dist/tools/github.js.map +1 -0
- package/dist/tools/index.d.ts +5 -2
- package/dist/tools/index.js +7 -4
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/multimodal.js +11 -12
- package/dist/tools/multimodal.js.map +1 -1
- package/dist/tools/rtk.js +22 -9
- package/dist/tools/rtk.js.map +1 -1
- package/dist/tools/search-glob.d.ts +1 -1
- package/dist/tools/search-glob.js +42 -24
- package/dist/tools/search-glob.js.map +1 -1
- package/dist/tools/search-grep.d.ts +1 -1
- package/dist/tools/search-grep.js +56 -32
- package/dist/tools/search-grep.js.map +1 -1
- package/dist/tools/shell.d.ts +7 -1
- package/dist/tools/shell.js +114 -61
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/ink/App.js +90 -42
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +5 -1
- package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
- package/dist/tui/ink/components/InputBox.js +16 -15
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/ModelPicker.d.ts +2 -2
- package/dist/tui/ink/components/ModelPicker.js +34 -26
- package/dist/tui/ink/components/ModelPicker.js.map +1 -1
- package/dist/tui/ink/components/SpinnerGlyph.d.ts +4 -4
- package/dist/tui/ink/components/SpinnerGlyph.js +34 -14
- package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -1
- package/dist/tui/ink/components/StatusBar.js +0 -2
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.js +1 -3
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/components/VirtualTranscript.js +3 -1
- package/dist/tui/ink/components/VirtualTranscript.js.map +1 -1
- package/dist/tui/ink/use-declined-versions.js +6 -2
- package/dist/tui/ink/use-declined-versions.js.map +1 -1
- package/dist/tui/ink/use-event-projection.js +12 -0
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/ink/use-overlays.js +16 -17
- package/dist/tui/ink/use-overlays.js.map +1 -1
- package/dist/tui/ink/use-render-metrics.js +6 -2
- package/dist/tui/ink/use-render-metrics.js.map +1 -1
- package/dist/utils/env.d.ts +1 -0
- package/dist/utils/env.js +60 -0
- package/dist/utils/env.js.map +1 -0
- package/dist/utils/fs.d.ts +10 -0
- package/dist/utils/fs.js +37 -0
- package/dist/utils/fs.js.map +1 -0
- package/package.json +1 -1
package/dist/mcp/transport.js
CHANGED
|
@@ -3,13 +3,14 @@
|
|
|
3
3
|
* stdin/stdout) for local servers. Remote HTTP/SSE transport can be
|
|
4
4
|
* added later by implementing the same Transport interface.
|
|
5
5
|
*/
|
|
6
|
-
import { spawn } from
|
|
6
|
+
import { spawn } from "node:child_process";
|
|
7
|
+
import { safeEnvironment } from "../utils/env.js";
|
|
7
8
|
export class StdioTransport {
|
|
8
9
|
opts;
|
|
9
10
|
child = null;
|
|
10
11
|
handlers = [];
|
|
11
12
|
closeHandlers = [];
|
|
12
|
-
buffer =
|
|
13
|
+
buffer = "";
|
|
13
14
|
ready;
|
|
14
15
|
constructor(opts) {
|
|
15
16
|
this.opts = opts;
|
|
@@ -19,26 +20,29 @@ export class StdioTransport {
|
|
|
19
20
|
return new Promise((resolve, reject) => {
|
|
20
21
|
try {
|
|
21
22
|
const child = spawn(this.opts.command, this.opts.args ?? [], {
|
|
22
|
-
env: { ...
|
|
23
|
+
env: { ...safeEnvironment(), ...this.opts.env },
|
|
23
24
|
cwd: this.opts.cwd,
|
|
24
|
-
stdio: [
|
|
25
|
+
stdio: ["pipe", "pipe", "pipe"],
|
|
25
26
|
});
|
|
26
27
|
this.child = child;
|
|
27
|
-
child.stdout
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
child.
|
|
33
|
-
|
|
34
|
-
|
|
28
|
+
if (!child.stdout || !child.stdin) {
|
|
29
|
+
reject(new Error(`MCP server ${this.opts.command} stdio is not piped`));
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
child.stdout.on("data", (buf) => this.onData(buf));
|
|
33
|
+
child.stderr.on("data", (buf) => {
|
|
34
|
+
process.stderr.write(`[mcp:${this.opts.command}] ${buf.toString("utf8")}`);
|
|
35
|
+
});
|
|
36
|
+
child.stdin.on("error", () => {
|
|
37
|
+
/* swallow EPIPE / ECONNRESET */
|
|
38
|
+
});
|
|
39
|
+
child.on("error", (err) => reject(err));
|
|
40
|
+
child.on("exit", () => {
|
|
35
41
|
this.child = null;
|
|
36
|
-
// Notify upper layers so pending requests can be rejected
|
|
37
|
-
// immediately rather than waiting for the request timeout.
|
|
38
42
|
for (const cb of this.closeHandlers)
|
|
39
43
|
cb();
|
|
40
44
|
});
|
|
41
|
-
child.on(
|
|
45
|
+
child.on("spawn", () => resolve());
|
|
42
46
|
}
|
|
43
47
|
catch (err) {
|
|
44
48
|
reject(err);
|
|
@@ -46,12 +50,12 @@ export class StdioTransport {
|
|
|
46
50
|
});
|
|
47
51
|
}
|
|
48
52
|
onData(buf) {
|
|
49
|
-
this.buffer += buf.toString(
|
|
50
|
-
let
|
|
51
|
-
while ((
|
|
52
|
-
const line = this.buffer.slice(0,
|
|
53
|
-
this.buffer = this.buffer.slice(
|
|
54
|
-
if (!line
|
|
53
|
+
this.buffer += buf.toString("utf8");
|
|
54
|
+
let nl;
|
|
55
|
+
while ((nl = this.buffer.indexOf("\n")) >= 0) {
|
|
56
|
+
const line = this.buffer.slice(0, nl).trimEnd();
|
|
57
|
+
this.buffer = this.buffer.slice(nl + 1);
|
|
58
|
+
if (!line)
|
|
55
59
|
continue;
|
|
56
60
|
try {
|
|
57
61
|
const parsed = JSON.parse(line);
|
|
@@ -59,17 +63,16 @@ export class StdioTransport {
|
|
|
59
63
|
h(parsed);
|
|
60
64
|
}
|
|
61
65
|
catch {
|
|
62
|
-
|
|
66
|
+
/* skip malformed */
|
|
63
67
|
}
|
|
64
68
|
}
|
|
65
69
|
}
|
|
66
70
|
async send(message) {
|
|
67
71
|
await this.ready;
|
|
68
72
|
if (!this.child || !this.child.stdin)
|
|
69
|
-
throw new Error(
|
|
73
|
+
throw new Error("Transport is closed");
|
|
70
74
|
await new Promise((resolve, reject) => {
|
|
71
|
-
|
|
72
|
-
this.child.stdin.write(data, err => err ? reject(err) : resolve());
|
|
75
|
+
this.child.stdin.write(JSON.stringify(message) + "\n", (err) => (err ? reject(err) : resolve()));
|
|
73
76
|
});
|
|
74
77
|
}
|
|
75
78
|
onMessage(handler) {
|
|
@@ -108,13 +111,16 @@ export class HttpTransport {
|
|
|
108
111
|
closed = false;
|
|
109
112
|
constructor(opts) {
|
|
110
113
|
this.opts = opts;
|
|
114
|
+
if (typeof fetch !== "function") {
|
|
115
|
+
throw new Error("HttpTransport requires a global fetch API (Node 18+ or a polyfill)");
|
|
116
|
+
}
|
|
111
117
|
}
|
|
112
118
|
async send(message) {
|
|
113
119
|
if (this.closed)
|
|
114
|
-
throw new Error(
|
|
120
|
+
throw new Error("HttpTransport is closed");
|
|
115
121
|
const headers = {
|
|
116
|
-
|
|
117
|
-
Accept:
|
|
122
|
+
"Content-Type": "application/json",
|
|
123
|
+
Accept: "application/json, text/event-stream",
|
|
118
124
|
...(this.opts.headers ?? {}),
|
|
119
125
|
};
|
|
120
126
|
// Token resolution: bearerProvider beats bearerToken so OAuth
|
|
@@ -129,7 +135,7 @@ export class HttpTransport {
|
|
|
129
135
|
let resp;
|
|
130
136
|
try {
|
|
131
137
|
resp = await fetch(this.opts.url, {
|
|
132
|
-
method:
|
|
138
|
+
method: "POST",
|
|
133
139
|
headers,
|
|
134
140
|
body: JSON.stringify(message),
|
|
135
141
|
signal: ac.signal,
|
|
@@ -139,20 +145,20 @@ export class HttpTransport {
|
|
|
139
145
|
clearTimeout(timer);
|
|
140
146
|
}
|
|
141
147
|
if (!resp.ok)
|
|
142
|
-
throw new Error(`MCP HTTP ${resp.status}: ${await resp.text().catch(() =>
|
|
143
|
-
const ctype = resp.headers.get(
|
|
144
|
-
if (ctype.includes(
|
|
148
|
+
throw new Error(`MCP HTTP ${resp.status}: ${await resp.text().catch(() => "")}`);
|
|
149
|
+
const ctype = resp.headers.get("content-type") ?? "";
|
|
150
|
+
if (ctype.includes("application/json")) {
|
|
145
151
|
const body = await resp.json();
|
|
146
152
|
for (const h of this.handlers)
|
|
147
153
|
h(body);
|
|
148
154
|
return;
|
|
149
155
|
}
|
|
150
|
-
if (ctype.includes(
|
|
156
|
+
if (ctype.includes("text/event-stream") && resp.body) {
|
|
151
157
|
// Parse SSE: each block is `event: foo\ndata: {...}\n\n`.
|
|
152
158
|
// We only act on `data:` lines that JSON-parse cleanly.
|
|
153
159
|
const reader = resp.body.getReader();
|
|
154
160
|
const decoder = new TextDecoder();
|
|
155
|
-
let buf =
|
|
161
|
+
let buf = "";
|
|
156
162
|
while (true) {
|
|
157
163
|
const { value, done } = await reader.read();
|
|
158
164
|
if (done)
|
|
@@ -160,11 +166,11 @@ export class HttpTransport {
|
|
|
160
166
|
buf += decoder.decode(value, { stream: true });
|
|
161
167
|
// Process complete events (terminated by blank line).
|
|
162
168
|
let idx;
|
|
163
|
-
while ((idx = buf.indexOf(
|
|
169
|
+
while ((idx = buf.indexOf("\n\n")) >= 0) {
|
|
164
170
|
const block = buf.slice(0, idx);
|
|
165
171
|
buf = buf.slice(idx + 2);
|
|
166
|
-
for (const line of block.split(
|
|
167
|
-
if (!line.startsWith(
|
|
172
|
+
for (const line of block.split("\n")) {
|
|
173
|
+
if (!line.startsWith("data:"))
|
|
168
174
|
continue;
|
|
169
175
|
const payload = line.slice(5).trim();
|
|
170
176
|
if (!payload)
|
|
@@ -174,7 +180,9 @@ export class HttpTransport {
|
|
|
174
180
|
for (const h of this.handlers)
|
|
175
181
|
h(parsed);
|
|
176
182
|
}
|
|
177
|
-
catch {
|
|
183
|
+
catch {
|
|
184
|
+
/* skip non-JSON SSE comments */
|
|
185
|
+
}
|
|
178
186
|
}
|
|
179
187
|
}
|
|
180
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/mcp/transport.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/mcp/transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,20 @@ const NVIDIA_NIM_MODELS = new Set([
|
|
|
21
21
|
"mistralai/mistral-nemotron",
|
|
22
22
|
"mistralai/devstral-2-123b-instruct-2512",
|
|
23
23
|
]);
|
|
24
|
+
// RULE ORDERING INVARIANTS (must be preserved — tested by dispatch.test.ts):
|
|
25
|
+
// 1. Exact native-ID prefix rules (claude-, gpt-, gemini-) come FIRST so
|
|
26
|
+
// they never match via the catch-all OR rule.
|
|
27
|
+
// 2. Explicit vendor-prefix rules (deepseek-ai/, ollama/, fireworks/, etc.)
|
|
28
|
+
// come BEFORE the NVIDIA NIM catalogue rule so user-chosen providers are
|
|
29
|
+
// never hijacked by the catalogue.
|
|
30
|
+
// 3. The NIM catalogue rule (exact-set match against NVIDIA_NIM_MODELS)
|
|
31
|
+
// comes BEFORE the catch-all because those catalogued model IDs would
|
|
32
|
+
// otherwise fall through to OpenRouter.
|
|
33
|
+
// 4. Local/extra-provider explicit-prefix rules (ollama/, llamacpp/,
|
|
34
|
+
// fireworks/, mistral/, cohere/, etc.) come AFTER NIM but BEFORE the
|
|
35
|
+
// catch-all so users can explicitly pick these providers.
|
|
36
|
+
// 5. The catch-all (any `/` or `:free` suffix) MUST be last so it only
|
|
37
|
+
// fires when no other rule has matched.
|
|
24
38
|
const RULES = [
|
|
25
39
|
// Native, no-prefix model IDs go to first-party APIs.
|
|
26
40
|
{ match: (id) => id.startsWith("claude-"), provider: "anthropic" },
|
|
@@ -71,7 +85,7 @@ const RULES = [
|
|
|
71
85
|
// OpenRouter (anthropic/, openai/, google/, deepseek/, moonshotai/,
|
|
72
86
|
// minimax/, qwen/, tencent/, z-ai/, inclusionai/, etc.).
|
|
73
87
|
{
|
|
74
|
-
match: (id) => id.includes("/") || id.
|
|
88
|
+
match: (id) => id.includes("/") || id.endsWith(":free"),
|
|
75
89
|
provider: "openrouter",
|
|
76
90
|
},
|
|
77
91
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../src/providers/dispatch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../src/providers/dispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* are lazy-constructed; missing API keys surface only on first use.
|
|
6
6
|
*/
|
|
7
7
|
import type { Provider, ProviderConfig } from "./iface.js";
|
|
8
|
+
import { type ProviderId } from "./dispatch.js";
|
|
8
9
|
import { type RateLimitOptions } from "./rate-limiter.js";
|
|
9
10
|
export * from "./iface.js";
|
|
10
11
|
export * from "./dispatch.js";
|
|
@@ -47,7 +48,17 @@ export interface ProviderRegistryConfig {
|
|
|
47
48
|
export declare class ProviderRegistry {
|
|
48
49
|
private config;
|
|
49
50
|
private cache;
|
|
51
|
+
/** Timestamp in ms (performance.now) when each provider was cached. */
|
|
52
|
+
private cacheTime;
|
|
53
|
+
/** Invalidate cached providers older than this many ms (30 min). */
|
|
54
|
+
private static readonly CACHE_TTL_MS;
|
|
50
55
|
constructor(config?: ProviderRegistryConfig);
|
|
56
|
+
/** Force-evict a cached provider so the next call to forModel
|
|
57
|
+
* re-constructs it with the latest config. Call this after updating
|
|
58
|
+
* API keys or other provider settings mid-session. */
|
|
59
|
+
invalidate(providerId: ProviderId): void;
|
|
60
|
+
/** Evict all cached providers (e.g. after bulk config reload). */
|
|
61
|
+
invalidateAll(): void;
|
|
51
62
|
forModel(modelId: string): Provider;
|
|
52
63
|
private maybeRateLimit;
|
|
53
64
|
private construct;
|
package/dist/providers/index.js
CHANGED
|
@@ -30,19 +30,46 @@ export { DeepSeekProvider } from "./deepseek.js";
|
|
|
30
30
|
export class ProviderRegistry {
|
|
31
31
|
config;
|
|
32
32
|
cache = new Map();
|
|
33
|
+
/** Timestamp in ms (performance.now) when each provider was cached. */
|
|
34
|
+
cacheTime = new Map();
|
|
35
|
+
/** Invalidate cached providers older than this many ms (30 min). */
|
|
36
|
+
static CACHE_TTL_MS = 30 * 60 * 1000;
|
|
33
37
|
constructor(config = {}) {
|
|
34
38
|
this.config = config;
|
|
35
39
|
}
|
|
40
|
+
/** Force-evict a cached provider so the next call to forModel
|
|
41
|
+
* re-constructs it with the latest config. Call this after updating
|
|
42
|
+
* API keys or other provider settings mid-session. */
|
|
43
|
+
invalidate(providerId) {
|
|
44
|
+
this.cache.delete(providerId);
|
|
45
|
+
this.cacheTime.delete(providerId);
|
|
46
|
+
}
|
|
47
|
+
/** Evict all cached providers (e.g. after bulk config reload). */
|
|
48
|
+
invalidateAll() {
|
|
49
|
+
this.cache.clear();
|
|
50
|
+
this.cacheTime.clear();
|
|
51
|
+
}
|
|
36
52
|
forModel(modelId) {
|
|
37
53
|
const id = routeModel(modelId);
|
|
38
54
|
const cached = this.cache.get(id);
|
|
39
|
-
if (cached)
|
|
40
|
-
|
|
55
|
+
if (cached) {
|
|
56
|
+
const cachedAt = this.cacheTime.get(id);
|
|
57
|
+
if (cachedAt !== undefined) {
|
|
58
|
+
const ageMs = performance.now() - cachedAt;
|
|
59
|
+
if (ageMs < ProviderRegistry.CACHE_TTL_MS)
|
|
60
|
+
return cached;
|
|
61
|
+
// Entry expired — fall through to re-construct below.
|
|
62
|
+
}
|
|
63
|
+
}
|
|
41
64
|
const provider = this.maybeRateLimit(this.construct(id));
|
|
42
65
|
this.cache.set(id, provider);
|
|
66
|
+
this.cacheTime.set(id, performance.now());
|
|
43
67
|
return provider;
|
|
44
68
|
}
|
|
45
69
|
maybeRateLimit(provider) {
|
|
70
|
+
// Known limitation: rateLimit config is captured at Registry
|
|
71
|
+
// construction time. There is no way to add rate limiting
|
|
72
|
+
// mid-session without reconstructing the full Registry.
|
|
46
73
|
if (!this.config.rateLimit)
|
|
47
74
|
return provider;
|
|
48
75
|
return withRateLimit(provider, this.config.rateLimit);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,UAAU,EAAmB,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EACL,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,WAAW,EACX,YAAY,EACZ,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAyB,MAAM,mBAAmB,CAAC;AAEzE,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAuBjD,MAAM,OAAO,gBAAgB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,UAAU,EAAmB,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EACL,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,WAAW,EACX,YAAY,EACZ,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAyB,MAAM,mBAAmB,CAAC;AAEzE,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAuBjD,MAAM,OAAO,gBAAgB;IAOP;IANZ,KAAK,GAAG,IAAI,GAAG,EAAwB,CAAC;IAChD,uEAAuE;IAC/D,SAAS,GAAG,IAAI,GAAG,EAAsB,CAAC;IAClD,oEAAoE;IAC5D,MAAM,CAAU,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAEtD,YAAoB,SAAiC,EAAE;QAAnC,WAAM,GAAN,MAAM,CAA6B;IAAG,CAAC;IAE3D;;2DAEuD;IACvD,UAAU,CAAC,UAAsB;QAC/B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC9B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAED,kEAAkE;IAClE,aAAa;QACX,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAED,QAAQ,CAAC,OAAe;QACtB,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAClC,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACxC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC;gBAC3C,IAAI,KAAK,GAAG,gBAAgB,CAAC,YAAY;oBAAE,OAAO,MAAM,CAAC;gBACzD,sDAAsD;YACxD,CAAC;QACH,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC7B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC;QAC1C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,cAAc,CAAC,QAAkB;QACvC,6DAA6D;QAC7D,0DAA0D;QAC1D,wDAAwD;QACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS;YAAE,OAAO,QAAQ,CAAC;QAC5C,OAAO,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACxD,CAAC;IAEO,SAAS,CAAC,EAAc;QAC9B,QAAQ,EAAE,EAAE,CAAC;YACX,KAAK,QAAQ;gBACX,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;YACtD,KAAK,YAAY;gBACf,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;YAC9D,KAAK,QAAQ;gBACX,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;YACtD,KAAK,WAAW;gBACd,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;YAC5D,KAAK,QAAQ;gBACX,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;YACtD,KAAK,QAAQ;gBACX,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;YACtD,KAAK,UAAU;gBACb,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;YAC1D,KAAK,WAAW;gBACd,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;YAC5D,KAAK,UAAU;gBACb,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;YAC1D,KAAK,SAAS;gBACZ,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;YACxD,KAAK,QAAQ;gBACX,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;YACtD,KAAK,UAAU;gBACb,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;YAC1D,KAAK,UAAU;gBACb,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;YAC1D,KAAK,YAAY;gBACf,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;YAC9D,KAAK,KAAK;gBACR,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;YAChD,KAAK,MAAM;gBACT,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YAClD,KAAK,KAAK;gBACR,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC;IACH,CAAC"}
|
|
@@ -148,8 +148,10 @@ class StreamState {
|
|
|
148
148
|
inThinkBlock = false;
|
|
149
149
|
static THINK_OPEN_RE = /<(?:think|thinking|reasoning|thought|REASONING_SCRATCHPAD)>/i;
|
|
150
150
|
static THINK_CLOSE_RE = /<\/(?:think|thinking|reasoning|thought|REASONING_SCRATCHPAD)>/i;
|
|
151
|
-
// includeThinking is accepted but
|
|
152
|
-
// content is always
|
|
151
|
+
// includeThinking is accepted but not used to gate event emission —
|
|
152
|
+
// reasoning content is always yielded so assembleTurn can echo it back
|
|
153
|
+
// on multi-turn DeepSeek API calls (omitting it causes HTTP 400).
|
|
154
|
+
// The display preference is handled by the TUI layer (showThinking flag).
|
|
153
155
|
constructor(_includeThinking) { }
|
|
154
156
|
/** Split a content delta into text + thinking pieces, honoring open <think> blocks across chunks. */
|
|
155
157
|
routeContent(input) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compat.js","sourceRoot":"","sources":["../../src/providers/openai-compat.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openai-compat.js","sourceRoot":"","sources":["../../src/providers/openai-compat.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
* Append-only, hash-chained audit log. Every entry is a JSON object
|
|
3
3
|
* carrying `prevHash` and `hash`; verify() walks the chain and detects
|
|
4
4
|
* tampering.
|
|
5
|
+
*
|
|
6
|
+
* The module also maintains an in-memory pending buffer so callers can
|
|
7
|
+
* drain recent entries at turn-end and push them to the gateway:
|
|
8
|
+
*
|
|
9
|
+
* const entries = await drainPending();
|
|
10
|
+
* await pushAuditEntries(sessionId, entries, token);
|
|
5
11
|
*/
|
|
6
12
|
export type AuditKind = 'tool_call' | 'approval' | 'policy_decision' | 'error' | 'model_call' | 'session_start' | 'session_end';
|
|
7
13
|
export interface AuditEntry {
|
|
@@ -25,3 +31,12 @@ export interface AuditLogOptions {
|
|
|
25
31
|
directory?: string;
|
|
26
32
|
}
|
|
27
33
|
export declare function createAuditLog(opts?: AuditLogOptions): AuditLog;
|
|
34
|
+
/**
|
|
35
|
+
* Return all audit entries written since the last call to `drainPending()`
|
|
36
|
+
* and clear the internal buffer.
|
|
37
|
+
*
|
|
38
|
+
* Designed for turn-end telemetry: the agent loop calls this after each
|
|
39
|
+
* turn and forwards the result to `pushAuditEntries()` for gateway upload.
|
|
40
|
+
* The function is synchronous in all but name — it never performs I/O.
|
|
41
|
+
*/
|
|
42
|
+
export declare function drainPending(): Promise<AuditEntry[]>;
|
package/dist/safety/audit-log.js
CHANGED
|
@@ -2,11 +2,19 @@
|
|
|
2
2
|
* Append-only, hash-chained audit log. Every entry is a JSON object
|
|
3
3
|
* carrying `prevHash` and `hash`; verify() walks the chain and detects
|
|
4
4
|
* tampering.
|
|
5
|
+
*
|
|
6
|
+
* The module also maintains an in-memory pending buffer so callers can
|
|
7
|
+
* drain recent entries at turn-end and push them to the gateway:
|
|
8
|
+
*
|
|
9
|
+
* const entries = await drainPending();
|
|
10
|
+
* await pushAuditEntries(sessionId, entries, token);
|
|
5
11
|
*/
|
|
6
12
|
import { appendFile, mkdir, readFile, stat } from 'node:fs/promises';
|
|
7
13
|
import { createHash, randomUUID } from 'node:crypto';
|
|
8
14
|
import { join } from 'node:path';
|
|
9
15
|
import { homedir } from 'node:os';
|
|
16
|
+
/** Module-level buffer — accumulates entries until `drainPending()` clears it. */
|
|
17
|
+
const _pendingBuffer = [];
|
|
10
18
|
export function createAuditLog(opts = {}) {
|
|
11
19
|
const dir = opts.directory ?? join(homedir(), '.dirgha', 'audit');
|
|
12
20
|
let lastHash = 'GENESIS';
|
|
@@ -25,6 +33,7 @@ export function createAuditLog(opts = {}) {
|
|
|
25
33
|
entry.hash = computeHash(lastHash, kind, entry.ts, sessionId, payload);
|
|
26
34
|
lastHash = entry.hash;
|
|
27
35
|
await appendFile(join(dir, fileFor()), `${JSON.stringify(entry)}\n`, 'utf8');
|
|
36
|
+
_pendingBuffer.push(entry);
|
|
28
37
|
},
|
|
29
38
|
async read(date) {
|
|
30
39
|
const path = join(dir, fileFor(date));
|
|
@@ -68,4 +77,16 @@ async function ensure(dir) {
|
|
|
68
77
|
if (!info)
|
|
69
78
|
await mkdir(dir, { recursive: true });
|
|
70
79
|
}
|
|
80
|
+
/**
|
|
81
|
+
* Return all audit entries written since the last call to `drainPending()`
|
|
82
|
+
* and clear the internal buffer.
|
|
83
|
+
*
|
|
84
|
+
* Designed for turn-end telemetry: the agent loop calls this after each
|
|
85
|
+
* turn and forwards the result to `pushAuditEntries()` for gateway upload.
|
|
86
|
+
* The function is synchronous in all but name — it never performs I/O.
|
|
87
|
+
*/
|
|
88
|
+
export async function drainPending() {
|
|
89
|
+
const snapshot = _pendingBuffer.splice(0);
|
|
90
|
+
return snapshot;
|
|
91
|
+
}
|
|
71
92
|
//# sourceMappingURL=audit-log.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audit-log.js","sourceRoot":"","sources":["../../src/safety/audit-log.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"audit-log.js","sourceRoot":"","sources":["../../src/safety/audit-log.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,kFAAkF;AAClF,MAAM,cAAc,GAAiB,EAAE,CAAC;AA+BxC,MAAM,UAAU,cAAc,CAAC,OAAwB,EAAE;IACvD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAClE,IAAI,QAAQ,GAAG,SAAS,CAAC;IAEzB,OAAO;QACL,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS;YACnC,MAAM,MAAM,CAAC,GAAG,CAAC,CAAC;YAClB,MAAM,KAAK,GAAe;gBACxB,EAAE,EAAE,UAAU,EAAE;gBAChB,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;gBAC5B,SAAS;gBACT,IAAI;gBACJ,OAAO;gBACP,QAAQ,EAAE,QAAQ;gBAClB,IAAI,EAAE,EAAE;aACT,CAAC;YACF,KAAK,CAAC,IAAI,GAAG,WAAW,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YACvE,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;YACtB,MAAM,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC7E,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,IAAI;YACb,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YAC1D,MAAM,GAAG,GAAiB,EAAE,CAAC;YAC7B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;oBAAE,SAAS;gBAC3B,IAAI,CAAC;oBAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAe,CAAC,CAAC;gBAAC,CAAC;gBAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC;YACxE,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,IAAI;YACf,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,IAAI,GAAG,SAAS,CAAC;YACrB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;gBACnG,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACvD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;gBAC9C,CAAC;gBACD,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;YACpB,CAAC;YACD,QAAQ,GAAG,IAAI,CAAC;YAChB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QACzB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,IAAY,EAAE,IAAY,EAAE,EAAU,EAAE,SAA6B,EAAE,OAAgB;IAC1G,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;IACpE,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,OAAO,CAAC,IAAa;IAC5B,MAAM,CAAC,GAAG,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACxD,OAAO,GAAG,CAAC,SAAS,CAAC;AACvB,CAAC;AAED,KAAK,UAAU,MAAM,CAAC,GAAW;IAC/B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACpD,IAAI,CAAC,IAAI;QAAE,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACnD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY;IAChC,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC1C,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Push CLI audit entries to the Dirgha gateway so they surface in the
|
|
3
|
+
* web IDE dashboard under the active agent session.
|
|
4
|
+
*
|
|
5
|
+
* Every function here is fire-and-forget: network errors, auth failures,
|
|
6
|
+
* and timeouts are all silently swallowed. Telemetry must never crash or
|
|
7
|
+
* slow down the CLI.
|
|
8
|
+
*/
|
|
9
|
+
import type { AuditEntry } from '../safety/audit-log.js';
|
|
10
|
+
/**
|
|
11
|
+
* POST each audit entry to the gateway's agent-session log endpoint.
|
|
12
|
+
*
|
|
13
|
+
* @param sessionId The agent session ID (from AgentLoopConfig).
|
|
14
|
+
* @param entries Audit entries returned by `drainPending()`.
|
|
15
|
+
* @param token JWT bearer token from `~/.dirgha/credentials.json`.
|
|
16
|
+
*/
|
|
17
|
+
export declare function pushAuditEntries(sessionId: string, entries: AuditEntry[], token: string): Promise<void>;
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Push CLI audit entries to the Dirgha gateway so they surface in the
|
|
3
|
+
* web IDE dashboard under the active agent session.
|
|
4
|
+
*
|
|
5
|
+
* Every function here is fire-and-forget: network errors, auth failures,
|
|
6
|
+
* and timeouts are all silently swallowed. Telemetry must never crash or
|
|
7
|
+
* slow down the CLI.
|
|
8
|
+
*/
|
|
9
|
+
const PUSH_TIMEOUT_MS = 5_000;
|
|
10
|
+
/**
|
|
11
|
+
* POST each audit entry to the gateway's agent-session log endpoint.
|
|
12
|
+
*
|
|
13
|
+
* @param sessionId The agent session ID (from AgentLoopConfig).
|
|
14
|
+
* @param entries Audit entries returned by `drainPending()`.
|
|
15
|
+
* @param token JWT bearer token from `~/.dirgha/credentials.json`.
|
|
16
|
+
*/
|
|
17
|
+
export async function pushAuditEntries(sessionId, entries, token) {
|
|
18
|
+
if (entries.length === 0)
|
|
19
|
+
return;
|
|
20
|
+
const base = (process.env['DIRGHA_GATEWAY_URL'] ?? 'https://api.dirgha.ai').replace(/\/+$/, '');
|
|
21
|
+
const url = `${base}/api/agent-sessions/${encodeURIComponent(sessionId)}/logs`;
|
|
22
|
+
for (const entry of entries) {
|
|
23
|
+
try {
|
|
24
|
+
const body = JSON.stringify({
|
|
25
|
+
kind: entry.kind,
|
|
26
|
+
ts: entry.ts,
|
|
27
|
+
payload: entry.payload,
|
|
28
|
+
sessionId: entry.sessionId,
|
|
29
|
+
});
|
|
30
|
+
await fetch(url, {
|
|
31
|
+
method: 'POST',
|
|
32
|
+
headers: {
|
|
33
|
+
'Content-Type': 'application/json',
|
|
34
|
+
Authorization: `Bearer ${token}`,
|
|
35
|
+
},
|
|
36
|
+
body,
|
|
37
|
+
signal: AbortSignal.timeout(PUSH_TIMEOUT_MS),
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
catch {
|
|
41
|
+
// Swallow every error — telemetry must never throw.
|
|
42
|
+
if (process.env['DIRGHA_AUDIT_DEBUG']) {
|
|
43
|
+
process.stderr.write(`[gateway-push] failed to push entry ${entry.id}\n`);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=gateway-push.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gateway-push.js","sourceRoot":"","sources":["../../src/telemetry/gateway-push.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,MAAM,eAAe,GAAG,KAAK,CAAC;AAE9B;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,OAAqB,EACrB,KAAa;IAEb,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAEjC,MAAM,IAAI,GACR,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,uBAAuB,CAAC,CAAC,OAAO,CACpE,MAAM,EACN,EAAE,CACH,CAAC;IACJ,MAAM,GAAG,GAAG,GAAG,IAAI,uBAAuB,kBAAkB,CAAC,SAAS,CAAC,OAAO,CAAC;IAE/E,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC1B,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,SAAS,EAAE,KAAK,CAAC,SAAS;aAC3B,CAAC,CAAC;YAEH,MAAM,KAAK,CAAC,GAAG,EAAE;gBACf,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,aAAa,EAAE,UAAU,KAAK,EAAE;iBACjC;gBACD,IAAI;gBACJ,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC;aAC7C,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,oDAAoD;YACpD,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBACtC,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,uCAAuC,KAAK,CAAC,EAAE,IAAI,CACpD,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Public API for the telemetry package.
|
|
3
|
+
*
|
|
4
|
+
* Re-exports the Posthog event sender and the gateway audit-push helper
|
|
5
|
+
* from a single import point.
|
|
6
|
+
*/
|
|
7
|
+
export { sendEvent, trackCommand, trackError } from './sender.js';
|
|
8
|
+
export type { TelemetryEvent } from './sender.js';
|
|
9
|
+
export { pushAuditEntries } from './gateway-push.js';
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Public API for the telemetry package.
|
|
3
|
+
*
|
|
4
|
+
* Re-exports the Posthog event sender and the gateway audit-push helper
|
|
5
|
+
* from a single import point.
|
|
6
|
+
*/
|
|
7
|
+
export { sendEvent, trackCommand, trackError } from './sender.js';
|
|
8
|
+
export { pushAuditEntries } from './gateway-push.js';
|
|
9
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGlE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC"}
|