@amalgm/chat 0.2.8 → 0.2.9-main.34746990150

package/host/native-runtime.js

@@ -6,6 +6,7 @@ import { OpenCodeAdapter } from './adapters/opencode.js';
 import { PiAdapter } from './adapters/pi.js';
 import { AcpAdapter } from './adapters/acp.js';
 import { assertExecutionInput } from './adapters/input-capabilities.js';
+import { materializePromptAttachments } from './adapters/attachments.js';
 import { NativeExecutionPreparer } from './native-contract.js';
 import { forwardPlatformEgress } from './platform-egress.js';
 import { generateConversationTitle } from './title-generator.js';
@@ -78,6 +79,8 @@ export class NativeChatRuntime {
     this.sessions.set(sessionId, session);
     try {
       session.native = await execution.binding.adapter.create(contract);
+      session.recoveryHistory = providerSessionId && session.native?.providerSessionId === providerSessionId
+        ? null : messages;
     } catch (error) {
       this.sessions.delete(sessionId);
       throw error;
@@ -99,10 +102,12 @@ export class NativeChatRuntime {
         null,
       );
       const adapter = request.execution.binding.adapter;
+      const native = await adapter.create(contract);
       state.adapter = adapter;
       state.contract = contract;
       state.executionRevision = request.execution.revision;
-      state.native = await adapter.create(contract);
+      state.native = native;
+      state.recoveryHistory = request.previousMessages;
     }
 
     const contract = this.preparer.forSession(
@@ -112,16 +117,27 @@ export class NativeChatRuntime {
       state.native?.providerSessionId || state.contract.providerSessionId,
     );
     state.contract = contract;
-    const prompt = state.recoveryHistory
+    const input = state.recoveryHistory
       ? promptWithRecoveryHistory(state.recoveryHistory, request.prompt)
       : request.prompt;
+    const materialize = state.adapter.materializeAttachments ?? state.adapter.outputType !== 'acp';
+    const prompt = materialize ? await materializePromptAttachments(input, this.preparer.runtimeHomeRoot) : input;
     state.recoveryHistory = null;
     let sequence = 0;
-    for await (const event of state.adapter.prompt(state.native, prompt, contract)) {
+    for await (const event of state.adapter.prompt(state.native, prompt, contract, { recordUsage: request.recordUsage })) {
       if (state.adapter.outputType === 'acp') {
         yield event;
         continue;
       }
+      if (event.type === 'error' || (event.type === 'done' && event.stopReason === 'error')) {
+        throw Object.assign(new Error(event.message || 'The provider turn failed'), {
+          code: 'PROVIDER_TURN_FAILED',
+          cause: event.raw,
+        });
+      }
+      if (event.type === 'usage.final') {
+        await request.recordUsage?.({ usage: event.usage, raw: event.raw ?? null });
+      }
       const update = toAcpSessionUpdate(event, {
         conversationId: request.sessionId,
         turnId: request.turnId,
@@ -186,16 +202,14 @@ export class NativeChatRuntime {
 }
 
 function promptWithRecoveryHistory(messages, prompt) {
-  const lines = [];
-  for (const message of messages.slice(-40)) {
-    const label = message.role === 'user' ? 'Human' : 'Assistant';
-    const text = typeof message.contentPlain === 'string' ? message.contentPlain.trim() : '';
-    if (text) lines.push(`${label}: ${text}`);
-  }
-  if (lines.length === 0) return prompt;
+  if (messages.length === 0) return prompt;
   return {
     parts: [
-      { type: 'text', text: `<conversation_history>\n${lines.join('\n')}\n</conversation_history>\n\n` },
+      { type: 'resource', resource: {
+        uri: 'amalgm:conversation-history',
+        mimeType: 'application/json',
+        text: JSON.stringify(messages.map(({ role, parts, contentPlain, error }) => ({ role, parts, contentPlain, error }))),
+      } },
       ...prompt.parts,
     ],
   };

package/host/sqlite/index.d.ts

@@ -1,6 +1,7 @@
 import type Database from 'better-sqlite3';
 import type {
   AppendTurnUpdateInput,
+  AppendTurnUsageInput,
   AppendTurnUpdatesInput,
   BeginConversationTurnInput,
   ConversationMessage,
@@ -56,6 +57,7 @@ export class SqliteConversationStore implements ConversationStorePort {
   }, updatedAt: string): ConversationRecord;
   archiveConversation(scope: ConversationScope, conversationId: string, archivedAt: string): Promise<ConversationRecord>;
   beginTurn(input: BeginConversationTurnInput): Promise<ConversationTurn>;
+  appendTurnUsage(input: AppendTurnUsageInput): Promise<void>;
   appendTurnUpdate(input: AppendTurnUpdateInput): Promise<StoredTurnUpdate>;
   appendTurnUpdates(input: AppendTurnUpdatesInput): Promise<readonly StoredTurnUpdate[]>;
   sealTurn(input: SealConversationTurnInput): Promise<ConversationTurn>;

package/host/sqlite/index.js

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import Database from 'better-sqlite3';
+import { finalizeTurnUsage, normalizeUsage } from '../../dist/usage/index.js';
 import {
   applyAcpTranscriptUpdate,
   createAcpTranscriptState,
@@ -8,7 +9,7 @@ import {
   promptContentPlain,
 } from '../../dist/conversations/index.js';
 
-const SCHEMA_VERSION = 2;
+const SCHEMA_VERSION = 3;
 const TERMINAL = new Set(['completed', 'failed', 'cancelled', 'interrupted']);
 
 export class SqliteConversationStoreError extends Error {
@@ -77,12 +78,22 @@ function conversationFromRow(row) {
 }
 
 function turnFromRow(row) {
+  const execution = Object.freeze(parseJson(row.execution_json, {}));
+  const observations = Object.freeze(parseJson(row.usage_json, []));
+  const records = observations.map(record => record.usage);
+  const usage = finalizeTurnUsage({
+    contract: { harness: execution.agent?.adapterId },
+    usage: records.at(-1), usageRecords: records,
+  });
   return Object.freeze({
+    contextUsage: parseJson(row.context_usage_json, null),
+    usage: usage ? Object.freeze(usage) : null,
+    usageRecords: observations,
     id: row.id,
     conversationId: row.conversation_id,
     status: row.status,
     prompt: Object.freeze(parseJson(row.prompt_json, { parts: [] })),
-    execution: Object.freeze(parseJson(row.execution_json, {})),
+    execution,
     error: row.error_json ? Object.freeze(parseJson(row.error_json, {})) : null,
     createdAt: row.created_at,
     startedAt: row.started_at,
@@ -110,6 +121,7 @@ function messageFromRow(row) {
     parts: Object.freeze(parseJson(row.parts_json, [])),
     contentPlain: row.content_plain,
     modelId: row.model_id,
+    error: row.role === 'assistant' && row.error_json ? Object.freeze(parseJson(row.error_json, {})) : null,
     createdAt: row.created_at,
     updatedAt: row.updated_at,
   });
@@ -134,6 +146,18 @@ function migrate(database) {
     );
   }
   if (version === SCHEMA_VERSION) return;
+  if (version === 2) {
+    database.exec(`
+      BEGIN IMMEDIATE;
+      ALTER TABLE turns ADD COLUMN usage_json TEXT NOT NULL DEFAULT '[]';
+      ALTER TABLE turns ADD COLUMN context_usage_json TEXT;
+      INSERT INTO schema_migrations(version, applied_at)
+        VALUES (3, strftime('%Y-%m-%dT%H:%M:%fZ', 'now'));
+      PRAGMA user_version = 3;
+      COMMIT;
+    `);
+    return;
+  }
   if (version === 1) {
     database.exec(`
       BEGIN IMMEDIATE;
@@ -144,6 +168,7 @@ function migrate(database) {
       PRAGMA user_version = 2;
       COMMIT;
     `);
+    migrate(database);
     return;
   }
   database.exec(`
@@ -181,6 +206,8 @@ function migrate(database) {
       prompt_json TEXT NOT NULL,
       execution_json TEXT NOT NULL,
       error_json TEXT,
+      usage_json TEXT NOT NULL DEFAULT '[]',
+      context_usage_json TEXT,
       created_at TEXT NOT NULL,
       started_at TEXT NOT NULL,
       completed_at TEXT,
@@ -237,7 +264,9 @@ function migrate(database) {
       VALUES (1, strftime('%Y-%m-%dT%H:%M:%fZ', 'now'));
     INSERT INTO schema_migrations(version, applied_at)
       VALUES (2, strftime('%Y-%m-%dT%H:%M:%fZ', 'now'));
-    PRAGMA user_version = 2;
+    INSERT INTO schema_migrations(version, applied_at)
+      VALUES (3, strftime('%Y-%m-%dT%H:%M:%fZ', 'now'));
+    PRAGMA user_version = 3;
     COMMIT;
   `);
 }
@@ -506,6 +535,18 @@ export class SqliteConversationStore {
     }
   }
 
+  async appendTurnUsage(input) {
+    this.database.transaction(() => {
+      const turn = this.#requireTurn(input, input.turnId);
+      if (turn.conversation_id !== input.conversationId || turn.status !== 'running') {
+        throw new SqliteConversationStoreError('TURN_NOT_RUNNING', `Turn is not running: ${input.turnId}`);
+      }
+      const records = parseJson(turn.usage_json, []);
+      records.push({ usage: normalizeUsage(input.observation.usage), raw: input.observation.raw ?? null });
+      this.database.prepare('UPDATE turns SET usage_json = ? WHERE id = ?').run(stringify(records), turn.id);
+    })();
+  }
+
   async appendTurnUpdate(input) {
     const updates = await this.appendTurnUpdates({
       ...input,
@@ -543,6 +584,8 @@ export class SqliteConversationStore {
         sequence += 1;
       }
       this.database.prepare('UPDATE turns SET next_sequence = ? WHERE id = ?').run(sequence, turn.id);
+      const context = input.updates.findLast(item => item.update.sessionUpdate === 'usage_update');
+      if (context) this.database.prepare('UPDATE turns SET context_usage_json = ? WHERE id = ?').run(stringify(context.update), turn.id);
       return stored;
     });
     return transaction().map(updateFromRow);
@@ -641,7 +684,8 @@ export class SqliteConversationStore {
   async listMessages(scope, conversationId) {
     const conversation = this.#requireConversation(scope, conversationId);
     return this.database.prepare(`
-      SELECT * FROM messages WHERE conversation_id = ? ORDER BY created_at ASC, role DESC
+      SELECT m.*, t.error_json FROM messages m JOIN turns t ON t.id = m.turn_id
+      WHERE m.conversation_id = ? ORDER BY m.created_at ASC, m.role DESC
     `).all(conversation.id).map(messageFromRow);
   }
 

package/host/tooling/runtime-home.js

@@ -1,4 +1,4 @@
-/** Prepare the one managed CLI home owned by an agent installation. */
+/** Prepare the managed CLI home owned by an installation and auth authority. */
 
 import fs from 'node:fs';
 import { runtimeEnv } from '../auth.js';

package/host/tooling/system-instructions.js

@@ -38,8 +38,8 @@ function cappedDocContent(content, maxChars = CONTEXT_FILE_MAX_CHARS) {
   return `${text.slice(0, maxChars).trimEnd()}\n[truncated]`;
 }
 
-export function systemInstructionsPath() {
-  return systemContextPaths(amalgmDir()).instructions;
+export function systemInstructionsPath(dir = amalgmDir()) {
+  return systemContextPaths(dir).instructions;
 }
 
 function escapeAttribute(value) {
@@ -50,13 +50,14 @@ function escapeAttribute(value) {
     .replace(/>/g, '>');
 }
 
-export function systemInstructionsBlock() {
-  const filePath = systemInstructionsPath();
+export function systemInstructionsBlock(dir) {
+  const filePath = systemInstructionsPath(dir);
   let content = '';
   try {
     content = fs.readFileSync(filePath, 'utf8');
-  } catch {
-    return '';
+  } catch (error) {
+    if (error.code === 'ENOENT') return '';
+    throw error;
   }
   if (isEmptyContextDoc(content)) return '';
   return [

package/host/tooling/system-prompt.js

@@ -4,27 +4,12 @@ function trimBlock(value) {
   return String(value || '').trim();
 }
 
-function safeBlock(label, render) {
-  if (typeof render !== 'function') return '';
-  try {
-    return trimBlock(render());
-  } catch (error) {
-    const message = error instanceof Error ? error.message.split('\n')[0] : String(error);
-    console.warn(`[chat] ${label} failed:`, message);
-    return '';
-  }
-}
-
 /** Compose machine, project, and exact agent-revision instructions at preparation. */
 export function composeSystemPrompt(contract, options = {}) {
   const parts = [];
-  const systemInstructions = safeBlock('system instructions', systemInstructionsBlock);
-  const projectContext = safeBlock(
-    'project context',
-    typeof options.projectContextPromptBlock === 'function'
-      ? () => options.projectContextPromptBlock(contract)
-      : null,
-  );
+  const systemInstructions = systemInstructionsBlock(options.amalgmDir);
+  const projectContext = typeof options.projectContextPromptBlock === 'function'
+    ? trimBlock(options.projectContextPromptBlock(contract)) : '';
   const agentInstructions = trimBlock(contract?.compiledAgentInstructions);
   if (systemInstructions) parts.push(systemInstructions);
   if (projectContext) parts.push(projectContext);
@@ -36,3 +21,12 @@ export function composeSystemPrompt(contract, options = {}) {
 export function preparedSystemPrompt(contract) {
   return trimBlock(contract?.instructions?.text);
 }
+
+/** Describe the exact regular-tool projection supplied by the composing host. */
+export function toolSystemInstructions(servers) {
+  const tools = servers.flatMap((server) => {
+    const selected = server._meta?.['amalgm.dev/tools'];
+    return Array.isArray(selected) ? selected.map((tool) => ({ server: server.name, ...tool })) : [];
+  });
+  return tools.length ? `Selected tools (call through their MCP server):\n${JSON.stringify(tools)}` : '';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amalgm/chat",
-  "version": "0.2.8",
+  "version": "0.2.9-main.34746990150",
   "description": "A provider-agnostic agent chat SDK with ACP content, prepared execution, normalized streams, and usage.",
   "type": "module",
   "license": "UNLICENSED",
@@ -86,7 +86,12 @@
   },
   "scripts": {
     "build": "node scripts/clean-dist.mjs && tsc -p tsconfig.json",
-    "test": "npm run build && node --test"
+    "test": "npm run build && node --test",
+    "release:admit": "node scripts/release/package.mjs admit",
+    "release:prepare": "node scripts/release/package.mjs prepare",
+    "release:examine": "node scripts/release/package.mjs examine",
+    "release:publish": "node scripts/release/package.mjs publish",
+    "test:release": "node --test scripts/release/*.test.mjs"
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^1.4.0",
@@ -100,5 +105,24 @@
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",
     "typescript": "^5.7.3"
+  },
+  "amalgmRelease": {
+    "schema": 1,
+    "workflow": "verify.yml",
+    "jobs": [
+      "verify"
+    ],
+    "verify": "test",
+    "cli": []
+  },
+  "allowScripts": {
+    "better-sqlite3@12.11.1": true
+  },
+  "gitHead": "d2d09289c5a18d926cf7c4d2f083d32760003d2d",
+  "amalgmSource": {
+    "repository": "amalgm-inc/amalgm-chat",
+    "branch": "main",
+    "commit": "d2d09289c5a18d926cf7c4d2f083d32760003d2d",
+    "occurrence": "34746990150"
   }
 }

package/dist/normalizers/cursor.d.ts

@@ -1,33 +0,0 @@
-/**
- * Cursor ACP normalizer. `cursorStopReason` is pure and exported at
- * module level; `normalizeCursorUpdate` / `cursorPromptUsage` construct
- * events, so they live behind `createCursorNormalizer(events)`.
- *
- * Because amalgm's event vocabulary already mirrors ACP `session/update`,
- * this is a thin shim, not a per-event translation table.
- */
-import type { AmalgmEvent, EventConstructors } from '../events/index.js';
-/** Engine cursor.js:27-35. ACP PromptResponse stopReason -> amalgm done stopReason. */
-export declare function cursorStopReason(stopReason: unknown): string;
-/** Per-tool bookkeeping row (engine `state.tools` Map values). */
-export interface CursorToolRecord {
-    toolName: any;
-    kind: any;
-    input: any;
-}
-/**
- * Per-prompt normalizer state — created by the adapter per prompt, carries
- * `providerSessionId` and the tool-call bookkeeping map (engine contract).
- */
-export interface CursorNormalizerState {
-    providerSessionId?: string | null | undefined;
-    tools: Map<string, CursorToolRecord>;
-}
-/** The engine `normalizers/cursor.js` event-constructing export set. */
-export interface CursorNormalizer {
-    normalizeCursorUpdate: (update: unknown, state: CursorNormalizerState) => AmalgmEvent[];
-    cursorPromptUsage: (usage: unknown, base?: Record<string, unknown>) => AmalgmEvent | null;
-}
-/** Build the Cursor normalizer over injected event constructors. */
-export declare function createCursorNormalizer(events: EventConstructors): CursorNormalizer;
-//# sourceMappingURL=cursor.d.ts.map

package/dist/normalizers/cursor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cursor.d.ts","sourceRoot":"","sources":["../../src/normalizers/cursor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAkBzE,uFAAuF;AACvF,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM,CAO5D;AA8CD,kEAAkE;AAClE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,GAAG,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,EAAE,GAAG,CAAC;CACZ;AAED;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC9C,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CACtC;AAcD,wEAAwE;AACxE,MAAM,WAAW,gBAAgB;IAC/B,qBAAqB,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,qBAAqB,KAAK,WAAW,EAAE,CAAC;IACxF,iBAAiB,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,WAAW,GAAG,IAAI,CAAC;CAC3F;AAED,oEAAoE;AACpE,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,iBAAiB,GAAG,gBAAgB,CAwGlF"}

package/dist/normalizers/cursor.js

@@ -1,196 +0,0 @@
-/**
- * Cursor ACP normalizer. `cursorStopReason` is pure and exported at
- * module level; `normalizeCursorUpdate` / `cursorPromptUsage` construct
- * events, so they live behind `createCursorNormalizer(events)`.
- *
- * Because amalgm's event vocabulary already mirrors ACP `session/update`,
- * this is a thin shim, not a per-event translation table.
- */
-/** ACP tool kinds → Amalgm tool kinds. */
-const ACP_TOOL_KINDS = {
-    read: 'file_read',
-    edit: 'file_edit',
-    delete: 'file_edit',
-    move: 'file_write',
-    search: 'search',
-    execute: 'bash',
-    fetch: 'browser',
-    think: 'unknown',
-    switch_mode: 'unknown',
-    other: 'unknown',
-};
-/** Engine cursor.js:27-35. ACP PromptResponse stopReason -> amalgm done stopReason. */
-export function cursorStopReason(stopReason) {
-    const clean = String(stopReason || '').trim();
-    if (!clean || clean === 'end_turn')
-        return 'end_turn';
-    if (clean === 'cancelled')
-        return 'cancelled';
-    if (clean === 'refusal')
-        return 'refusal';
-    if (clean === 'max_tokens' || clean === 'max_turn_requests')
-        return clean;
-    return 'end_turn';
-}
-/** Engine cursor.js:37-41. */
-function contentText(content) {
-    if (!content || typeof content !== 'object')
-        return '';
-    if (typeof content['text'] === 'string')
-        return content['text'];
-    return '';
-}
-/** Engine cursor.js:43-63. ACP ToolCallContent[] -> a renderable output value. */
-function toolOutput(content) {
-    if (!Array.isArray(content) || content.length === 0)
-        return undefined;
-    const texts = [];
-    const diffs = [];
-    for (const item of content) {
-        if (!item || typeof item !== 'object')
-            continue;
-        if (item['type'] === 'diff') {
-            diffs.push({ path: item['path'], oldText: item['oldText'] ?? null, newText: item['newText'] ?? '' });
-        }
-        else if (item['type'] === 'content') {
-            const text = contentText(item['content']);
-            if (text)
-                texts.push(text);
-        }
-        else if (item['type'] === 'terminal' && item['terminalId']) {
-            texts.push(`[terminal ${item['terminalId']}]`);
-        }
-    }
-    if (diffs.length && texts.length)
-        return { diffs, text: texts.join('\n') };
-    if (diffs.length)
-        return diffs.length === 1 ? diffs[0] : { diffs };
-    if (texts.length)
-        return texts.join('\n');
-    return undefined;
-}
-/** Engine cursor.js:65-76. Shell `{stdout, stderr, exitCode}` -> `{text?, exitCode?}`. */
-function rawOutputValue(rawOutput) {
-    if (rawOutput === undefined || rawOutput === null)
-        return undefined;
-    if (typeof rawOutput !== 'object')
-        return rawOutput;
-    const record = rawOutput;
-    if (typeof record['stdout'] === 'string' || typeof record['stderr'] === 'string') {
-        const text = [record['stdout'], record['stderr']].filter(Boolean).join('\n').trimEnd();
-        return {
-            ...(text ? { text } : {}),
-            ...(record['exitCode'] !== undefined ? { exitCode: record['exitCode'] } : {}),
-        };
-    }
-    return rawOutput;
-}
-/** Engine cursor.js:78-87. Merge an update into the known tool row (title/kind/input stick). */
-function toolData(state, toolCallId, update = {}) {
-    const known = state.tools.get(toolCallId) || {};
-    const next = {
-        toolName: update['title'] || known.toolName || 'Tool',
-        kind: ACP_TOOL_KINDS[update['kind']] || known.kind || undefined,
-        input: update['rawInput'] !== undefined ? update['rawInput'] : known.input,
-    };
-    state.tools.set(toolCallId, next);
-    return next;
-}
-/** Build the Cursor normalizer over injected event constructors. */
-export function createCursorNormalizer(events) {
-    const { errorEvent, reasoningDelta, textDelta, toolCompleted, toolStarted, toolUpdated, usageFinal, } = events;
-    /**
-     * Engine cursor.js:89-149. One ACP session/update notification -> amalgm
-     * events. `state` carries providerSessionId and per-turn tool
-     * bookkeeping; it is created per prompt.
-     */
-    function normalizeCursorUpdate(updateInput, state) {
-        const update = updateInput;
-        const base = { providerSessionId: state.providerSessionId };
-        const kind = update?.['sessionUpdate'];
-        if (kind === 'agent_message_chunk') {
-            const text = contentText(update['content']);
-            return text ? [textDelta(text, base)] : [];
-        }
-        if (kind === 'agent_thought_chunk') {
-            const text = contentText(update['content']);
-            return text ? [reasoningDelta(text, base)] : [];
-        }
-        if (kind === 'tool_call') {
-            const data = toolData(state, update['toolCallId'], update);
-            return [toolStarted(update['toolCallId'], { ...base, ...data })];
-        }
-        if (kind === 'tool_call_update') {
-            const data = toolData(state, update['toolCallId'], update);
-            // Shell/execute results arrive as rawOutput ({exitCode, stdout, stderr});
-            // file edits arrive as content diff items.
-            const output = toolOutput(update['content']) ?? rawOutputValue(update['rawOutput']);
-            if (update['status'] === 'completed' || update['status'] === 'failed') {
-                state.tools.delete(update['toolCallId']);
-                return [toolCompleted(update['toolCallId'], {
-                        ...base,
-                        ...data,
-                        ...(output !== undefined ? { output } : {}),
-                        isError: update['status'] === 'failed',
-                        ...(update['status'] === 'failed' ? { error: output || 'Tool call failed' } : {}),
-                    })];
-            }
-            return [toolUpdated(update['toolCallId'], {
-                    ...base,
-                    toolName: data.toolName,
-                    kind: data.kind,
-                    ...(update['rawInput'] !== undefined ? { inputDelta: update['rawInput'] } : {}),
-                    ...(output !== undefined ? { output } : {}),
-                })];
-        }
-        if (kind === 'usage_update') {
-            // Cursor does not emit these today; mapped so context tracking lights up
-            // the moment the agent ships the ACP session-usage extension.
-            return [usageFinal({
-                    usedTokens: update['used'],
-                    maxTokens: update['size'],
-                    costUsd: update['cost']?.amount ?? null,
-                    operation: 'context_snapshot',
-                    billable: false,
-                    exact: false,
-                    source: 'cursor_acp_usage_update',
-                }, base)];
-        }
-        if (kind === 'error') {
-            return [errorEvent(update['message'] || 'Cursor agent error', base)];
-        }
-        // Intentionally ignored: user_message_chunk (session/load replay),
-        // session_info_update (amalgm owns titles), available_commands_update,
-        // current_mode_update, config_options_update, plan.
-        return [];
-    }
-    /**
-     * Engine cursor.js:151-168. ACP PromptResponse.usage (session-usage RFD)
-     * -> exact turn usage. Cursor does not populate this today; the mapping
-     * is here for when it does.
-     */
-    function cursorPromptUsage(usageInput, base = {}) {
-        const usage = usageInput;
-        if (!usage || typeof usage !== 'object')
-            return null;
-        const total = Number(usage['total_tokens'] ?? usage['totalTokens']);
-        if (!Number.isFinite(total) || total <= 0)
-            return null;
-        return usageFinal({
-            inputTokens: usage['input_tokens'] ?? usage['inputTokens'],
-            outputTokens: usage['output_tokens'] ?? usage['outputTokens'],
-            cacheReadTokens: usage['cached_read_tokens'] ?? usage['cacheReadTokens'],
-            cacheWriteTokens: usage['cached_write_tokens'] ?? usage['cacheWriteTokens'],
-            thoughtTokens: usage['thought_tokens'] ?? usage['thoughtTokens'],
-            operation: 'chat_turn',
-            billable: true,
-            exact: true,
-            source: 'cursor_acp_prompt_usage',
-        }, base);
-    }
-    return {
-        normalizeCursorUpdate,
-        cursorPromptUsage,
-    };
-}
-//# sourceMappingURL=cursor.js.map

package/dist/normalizers/cursor.js.map

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