@ag-eco/agentplate-cli 0.13.1 → 0.13.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ag-eco/agentplate-cli",
-	"version": "0.13.1",
+	"version": "0.13.3",
 	"description": "Multi-agent orchestration for AI coding agents — spawn workers in git worktrees via tmux, coordinate through SQLite mail, merge with tiered conflict resolution. Pluggable runtime adapters for Claude Code, Pi, and more.",
 	"author": "Jaymin West",
 	"license": "MIT",

package/src/commands/init.test.ts

@@ -473,6 +473,23 @@ describe("initCommand: --name flag", () => {
  * Build a Spawner that returns preset responses keyed by "arg0 arg1 ..." prefix.
  * Records all calls for assertion.
  */
+/**
+ * Normalize the bundled tool invocation `[bun, <…/tools/<tool>/entry.ts>, ...cmd]`
+ * back to the logical `[cli, ...cmd]` (e.g. `["lm", "init"]`) so tests can keep
+ * asserting on the user-facing command shape regardless of how init spawns it.
+ */
+function normalizeToolArgs(args: string[]): string[] {
+	const entry = args[1] ?? "";
+	const cli = entry.includes("/tools/loam/")
+		? "lm"
+		: entry.includes("/tools/sprout/")
+			? "sr"
+			: entry.includes("/tools/trellis/")
+				? "tl"
+				: null;
+	return cli ? [cli, ...args.slice(2)] : args;
+}
+
 function createMockSpawner(
 	responses: Record<string, { exitCode: number; stdout: string; stderr: string }>,
 ): {
@@ -480,7 +497,8 @@ function createMockSpawner(
 	calls: string[][];
 } {
 	const calls: string[][] = [];
-	const spawner: Spawner = async (args) => {
+	const spawner: Spawner = async (rawArgs) => {
+		const args = normalizeToolArgs(rawArgs);
 		calls.push(args);
 		const key = args.join(" ");
 		// Longest prefix match

package/src/commands/init.ts

@@ -52,17 +52,54 @@ const defaultSpawner: Spawner = async (args, opts) => {
 interface SiblingTool {
 	name: string;
 	cli: string;
+	/** Bundled entrypoint, relative to this file (src/commands/). */
+	entry: string;
 	dotDir: string;
 	initCmd: string[];
 	onboardCmd: string[];
 }
 
+// loam/sprout/trellis are bundled inside this package (src/tools/*), so they are
+// invoked via their bundled entrypoints with the current bun runtime rather than
+// looked up as `lm`/`sr`/`tl` on PATH. This makes `ap init` work even when
+// ~/.npm-global/bin (or wherever the package bins live) isn't on the PATH of the
+// `ap` process — the cause of spurious "loam/sprout/trellis not installed" errors.
 const SIBLING_TOOLS: SiblingTool[] = [
-	{ name: "loam", cli: "lm", dotDir: ".loam", initCmd: ["init"], onboardCmd: ["onboard"] },
-	{ name: "sprout", cli: "sr", dotDir: ".sprout", initCmd: ["init"], onboardCmd: ["onboard"] },
-	{ name: "trellis", cli: "tl", dotDir: ".trellis", initCmd: ["init"], onboardCmd: ["onboard"] },
+	{
+		name: "loam",
+		cli: "lm",
+		entry: "../tools/loam/cli.ts",
+		dotDir: ".loam",
+		initCmd: ["init"],
+		onboardCmd: ["onboard"],
+	},
+	{
+		name: "sprout",
+		cli: "sr",
+		entry: "../tools/sprout/index.ts",
+		dotDir: ".sprout",
+		initCmd: ["init"],
+		onboardCmd: ["onboard"],
+	},
+	{
+		name: "trellis",
+		cli: "tl",
+		entry: "../tools/trellis/index.ts",
+		dotDir: ".trellis",
+		initCmd: ["init"],
+		onboardCmd: ["onboard"],
+	},
 ];
 
+/**
+ * Build the argv to run a bundled tool's CLI: the current bun runtime plus the
+ * tool's entrypoint resolved inside this package. PATH-independent.
+ */
+function toolArgv(tool: SiblingTool, ...cmd: string[]): string[] {
+	const entryPath = new URL(tool.entry, import.meta.url).pathname;
+	return [process.execPath, entryPath, ...cmd];
+}
+
 type ToolStatus = "initialized" | "already_initialized" | "skipped";
 type OnboardStatus = "appended" | "current";
 
@@ -85,9 +122,9 @@ export function resolveToolSet(opts: InitOptions): SiblingTool[] {
 	});
 }
 
-async function isToolInstalled(cli: string, spawner: Spawner): Promise<boolean> {
+async function isToolInstalled(tool: SiblingTool, spawner: Spawner): Promise<boolean> {
 	try {
-		const result = await spawner([cli, "--version"]);
+		const result = await spawner(toolArgv(tool, "--version"));
 		return result.exitCode === 0;
 	} catch {
 		return false;
@@ -99,18 +136,20 @@ async function initSiblingTool(
 	projectRoot: string,
 	spawner: Spawner,
 ): Promise<ToolStatus> {
-	const installed = await isToolInstalled(tool.cli, spawner);
+	const installed = await isToolInstalled(tool, spawner);
 	if (!installed) {
+		// Bundled in this package — if this fires, the agentplate install itself
+		// is incomplete rather than a missing separate package.
 		printWarning(
-			`${tool.name} not installed — skipping`,
-			`install: npm i -g @ag-eco/${tool.name}-cli`,
+			`${tool.name} unavailable — skipping`,
+			"bundled in @ag-eco/agentplate-cli; try reinstalling: npm i -g @ag-eco/agentplate-cli",
 		);
 		return "skipped";
 	}
 
 	let result: { exitCode: number; stdout: string; stderr: string };
 	try {
-		result = await spawner([tool.cli, ...tool.initCmd], { cwd: projectRoot });
+		result = await spawner(toolArgv(tool, ...tool.initCmd), { cwd: projectRoot });
 	} catch (err) {
 		// Spawn failure (e.g. ENOENT) — treat as not installed
 		const message = err instanceof Error ? err.message : String(err);
@@ -138,11 +177,11 @@ async function onboardTool(
 	projectRoot: string,
 	spawner: Spawner,
 ): Promise<OnboardStatus> {
-	const installed = await isToolInstalled(tool.cli, spawner);
+	const installed = await isToolInstalled(tool, spawner);
 	if (!installed) return "current";
 
 	try {
-		const result = await spawner([tool.cli, ...tool.onboardCmd], { cwd: projectRoot });
+		const result = await spawner(toolArgv(tool, ...tool.onboardCmd), { cwd: projectRoot });
 		return result.exitCode === 0 ? "appended" : "current";
 	} catch {
 		return "current";

package/src/doctor/databases.test.ts

@@ -49,14 +49,17 @@ describe("checkDatabases", () => {
 		rmSync(tempDir, { recursive: true, force: true });
 	});
 
-	test("fails when required database files do not exist (merge-queue.db is optional)", () => {
+	test("fails only for sessions.db when no databases exist (mail/metrics/merge-queue are optional)", () => {
 		const checks = checkDatabases(mockConfig, tempDir) as DoctorCheck[];
 
 		expect(checks).toHaveLength(4);
-		expect(checks[0]?.status).toBe("fail");
+		// mail.db and metrics.db are created lazily on first write (first mail /
+		// first session-end metric) — their absence in a fresh project is normal.
+		expect(checks[0]?.status).toBe("pass");
 		expect(checks[0]?.name).toBe("mail.db exists");
-		expect(checks[1]?.status).toBe("fail");
+		expect(checks[1]?.status).toBe("pass");
 		expect(checks[1]?.name).toBe("metrics.db exists");
+		// sessions.db is created at `ap init` (run creation), so its absence is a failure.
 		expect(checks[2]?.status).toBe("fail");
 		expect(checks[2]?.name).toBe("sessions.db exists");
 		// merge-queue.db is created lazily on first merge — its absence is normal.

package/src/doctor/databases.ts

@@ -21,6 +21,7 @@ export const checkDatabases: DoctorCheckFn = (_config, agentplateDir): DoctorChe
 	}> = [
 		{
 			name: "mail.db",
+			optional: true,
 			tables: ["messages"],
 			requiredColumns: {
 				messages: [
@@ -40,6 +41,7 @@ export const checkDatabases: DoctorCheckFn = (_config, agentplateDir): DoctorChe
 		},
 		{
 			name: "metrics.db",
+			optional: true,
 			tables: ["sessions"],
 			requiredColumns: {
 				sessions: [

package/src/doctor/ecosystem.test.ts

@@ -246,7 +246,9 @@ describe("checkEcosystem", () => {
 		const results = await check(mockConfig, "/tmp/.agentplate");
 
 		const loam = results.find((r) => r.name === "loam semver");
-		const hasHint = loam?.details?.some((d) => d.includes("@ag-eco/loam-cli"));
+		// loam/sprout/trellis are bundled into @ag-eco/agentplate-cli now, so the
+		// install hint points at the single package, not a standalone @ag-eco/loam-cli.
+		const hasHint = loam?.details?.some((d) => d.includes("@ag-eco/agentplate-cli"));
 		expect(hasHint).toBe(true);
 	});
 

package/src/version.ts

@@ -2,4 +2,4 @@
  * Single source of truth for the package version, shared by every bundled bin
  * (ap/agentplate, lm/loam, sr, tl). Updated by scripts/version-bump.ts.
  */
-export const VERSION = "0.13.1";
+export const VERSION = "0.13.3";