@amalgm/chat 0.2.8 → 0.2.9-main.34746990150
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/PURPOSE.md +94 -41
- package/README.md +17 -4
- package/dist/acp/projection.d.ts +8 -0
- package/dist/acp/projection.d.ts.map +1 -1
- package/dist/acp/projection.js +10 -3
- package/dist/acp/projection.js.map +1 -1
- package/dist/conversations/index.d.ts +1 -0
- package/dist/conversations/index.d.ts.map +1 -1
- package/dist/conversations/index.js +1 -0
- package/dist/conversations/index.js.map +1 -1
- package/dist/conversations/transcript-parts.d.ts +38 -0
- package/dist/conversations/transcript-parts.d.ts.map +1 -0
- package/dist/conversations/transcript-parts.js +2 -0
- package/dist/conversations/transcript-parts.js.map +1 -0
- package/dist/conversations/transcript-tools.d.ts +11 -0
- package/dist/conversations/transcript-tools.d.ts.map +1 -0
- package/dist/conversations/transcript-tools.js +47 -0
- package/dist/conversations/transcript-tools.js.map +1 -0
- package/dist/conversations/transcript.d.ts +5 -4
- package/dist/conversations/transcript.d.ts.map +1 -1
- package/dist/conversations/transcript.js +43 -143
- package/dist/conversations/transcript.js.map +1 -1
- package/dist/conversations/types.d.ts +19 -0
- package/dist/conversations/types.d.ts.map +1 -1
- package/dist/conversations/types.js.map +1 -1
- package/dist/events/constructors.d.ts.map +1 -1
- package/dist/events/constructors.js +2 -52
- package/dist/events/constructors.js.map +1 -1
- package/dist/events/schema.d.ts +72 -72
- package/dist/events/schema.js +16 -16
- package/dist/events/schema.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/input/prompt.js +1 -1
- package/dist/input/prompt.js.map +1 -1
- package/dist/mcp/server.js +13 -13
- package/dist/mcp/server.js.map +1 -1
- package/dist/normalizers/claude.d.ts +142 -142
- package/dist/normalizers/claude.d.ts.map +1 -1
- package/dist/normalizers/claude.js +23 -37
- package/dist/normalizers/claude.js.map +1 -1
- package/dist/normalizers/codex.d.ts +71 -71
- package/dist/normalizers/codex.d.ts.map +1 -1
- package/dist/normalizers/codex.js +12 -24
- package/dist/normalizers/codex.js.map +1 -1
- package/dist/normalizers/index.d.ts +0 -1
- package/dist/normalizers/index.d.ts.map +1 -1
- package/dist/normalizers/index.js +0 -1
- package/dist/normalizers/index.js.map +1 -1
- package/dist/normalizers/opencode.d.ts.map +1 -1
- package/dist/normalizers/opencode.js +9 -6
- package/dist/normalizers/opencode.js.map +1 -1
- package/dist/normalizers/pi.d.ts.map +1 -1
- package/dist/normalizers/pi.js +27 -14
- package/dist/normalizers/pi.js.map +1 -1
- package/dist/sessions/chat.d.ts +5 -5
- package/dist/sessions/chat.d.ts.map +1 -1
- package/dist/sessions/chat.js +51 -19
- package/dist/sessions/chat.js.map +1 -1
- package/dist/sessions/index.d.ts +1 -1
- package/dist/sessions/index.d.ts.map +1 -1
- package/dist/sessions/index.js +1 -1
- package/dist/sessions/index.js.map +1 -1
- package/dist/usage/acp.d.ts +4 -0
- package/dist/usage/acp.d.ts.map +1 -0
- package/dist/usage/acp.js +20 -0
- package/dist/usage/acp.js.map +1 -0
- package/dist/usage/finalize.d.ts +1 -11
- package/dist/usage/finalize.d.ts.map +1 -1
- package/dist/usage/finalize.js +29 -47
- package/dist/usage/finalize.js.map +1 -1
- package/dist/usage/index.d.ts +2 -1
- package/dist/usage/index.d.ts.map +1 -1
- package/dist/usage/index.js +2 -1
- package/dist/usage/index.js.map +1 -1
- package/dist/usage/normalize.d.ts +8 -9
- package/dist/usage/normalize.d.ts.map +1 -1
- package/dist/usage/normalize.js +20 -20
- package/dist/usage/normalize.js.map +1 -1
- package/dist/usage/ports.d.ts +4 -4
- package/dist/usage/ports.d.ts.map +1 -1
- package/dist/usage/ports.js +5 -5
- package/dist/usage/ports.js.map +1 -1
- package/dist/usage/tokens.d.ts +13 -38
- package/dist/usage/tokens.d.ts.map +1 -1
- package/dist/usage/tokens.js +39 -72
- package/dist/usage/tokens.js.map +1 -1
- package/host/adapters/acp-prompt.js +36 -0
- package/host/adapters/acp.js +50 -71
- package/host/adapters/attachments.js +37 -0
- package/host/adapters/claude.js +9 -2
- package/host/adapters/codex.js +36 -18
- package/host/adapters/cursor.js +72 -99
- package/host/adapters/opencode.js +39 -25
- package/host/adapters/pi.js +24 -19
- package/host/adapters/prompt.js +13 -21
- package/host/adapters/provider-url.js +8 -0
- package/host/auth.js +10 -9
- package/host/http.js +3 -2
- package/host/model-resolution.js +7 -0
- package/host/native-contract.js +4 -3
- package/host/native-runtime.js +25 -11
- package/host/sqlite/index.d.ts +2 -0
- package/host/sqlite/index.js +48 -4
- package/host/tooling/runtime-home.js +1 -1
- package/host/tooling/system-instructions.js +7 -6
- package/host/tooling/system-prompt.js +12 -18
- package/package.json +26 -2
- package/dist/normalizers/cursor.d.ts +0 -33
- package/dist/normalizers/cursor.d.ts.map +0 -1
- package/dist/normalizers/cursor.js +0 -196
- package/dist/normalizers/cursor.js.map +0 -1
|
@@ -1,171 +1,71 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { record, reduceTranscriptTool, updateTiming } from './transcript-tools.js';
|
|
2
2
|
export function createAcpTranscriptState() {
|
|
3
|
-
return {
|
|
4
|
-
parts: [],
|
|
5
|
-
textPartIndex: null,
|
|
6
|
-
reasoningPartIndex: null,
|
|
7
|
-
toolPartIndexById: new Map(),
|
|
8
|
-
};
|
|
9
|
-
}
|
|
10
|
-
function record(value) {
|
|
11
|
-
return value && typeof value === 'object' && !Array.isArray(value) ? value : {};
|
|
3
|
+
return { parts: [], textPartIndex: null, reasoningPartIndex: null, toolPartIndexById: new Map() };
|
|
12
4
|
}
|
|
13
5
|
function finishOpenParts(state, failed = false) {
|
|
14
|
-
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
if (state.reasoningPartIndex !== null) {
|
|
20
|
-
const current = record(state.parts[state.reasoningPartIndex]);
|
|
21
|
-
state.parts[state.reasoningPartIndex] = { ...current, state: failed ? 'error' : 'done' };
|
|
22
|
-
state.reasoningPartIndex = null;
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
function contentText(update) {
|
|
26
|
-
const content = record(update['content']);
|
|
27
|
-
return typeof content['text'] === 'string' ? content['text'] : '';
|
|
28
|
-
}
|
|
29
|
-
function persistedUpdateStartedAt(update) {
|
|
30
|
-
const meta = record(update['_meta']);
|
|
31
|
-
const amalgm = record(meta['amalgm']);
|
|
32
|
-
const native = record(amalgm['native']);
|
|
33
|
-
const timestampMs = Number(native['timestampMs']);
|
|
34
|
-
return Number.isFinite(timestampMs) && timestampMs > 0
|
|
35
|
-
? new Date(timestampMs).toISOString()
|
|
36
|
-
: null;
|
|
37
|
-
}
|
|
38
|
-
function appendText(state, text) {
|
|
39
|
-
if (state.reasoningPartIndex !== null)
|
|
40
|
-
finishOpenParts(state);
|
|
41
|
-
if (state.textPartIndex === null) {
|
|
42
|
-
state.textPartIndex = state.parts.push({ type: 'text', text, state: 'active' }) - 1;
|
|
43
|
-
return;
|
|
6
|
+
for (const key of ['textPartIndex', 'reasoningPartIndex']) {
|
|
7
|
+
const index = state[key];
|
|
8
|
+
if (index !== null)
|
|
9
|
+
state.parts[index] = { ...state.parts[index], state: failed ? 'error' : 'complete' };
|
|
10
|
+
state[key] = null;
|
|
44
11
|
}
|
|
45
|
-
const current = record(state.parts[state.textPartIndex]);
|
|
46
|
-
state.parts[state.textPartIndex] = { ...current, text: `${String(current['text'] || '')}${text}` };
|
|
47
12
|
}
|
|
48
|
-
function
|
|
49
|
-
|
|
13
|
+
function appendText(state, type, text, update) {
|
|
14
|
+
const key = type === 'text' ? 'textPartIndex' : 'reasoningPartIndex';
|
|
15
|
+
const otherKey = type === 'text' ? 'reasoningPartIndex' : 'textPartIndex';
|
|
16
|
+
const messageId = 'messageId' in update && typeof update.messageId === 'string' ? update.messageId : undefined;
|
|
17
|
+
const current = state[key] === null ? undefined : state.parts[state[key]];
|
|
18
|
+
if (state[otherKey] !== null || (messageId && current?.messageId && current.messageId !== messageId))
|
|
50
19
|
finishOpenParts(state);
|
|
51
|
-
if (state
|
|
52
|
-
const
|
|
53
|
-
state
|
|
54
|
-
|
|
55
|
-
text,
|
|
56
|
-
state: 'active',
|
|
57
|
-
...(startedAt ? {
|
|
58
|
-
providerMetadata: { processTiming: { startedAt, kind: 'reasoning' } },
|
|
59
|
-
} : {}),
|
|
20
|
+
if (state[key] === null) {
|
|
21
|
+
const timing = updateTiming(update);
|
|
22
|
+
state[key] = state.parts.push({ type, text, state: 'active',
|
|
23
|
+
...(messageId ? { messageId } : {}), ...(timing ? { timing } : {}),
|
|
60
24
|
}) - 1;
|
|
61
|
-
return;
|
|
62
|
-
}
|
|
63
|
-
const current = record(state.parts[state.reasoningPartIndex]);
|
|
64
|
-
state.parts[state.reasoningPartIndex] = { ...current, text: `${String(current['text'] || '')}${text}` };
|
|
65
|
-
}
|
|
66
|
-
function startTool(state, update) {
|
|
67
|
-
finishOpenParts(state);
|
|
68
|
-
const toolCallId = String(update['toolCallId'] || '');
|
|
69
|
-
if (!toolCallId)
|
|
70
|
-
return;
|
|
71
|
-
const title = String(update['title'] || 'Tool');
|
|
72
|
-
const index = state.toolPartIndexById.get(toolCallId);
|
|
73
|
-
const next = {
|
|
74
|
-
type: toToolPartType(title),
|
|
75
|
-
toolCallId,
|
|
76
|
-
toolName: title,
|
|
77
|
-
title,
|
|
78
|
-
kind: update['kind'],
|
|
79
|
-
input: record(update['rawInput']),
|
|
80
|
-
state: update['status'] === 'failed' ? 'output-error' : 'calling',
|
|
81
|
-
status: update['status'] || 'in_progress',
|
|
82
|
-
};
|
|
83
|
-
if (index === undefined) {
|
|
84
|
-
state.toolPartIndexById.set(toolCallId, state.parts.push(next) - 1);
|
|
85
25
|
}
|
|
86
26
|
else {
|
|
87
|
-
|
|
27
|
+
const part = state.parts[state[key]];
|
|
28
|
+
state.parts[state[key]] = { ...part, text: part.text + text };
|
|
88
29
|
}
|
|
89
30
|
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
return;
|
|
100
|
-
const current = record(state.parts[index]);
|
|
101
|
-
const status = String(update['status'] || current['status'] || 'in_progress');
|
|
102
|
-
const failed = status === 'failed';
|
|
103
|
-
const completed = status === 'completed';
|
|
104
|
-
state.parts[index] = {
|
|
105
|
-
...current,
|
|
106
|
-
...(update['title'] === undefined ? {} : { title: update['title'], toolName: update['title'] }),
|
|
107
|
-
...(update['kind'] === undefined ? {} : { kind: update['kind'] }),
|
|
108
|
-
...(update['rawInput'] === undefined ? {} : { input: update['rawInput'] }),
|
|
109
|
-
...(update['rawOutput'] === undefined && update['content'] === undefined
|
|
110
|
-
? {}
|
|
111
|
-
: { output: update['rawOutput'] ?? update['content'] }),
|
|
112
|
-
status,
|
|
113
|
-
state: failed ? 'output-error' : completed ? 'output-available' : 'calling',
|
|
114
|
-
};
|
|
115
|
-
if (failed || completed)
|
|
116
|
-
state.toolPartIndexById.delete(toolCallId);
|
|
117
|
-
}
|
|
118
|
-
/** Fold one official ACP update into the UI transcript projection. */
|
|
119
|
-
export function applyAcpTranscriptUpdate(state, input) {
|
|
120
|
-
const update = input;
|
|
121
|
-
switch (update['sessionUpdate']) {
|
|
122
|
-
case 'agent_message_chunk': {
|
|
123
|
-
const content = record(update['content']);
|
|
124
|
-
if (content['type'] === 'text')
|
|
125
|
-
appendText(state, contentText(update));
|
|
126
|
-
else if (content['type'] === 'image') {
|
|
31
|
+
/** The same provider-independent ACP projection serves live, replay, and storage. */
|
|
32
|
+
export function applyAcpTranscriptUpdate(state, update) {
|
|
33
|
+
switch (update.sessionUpdate) {
|
|
34
|
+
case 'agent_message_chunk':
|
|
35
|
+
case 'agent_thought_chunk':
|
|
36
|
+
if (update.content.type === 'text') {
|
|
37
|
+
appendText(state, update.sessionUpdate === 'agent_message_chunk' ? 'text' : 'reasoning', update.content.text, update);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
127
40
|
finishOpenParts(state);
|
|
128
|
-
state.parts.push({
|
|
41
|
+
state.parts.push({ ...update.content, state: 'complete' });
|
|
129
42
|
}
|
|
130
43
|
break;
|
|
131
|
-
}
|
|
132
|
-
case 'agent_thought_chunk':
|
|
133
|
-
appendReasoning(state, contentText(update), update);
|
|
134
|
-
break;
|
|
135
44
|
case 'tool_call':
|
|
136
|
-
|
|
137
|
-
break;
|
|
138
|
-
case 'tool_call_update':
|
|
139
|
-
updateTool(state, update);
|
|
140
|
-
break;
|
|
141
|
-
case 'compaction_update':
|
|
45
|
+
case 'tool_call_update': {
|
|
142
46
|
finishOpenParts(state);
|
|
143
|
-
state.
|
|
47
|
+
const index = state.toolPartIndexById.get(update.toolCallId);
|
|
48
|
+
const tool = reduceTranscriptTool(index === undefined ? undefined : state.parts[index], update);
|
|
49
|
+
if (index === undefined)
|
|
50
|
+
state.toolPartIndexById.set(update.toolCallId, state.parts.push(tool) - 1);
|
|
51
|
+
else
|
|
52
|
+
state.parts[index] = tool;
|
|
144
53
|
break;
|
|
54
|
+
}
|
|
145
55
|
default:
|
|
56
|
+
// Session state (usage, compaction, modes, plans) is not message content.
|
|
146
57
|
break;
|
|
147
58
|
}
|
|
148
59
|
}
|
|
149
60
|
export function finalizeAcpTranscript(state, failed = false) {
|
|
150
61
|
finishOpenParts(state, failed);
|
|
151
|
-
state.parts = state.parts.map((part) =>
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
return { ...current, state: failed ? 'error' : 'done' };
|
|
155
|
-
}
|
|
156
|
-
if (typeof current['type'] === 'string' && current['type'].startsWith('tool-') && current['state'] === 'calling') {
|
|
157
|
-
return { ...current, state: failed ? 'output-error' : 'output-available' };
|
|
158
|
-
}
|
|
159
|
-
return current;
|
|
160
|
-
});
|
|
161
|
-
return Object.freeze(state.parts.map((part) => Object.freeze({ ...record(part) })));
|
|
62
|
+
state.parts = state.parts.map((part) => part.type === 'tool' && (part.state === 'pending' || part.state === 'active')
|
|
63
|
+
? { ...part, state: 'error', incomplete: true } : part);
|
|
64
|
+
return Object.freeze(state.parts.map((part) => Object.freeze({ ...part })));
|
|
162
65
|
}
|
|
163
66
|
export function promptContentPlain(parts) {
|
|
164
|
-
const text = parts
|
|
165
|
-
.map((part) =>
|
|
166
|
-
.filter((part) => part['type'] === 'text' && typeof part['text'] === 'string')
|
|
167
|
-
.map((part) => part['text'])
|
|
168
|
-
.join('\n');
|
|
67
|
+
const text = parts.map(record).filter((part) => part['type'] === 'text' && typeof part['text'] === 'string')
|
|
68
|
+
.map((part) => part['text']).join('\n');
|
|
169
69
|
return text || null;
|
|
170
70
|
}
|
|
171
71
|
//# sourceMappingURL=transcript.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transcript.js","sourceRoot":"","sources":["../../src/conversations/transcript.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transcript.js","sourceRoot":"","sources":["../../src/conversations/transcript.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AASnF,MAAM,UAAU,wBAAwB;IACtC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;AACpG,CAAC;AAED,SAAS,eAAe,CAAC,KAAyB,EAAE,MAAM,GAAG,KAAK;IAChE,KAAK,MAAM,GAAG,IAAI,CAAC,eAAe,EAAE,oBAAoB,CAAU,EAAE,CAAC;QACnE,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,KAAK,KAAK,IAAI;YAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAE,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;QAC1G,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IACpB,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,KAAyB,EAAE,IAA0B,EAAE,IAAY,EAAE,MAAqB;IAC5G,MAAM,GAAG,GAAG,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,oBAAoB,CAAC;IACrE,MAAM,QAAQ,GAAG,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,eAAe,CAAC;IAC1E,MAAM,SAAS,GAAG,WAAW,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/G,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAE,CAAuB,CAAC;IACjG,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,IAAI,CAAC,SAAS,IAAI,OAAO,EAAE,SAAS,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC;QAAE,eAAe,CAAC,KAAK,CAAC,CAAC;IAC7H,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QACpC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ;YACzD,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnE,CAAC,GAAG,CAAC,CAAC;IACT,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAE,CAAuB,CAAC;QAC5D,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAE,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;IACjE,CAAC;AACH,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,wBAAwB,CAAC,KAAyB,EAAE,MAAqB;IACvF,QAAQ,MAAM,CAAC,aAAa,EAAE,CAAC;QAC7B,KAAK,qBAAqB,CAAC;QAC3B,KAAK,qBAAqB;YACxB,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACnC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,aAAa,KAAK,qBAAqB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACxH,CAAC;iBAAM,CAAC;gBACN,eAAe,CAAC,KAAK,CAAC,CAAC;gBACvB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;YAC7D,CAAC;YACD,MAAM;QACR,KAAK,WAAW,CAAC;QACjB,KAAK,kBAAkB,CAAC,CAAC,CAAC;YACxB,eAAe,CAAC,KAAK,CAAC,CAAC;YACvB,MAAM,KAAK,GAAG,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAC7D,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAuB,EAAE,MAAM,CAAC,CAAC;YACtH,IAAI,KAAK,KAAK,SAAS;gBAAE,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;;gBAC/F,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;YAC/B,MAAM;QACR,CAAC;QACD;YACE,0EAA0E;YAC1E,MAAM;IACV,CAAC;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAyB,EAAE,MAAM,GAAG,KAAK;IAC7E,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC;QACnH,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC1D,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAyB;IAC1D,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,MAAM,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,QAAQ,CAAC;SACzG,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpD,OAAO,IAAI,IAAI,IAAI,CAAC;AACtB,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { NormalizedUsage } from '../usage/normalize.js';
|
|
1
2
|
import type { SessionUpdate } from '@agentclientprotocol/sdk';
|
|
2
3
|
import type { ExecutionContract } from '../execution/contract.js';
|
|
3
4
|
import type { PromptInput } from '../input/prompt.js';
|
|
@@ -34,10 +35,22 @@ export interface ConversationMessage {
|
|
|
34
35
|
readonly parts: readonly unknown[];
|
|
35
36
|
readonly contentPlain: string | null;
|
|
36
37
|
readonly modelId: string | null;
|
|
38
|
+
/** Assistant outcome projected from its durable turn, separate from content. */
|
|
39
|
+
readonly error?: Readonly<Record<string, unknown>> | null;
|
|
37
40
|
readonly createdAt: string;
|
|
38
41
|
readonly updatedAt: string;
|
|
39
42
|
}
|
|
43
|
+
/** One native measurement, retained with its evidence independently of ACP output. */
|
|
44
|
+
export interface UsageObservation {
|
|
45
|
+
readonly usage: NormalizedUsage;
|
|
46
|
+
readonly raw: unknown;
|
|
47
|
+
}
|
|
40
48
|
export interface ConversationTurn {
|
|
49
|
+
readonly contextUsage: Extract<SessionUpdate, {
|
|
50
|
+
sessionUpdate: 'usage_update';
|
|
51
|
+
}> | null;
|
|
52
|
+
readonly usage: NormalizedUsage | null;
|
|
53
|
+
readonly usageRecords: readonly UsageObservation[];
|
|
41
54
|
readonly id: string;
|
|
42
55
|
readonly conversationId: string;
|
|
43
56
|
readonly status: TurnExecutionStatus;
|
|
@@ -82,6 +95,11 @@ export interface BeginConversationTurnInput extends ConversationScope {
|
|
|
82
95
|
readonly execution: ExecutionContract;
|
|
83
96
|
readonly createdAt: string;
|
|
84
97
|
}
|
|
98
|
+
export interface AppendTurnUsageInput extends ConversationScope {
|
|
99
|
+
readonly conversationId: string;
|
|
100
|
+
readonly turnId: string;
|
|
101
|
+
readonly observation: UsageObservation;
|
|
102
|
+
}
|
|
85
103
|
export interface AppendTurnUpdateInput extends ConversationScope {
|
|
86
104
|
readonly conversationId: string;
|
|
87
105
|
readonly turnId: string;
|
|
@@ -132,6 +150,7 @@ export interface ConversationStorePort {
|
|
|
132
150
|
markSeen(scope: ConversationScope, conversationId: string, updatedAt: string): Promise<ConversationRecord>;
|
|
133
151
|
archiveConversation(scope: ConversationScope, conversationId: string, archivedAt: string): Promise<ConversationRecord>;
|
|
134
152
|
beginTurn(input: BeginConversationTurnInput): Promise<ConversationTurn>;
|
|
153
|
+
appendTurnUsage(input: AppendTurnUsageInput): Promise<void>;
|
|
135
154
|
appendTurnUpdate(input: AppendTurnUpdateInput): Promise<StoredTurnUpdate>;
|
|
136
155
|
appendTurnUpdates(input: AppendTurnUpdatesInput): Promise<readonly StoredTurnUpdate[]>;
|
|
137
156
|
sealTurn(input: SealConversationTurnInput): Promise<ConversationTurn>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/conversations/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/conversations/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/conversations/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/conversations/types.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,aAAa,EAAE,UAAU,EAAE,OAAO,CAAU,CAAC;AAG5F,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,SAAS;IACT,WAAW;IACX,QAAQ;IACR,WAAW;IACX,aAAa;CACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constructors.d.ts","sourceRoot":"","sources":["../../src/events/constructors.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"constructors.d.ts","sourceRoot":"","sources":["../../src/events/constructors.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAIpE,uCAAuC;AACvC,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEhD,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAErC,MAAM,WAAW,uBAAuB;IACtC,yFAAyF;IACzF,OAAO,EAAE,WAAW,CAAC;IACrB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAQD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,uBAAuB;gCA8HpC,SAAS,KAAQ,WAAW;+BAL7B,SAAS,KAAQ,WAAW;kBALzC,SAAS,KAAQ,WAAW;0BAVnB,OAAO,SAAQ,SAAS,KAAQ,WAAW;kBAjGnD,MAAM,SAAQ,SAAS,KAAQ,WAAW;2BAkBjC,OAAO,SAAQ,SAAS,KAAQ,WAAW;8BAKzC,SAAS,KAAQ,WAAW;0BAVhC,SAAS,KAAQ,WAAW;sBAL/B,OAAO,SAAQ,SAAS,KAAQ,WAAW;wBA4DzC,OAAO,SAAQ,SAAS,KAAQ,WAAW;sBAxC7C,OAAO,SAAQ,SAAS,KAAQ,WAAW;sBAmB3C,OAAO,SAAQ,SAAS,KAAQ,WAAW;yBA6CxC,SAAS,GAAG,IAAI,SAAQ,SAAS,KAAQ,WAAW;4BAUjD,OAAO,SAAQ,SAAS,KAAQ,WAAW;EAyC3E;AAED,yDAAyD;AACzD,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC"}
|
|
@@ -6,33 +6,10 @@
|
|
|
6
6
|
* - Schema validation is controlled by the explicit `validateEvents` option
|
|
7
7
|
* and defaults to on.
|
|
8
8
|
*/
|
|
9
|
+
import { normalizeUsage } from '../usage/normalize.js';
|
|
9
10
|
import { validateAmalgmEvent } from './schema.js';
|
|
10
11
|
import { withActionDescriptor, withOutputDescriptor } from '../transcript/tool-display.js';
|
|
11
12
|
import { mcpMetadataFromName, normalizeError, titleForTool, toolKind } from '../transcript/tool-shape.js';
|
|
12
|
-
/** Engine events.js:126-136. Bucket precedence: tokenList key > tokenList alias > flat field; total excludes thought when summed. */
|
|
13
|
-
function usageTokenList(usage = {}) {
|
|
14
|
-
const source = usage?.['tokenList'] && typeof usage['tokenList'] === 'object' ? usage['tokenList'] : {};
|
|
15
|
-
const input = finiteNonNegativeOrNull(source.input ?? source.inputTokens ?? usage?.['inputTokens']) ?? 0;
|
|
16
|
-
const output = finiteNonNegativeOrNull(source.output ?? source.outputTokens ?? usage?.['outputTokens']) ?? 0;
|
|
17
|
-
const cacheRead = finiteNonNegativeOrNull(source.cacheRead ?? source.cacheReadTokens ?? usage?.['cacheReadTokens']) ?? 0;
|
|
18
|
-
const cacheWrite = finiteNonNegativeOrNull(source.cacheWrite ?? source.cacheWriteTokens ?? usage?.['cacheWriteTokens']) ?? 0;
|
|
19
|
-
const thought = finiteNonNegativeOrNull(source.thought ?? source.thoughtTokens ?? usage?.['thoughtTokens']) ?? 0;
|
|
20
|
-
const total = finiteNonNegativeOrNull(source.total ?? source.totalTokens)
|
|
21
|
-
?? input + output + cacheRead + cacheWrite;
|
|
22
|
-
return { input, output, cacheRead, cacheWrite, thought, total };
|
|
23
|
-
}
|
|
24
|
-
/** Engine events.js:138-142. Explicit size (camel or snake case) wins; else tokenList total. */
|
|
25
|
-
function usageInputContextSize(usage = {}, tokenList = usageTokenList(usage)) {
|
|
26
|
-
const explicit = finiteNonNegativeOrNull(usage?.['inputContextSize'] ?? usage?.['input_context_size']);
|
|
27
|
-
if (explicit !== null)
|
|
28
|
-
return explicit;
|
|
29
|
-
return tokenList.total;
|
|
30
|
-
}
|
|
31
|
-
/** Engine events.js:144-147. */
|
|
32
|
-
function finiteNonNegativeOrNull(value) {
|
|
33
|
-
const parsed = Number(value);
|
|
34
|
-
return Number.isFinite(parsed) && parsed >= 0 ? parsed : null;
|
|
35
|
-
}
|
|
36
13
|
/** Engine events.js:149-152. Strictly positive — zero collapses to null. */
|
|
37
14
|
function finiteOrNull(value) {
|
|
38
15
|
const parsed = Number(value);
|
|
@@ -136,34 +113,7 @@ export function createEventConstructors(options) {
|
|
|
136
113
|
}
|
|
137
114
|
/** Engine events.js:95-124. Normalizes any usage-ish record into the strict usageSnapshot shape. */
|
|
138
115
|
function usageFinal(usage, data = {}) {
|
|
139
|
-
|
|
140
|
-
const inputContextSize = usageInputContextSize(usage ?? {}, tokenList);
|
|
141
|
-
return event('usage.final', {
|
|
142
|
-
...data,
|
|
143
|
-
usage: {
|
|
144
|
-
tokenList,
|
|
145
|
-
cumulativeTokenList: usage?.['cumulativeTokenList'] || null,
|
|
146
|
-
previousCumulativeTokenList: usage?.['previousCumulativeTokenList'] || null,
|
|
147
|
-
inputTokens: tokenList.input,
|
|
148
|
-
outputTokens: tokenList.output,
|
|
149
|
-
cacheReadTokens: tokenList.cacheRead,
|
|
150
|
-
cacheWriteTokens: tokenList.cacheWrite,
|
|
151
|
-
thoughtTokens: tokenList.thought,
|
|
152
|
-
inputContextSize,
|
|
153
|
-
contextUsedTokens: finiteOrNull(usage?.['contextUsedTokens'] ?? usage?.['usedTokens'] ?? inputContextSize),
|
|
154
|
-
contextLimit: finiteOrNull(usage?.['contextLimit'] ?? usage?.['maxTokens'] ?? usage?.['modelContextWindow']),
|
|
155
|
-
usedTokens: finiteOrNull(usage?.['usedTokens'] ?? usage?.['contextUsedTokens'] ?? inputContextSize),
|
|
156
|
-
lastUsedTokens: finiteOrNull(usage?.['lastUsedTokens'] ?? usage?.['contextUsedTokens'] ?? usage?.['usedTokens'] ?? inputContextSize),
|
|
157
|
-
maxTokens: finiteOrNull(usage?.['maxTokens'] ?? usage?.['contextLimit'] ?? usage?.['modelContextWindow']),
|
|
158
|
-
totalProcessedTokens: finiteOrNull(usage?.['totalProcessedTokens']),
|
|
159
|
-
costUsd: usage?.['costUsd'] ?? null,
|
|
160
|
-
marketCostUsd: usage?.['marketCostUsd'] ?? null,
|
|
161
|
-
operation: String(usage?.['operation'] || 'chat_step'),
|
|
162
|
-
billable: usage?.['billable'] !== false,
|
|
163
|
-
source: usage?.['source'] || 'unknown',
|
|
164
|
-
exact: usage?.['exact'] === true,
|
|
165
|
-
},
|
|
166
|
-
});
|
|
116
|
+
return event('usage.final', { ...data, usage: normalizeUsage(usage ?? {}) });
|
|
167
117
|
}
|
|
168
118
|
/** Engine events.js:154-156. */
|
|
169
119
|
function errorEvent(message, data = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constructors.js","sourceRoot":"","sources":["../../src/events/constructors.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"constructors.js","sourceRoot":"","sources":["../../src/events/constructors.ts"],"names":[],"mappings":"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"}
|