@getmarrow/mcp 3.9.93 → 3.9.95
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 +21 -1
- package/dist/cli.js +3 -1
- package/dist/cli.js.map +1 -1
- package/dist/codex-native-usage.d.ts +30 -0
- package/dist/codex-native-usage.d.ts.map +1 -0
- package/dist/codex-native-usage.js +289 -0
- package/dist/codex-native-usage.js.map +1 -0
- package/dist/habit-loop-copy.d.ts +11 -7
- package/dist/habit-loop-copy.d.ts.map +1 -1
- package/dist/habit-loop-copy.js +90 -24
- package/dist/habit-loop-copy.js.map +1 -1
- package/dist/hook-contract.d.ts +2 -2
- package/dist/hook-contract.js +1 -1
- package/dist/hook-session.d.ts.map +1 -1
- package/dist/hook-session.js +14 -6
- package/dist/hook-session.js.map +1 -1
- package/dist/hook.d.ts.map +1 -1
- package/dist/hook.js +17 -6
- package/dist/hook.js.map +1 -1
- package/dist/index.d.ts +0 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -23
- package/dist/index.js.map +1 -1
- package/dist/model-usage.d.ts +26 -0
- package/dist/model-usage.d.ts.map +1 -0
- package/dist/model-usage.js +84 -0
- package/dist/model-usage.js.map +1 -0
- package/dist/types.d.ts +16 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/server.json +2 -2
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { MarrowModelUsageInput } from './types';
|
|
2
|
+
export declare const CODEX_USAGE_LIMITS: {
|
|
3
|
+
readonly fileBytes: number;
|
|
4
|
+
readonly tailBytes: number;
|
|
5
|
+
readonly lineBytes: number;
|
|
6
|
+
readonly lines: 2048;
|
|
7
|
+
readonly readMs: 50;
|
|
8
|
+
};
|
|
9
|
+
type Counters = [number, number, number, number, number, number | null];
|
|
10
|
+
export interface CodexUsageCheckpoint {
|
|
11
|
+
version: 1;
|
|
12
|
+
thread: string;
|
|
13
|
+
turn: string;
|
|
14
|
+
model: string;
|
|
15
|
+
total: Counters;
|
|
16
|
+
submitted?: string;
|
|
17
|
+
}
|
|
18
|
+
export interface CodexUsageObservation {
|
|
19
|
+
reason: string;
|
|
20
|
+
checkpoint?: CodexUsageCheckpoint;
|
|
21
|
+
usage?: MarrowModelUsageInput;
|
|
22
|
+
}
|
|
23
|
+
/** Reads one supported event or bounded current transcript. Never returns transcript text. */
|
|
24
|
+
export declare function observeCodexNativeUsage(input: unknown, previous?: CodexUsageCheckpoint, options?: {
|
|
25
|
+
sessionsRoot?: string;
|
|
26
|
+
}): CodexUsageObservation;
|
|
27
|
+
/** Compact private checkpoint avoids duplicate uploads across native hook processes. */
|
|
28
|
+
export declare function captureCodexNativeUsage(input: unknown, apiKey: string, baseUrl: string, agentId?: string): Promise<void>;
|
|
29
|
+
export {};
|
|
30
|
+
//# sourceMappingURL=codex-native-usage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-native-usage.d.ts","sourceRoot":"","sources":["../src/codex-native-usage.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAIrD,eAAO,MAAM,kBAAkB;;;;;;CAAiH,CAAC;AAEjJ,KAAK,QAAQ,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;AACxE,MAAM,WAAW,oBAAoB;IAAG,OAAO,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE;AACtI,MAAM,WAAW,qBAAqB;IAAG,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,oBAAoB,CAAC;IAAC,KAAK,CAAC,EAAE,qBAAqB,CAAA;CAAE;AA6E3H,8FAA8F;AAC9F,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,oBAAoB,EACrF,OAAO,GAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,qBAAqB,CAsEhE;AAcD,wFAAwF;AACxF,wBAAsB,uBAAuB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+B9H"}
|
|
@@ -0,0 +1,289 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CODEX_USAGE_LIMITS = void 0;
|
|
4
|
+
exports.observeCodexNativeUsage = observeCodexNativeUsage;
|
|
5
|
+
exports.captureCodexNativeUsage = captureCodexNativeUsage;
|
|
6
|
+
const node_fs_1 = require("node:fs");
|
|
7
|
+
const node_crypto_1 = require("node:crypto");
|
|
8
|
+
const node_os_1 = require("node:os");
|
|
9
|
+
const node_path_1 = require("node:path");
|
|
10
|
+
const node_perf_hooks_1 = require("node:perf_hooks");
|
|
11
|
+
const index_1 = require("./index");
|
|
12
|
+
const habit_loop_copy_1 = require("./habit-loop-copy");
|
|
13
|
+
const model_usage_1 = require("./model-usage");
|
|
14
|
+
const UUID = /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i;
|
|
15
|
+
const MODEL = /^[a-zA-Z0-9_.:-]{1,120}$/;
|
|
16
|
+
exports.CODEX_USAGE_LIMITS = { fileBytes: 32 * 1024 * 1024, tailBytes: 256 * 1024, lineBytes: 64 * 1024, lines: 2048, readMs: 50 };
|
|
17
|
+
const TRANSCRIPT_VERSIONS = new Set(['0.157.1']);
|
|
18
|
+
const record = (v) => v && typeof v === 'object' && !Array.isArray(v) ? v : null;
|
|
19
|
+
const hash = (v) => (0, node_crypto_1.createHash)('sha256').update(JSON.stringify(v)).digest('hex');
|
|
20
|
+
const count = (v) => typeof v === 'number' && Number.isSafeInteger(v) && v >= 0;
|
|
21
|
+
function counters(value, camel = false) {
|
|
22
|
+
const v = record(value);
|
|
23
|
+
if (!v)
|
|
24
|
+
return null;
|
|
25
|
+
const names = camel ? ['inputTokens', 'cachedInputTokens', 'outputTokens', 'reasoningOutputTokens', 'totalTokens', 'cacheWriteInputTokens']
|
|
26
|
+
: ['input_tokens', 'cached_input_tokens', 'output_tokens', 'reasoning_output_tokens', 'total_tokens', 'cache_write_input_tokens'];
|
|
27
|
+
if (Object.keys(v).some(k => !names.includes(k)))
|
|
28
|
+
return null;
|
|
29
|
+
const values = names.map(k => v[k]);
|
|
30
|
+
if (!values.slice(0, 5).every(count) || (values[5] !== undefined && !count(values[5])))
|
|
31
|
+
return null;
|
|
32
|
+
const result = [...values.slice(0, 5), values[5] ?? null];
|
|
33
|
+
if (result[1] + (result[5] || 0) > result[0] || result[3] > result[2] || result[4] !== result[0] + result[2])
|
|
34
|
+
return null;
|
|
35
|
+
return result;
|
|
36
|
+
}
|
|
37
|
+
function ownedPath(path, directory) {
|
|
38
|
+
try {
|
|
39
|
+
const s = (0, node_fs_1.lstatSync)(path);
|
|
40
|
+
return !s.isSymbolicLink() && (directory ? s.isDirectory() : s.isFile())
|
|
41
|
+
&& (typeof process.getuid !== 'function' || s.uid === process.getuid()) && !(s.mode & 0o022);
|
|
42
|
+
}
|
|
43
|
+
catch {
|
|
44
|
+
return false;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
function safeTranscript(path, root) {
|
|
48
|
+
if (!(0, node_path_1.isAbsolute)(path) || !(0, node_path_1.isAbsolute)(root))
|
|
49
|
+
return false;
|
|
50
|
+
// The opened spelling must be the same path whose ancestors we validate.
|
|
51
|
+
// In particular, a symlink followed by /.. has different filesystem semantics.
|
|
52
|
+
if (path !== (0, node_path_1.resolve)(path))
|
|
53
|
+
return false;
|
|
54
|
+
const rel = (0, node_path_1.relative)(root, path);
|
|
55
|
+
if (!rel || rel.startsWith('..') || (0, node_path_1.isAbsolute)(rel) || !path.endsWith('.jsonl'))
|
|
56
|
+
return false;
|
|
57
|
+
// Validate every ancestor, not just the final path: no symlink traversal.
|
|
58
|
+
let current = (0, node_path_1.resolve)(path);
|
|
59
|
+
while (current !== (0, node_path_1.dirname)(current)) {
|
|
60
|
+
if (current === root || (0, node_path_1.relative)(root, current).startsWith('..') === false) {
|
|
61
|
+
if (!ownedPath(current, current !== (0, node_path_1.resolve)(path)))
|
|
62
|
+
return false;
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
const stat = (0, node_fs_1.lstatSync)(current);
|
|
66
|
+
if (stat.isSymbolicLink() || !stat.isDirectory())
|
|
67
|
+
return false;
|
|
68
|
+
}
|
|
69
|
+
current = (0, node_path_1.dirname)(current);
|
|
70
|
+
}
|
|
71
|
+
return true;
|
|
72
|
+
}
|
|
73
|
+
function delta(total, last, previous) {
|
|
74
|
+
return !!previous && total.every((value, i) => {
|
|
75
|
+
const prior = previous[i], current = last[i];
|
|
76
|
+
return value === null ? prior === null && current === null
|
|
77
|
+
: prior !== null && current !== null && value >= prior && value - prior === current;
|
|
78
|
+
}) && last[4] > 0;
|
|
79
|
+
}
|
|
80
|
+
function observation(thread, turn, model, provider, total, last, previous, occurredAt) {
|
|
81
|
+
const checkpoint = { version: 1, thread, turn, model, total };
|
|
82
|
+
if (!delta(total, last, previous))
|
|
83
|
+
return { reason: 'delta_not_proven', checkpoint };
|
|
84
|
+
const context = (0, habit_loop_copy_1.modelUsageCaptureContextFromEnv)();
|
|
85
|
+
let billingHost;
|
|
86
|
+
try {
|
|
87
|
+
const endpoint = new URL(context.endpoint || '');
|
|
88
|
+
if (provider === 'openai' && endpoint.protocol === 'https:' && endpoint.hostname === 'api.openai.com'
|
|
89
|
+
&& !endpoint.port && !endpoint.username && !endpoint.password)
|
|
90
|
+
billingHost = 'first_party';
|
|
91
|
+
}
|
|
92
|
+
catch { /* Billing evidence remains unknown. */ }
|
|
93
|
+
const usage = (0, model_usage_1.normalizeModelUsage)({ provider, model, session_id: thread,
|
|
94
|
+
usage_event_id: `codex-native:${hash([thread, turn, model, total])}`,
|
|
95
|
+
input_tokens: last[0], cached_tokens: last[1], output_tokens: last[2], total_tokens: last[4],
|
|
96
|
+
...(last[5] === null ? {} : { cache_write_tokens: last[5] }),
|
|
97
|
+
// Codex counters already include cached input and reasoning output.
|
|
98
|
+
token_semantics: 'input_includes_cache', usage_kind: 'delta', source: 'codex_native_usage', action_type: 'model',
|
|
99
|
+
billing_host: billingHost, billing_mode: context.billing_mode, pricing_dimensions: context.pricing_dimensions,
|
|
100
|
+
occurred_at: occurredAt,
|
|
101
|
+
});
|
|
102
|
+
return { reason: 'observed_delta', checkpoint, usage };
|
|
103
|
+
}
|
|
104
|
+
/** Reads one supported event or bounded current transcript. Never returns transcript text. */
|
|
105
|
+
function observeCodexNativeUsage(input, previous, options = {}) {
|
|
106
|
+
try {
|
|
107
|
+
const hook = record(input);
|
|
108
|
+
if (!hook)
|
|
109
|
+
return { reason: 'unsupported_shape' };
|
|
110
|
+
// Native subagent session_id can name its parent. Without a proven Marrow
|
|
111
|
+
// binding for that child, abstain rather than upload parent-attributed usage.
|
|
112
|
+
if (hook.subagent_transcript_path !== undefined || hook.agent_id !== undefined)
|
|
113
|
+
return { reason: 'subagent_binding_unproven' };
|
|
114
|
+
if (typeof hook.model !== 'string' || !MODEL.test(hook.model))
|
|
115
|
+
return { reason: 'model_missing' };
|
|
116
|
+
if (hook.method === 'thread/tokenUsage/updated') {
|
|
117
|
+
const params = record(hook.params), usage = record(params?.tokenUsage);
|
|
118
|
+
const thread = params?.threadId, turn = params?.turnId;
|
|
119
|
+
if (typeof thread !== 'string' || !UUID.test(thread) || typeof turn !== 'string' || !UUID.test(turn)
|
|
120
|
+
|| hook.session_id !== thread || hook.turn_id !== turn || !usage)
|
|
121
|
+
return { reason: 'event_identity_unproven' };
|
|
122
|
+
if (Object.keys(usage).some(k => !['total', 'last', 'modelContextWindow'].includes(k)))
|
|
123
|
+
return { reason: 'unsupported_shape' };
|
|
124
|
+
const total = counters(usage.total, true), last = counters(usage.last, true);
|
|
125
|
+
if (!total || !last)
|
|
126
|
+
return { reason: 'invalid_counters' };
|
|
127
|
+
const prior = previous?.thread === thread && previous.turn === turn && previous.model === hook.model ? previous.total : undefined;
|
|
128
|
+
return observation(thread, turn, hook.model, undefined, total, last, prior);
|
|
129
|
+
}
|
|
130
|
+
if (typeof hook.session_id !== 'string' || !UUID.test(hook.session_id) || typeof hook.transcript_path !== 'string')
|
|
131
|
+
return { reason: 'transcript_identity_unproven' };
|
|
132
|
+
const root = (0, node_path_1.resolve)(options.sessionsRoot || (0, node_path_1.join)(process.env.CODEX_HOME || (0, node_path_1.join)((0, node_os_1.homedir)(), '.codex'), 'sessions'));
|
|
133
|
+
const file = hook.transcript_path;
|
|
134
|
+
if (!safeTranscript(file, root))
|
|
135
|
+
return { reason: 'transcript_path_rejected' };
|
|
136
|
+
const started = node_perf_hooks_1.performance.now();
|
|
137
|
+
const fd = (0, node_fs_1.openSync)(file, node_fs_1.constants.O_RDONLY | node_fs_1.constants.O_NOFOLLOW);
|
|
138
|
+
let head, tail, offset;
|
|
139
|
+
try {
|
|
140
|
+
const stat = (0, node_fs_1.fstatSync)(fd);
|
|
141
|
+
if (!stat.isFile() || (typeof process.getuid === 'function' && stat.uid !== process.getuid()) || (stat.mode & 0o022) || stat.size > exports.CODEX_USAGE_LIMITS.fileBytes)
|
|
142
|
+
return { reason: 'transcript_size_limit' };
|
|
143
|
+
const read = (start, size) => { const b = Buffer.alloc(size); return b.subarray(0, (0, node_fs_1.readSync)(fd, b, 0, size, start)).toString('utf8'); };
|
|
144
|
+
head = read(0, Math.min(stat.size, exports.CODEX_USAGE_LIMITS.lineBytes));
|
|
145
|
+
offset = Math.max(0, stat.size - exports.CODEX_USAGE_LIMITS.tailBytes);
|
|
146
|
+
tail = read(offset, stat.size - offset);
|
|
147
|
+
if ((0, node_fs_1.fstatSync)(fd).size !== stat.size)
|
|
148
|
+
return { reason: 'transcript_changed_during_read' };
|
|
149
|
+
}
|
|
150
|
+
finally {
|
|
151
|
+
(0, node_fs_1.closeSync)(fd);
|
|
152
|
+
}
|
|
153
|
+
if (node_perf_hooks_1.performance.now() - started > exports.CODEX_USAGE_LIMITS.readMs)
|
|
154
|
+
return { reason: 'transcript_time_limit' };
|
|
155
|
+
const firstLineEnd = head.indexOf('\n');
|
|
156
|
+
if (firstLineEnd < 0)
|
|
157
|
+
return { reason: 'transcript_metadata_limit' };
|
|
158
|
+
const header = record(JSON.parse(head.slice(0, firstLineEnd))), meta = record(header?.payload);
|
|
159
|
+
if (header?.type !== 'session_meta' || meta?.id !== hook.session_id || !TRANSCRIPT_VERSIONS.has(String(meta?.cli_version)))
|
|
160
|
+
return { reason: 'transcript_version_or_identity_unproven' };
|
|
161
|
+
if (meta?.parent_thread_id || record(meta?.source)?.subagent)
|
|
162
|
+
return { reason: 'subagent_binding_unproven' };
|
|
163
|
+
const lines = tail.split('\n');
|
|
164
|
+
if (offset)
|
|
165
|
+
lines.shift();
|
|
166
|
+
if (lines.length > exports.CODEX_USAGE_LIMITS.lines)
|
|
167
|
+
return { reason: 'transcript_line_limit' };
|
|
168
|
+
let turn, model, prior;
|
|
169
|
+
let found = { reason: 'current_turn_delta_unavailable' };
|
|
170
|
+
for (const line of lines) {
|
|
171
|
+
if (node_perf_hooks_1.performance.now() - started > exports.CODEX_USAGE_LIMITS.readMs)
|
|
172
|
+
return { reason: 'transcript_time_limit' };
|
|
173
|
+
if (Buffer.byteLength(line) > exports.CODEX_USAGE_LIMITS.lineBytes)
|
|
174
|
+
return { reason: 'transcript_line_limit' };
|
|
175
|
+
if (!line || (!line.includes('"turn_context"') && !line.includes('"token_count"')))
|
|
176
|
+
continue;
|
|
177
|
+
const event = record(JSON.parse(line)), p = record(event?.payload);
|
|
178
|
+
if (event?.type === 'turn_context') {
|
|
179
|
+
turn = typeof p?.turn_id === 'string' && UUID.test(p.turn_id) ? p.turn_id : undefined;
|
|
180
|
+
model = typeof p?.model === 'string' && MODEL.test(p.model) ? p.model : undefined;
|
|
181
|
+
prior = undefined;
|
|
182
|
+
found = { reason: 'current_turn_delta_unavailable' };
|
|
183
|
+
}
|
|
184
|
+
else if (event?.type === 'event_msg' && p?.type === 'token_count') {
|
|
185
|
+
const info = record(p.info), total = counters(info?.total_token_usage), last = counters(info?.last_token_usage);
|
|
186
|
+
if (!turn || !model || !total || !last) {
|
|
187
|
+
prior = undefined;
|
|
188
|
+
found = { reason: 'unsupported_shape' };
|
|
189
|
+
continue;
|
|
190
|
+
}
|
|
191
|
+
if (prior && total.every((n, i) => n === prior[i]))
|
|
192
|
+
continue;
|
|
193
|
+
if (model !== hook.model || (hook.turn_id !== undefined && hook.turn_id !== turn)) {
|
|
194
|
+
prior = total;
|
|
195
|
+
found = { reason: 'turn_model_mismatch' };
|
|
196
|
+
continue;
|
|
197
|
+
}
|
|
198
|
+
const time = event?.timestamp;
|
|
199
|
+
if (typeof time !== 'string' || !Number.isFinite(Date.parse(time)))
|
|
200
|
+
return { reason: 'timestamp_missing' };
|
|
201
|
+
found = observation(hook.session_id, turn, model, meta?.model_provider === 'openai' ? 'openai' : undefined, total, last, prior, new Date(time).toISOString());
|
|
202
|
+
prior = total;
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
return found;
|
|
206
|
+
}
|
|
207
|
+
catch {
|
|
208
|
+
return { reason: 'native_usage_unavailable' };
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
function checkpointPath(thread, agentId) {
|
|
212
|
+
const home = (0, node_os_1.homedir)(), parent = (0, node_path_1.join)(home, '.marrow'), root = (0, node_path_1.join)(parent, 'codex-native-usage');
|
|
213
|
+
try {
|
|
214
|
+
if (!ownedPath(home, true))
|
|
215
|
+
return null;
|
|
216
|
+
for (const dir of [parent, root]) {
|
|
217
|
+
try {
|
|
218
|
+
(0, node_fs_1.mkdirSync)(dir, { mode: 0o700 });
|
|
219
|
+
}
|
|
220
|
+
catch { /* Validate existing directory below. */ }
|
|
221
|
+
if (!ownedPath(dir, true))
|
|
222
|
+
return null;
|
|
223
|
+
}
|
|
224
|
+
return (0, node_path_1.join)(root, `${hash([agentId, thread])}.json`);
|
|
225
|
+
}
|
|
226
|
+
catch {
|
|
227
|
+
return null;
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
/** Compact private checkpoint avoids duplicate uploads across native hook processes. */
|
|
231
|
+
async function captureCodexNativeUsage(input, apiKey, baseUrl, agentId) {
|
|
232
|
+
const hook = record(input), params = record(hook?.params);
|
|
233
|
+
const thread = hook?.method === 'thread/tokenUsage/updated' ? params?.threadId : hook?.session_id;
|
|
234
|
+
if (hook?.subagent_transcript_path !== undefined || hook?.agent_id !== undefined)
|
|
235
|
+
return;
|
|
236
|
+
if (!apiKey || !agentId || typeof thread !== 'string' || !UUID.test(thread))
|
|
237
|
+
return;
|
|
238
|
+
const file = checkpointPath(thread, agentId);
|
|
239
|
+
if (!file)
|
|
240
|
+
return;
|
|
241
|
+
let previous;
|
|
242
|
+
try {
|
|
243
|
+
if (ownedPath(file, false) && (0, node_fs_1.lstatSync)(file).size <= 2048) {
|
|
244
|
+
const fd = (0, node_fs_1.openSync)(file, node_fs_1.constants.O_RDONLY | node_fs_1.constants.O_NOFOLLOW);
|
|
245
|
+
let saved;
|
|
246
|
+
try {
|
|
247
|
+
if ((0, node_fs_1.fstatSync)(fd).size > 2048)
|
|
248
|
+
return;
|
|
249
|
+
saved = JSON.parse((0, node_fs_1.readFileSync)(fd, 'utf8'));
|
|
250
|
+
}
|
|
251
|
+
finally {
|
|
252
|
+
(0, node_fs_1.closeSync)(fd);
|
|
253
|
+
}
|
|
254
|
+
if (saved.version === 1 && saved.thread === thread && typeof saved.turn === 'string' && UUID.test(saved.turn)
|
|
255
|
+
&& typeof saved.model === 'string' && MODEL.test(saved.model) && Array.isArray(saved.total)
|
|
256
|
+
&& saved.total.length === 6 && saved.total.slice(0, 5).every(count) && (saved.total[5] === null || count(saved.total[5])))
|
|
257
|
+
previous = saved;
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
catch { /* An invalid checkpoint proves no delta. */ }
|
|
261
|
+
const result = observeCodexNativeUsage(input, previous);
|
|
262
|
+
if (!result.checkpoint)
|
|
263
|
+
return;
|
|
264
|
+
if (result.usage) {
|
|
265
|
+
if (previous?.submitted === result.usage.usage_event_id)
|
|
266
|
+
return;
|
|
267
|
+
try {
|
|
268
|
+
await (0, index_1.marrowModelUsage)(apiKey, baseUrl, result.usage, result.checkpoint.thread, agentId);
|
|
269
|
+
}
|
|
270
|
+
catch {
|
|
271
|
+
return;
|
|
272
|
+
} // Keep the prior checkpoint so the same observation can retry unchanged.
|
|
273
|
+
result.checkpoint.submitted = result.usage.usage_event_id;
|
|
274
|
+
}
|
|
275
|
+
else
|
|
276
|
+
result.checkpoint.submitted = previous?.submitted;
|
|
277
|
+
const temporary = `${file}.${process.pid}.${hash(Date.now()).slice(0, 8)}.tmp`;
|
|
278
|
+
try {
|
|
279
|
+
(0, node_fs_1.writeFileSync)(temporary, JSON.stringify(result.checkpoint), { mode: 0o600, flag: 'wx' });
|
|
280
|
+
(0, node_fs_1.renameSync)(temporary, file);
|
|
281
|
+
}
|
|
282
|
+
catch {
|
|
283
|
+
try {
|
|
284
|
+
(0, node_fs_1.unlinkSync)(temporary);
|
|
285
|
+
}
|
|
286
|
+
catch { /* Best effort checkpoint only. */ }
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
//# sourceMappingURL=codex-native-usage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-native-usage.js","sourceRoot":"","sources":["../src/codex-native-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { MarrowModelUsageInput } from './types';
|
|
1
2
|
export interface MarrowHabitLoopCopy {
|
|
2
3
|
contract: 'marrow.habit-loop.v1';
|
|
3
4
|
headline: string;
|
|
@@ -7,12 +8,15 @@ export interface MarrowHabitLoopCopy {
|
|
|
7
8
|
text: string;
|
|
8
9
|
}
|
|
9
10
|
export declare function formatHabitLoopCopy(source: unknown): MarrowHabitLoopCopy | null;
|
|
10
|
-
export
|
|
11
|
+
export interface ModelUsageCaptureContext {
|
|
12
|
+
/** Observed request endpoint, supplied by the host adapter/config; never taken from response content. */
|
|
13
|
+
endpoint?: string;
|
|
11
14
|
provider?: string;
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
pricing_dimensions?: Record<string, string | number>;
|
|
16
|
+
billing_mode?: 'api' | 'subscription';
|
|
17
|
+
usage_kind?: 'delta' | 'cumulative';
|
|
18
|
+
occurred_at?: string;
|
|
19
|
+
}
|
|
20
|
+
export declare function modelUsageCaptureContextFromEnv(): ModelUsageCaptureContext;
|
|
21
|
+
export declare function extractModelUsageFromUnknown(source: unknown, context?: ModelUsageCaptureContext): MarrowModelUsageInput | null;
|
|
18
22
|
//# sourceMappingURL=habit-loop-copy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"habit-loop-copy.d.ts","sourceRoot":"","sources":["../src/habit-loop-copy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"habit-loop-copy.d.ts","sourceRoot":"","sources":["../src/habit-loop-copy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAYrD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,GAAG,mBAAmB,GAAG,IAAI,CA4B/E;AAED,MAAM,WAAW,wBAAwB;IACvC,yGAAyG;IACzG,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACrD,YAAY,CAAC,EAAE,KAAK,GAAG,cAAc,CAAC;IACtC,UAAU,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,+BAA+B,IAAI,wBAAwB,CAQ1E;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,GAAE,wBAA6B,GAAG,qBAAqB,GAAG,IAAI,CAuElI"}
|
package/dist/habit-loop-copy.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.formatHabitLoopCopy = formatHabitLoopCopy;
|
|
4
|
+
exports.modelUsageCaptureContextFromEnv = modelUsageCaptureContextFromEnv;
|
|
4
5
|
exports.extractModelUsageFromUnknown = extractModelUsageFromUnknown;
|
|
6
|
+
const model_usage_1 = require("./model-usage");
|
|
5
7
|
function asRecord(value) {
|
|
6
8
|
return value && typeof value === 'object' && !Array.isArray(value)
|
|
7
9
|
? value
|
|
@@ -39,40 +41,104 @@ function formatHabitLoopCopy(source) {
|
|
|
39
41
|
text: [headline, `Next: ${next}`, ...(avoid.length ? [`Avoid: ${avoid[0]}`] : []), `Savings: ${savings}`].join('\n'),
|
|
40
42
|
};
|
|
41
43
|
}
|
|
42
|
-
function
|
|
44
|
+
function modelUsageCaptureContextFromEnv() {
|
|
45
|
+
let pricing_dimensions;
|
|
46
|
+
const raw = process.env.MARROW_MODEL_USAGE_PRICING_DIMENSIONS;
|
|
47
|
+
if (raw && raw.length <= 2048) {
|
|
48
|
+
try {
|
|
49
|
+
pricing_dimensions = (0, model_usage_1.normalizeModelUsage)({ pricing_dimensions: JSON.parse(raw) }).pricing_dimensions;
|
|
50
|
+
}
|
|
51
|
+
catch { /* Unknown configuration remains unpriced. */ }
|
|
52
|
+
}
|
|
53
|
+
return { endpoint: process.env.MARROW_MODEL_USAGE_ENDPOINT, pricing_dimensions,
|
|
54
|
+
billing_mode: process.env.MARROW_MODEL_USAGE_BILLING_MODE === 'subscription' ? 'subscription' : undefined };
|
|
55
|
+
}
|
|
56
|
+
function extractModelUsageFromUnknown(source, context = {}) {
|
|
43
57
|
const root = asRecord(source);
|
|
44
58
|
if (!root)
|
|
45
59
|
return null;
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
|| asRecord(asRecord(root.response)?.usage)
|
|
49
|
-
|| asRecord(asRecord(root.message)?.usage)
|
|
50
|
-
|| asRecord(root.usageMetadata);
|
|
60
|
+
const response = asRecord(root.response) || asRecord(root.message) || root;
|
|
61
|
+
const usage = asRecord(response.usage) || asRecord(response.token_usage) || asRecord(response.usageMetadata);
|
|
51
62
|
if (!usage)
|
|
52
63
|
return null;
|
|
64
|
+
const number = (value) => typeof value === 'number' && Number.isSafeInteger(value) && value >= 0 ? value : undefined;
|
|
53
65
|
const numberAt = (...keys) => {
|
|
54
66
|
for (const key of keys) {
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
return Math.floor(value);
|
|
67
|
+
if (Object.hasOwn(usage, key))
|
|
68
|
+
return number(usage[key]);
|
|
58
69
|
}
|
|
59
70
|
return undefined;
|
|
60
71
|
};
|
|
61
|
-
const
|
|
62
|
-
const
|
|
63
|
-
const
|
|
64
|
-
const
|
|
65
|
-
if (
|
|
72
|
+
const model = asString(response.model) || asString(response.modelVersion) || undefined;
|
|
73
|
+
const declaredProvider = asString(root.provider) || asString(response.provider) || context.provider;
|
|
74
|
+
const responseId = asString(response.id);
|
|
75
|
+
const numericKeys = ['input_tokens', 'prompt_tokens', 'inputTokenCount', 'promptTokenCount', 'output_tokens', 'completion_tokens', 'outputTokenCount', 'candidatesTokenCount', 'cached_tokens', 'cache_read_input_tokens', 'cachedContentTokenCount', 'cache_write_tokens', 'cache_creation_input_tokens', 'total_tokens', 'totalTokenCount', 'totalTokens'];
|
|
76
|
+
if (numericKeys.some(key => Object.hasOwn(usage, key) && number(usage[key]) === undefined))
|
|
66
77
|
return null;
|
|
67
|
-
const
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
78
|
+
for (const detail of [asRecord(usage.input_tokens_details), asRecord(usage.prompt_tokens_details)]) {
|
|
79
|
+
if (detail && ['cached_tokens', 'cache_write_tokens'].some(key => Object.hasOwn(detail, key) && number(detail[key]) === undefined))
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
82
|
+
let endpointProvider;
|
|
83
|
+
try {
|
|
84
|
+
const endpoint = new URL(context.endpoint || '');
|
|
85
|
+
if (endpoint.protocol === 'https:' && !endpoint.username && !endpoint.password && !endpoint.port) {
|
|
86
|
+
endpointProvider = { 'api.openai.com': 'openai', 'api.anthropic.com': 'anthropic' }[endpoint.hostname];
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
catch { /* No endpoint proof. */ }
|
|
90
|
+
const provider = declaredProvider || endpointProvider;
|
|
91
|
+
const mismatch = !!(endpointProvider && (declaredProvider && endpointProvider !== declaredProvider
|
|
92
|
+
|| endpointProvider === 'openai' && model?.startsWith('claude-')
|
|
93
|
+
|| endpointProvider === 'anthropic' && model && !model.startsWith('claude-')
|
|
94
|
+
|| endpointProvider === 'openai' && responseId?.startsWith('msg_')
|
|
95
|
+
|| endpointProvider === 'anthropic' && /^(?:resp_|chatcmpl[-_])/.test(responseId || '')));
|
|
96
|
+
const openai = provider === 'openai';
|
|
97
|
+
const anthropic = provider === 'anthropic';
|
|
98
|
+
const input_tokens = numberAt('input_tokens', 'prompt_tokens', 'inputTokenCount', 'promptTokenCount');
|
|
99
|
+
const output_tokens = numberAt('output_tokens', 'completion_tokens', 'outputTokenCount', 'candidatesTokenCount');
|
|
100
|
+
const details = asRecord(usage.input_tokens_details) || asRecord(usage.prompt_tokens_details);
|
|
101
|
+
const cached_tokens = numberAt('cached_tokens', 'cache_read_input_tokens', 'cachedContentTokenCount') ?? (openai ? number(details?.cached_tokens) : undefined);
|
|
102
|
+
const cache_write_tokens = numberAt('cache_write_tokens', 'cache_creation_input_tokens') ?? (openai ? number(details?.cache_write_tokens) : undefined);
|
|
103
|
+
// Native Anthropic input excludes cache reads/writes; OpenAI input includes them.
|
|
104
|
+
const token_semantics = openai ? 'input_includes_cache' : anthropic ? 'disjoint' : undefined;
|
|
105
|
+
const observedTotal = numberAt('total_tokens', 'totalTokenCount', 'totalTokens');
|
|
106
|
+
const total_tokens = observedTotal ?? (input_tokens !== undefined && output_tokens !== undefined && token_semantics
|
|
107
|
+
? input_tokens + output_tokens + (anthropic ? (cached_tokens || 0) + (cache_write_tokens || 0) : 0) : undefined);
|
|
108
|
+
if ([input_tokens, output_tokens, cached_tokens, cache_write_tokens, total_tokens].every(value => value === undefined))
|
|
109
|
+
return null;
|
|
110
|
+
const id = asString(response.id);
|
|
111
|
+
const stableId = !mismatch && id && (openai && /^(?:chatcmpl|resp)_[a-zA-Z0-9_-]{1,120}$/.test(id)
|
|
112
|
+
|| openai && /^chatcmpl-[a-zA-Z0-9_-]{1,120}$/.test(id)
|
|
113
|
+
|| anthropic && /^msg_[a-zA-Z0-9_-]{1,120}$/.test(id)) ? `${provider}:${id}` : undefined;
|
|
114
|
+
const dims = { ...context.pricing_dimensions };
|
|
115
|
+
const tier = asString(response.service_tier) || asString(usage.service_tier);
|
|
116
|
+
if (tier && (openai || anthropic))
|
|
117
|
+
dims.tier = tier === 'default' && openai ? 'standard' : tier;
|
|
118
|
+
const geo = asString(usage.inference_geo);
|
|
119
|
+
if (anthropic && geo)
|
|
120
|
+
dims.region = geo;
|
|
121
|
+
const creation = asRecord(usage.cache_creation);
|
|
122
|
+
if (anthropic && creation) {
|
|
123
|
+
const five = number(creation.ephemeral_5m_input_tokens), hour = number(creation.ephemeral_1h_input_tokens);
|
|
124
|
+
if (five !== undefined && hour !== undefined && cache_write_tokens === five + hour && five + hour > 0) {
|
|
125
|
+
dims.cache_ttl = five && hour ? 'mixed_unresolved' : hour ? '1h' : '5m';
|
|
126
|
+
}
|
|
127
|
+
else if (cache_write_tokens)
|
|
128
|
+
dims.cache_ttl = 'unresolved';
|
|
129
|
+
}
|
|
130
|
+
const usage_kind = context.usage_kind === 'cumulative' || root.usage_kind === 'cumulative' || response.usage_kind === 'cumulative' || root.type === 'message_start' ? 'cumulative'
|
|
131
|
+
: stableId ? 'delta' : context.usage_kind;
|
|
132
|
+
// No raw content, endpoint, guessed coverage or client-asserted savings crosses this boundary.
|
|
133
|
+
try {
|
|
134
|
+
return (0, model_usage_1.normalizeModelUsage)({ provider, model, input_tokens, output_tokens, cached_tokens, cache_write_tokens, total_tokens,
|
|
135
|
+
token_semantics, billing_host: endpointProvider && !mismatch ? 'first_party' : undefined,
|
|
136
|
+
usage_event_id: stableId, usage_kind, occurred_at: context.occurred_at,
|
|
137
|
+
pricing_dimensions: Object.keys(dims).length ? dims : undefined, billing_mode: context.billing_mode,
|
|
138
|
+
});
|
|
139
|
+
}
|
|
140
|
+
catch {
|
|
141
|
+
return null;
|
|
142
|
+
}
|
|
77
143
|
}
|
|
78
144
|
//# sourceMappingURL=habit-loop-copy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"habit-loop-copy.js","sourceRoot":"","sources":["../src/habit-loop-copy.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"habit-loop-copy.js","sourceRoot":"","sources":["../src/habit-loop-copy.ts"],"names":[],"mappings":"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"}
|
package/dist/hook-contract.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { resolveMarrowEnv, type ResolvedMarrowEnv } from './env';
|
|
2
|
-
export declare const MCP_ADAPTER_VERSION = "3.9.
|
|
2
|
+
export declare const MCP_ADAPTER_VERSION = "3.9.95";
|
|
3
3
|
export declare const NATIVE_HOOK_MATCHER = "Bash|Edit|Write|MultiEdit|Read|Glob|Grep|Search|WebSearch|Task|functions\\.(?!mcp__marrow__marrow_).*|mcp__(?!marrow__marrow_).*";
|
|
4
4
|
export declare const GROK_NATIVE_HOOK_MATCHER = "run_terminal_command|search_replace|write|spawn_subagent|use_tool|workflow|image_gen|image_edit|image_to_video|reference_to_video";
|
|
5
|
-
export declare const MCP_PACKAGE_SPEC = "@getmarrow/mcp@3.9.
|
|
5
|
+
export declare const MCP_PACKAGE_SPEC = "@getmarrow/mcp@3.9.95";
|
|
6
6
|
export declare const CONTEXT_HOOK_COMMAND: string;
|
|
7
7
|
export declare const PRE_ACTION_HOOK_COMMAND: string;
|
|
8
8
|
export declare const ACTION_RESULT_HOOK_COMMAND: string;
|
package/dist/hook-contract.js
CHANGED
|
@@ -21,7 +21,7 @@ const node_fs_1 = require("node:fs");
|
|
|
21
21
|
const node_os_1 = require("node:os");
|
|
22
22
|
const node_path_1 = require("node:path");
|
|
23
23
|
const env_1 = require("./env");
|
|
24
|
-
exports.MCP_ADAPTER_VERSION = '3.9.
|
|
24
|
+
exports.MCP_ADAPTER_VERSION = '3.9.95';
|
|
25
25
|
exports.NATIVE_HOOK_MATCHER = 'Bash|Edit|Write|MultiEdit|Read|Glob|Grep|Search|WebSearch|Task|functions\\.(?!mcp__marrow__marrow_).*|mcp__(?!marrow__marrow_).*';
|
|
26
26
|
exports.GROK_NATIVE_HOOK_MATCHER = 'run_terminal_command|search_replace|write|spawn_subagent|use_tool|workflow|image_gen|image_edit|image_to_video|reference_to_video';
|
|
27
27
|
exports.MCP_PACKAGE_SPEC = `@getmarrow/mcp@${exports.MCP_ADAPTER_VERSION}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-session.d.ts","sourceRoot":"","sources":["../src/hook-session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hook-session.d.ts","sourceRoot":"","sources":["../src/hook-session.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,oBAAoB,QAA2B,CAAC;AAuE7D,wBAAgB,qBAAqB,CAAC,QAAQ,SAAgB,GAAG;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAa5G;AAED,wBAAgB,wBAAwB,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAIjE;AAED,wBAAsB,qBAAqB,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CA+E1E"}
|