@antelopejs/dms-ai 0.6.0 → 0.7.0

package/frontend-vue/tests/panel-tools.test.ts

@@ -0,0 +1,165 @@
+// @vitest-environment jsdom
+import { flushPromises } from "@vue/test-utils";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { nextTick } from "vue";
+import {
+	buttonWithText,
+	CONVERSATION_ID,
+	createHarness,
+	deliver,
+	openPanel,
+	sendMessage,
+	sentOfType,
+	unmountPanel,
+} from "./support/panel-harness";
+import { CHANGE_SET, DIFF_REQUEST } from "./support/panel-fixtures";
+
+beforeEach(() => {
+	localStorage.setItem("dms-ai-conversation-id", CONVERSATION_ID);
+});
+
+afterEach(() => {
+	unmountPanel();
+	localStorage.clear();
+	vi.useRealTimers();
+});
+
+describe("tool rows and change sets", () => {
+	it("draws each call with the lexicon's words and its state", async () => {
+		const harness = createHarness();
+		const panel = await openPanel(harness);
+		await sendMessage(panel, "go");
+		deliver(harness, {
+			type: "tool_call_start",
+			callId: "c0",
+			toolName: "Read",
+			args: { file_path: "/a/customer.form.ts" },
+		});
+		deliver(harness, {
+			type: "tool_call_end",
+			callId: "c0",
+			status: "success",
+			result: "",
+			outcome: "done",
+		});
+		deliver(harness, {
+			type: "tool_call_start",
+			callId: "c9",
+			toolName: "Bash",
+			args: { command: "pnpm add dayjs" },
+		});
+		deliver(harness, {
+			type: "tool_call_end",
+			callId: "c9",
+			status: "error",
+			result: "",
+			outcome: "denied",
+		});
+		deliver(harness, {
+			type: "tool_call_start",
+			callId: "c1",
+			toolName: "Edit",
+			args: { file_path: "/repo/crm/customers/customer.form.ts" },
+		});
+		deliver(harness, DIFF_REQUEST);
+		await nextTick();
+		const rows = panel.findAll(".cb-tool");
+		expect(
+			rows.map((row) => row.classes().find((name) => name.startsWith("is-"))),
+		).toEqual(["is-done", "is-denied", "is-waiting"]);
+		expect(rows[0].text()).toContain("Read file");
+		expect(rows[0].text()).toContain("customer.form.ts");
+		expect(rows[2].text()).toContain("1 of 1 · below");
+		expect(panel.find(".cb-tools__head").text()).toContain("Used 3 tools");
+	});
+
+	it("shows the raw JSON of a call on demand", async () => {
+		const harness = createHarness();
+		const panel = await openPanel(harness);
+		await sendMessage(panel, "go");
+		deliver(harness, {
+			type: "tool_call_start",
+			callId: "c0",
+			toolName: "mcp__dms-ai__BuilderAddBlock",
+			args: { name: "Top customers", type: "TopListCard" },
+		});
+		deliver(harness, {
+			type: "tool_call_end",
+			callId: "c0",
+			status: "success",
+			result: "ok",
+			outcome: "done",
+		});
+		await nextTick();
+		await panel.find(".cb-tool").trigger("click");
+		expect(panel.find(".cb-kv").text()).toContain("TopListCard");
+		await buttonWithText(panel, "Raw JSON").trigger("click");
+		expect(panel.find(".cb-raw").text()).toContain('"type": "TopListCard"');
+	});
+
+	it("ends a turn with its change set: undo, review, then redo", async () => {
+		const harness = createHarness();
+		const panel = await openPanel(harness);
+		await sendMessage(panel, "go");
+		deliver(harness, { type: "change_set", changeSet: CHANGE_SET });
+		deliver(harness, { type: "run_done" });
+		await nextTick();
+		const card = panel.find(".cb-change");
+		expect(card.text()).toContain("Applied · checkpoint 14");
+		expect(card.text()).toContain("2 files changed · 2 Builder operations");
+		expect(card.text()).toContain("new");
+		await buttonWithText(card, "Review diff").trigger("click");
+		expect(harness.navigate).toHaveBeenCalledWith(
+			"/modules/ai/changes?set=cs-14",
+		);
+		await buttonWithText(card, "Undo").trigger("click");
+		await flushPromises();
+		expect(sentOfType(harness, "change_set_action")).toEqual([
+			{
+				type: "change_set_action",
+				conversationId: CONVERSATION_ID,
+				changeSetId: "cs-14",
+				action: "undo",
+			},
+		]);
+		deliver(harness, {
+			type: "change_set",
+			changeSet: { ...CHANGE_SET, state: "undone", stateChangedBy: "Camille" },
+		});
+		await nextTick();
+		expect(panel.find(".cb-change").text()).toContain(
+			"Undone · checkpoint 14 restored",
+		);
+		expect(panel.find(".cb-change").text()).toContain("by Camille");
+		await buttonWithText(panel.find(".cb-change"), "Redo").trigger("click");
+		expect(sentOfType(harness, "change_set_action").at(-1)).toMatchObject({
+			action: "redo",
+		});
+	});
+
+	it("asks before undoing a set later ones build on", async () => {
+		const harness = createHarness();
+		vi.mocked(harness.api.get).mockResolvedValueOnce({
+			conflicts: [
+				{
+					changeSetId: "cs-15",
+					number: 15,
+					title: "Refund rate",
+					files: ["sales/overview.page.ts"],
+				},
+			],
+		});
+		const panel = await openPanel(harness);
+		deliver(harness, { type: "change_set", changeSet: CHANGE_SET });
+		await nextTick();
+		await buttonWithText(panel.find(".cb-change"), "Undo").trigger("click");
+		await flushPromises();
+		expect(panel.find(".u-modal").text()).toContain("#15 Refund rate");
+		await buttonWithText(panel.find(".u-modal"), "Undo them together").trigger(
+			"click",
+		);
+		expect(sentOfType(harness, "change_set_action")[0]).toMatchObject({
+			includeLater: true,
+		});
+	});
+});

