acpx 0.9.0 → 0.11.0

package/dist/runtime.d.ts

@@ -1,5 +1,5 @@
-import { a as AcpPermissionRequest, c as NonInteractivePermissionPolicy, f as SessionRecord, i as AcpPermissionDecision, l as PermissionMode, n as SystemPromptOption, s as McpServer$1, t as SessionAgentOptions } from "./session-options-CFudjdkU.js";
-import { t as AcpClient } from "./client-BssohYqM.js";
+import { a as AcpPermissionRequest, c as NonInteractivePermissionPolicy, f as SessionRecord, i as AcpPermissionDecision, l as PermissionMode, n as SystemPromptOption, s as McpServer$1, t as SessionAgentOptions } from "./session-options-Co1oGEK8.js";
+import { t as AcpClient } from "./client-j3sLnpcM.js";
 import fs from "node:fs";
 import { ToolCallContent, ToolCallLocation, ToolKind } from "@agentclientprotocol/sdk";
 
@@ -61,12 +61,64 @@ type AcpRuntimeSessionModels = {
   currentModelId?: string;
   availableModelIds: string[];
 };
+/**
+ * Cumulative session cost as reported by the agent. Mirrors ACP's
+ * `Cost`, but both fields are optional here because not every adapter
+ * populates them on every event.
+ */
+type AcpRuntimeUsageCost = {
+  amount?: number;
+  currency?: string;
+};
+/**
+ * Per-turn token breakdown. Sourced from `UsageUpdate._meta.usage` on
+ * adapters that populate it (Claude Code today; Codex and others may
+ * omit it). All fields optional — consumers should treat missing
+ * fields as "unknown", not "zero".
+ */
+type AcpRuntimeUsageBreakdown = {
+  inputTokens?: number;
+  outputTokens?: number;
+  cachedReadTokens?: number;
+  cachedWriteTokens?: number;
+  thoughtTokens?: number;
+  totalTokens?: number;
+};
+/**
+ * Agent-advertised slash command. The runtime only surfaces enough to
+ * drive a picker UI ("does the agent advertise /compact?"). The full
+ * `AvailableCommandInput` schema from ACP is intentionally not plumbed
+ * through.
+ */
+type AcpRuntimeAvailableCommand = {
+  name: string;
+  description?: string; /** True/false when ACP advertised whether this command has an input schema. */
+  hasInput?: boolean;
+};
+/**
+ * Session-level usage roll-up surfaced through `getStatus()`. The
+ * reducer persists the breakdowns onto the session record; this type
+ * exposes them on the runtime contract.
+ */
+type AcpRuntimeSessionUsage = {
+  cumulative?: AcpRuntimeUsageBreakdown; /** Cumulative session cost when the agent reported it. */
+  cost?: AcpRuntimeUsageCost; /** Keyed by user-message id, matching the persisted reducer state. */
+  perRequest?: Record<string, AcpRuntimeUsageBreakdown>;
+};
 type AcpRuntimeStatus = {
   summary?: string;
   acpxRecordId?: string;
   backendSessionId?: string;
   agentSessionId?: string;
-  models?: AcpRuntimeSessionModels;
+  models?: AcpRuntimeSessionModels; /** Token usage and cost from the persisted session record. */
+  usage?: AcpRuntimeSessionUsage;
+  /**
+   * Commands the agent advertised via `available_commands_update`.
+   * Sourced from the persisted record — older session files only
+   * preserve `name`, so `description` and `hasInput` may be undefined
+   * even when a more recent live event would have carried both.
+   */
+  availableCommands?: AcpRuntimeAvailableCommand[];
   details?: Record<string, unknown>;
 };
 type AcpRuntimeDoctorReport = {
@@ -86,7 +138,21 @@ type AcpRuntimeEvent = {
   text: string;
   tag?: AcpSessionUpdateTag;
   used?: number;
-  size?: number;
+  size?: number; /** Populated on `usage_update` events when the agent reported a cost. */
+  cost?: AcpRuntimeUsageCost;
+  /**
+   * Populated on `usage_update` events when the agent attached a
+   * per-turn breakdown via `_meta.usage` (Claude Code does this; not
+   * every adapter does).
+   */
+  breakdown?: AcpRuntimeUsageBreakdown;
+  /**
+   * Populated on `available_commands_update` events. The list is a
+   * normalized view of the wire payload — names, descriptions, and
+   * a `hasInput` flag derived from whether the agent advertised a
+   * non-null `input` schema.
+   */
+  availableCommands?: AcpRuntimeAvailableCommand[];
 } | {
   type: "tool_call";
   text: string;
@@ -396,5 +462,5 @@ declare function createRuntimeStore(options: {
   stateDir: string;
 }): AcpSessionStore;
 //#endregion
-export { ACPX_BACKEND_ID, type AcpAgentRegistry, type AcpFileSessionStoreOptions, type AcpPermissionDecision, type AcpPermissionRequest, type AcpRuntime, type AcpRuntimeCapabilities, type AcpRuntimeDoctorReport, type AcpRuntimeEnsureInput, AcpRuntimeError, type AcpRuntimeErrorCode, type AcpRuntimeEvent, type AcpRuntimeHandle, type AcpRuntimeOptions, type AcpRuntimePromptMode, type AcpRuntimeSessionMode, type AcpRuntimeSessionModels, type AcpRuntimeStatus, type AcpRuntimeTurn, type AcpRuntimeTurnAttachment, type AcpRuntimeTurnInput, type AcpRuntimeTurnResult, type AcpRuntimeTurnResultError, type AcpSessionRecord, type AcpSessionStore, type AcpSessionUpdateTag, AcpxRuntime, DEFAULT_AGENT_NAME, type SessionAgentOptions, type SystemPromptOption, createAcpRuntime, createAgentRegistry, createFileSessionStore, createRuntimeStore, decodeAcpxRuntimeHandleState, encodeAcpxRuntimeHandleState, isAcpRuntimeError };
+export { ACPX_BACKEND_ID, type AcpAgentRegistry, type AcpFileSessionStoreOptions, type AcpPermissionDecision, type AcpPermissionRequest, type AcpRuntime, type AcpRuntimeAvailableCommand, type AcpRuntimeCapabilities, type AcpRuntimeDoctorReport, type AcpRuntimeEnsureInput, AcpRuntimeError, type AcpRuntimeErrorCode, type AcpRuntimeEvent, type AcpRuntimeHandle, type AcpRuntimeOptions, type AcpRuntimePromptMode, type AcpRuntimeSessionMode, type AcpRuntimeSessionModels, type AcpRuntimeSessionUsage, type AcpRuntimeStatus, type AcpRuntimeTurn, type AcpRuntimeTurnAttachment, type AcpRuntimeTurnInput, type AcpRuntimeTurnResult, type AcpRuntimeTurnResultError, type AcpRuntimeUsageBreakdown, type AcpRuntimeUsageCost, type AcpSessionRecord, type AcpSessionStore, type AcpSessionUpdateTag, AcpxRuntime, DEFAULT_AGENT_NAME, type SessionAgentOptions, type SystemPromptOption, createAcpRuntime, createAgentRegistry, createFileSessionStore, createRuntimeStore, decodeAcpxRuntimeHandleState, encodeAcpxRuntimeHandleState, isAcpRuntimeError };
 //# sourceMappingURL=runtime.d.ts.map

package/dist/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","names":[],"sources":["../src/agent-registry.ts","../src/runtime/public/contract.ts","../src/runtime/engine/manager.ts","../src/runtime/public/file-session-store.ts","../src/runtime/public/errors.ts","../src/runtime/public/shared.ts","../src/runtime/public/handle-state.ts","../src/runtime.ts"],"mappings":"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"}
+{"version":3,"file":"runtime.d.ts","names":[],"sources":["../src/agent-registry.ts","../src/runtime/public/contract.ts","../src/runtime/engine/manager.ts","../src/runtime/public/file-session-store.ts","../src/runtime/public/errors.ts","../src/runtime/public/shared.ts","../src/runtime/public/handle-state.ts","../src/runtime.ts"],"mappings":"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"}

package/dist/runtime.js

@@ -1,4 +1,4 @@
-import { C as applyConversation, Dt as isAcpResourceNotFoundError, E as AcpClient, Et as extractAcpError, K as defaultSessionEventLog, T as reconcileAgentSessionId, Tt as normalizeOutputError, W as parseSessionRecord, Z as assertPersistedKeyPolicy, _ as recordPromptSubmission, _t as withTimeout, a as applyRequestedModelIfAdvertised, c as setDesiredConfigOption, d as syncAdvertisedModelState, f as applyConfigOptionsToRecord, g as recordClientOperation, h as createSessionConversation, i as connectAndLoadSession, l as setDesiredModeId, m as cloneSessionConversation, n as runPromptTurn, ot as serializeSessionRecordForDisk, p as cloneSessionAcpxState, pt as textPrompt, r as withConnectedSession, s as setCurrentModelId, t as LiveSessionCheckpoint, v as recordSessionUpdate, vt as DEFAULT_AGENT_NAME, w as applyLifecycleSnapshotToRecord, x as persistSessionOptions, xt as resolveAgentCommand, y as trimConversationForRuntime, yt as listBuiltInAgents } from "./live-checkpoint-D5d-K9s1.js";
+import { Ct as withTimeout, D as applyLifecycleSnapshotToRecord, Dt as resolveAgentCommand, E as applyConversation, K as assertPersistedKeyPolicy, Mt as extractAcpError, Nt as isAcpResourceNotFoundError, O as reconcileAgentSessionId, S as advertisedModelState, Tt as listBuiltInAgents, _ as createSessionConversation, a as applyRequestedModelIfAdvertised, at as defaultSessionEventLog, b as recordSessionUpdate, c as setCurrentModelId, d as setDesiredModelId, f as syncAdvertisedModelState, g as cloneSessionConversation, h as cloneSessionAcpxState, i as connectAndLoadSession, j as modelStateFromConfigOptions, jt as normalizeOutputError, k as AcpClient, l as setDesiredConfigOption, m as applyConfigOptionsToState, n as runPromptTurn, nt as serializeSessionRecordForDisk, o as currentModelIdFromSetModelResponse, p as applyConfigOptionsToRecord, r as withConnectedSession, s as clearDesiredConfigOption, t as LiveSessionCheckpoint, tt as parseSessionRecord, u as setDesiredModeId, v as recordClientOperation, w as persistSessionOptions, wt as DEFAULT_AGENT_NAME, x as trimConversationForRuntime, y as recordPromptSubmission, yt as textPrompt } from "./live-checkpoint-BZrk9Mjz.js";
 import path from "node:path";
 import fs from "node:fs/promises";
 import { randomUUID } from "node:crypto";
@@ -325,7 +325,7 @@ const PROMPT_EVENT_PARSERS = {
 		tag: "agent_thought_chunk"
 	}),
 	usage_update: usageUpdateEvent,
-	available_commands_update: (payload) => statusUpdateEvent("available_commands_update", payload),
+	available_commands_update: availableCommandsUpdateEvent,
 	current_mode_update: (payload) => statusUpdateEvent("current_mode_update", payload),
 	config_option_update: (payload) => statusUpdateEvent("config_option_update", payload),
 	session_info_update: (payload) => statusUpdateEvent("session_info_update", payload),
@@ -341,14 +341,88 @@ function promptEventParser(type) {
 function usageUpdateEvent(payload) {
 	const used = asOptionalFiniteNumber(payload.used);
 	const size = asOptionalFiniteNumber(payload.size);
+	const meta = isRecord(payload._meta) ? payload._meta : void 0;
+	return buildUsageUpdateEvent({
+		used,
+		size,
+		cost: normalizeUsageCost(payload.cost),
+		breakdown: normalizeUsageBreakdown(meta?.usage)
+	});
+}
+function buildUsageUpdateEvent(parts) {
+	const { used, size, cost, breakdown } = parts;
 	return {
 		type: "status",
 		text: used != null && size != null ? `usage updated: ${used}/${size}` : "usage updated",
 		tag: "usage_update",
 		...used != null ? { used } : {},
-		...size != null ? { size } : {}
+		...size != null ? { size } : {},
+		...cost ? { cost } : {},
+		...breakdown ? { breakdown } : {}
+	};
+}
+function availableCommandsUpdateEvent(payload) {
+	const raw = Array.isArray(payload.availableCommands) ? payload.availableCommands : [];
+	const availableCommands = [];
+	for (const entry of raw) {
+		if (!isRecord(entry)) continue;
+		const name = asTrimmedString(entry.name);
+		if (!name) continue;
+		const description = asTrimmedString(entry.description);
+		availableCommands.push({
+			name,
+			...description ? { description } : {},
+			hasInput: entry.input != null
+		});
+	}
+	return {
+		type: "status",
+		text: availableCommands.length > 0 ? `available commands updated (${availableCommands.length})` : "available commands updated",
+		tag: "available_commands_update",
+		availableCommands
 	};
 }
+function normalizeUsageCost(value) {
+	if (!isRecord(value)) return;
+	const amount = asOptionalFiniteNumber(value.amount);
+	const currency = asTrimmedString(value.currency);
+	if (amount == null && !currency) return;
+	return {
+		...amount != null ? { amount } : {},
+		...currency ? { currency } : {}
+	};
+}
+const USAGE_BREAKDOWN_FIELDS = [
+	["inputTokens", ["inputTokens", "input_tokens"]],
+	["outputTokens", ["outputTokens", "output_tokens"]],
+	["cachedReadTokens", [
+		"cachedReadTokens",
+		"cacheReadInputTokens",
+		"cache_read_input_tokens"
+	]],
+	["cachedWriteTokens", [
+		"cachedWriteTokens",
+		"cacheCreationInputTokens",
+		"cache_creation_input_tokens"
+	]],
+	["thoughtTokens", ["thoughtTokens", "thought_tokens"]],
+	["totalTokens", ["totalTokens", "total_tokens"]]
+];
+function normalizeUsageBreakdown(value) {
+	if (!isRecord(value)) return;
+	const breakdown = {};
+	for (const [key, aliases] of USAGE_BREAKDOWN_FIELDS) {
+		const v = firstFiniteNumber(value, aliases);
+		if (v != null) breakdown[key] = v;
+	}
+	return Object.keys(breakdown).length > 0 ? breakdown : void 0;
+}
+function firstFiniteNumber(record, keys) {
+	for (const key of keys) {
+		const value = asOptionalFiniteNumber(record[key]);
+		if (value != null) return value;
+	}
+}
 function statusUpdateEvent(tag, payload) {
 	const text = resolveStatusTextForTag({
 		tag,
@@ -540,6 +614,62 @@ function buildModelsField(record) {
 		availableModelIds: [...available]
 	} };
 }
+function tokenUsageToBreakdown(usage) {
+	if (!usage) return;
+	const breakdown = {};
+	assignUsageBreakdownField(breakdown, "inputTokens", usage.input_tokens);
+	assignUsageBreakdownField(breakdown, "outputTokens", usage.output_tokens);
+	assignUsageBreakdownField(breakdown, "cachedReadTokens", usage.cache_read_input_tokens);
+	assignUsageBreakdownField(breakdown, "cachedWriteTokens", usage.cache_creation_input_tokens);
+	assignUsageBreakdownField(breakdown, "thoughtTokens", usage.thought_tokens);
+	assignUsageBreakdownField(breakdown, "totalTokens", usage.total_tokens);
+	return Object.keys(breakdown).length > 0 ? breakdown : void 0;
+}
+function assignUsageBreakdownField(breakdown, key, value) {
+	if (value !== void 0) breakdown[key] = value;
+}
+function buildUsageField(record) {
+	const cumulative = tokenUsageToBreakdown(record.cumulative_token_usage);
+	const perRequestEntries = Object.entries(record.request_token_usage ?? {}).map(([id, value]) => [id, tokenUsageToBreakdown(value)]).filter((entry) => entry[1] !== void 0);
+	const perRequest = perRequestEntries.length > 0 ? Object.fromEntries(perRequestEntries) : void 0;
+	const cost = record.cumulative_cost;
+	const usage = {
+		...cumulative ? { cumulative } : {},
+		...cost ? { cost } : {},
+		...perRequest ? { perRequest } : {}
+	};
+	return Object.keys(usage).length > 0 ? { usage } : {};
+}
+function buildAvailableCommandsField(record) {
+	const commands = record.acpx?.available_commands;
+	if (!commands || commands.length === 0) return {};
+	const availableCommands = commands.map((command) => runtimeAvailableCommand(command)).filter((command) => command !== void 0);
+	return availableCommands.length > 0 ? { availableCommands } : {};
+}
+function runtimeAvailableCommand(command) {
+	if (typeof command === "string") {
+		const name = command.trim();
+		return name ? { name } : void 0;
+	}
+	const record = commandRecord(command);
+	if (!record) return;
+	const name = trimmedField(record.name);
+	if (!name) return;
+	const runtimeCommand = { name };
+	const description = trimmedField(record.description);
+	if (description) runtimeCommand.description = description;
+	if (typeof record.has_input === "boolean") runtimeCommand.hasInput = record.has_input;
+	return runtimeCommand;
+}
+function commandRecord(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	return value;
+}
+function trimmedField(value) {
+	if (typeof value !== "string") return;
+	const trimmed = value.trim();
+	return trimmed ? trimmed : void 0;
+}
 function advertisedConfigOptionIds(record) {
 	const configOptions = record.acpx?.config_options;
 	if (!configOptions) return;
@@ -554,6 +684,30 @@ function resolveSupportedConfigOptionId(record, configId) {
 	const supportedText = supported.length > 0 ? supported.join(", ") : "none";
 	throw new AcpRuntimeError("ACP_BACKEND_UNSUPPORTED_CONTROL", `ACP session ${record.acpxRecordId} does not advertise config option '${configId}'. Supported config options: ${supportedText}.`);
 }
+function applyConfigOptionResponseToTurn(turn, response) {
+	if (!response?.configOptions) return;
+	turn.acpxState = applyConfigOptionsToState(turn.acpxState, response.configOptions);
+}
+function applyDesiredConfigOptionToTurn(turn, configId, value) {
+	const nextState = cloneSessionAcpxState(turn.acpxState) ?? {};
+	if (configId === modelStateFromConfigOptions(nextState.config_options)?.configId) {
+		nextState.session_options = {
+			...nextState.session_options,
+			model: value
+		};
+		clearDesiredConfigOption(nextState, configId);
+	} else if (configId === "mode") nextState.desired_mode_id = value;
+	else nextState.desired_config_options = {
+		...nextState.desired_config_options,
+		[configId]: value
+	};
+	turn.acpxState = nextState;
+}
+function applyDesiredConfigOptionToRecord(record, configId, value) {
+	if (configId === modelStateFromConfigOptions(record.acpx?.config_options)?.configId) setDesiredModelId(record, value, configId);
+	else if (configId === "mode") setDesiredModeId(record, value);
+	else setDesiredConfigOption(record, configId, value);
+}
 async function createOrLoadRuntimeSession(client, resumeSessionId, cwd) {
 	if (resumeSessionId) {
 		if (client.supportsResumeSession()) {
@@ -722,7 +876,7 @@ var AcpRuntimeManager = class {
 		record.protocolVersion = client.initializeResult?.protocolVersion;
 		record.agentCapabilities = client.initializeResult?.agentCapabilities;
 		applyConfigOptionsToRecord(record, session.sessionResult);
-		const requestedModelApplied = await applyRequestedModelIfAdvertised({
+		const modelApplication = await applyRequestedModelIfAdvertised({
 			client,
 			sessionId: session.sessionId,
 			requestedModel: input.sessionOptions?.model,
@@ -730,8 +884,9 @@ var AcpRuntimeManager = class {
 			agentCommand,
 			timeoutMs: this.options.timeoutMs
 		});
-		syncAdvertisedModelState(record, session.sessionResult.models);
-		if (requestedModelApplied) setCurrentModelId(record, input.sessionOptions?.model);
+		applyConfigOptionsToRecord(record, modelApplication.response);
+		syncAdvertisedModelState(record, modelApplication.response ? modelStateFromConfigOptions(modelApplication.response.configOptions) : session.sessionResult.models);
+		if (modelApplication.applied) setCurrentModelId(record, currentModelIdFromSetModelResponse(modelApplication.response, input.sessionOptions?.model));
 		applyLifecycleSnapshotToRecord(record, client.getAgentLifecycleSnapshot());
 		persistSessionOptions(record, input.sessionOptions);
 		await this.options.sessionStore.save(record);
@@ -904,7 +1059,18 @@ var AcpRuntimeManager = class {
 			},
 			setSessionModel: async (modelId) => {
 				await this.waitForRuntimeControlSession(task, turn);
-				await turn.client.setSessionModel(turn.activeSessionId, modelId);
+				const models = advertisedModelState(turn.acpxState);
+				const response = await turn.client.setSessionModel(turn.activeSessionId, modelId, models);
+				applyConfigOptionResponseToTurn(turn, response);
+				const nextState = cloneSessionAcpxState(turn.acpxState) ?? {};
+				nextState.session_options = {
+					...nextState.session_options,
+					model: modelId
+				};
+				nextState.current_model_id = currentModelIdFromSetModelResponse(response, modelId);
+				clearDesiredConfigOption(nextState, models?.configId);
+				turn.acpxState = nextState;
+				return response;
 			},
 			setSessionConfigOption: async (configId, value) => {
 				return (await task.state.activeController.setResolvedSessionConfigOption(configId, value)).response;
@@ -936,25 +1102,8 @@ var AcpRuntimeManager = class {
 		};
 	}
 	applyRuntimeConfigOptionState(turn, configId, value, response) {
-		if (response?.configOptions) {
-			const nextState = cloneSessionAcpxState(turn.acpxState) ?? {};
-			nextState.config_options = structuredClone(response.configOptions);
-			turn.acpxState = nextState;
-		}
-		if (configId === "mode") {
-			const nextState = cloneSessionAcpxState(turn.acpxState) ?? {};
-			nextState.desired_mode_id = value;
-			turn.acpxState = nextState;
-			return;
-		}
-		if (configId !== "model") {
-			const nextState = cloneSessionAcpxState(turn.acpxState) ?? {};
-			nextState.desired_config_options = {
-				...nextState.desired_config_options,
-				[configId]: value
-			};
-			turn.acpxState = nextState;
-		}
+		applyConfigOptionResponseToTurn(turn, response);
+		applyDesiredConfigOptionToTurn(turn, configId, value);
 	}
 	installRuntimeTurnEventHandlers(task, turn) {
 		turn.client.setEventHandlers({
@@ -1106,6 +1255,8 @@ var AcpRuntimeManager = class {
 			backendSessionId: record.acpSessionId,
 			agentSessionId: record.agentSessionId,
 			...buildModelsField(record),
+			...buildUsageField(record),
+			...buildAvailableCommandsField(record),
 			details: {
 				cwd: record.cwd,
 				lastUsedAt: record.lastUsedAt,
@@ -1131,16 +1282,14 @@ var AcpRuntimeManager = class {
 		if (controller) {
 			const { configId, response } = await controller.setResolvedSessionConfigOption(key, value);
 			applyConfigOptionsToRecord(record, response);
-			if (configId === "mode") setDesiredModeId(record, value);
-			else setDesiredConfigOption(record, configId, value);
+			applyDesiredConfigOptionToRecord(record, configId, value);
 			await this.options.sessionStore.save(record);
 			return;
 		}
 		const result = await this.withRuntimeControlSession(record, sessionMode, async ({ client, sessionId, record: connectedRecord }) => {
 			const configId = resolveSupportedConfigOptionId(connectedRecord, key);
 			applyConfigOptionsToRecord(connectedRecord, await client.setSessionConfigOption(sessionId, configId, value));
-			if (configId === "mode") setDesiredModeId(connectedRecord, value);
-			else setDesiredConfigOption(connectedRecord, configId, value);
+			applyDesiredConfigOptionToRecord(connectedRecord, configId, value);
 		});
 		await this.options.sessionStore.save(result.record);
 	}
@@ -1212,13 +1361,20 @@ var FileSessionStore = class {
 	}
 	async load(sessionId) {
 		await this.ensureDir();
+		let payload;
 		try {
-			const payload = await fs.readFile(this.filePath(sessionId), "utf8");
-			return parseSessionRecord(JSON.parse(payload)) ?? void 0;
+			payload = await fs.readFile(this.filePath(sessionId), "utf8");
 		} catch (error) {
 			if (error.code === "ENOENT") return;
 			throw error;
 		}
+		let parsed;
+		try {
+			parsed = JSON.parse(payload);
+		} catch {
+			return;
+		}
+		return parseSessionRecord(parsed) ?? void 0;
 	}
 	async save(record) {
 		await this.ensureDir();