package/frontend-vue/tests/sidecar-guest.test.ts

@@ -1,15 +1,11 @@
-import { readFileSync } from "node:fs";
-import { resolve } from "node:path";
-import ts from "typescript";
-import * as vue from "vue";
+import { afterEach, expect, it, vi } from "vitest";
 import { nextTick, ref, type Ref } from "vue";
-import { expect, it, vi } from "vitest";
-import * as constants from "../app/runtime/constants";
-import { runWhenLoggedIn } from "../app/runtime/session-gate";
+import plugin from "../app/plugins/ai.client";
 
-interface PluginExports {
-	default: (context: unknown) => void | Promise<void>;
-}
+vi.mock("#dms/frontend-module", () => ({
+	defineDmsPlugin: (definition: unknown) => definition,
+	useDmsRouter: () => ({ push: vi.fn() }),
+}));
 
 interface PluginHarness {
 	useAuthFetch: ReturnType<typeof vi.fn>;
@@ -17,66 +13,32 @@ interface PluginHarness {
 	run: () => void | Promise<void>;
 }
 
-const SESSION_GATE_MODULE = "../runtime/session-gate";
-const SIDECAR_STATUS_MODULE = "../runtime/sidecar-status";
-const CONSTANTS_MODULE = "../runtime/constants";
-
-// A first probe reporting "no assistant here" stops the startup right after the
+// A first probe reporting a disabled sidecar stops the startup right after the
 // authenticated fetch, which is all these tests need to observe.
-const silentController = {
-	createSidecarStatusController: () => ({ init: async () => false }),
-};
+function disabledSidecarRead() {
+	return {
+		data: ref({ disabled: true }),
+		error: ref(null),
+		pending: ref(false),
+		execute: async () => undefined,
+		refresh: async () => undefined,
+	};
+}
 
 function loadPlugin(loggedIn: Ref<boolean>): PluginHarness {
-	const source = readFileSync(
-		resolve(__dirname, "../app/plugins/ai.client.ts"),
-		"utf8",
-	);
-	const compiled = ts.transpileModule(
-		source
-			.replace("import.meta.env.DEV", "true")
-			.replace("import.meta.hot", "undefined"),
-		{ compilerOptions: { module: ts.ModuleKind.CommonJS } },
-	);
-	const exports = {} as PluginExports;
 	const useAuthFetch = vi.fn(() => ({ $authFetch: vi.fn() }));
 	const unregisterSidePanel = vi.fn();
-	const requireModule = (name: string) => {
-		if (name === "#dms/frontend-module") {
-			return {
-				defineDmsPlugin: (plugin: unknown) => plugin,
-				useDmsRouter: () => ({ push: vi.fn() }),
-			};
-		}
-		if (name === "vue") return vue;
-		if (name === CONSTANTS_MODULE) return constants;
-		if (name === SESSION_GATE_MODULE) return { runWhenLoggedIn };
-		if (name === SIDECAR_STATUS_MODULE) return silentController;
-		return {};
-	};
-	new Function(
-		"require",
-		"exports",
-		"useDmsUserSession",
-		"useAuthFetch",
-		"useToast",
-		"useDevReload",
-		"unregisterSidePanel",
-		compiled.outputText,
-	)(
-		requireModule,
-		exports,
-		() => ({ loggedIn }),
-		useAuthFetch,
-		() => ({ add: vi.fn() }),
-		() => ({ awaitRoute: vi.fn() }),
-		unregisterSidePanel,
-	);
+	vi.stubGlobal("useDmsUserSession", () => ({ loggedIn }));
+	vi.stubGlobal("useAuthFetch", useAuthFetch);
+	vi.stubGlobal("useToast", () => ({ add: vi.fn() }));
+	vi.stubGlobal("useDevReload", () => ({ awaitRoute: vi.fn() }));
+	vi.stubGlobal("useApiData", disabledSidecarRead);
+	vi.stubGlobal("unregisterSidePanel", unregisterSidePanel);
 	return {
 		useAuthFetch,
 		unregisterSidePanel,
 		run: () =>
-			exports.default({
+			plugin({
 				vueApp: { onUnmount: vi.fn(), provide: vi.fn() },
 				$i18n: { t: (key: string) => key, locale: ref("en-GB") },
 				hook: vi.fn(),
@@ -85,27 +47,33 @@ function loadPlugin(loggedIn: Ref<boolean>): PluginHarness {
 	};
 }
 
+afterEach(() => {
+	vi.unstubAllGlobals();
+});
+
 it("does not invoke authenticated fetching or inject the assistant for a guest", async () => {
-	const plugin = loadPlugin(ref(false));
-	await plugin.run();
-	expect(plugin.useAuthFetch).not.toHaveBeenCalled();
+	const harness = loadPlugin(ref(false));
+	await harness.run();
+	expect(harness.useAuthFetch).not.toHaveBeenCalled();
 });
 
 it("starts the assistant when a guest signs in without reloading the page", async () => {
 	const loggedIn = ref(false);
-	const plugin = loadPlugin(loggedIn);
-	await plugin.run();
-	expect(plugin.useAuthFetch).not.toHaveBeenCalled();
+	const harness = loadPlugin(loggedIn);
+	await harness.run();
+	expect(harness.useAuthFetch).not.toHaveBeenCalled();
 
 	loggedIn.value = true;
 	await nextTick();
-	expect(plugin.useAuthFetch).toHaveBeenCalledTimes(1);
+	expect(harness.useAuthFetch).toHaveBeenCalledTimes(1);
 });
 
 it("withdraws the docked panel when the first probe finds no assistant", async () => {
-	const plugin = loadPlugin(ref(true));
-	await plugin.run();
+	const harness = loadPlugin(ref(true));
+	await harness.run();
 	await vi.waitFor(() =>
-		expect(plugin.unregisterSidePanel).toHaveBeenCalledWith("dms-ai:assistant"),
+		expect(harness.unregisterSidePanel).toHaveBeenCalledWith(
+			"dms-ai:assistant",
+		),
 	);
 });

package/frontend-vue/tests/support/panel-fixtures.ts

@@ -0,0 +1,110 @@
+import { CONVERSATION_ID } from "./panel-harness";
+
+export const DIFF_REQUEST = {
+	type: "permission_request",
+	requestId: "r1",
+	callId: "c1",
+	toolName: "Edit",
+	args: { file_path: "/repo/crm/customers/customer.form.ts" },
+	summary: "Edit customer.form.ts",
+	kind: "edit",
+	alwaysAsk: false,
+	preview: {
+		type: "diff",
+		path: "/repo/crm/customers/customer.form.ts",
+		relativePath: "crm/customers/customer.form.ts",
+		isNewFile: false,
+		added: 1,
+		removed: 1,
+		hunks: [
+			{
+				oldStart: 42,
+				newStart: 42,
+				lines: [
+					{ kind: "remove", text: 'label: "VAT",' },
+					{ kind: "add", text: 'label: "VAT number",' },
+				],
+			},
+		],
+	},
+	ruleOptions: [
+		{ kind: "file", value: "crm/customers/customer.form.ts" },
+		{ kind: "directory", value: "crm/customers/" },
+	],
+	createdAtMs: Date.now(),
+	expiresAtMs: Date.now() + 252_000,
+};
+
+export const COMMAND_REQUEST = {
+	...DIFF_REQUEST,
+	requestId: "r2",
+	callId: "c2",
+	toolName: "Bash",
+	args: { command: "pnpm add jsvat" },
+	summary: "Run pnpm add jsvat",
+	kind: "command",
+	preview: {
+		type: "command",
+		command: "pnpm add jsvat",
+		cwd: "/repo",
+		effect: "adds_dependency",
+		touches: ["package.json", "pnpm-lock.yaml"],
+	},
+	ruleOptions: [{ kind: "command", value: "pnpm add" }],
+};
+
+export const DELETE_REQUEST = {
+	...DIFF_REQUEST,
+	requestId: "r3",
+	callId: "c3",
+	toolName: "mcp__dms-ai__BuilderDeleteResource",
+	args: { ref: "legacy_coupons" },
+	summary: "Delete the table legacy_coupons",
+	kind: "destructive",
+	alwaysAsk: true,
+	preview: {
+		type: "destructive",
+		operation: "resource · API routes",
+		target: "legacy_coupons",
+		consequence: "deletes_data",
+		confirmText: "legacy_coupons",
+		canKeepData: true,
+	},
+	ruleOptions: [],
+};
+
+export const CHANGE_SET = {
+	id: "cs-14",
+	number: 14,
+	conversationId: CONVERSATION_ID,
+	title: "Top customers",
+	createdAtMs: Date.now(),
+	agent: "claude",
+	scope: "safe",
+	isAutoFix: false,
+	overlapped: false,
+	files: [
+		{
+			path: "sales/overview.page.ts",
+			status: "modified",
+			added: 14,
+			removed: 1,
+		},
+		{
+			path: "sales/queries/top-customers.ts",
+			status: "added",
+			added: 22,
+			removed: 0,
+		},
+	],
+	added: 36,
+	removed: 1,
+	typecheck: "passed",
+	state: "applied",
+	approvalsNeeded: 0,
+	builderOps: 2,
+};
+
+export function keydown(target: Element, key: string): void {
+	target.dispatchEvent(new KeyboardEvent("keydown", { key, bubbles: true }));
+}

package/frontend-vue/tests/support/panel-harness.ts

@@ -94,8 +94,8 @@ export function createHarness(): Harness {
 			intents.push({ kind: "open", conversationId });
 			panel.open();
 		},
-		startConversation: (prompt) => {
-			intents.push({ kind: "start", prompt });
+		startConversation: (prompt, mode) => {
+			intents.push({ kind: "start", prompt, mode });
 			panel.open();
 		},
 		holdStream: () => {

package/frontend-vue/vitest.config.ts

@@ -1,9 +1,10 @@
 import { resolve } from "node:path";
 import vue from "@vitejs/plugin-vue";
 import { defineConfig } from "vitest/config";
+import { backendBoundary } from "./build/backend-boundary.ts";
 
 export default defineConfig({
-	plugins: [vue()],
+	plugins: [backendBoundary(), vue()],
 	resolve: {
 		alias: {
 			// The renderer's runtime exists in the generated application only.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antelopejs/dms-ai",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "AI development assistant for the AntelopeJS DMS: a chat panel next to every page and a coding agent that edits the project in reviewable, undoable change sets.",
   "keywords": [
     "ai",
@@ -47,10 +47,10 @@
     "prepack": "pnpm run build && pnpm run build:sidecar",
     "frontend:dev": "cd playground && pnpm frontend:dev",
     "dev": "cd playground && pnpm dev",
-    "lint": "oxlint --disable-nested-config && oxfmt --disable-nested-config --check . && cd frontend-vue && pnpm lint && cd ../sidecar && pnpm lint && antelopejs-check-interface-ranges",
-    "lint:fix": "oxlint --disable-nested-config --fix --max-warnings=1000000 && oxfmt --disable-nested-config . && cd frontend-vue && pnpm lint:fix && cd ../sidecar && pnpm lint:fix",
-    "typecheck": "tsc --noEmit && cd frontend-vue && pnpm typecheck:chat && pnpm typecheck && cd ../sidecar && pnpm typecheck",
-    "test": "cd sidecar && pnpm test && cd ../frontend-vue && pnpm test",
+    "lint": "oxlint && pnpm --dir frontend-vue lint && antelopejs-check-interface-ranges && node scripts/check-playground-install.mjs && node scripts/check-i18n.mjs",
+    "lint:fix": "oxlint --fix && oxfmt . && pnpm --dir frontend-vue lint:fix",
+    "typecheck": "tsc --noEmit && pnpm --dir frontend-vue typecheck:chat && pnpm --dir sidecar typecheck",
+    "test": "pnpm run test:node",
     "test:node": "([ -n \"$DMS_PREBUILT\" ] || pnpm run build) && node --test \"tests/!(sidecar-build).test.cjs\"",
     "test:sidecar-smoke": "pnpm run build:sidecar && node --test tests/sidecar-build.test.cjs",
     "test:frontend-registration": "pnpm run build && node --test tests/frontend-registration.test.cjs",
@@ -61,14 +61,24 @@
     "test:build-id": "node --test tests/build-id.test.cjs",
     "test:e2e": "cd sidecar && pnpm test:e2e",
     "release": "pnpm install --frozen-lockfile && release-it",
-    "format": "oxfmt --disable-nested-config . && cd frontend-vue && pnpm format",
-    "knip": "knip --dependencies",
-    "knip:all": "knip"
+    "format": "oxfmt . && pnpm --dir frontend-vue format",
+    "knip": "knip --dependencies && pnpm --dir sidecar knip",
+    "knip:all": "knip",
+    "prepare": "if git rev-parse --is-inside-work-tree >/dev/null 2>&1 && command -v lefthook >/dev/null 2>&1; then lefthook install; fi",
+    "checks": "antelopejs-checks",
+    "size": "antelopejs-check-size",
+    "ratchet": "antelopejs-ratchet",
+    "sync": "antelopejs-sync",
+    "ratchet:update": "antelopejs-ratchet --update",
+    "sync:check": "antelopejs-sync --check",
+    "format:check": "oxfmt --check .",
+    "suppressions": "antelopejs-suppressions",
+    "suppressions:update": "antelopejs-suppressions --update"
   },
   "dependencies": {
     "@antelopejs/interface-api": ">=0.0.15 <1.0.0",
     "@antelopejs/interface-core": ">=0.2.4 <1.0.0",
-    "@antelopejs/interface-dms": ">=0.8.0 <1.0.0",
+    "@antelopejs/interface-dms": ">=0.9.0 <1.0.0",
     "@anthropic-ai/claude-agent-sdk": "^0.2.131",
     "@anthropic-ai/claude-code": "^2.1.131",
     "@modelcontextprotocol/sdk": "1.29.0",
@@ -76,10 +86,11 @@
     "zod": "^4.0.0"
   },
   "devDependencies": {
-    "@antelopejs/tooling-configs": ">=0.0.9 <1.0.0",
+    "@antelopejs/tooling-configs": "^0.2.11",
     "@types/node": "^24.0.0",
     "@types/ws": "^8.5.12",
     "knip": "^6.34.0",
+    "lefthook": "^2.2.2",
     "oxfmt": "^0.66.0",
     "oxlint": "1.81.0",
     "oxlint-tsgolint": "^7.0.2001",

package/sidecar/dist/agent/attachment-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"attachment-files.js","sourceRoot":"","sources":["../../src/agent/attachment-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAIlC,SAAS,gBAAgB,CAAC,IAAY;IACpC,MAAM,IAAI,GAAG,IAAI;SACd,QAAQ,CAAC,IAAI,CAAC;SACd,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,IAAI,EAAE,CAAC;IACV,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,eAAuB,EACvB,cAAsB;IAEtB,OAAO,IAAI,CAAC,IAAI,CACd,eAAe,EACf,GAAG,kBAAkB,EACrB,mBAAmB,EACnB,cAAc,CAAC,cAAc,CAAC,CAC/B,CAAC;AACJ,CAAC;AAID,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,GAAmB,EACnB,KAAa,EACb,GAAW;IAEX,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,KAAK,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;IACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC1C,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC9D,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,SAAmB;IAChE,MAAM,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAClE,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"attachment-files.js","sourceRoot":"","sources":["../../src/agent/attachment-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAMlC,SAAS,gBAAgB,CAAC,IAAY;IACpC,MAAM,IAAI,GAAG,IAAI;SACd,QAAQ,CAAC,IAAI,CAAC;SACd,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,IAAI,EAAE,CAAC;IACV,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,eAAuB,EACvB,cAAsB;IAEtB,OAAO,IAAI,CAAC,IAAI,CACd,eAAe,EACf,GAAG,kBAAkB,EACrB,mBAAmB,EACnB,cAAc,CAAC,cAAc,CAAC,CAC/B,CAAC;AACJ,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,GAAmB,EACnB,KAAa,EACb,GAAW;IAEX,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,KAAK,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;IACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC1C,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC9D,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,SAAmB;IAChE,MAAM,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAClE,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC"}

package/sidecar/dist/agent/call-ledger.d.ts

@@ -1,6 +1,7 @@
+import type { ToolArgs } from "./edit-targets.js";
 export interface CallLedger {
-    announce(conversationId: string, callId: string, toolName: string, args: unknown): void;
-    claim(conversationId: string, toolName: string, args: unknown): string | undefined;
+    announce(conversationId: string, callId: string, toolName: string, args: ToolArgs): void;
+    claim(conversationId: string, toolName: string, args: ToolArgs): string | undefined;
     forget(conversationId: string): void;
 }
 export declare function createCallLedger(): CallLedger;

package/sidecar/dist/agent/call-ledger.js

@@ -2,7 +2,7 @@ import { bareToolName } from "./tool-kinds.js";
 const MAX_ANNOUNCED_CALLS = 100;
 function argsKey(args) {
     try {
-        return JSON.stringify(args ?? null);
+        return JSON.stringify(args);
     }
     catch {
         return "";

package/sidecar/dist/agent/call-ledger.js.map

@@ -1 +1 @@
-{"version":3,"file":"call-ledger.js","sourceRoot":"","sources":["../../src/agent/call-ledger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,MAAM,mBAAmB,GAAG,GAAG,CAAC;AA6BhC,SAAS,OAAO,CAAC,IAAa;IAC5B,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,MAAM,cAAc,GAAG,IAAI,GAAG,EAA2B,CAAC;IAC1D,OAAO;QACL,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI;YAC7C,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YACvD,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC;gBAAE,OAAO;YACzD,KAAK,CAAC,IAAI,CAAC;gBACT,MAAM;gBACN,QAAQ,EAAE,YAAY,CAAC,QAAQ,CAAC;gBAChC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC;aACvB,CAAC,CAAC;YACH,cAAc,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC;QACxE,CAAC;QACD,KAAK,CAAC,cAAc,EAAE,QAAQ,EAAE,IAAI;YAClC,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YACvD,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;YACpC,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;YAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAC3B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,CAAC,OAAO,KAAK,GAAG,CAChD,CAAC;YACF,MAAM,KAAK,GACT,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC;YACnE,IAAI,KAAK,GAAG,CAAC;gBAAE,OAAO,SAAS,CAAC;YAChC,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACzC,OAAO,OAAO,EAAE,MAAM,CAAC;QACzB,CAAC;QACD,MAAM,CAAC,cAAc;YACnB,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACxC,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"call-ledger.js","sourceRoot":"","sources":["../../src/agent/call-ledger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,MAAM,mBAAmB,GAAG,GAAG,CAAC;AA6BhC,SAAS,OAAO,CAAC,IAAc;IAC7B,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,MAAM,cAAc,GAAG,IAAI,GAAG,EAA2B,CAAC;IAC1D,OAAO;QACL,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI;YAC7C,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YACvD,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC;gBAAE,OAAO;YACzD,KAAK,CAAC,IAAI,CAAC;gBACT,MAAM;gBACN,QAAQ,EAAE,YAAY,CAAC,QAAQ,CAAC;gBAChC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC;aACvB,CAAC,CAAC;YACH,cAAc,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC;QACxE,CAAC;QACD,KAAK,CAAC,cAAc,EAAE,QAAQ,EAAE,IAAI;YAClC,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YACvD,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;YACpC,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;YAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAC3B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,CAAC,OAAO,KAAK,GAAG,CAChD,CAAC;YACF,MAAM,KAAK,GACT,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC;YACnE,IAAI,KAAK,GAAG,CAAC;gBAAE,OAAO,SAAS,CAAC;YAChC,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACzC,OAAO,OAAO,EAAE,MAAM,CAAC;QACzB,CAAC;QACD,MAAM,CAAC,cAAc;YACnB,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACxC,CAAC;KACF,CAAC;AACJ,CAAC"}

package/sidecar/dist/agent/command-analysis.js

@@ -3,7 +3,6 @@ const UNRULABLE_CONSTRUCTS = /`|\$\(|>|</;
 const WHITESPACE = /\s+/;
 const FLAG_PREFIX = "-";
 const COMMAND_RULE_WORDS = 2;
-const PACKAGE_MANAGERS = ["pnpm", "npm", "yarn", "bun"];
 const ADD_VERBS = ["add"];
 const INSTALL_VERBS = ["install", "i"];
 const REMOVE_VERBS = ["remove", "rm", "uninstall", "un"];
@@ -15,12 +14,12 @@ const VALUE_FLAGS = [
     "--prefix",
     "--cwd",
 ];
-const LOCKFILE_BY_MANAGER = {
-    pnpm: "pnpm-lock.yaml",
-    npm: "package-lock.json",
-    yarn: "yarn.lock",
-    bun: "bun.lock",
-};
+const LOCKFILE_BY_MANAGER = new Map([
+    ["pnpm", "pnpm-lock.yaml"],
+    ["npm", "package-lock.json"],
+    ["yarn", "yarn.lock"],
+    ["bun", "bun.lock"],
+]);
 const PACKAGE_MANIFEST = "package.json";
 function splitSegments(command) {
     return command
@@ -34,6 +33,8 @@ function words(segment) {
 function findVerb(args) {
     for (let i = 0; i < args.length; i++) {
         const word = args[i];
+        if (word === undefined)
+            break;
         if (VALUE_FLAGS.includes(word)) {
             i++;
             continue;
@@ -59,14 +60,13 @@ function effectOfVerb(at) {
 }
 function segmentChange(segment) {
     const [manager, ...args] = words(segment);
-    if (manager === undefined || !PACKAGE_MANAGERS.includes(manager)) {
+    const lockfile = manager === undefined ? undefined : LOCKFILE_BY_MANAGER.get(manager);
+    if (lockfile === undefined)
         return null;
-    }
     const at = findVerb(args);
     const effect = at === null ? null : effectOfVerb(at);
     if (effect === null)
         return null;
-    const lockfile = LOCKFILE_BY_MANAGER[manager];
     return { effect, touches: [PACKAGE_MANIFEST, lockfile] };
 }
 export function detectDependencyChange(command) {
@@ -81,11 +81,10 @@ export function commandRulePrefix(command) {
     if (UNRULABLE_CONSTRUCTS.test(command))
         return null;
     const segments = splitSegments(command);
-    if (segments.length !== 1)
+    const [segment] = segments;
+    if (segments.length !== 1 || segment === undefined)
         return null;
-    const prefix = words(segments[0])
-        .slice(0, COMMAND_RULE_WORDS)
-        .join(" ");
+    const prefix = words(segment).slice(0, COMMAND_RULE_WORDS).join(" ");
     return prefix.length > 0 ? prefix : null;
 }
 function startsWithWords(segment, prefix) {

package/sidecar/dist/agent/command-analysis.js.map

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