@vitest-agent/cli 2.2.18 → 3.0.0

package/bin/vitest-agent.js

@@ -1,34 +1,14 @@
 #!/usr/bin/env node
-import { CliLive } from "../layers/CliLive.js";
-import { agentCommand } from "../commands/agent.js";
-import { dbCommand } from "../commands/db.js";
-import { doctorCommand } from "../commands/doctor.js";
-import * as NodeServices from "@effect/platform-node/NodeServices";
-import { PathResolutionLive, formatFatalError, resolveDataPath, resolveLogFile, resolveLogLevel } from "@vitest-agent/sdk";
-import { Cause, Console, Effect } from "effect";
-import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
-import { Command } from "effect/unstable/cli";
+import { main } from "../main.js";
 
 //#region src/bin.ts
 /**
-* CLI entry point for vitest-agent.
+* CLI entry point for vitest-agent. Thin shim over `main.ts` — the
+* assembled program that owns the process.
 *
 * @packageDocumentation
 */
-const rootCommand = Command.make("vitest-agent").pipe(Command.withSubcommands([
-	dbCommand,
-	doctorCommand,
-	agentCommand
-]));
-const cli = Command.run(rootCommand, { version: "0.0.0" });
-const logLevel = resolveLogLevel();
-const logFile = resolveLogFile();
-const projectDir = process.env.VITEST_AGENT_PROJECT_DIR ?? process.cwd();
-const main = resolveDataPath(projectDir).pipe(Effect.flatMap((dbPath) => cli.pipe(Effect.provide(CliLive(dbPath, logLevel, logFile)))), Effect.provide(PathResolutionLive(projectDir)), Effect.provide(NodeServices.layer), Effect.catchCause((cause) => {
-	if (cause.reasons.filter(Cause.isDieReason).length > 0) return Console.error(`vitest-agent: ${formatFatalError(cause)}`).pipe(Effect.andThen(Effect.failCause(cause)));
-	return Effect.failCause(cause);
-}));
-NodeRuntime.runMain(main);
+main();
 
 //#endregion
 export {  };

package/commands/agent.js

@@ -1,16 +1,13 @@
-import { SidecarLive } from "../layers/SidecarLive.js";
-import { registerAgentEffect } from "../lib/internal-register-agent.js";
-import { DATA_DB_FILENAME, REGISTRY_DB_FILENAME, resolveProjectDataDir, resolveRegistryDir, resolveSessionMapPath } from "../lib/sidecar-paths.js";
-import { endAgentEffect } from "../lib/internal-end-agent.js";
 import { recordCommand } from "./record.js";
 import { triageCommand } from "./triage.js";
 import { wrapupCommand } from "./wrapup.js";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { classifyTestPath, detectNonDefaultDiscoverStrategy, findOwningWorkspace, resolveProjectKeyFromCwd } from "@vitest-agent/sdk";
+import { SidecarPlatformLive, endAgentEffect, registerAgentEffect, resolveHookPaths, resolveProjectKeyFromCwd } from "@vitest-agent/engine";
+import { classifyTestPath, detectNonDefaultDiscoverStrategy, findOwningWorkspace } from "@vitest-agent/sdk";
 import { Cause, Effect, Option } from "effect";
+import { Argument, Command, Flag } from "effect/unstable/cli";
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
-import { Argument, Command, Flag } from "effect/unstable/cli";
 import { findWorkspaceRootSync, getWorkspacePackagesSync } from "@effected/workspaces";
 import { nodeSyncOps } from "@effected/workspaces/node-sync";
 import { exitCodeForTag, injectEnv } from "@vitest-agent/sdk/dispatch";
@@ -66,14 +63,14 @@ const mapDefectToExit = (cause) => {
 	const message = defect instanceof Error ? defect.message : String(defect ?? "unknown defect");
 	return writeStderrAndExit(5, "Defect", message);
 };
-const hostKindOpt = Flag.string("host-kind").pipe(Flag.withDescription("Host vendor identifier; e.g. 'claude-code', 'cursor', 'goose'"));
-const agentTypeOpt = Flag.string("agent-type").pipe(Flag.withDescription("Agent type, must begin with the host-kind prefix"));
-const hostSessionIdOpt = Flag.string("host-session-id").pipe(Flag.withDescription("Host's native session id (host chat UUID; `session_id` in the CC hook payload)"));
-const transcriptPathOpt = Flag.string("transcript-path").pipe(Flag.withDescription("Path to the host's transcript file (basename UUID is the conversation key)"));
-const cwdOpt = Flag.string("cwd").pipe(Flag.withDescription("Workspace root directory the agent is running in"));
-const parentAgentIdOpt = Flag.optional(Flag.string("parent-agent-id"));
-const clientNonceOpt = Flag.optional(Flag.string("client-nonce"));
-const projectKeyOverrideOpt = Flag.optional(Flag.string("project-key"));
+const hostKindOpt = Flag.String("host-kind").pipe(Flag.withDescription("Host vendor identifier; e.g. 'claude-code', 'cursor', 'goose'"));
+const agentTypeOpt = Flag.String("agent-type").pipe(Flag.withDescription("Agent type, must begin with the host-kind prefix"));
+const hostSessionIdOpt = Flag.String("host-session-id").pipe(Flag.withDescription("Host's native session id (host chat UUID; `session_id` in the CC hook payload)"));
+const transcriptPathOpt = Flag.String("transcript-path").pipe(Flag.withDescription("Path to the host's transcript file (basename UUID is the conversation key)"));
+const cwdOpt = Flag.String("cwd").pipe(Flag.withDescription("Workspace root directory the agent is running in"));
+const parentAgentIdOpt = Flag.optional(Flag.String("parent-agent-id"));
+const clientNonceOpt = Flag.optional(Flag.String("client-nonce"));
+const projectKeyOverrideOpt = Flag.optional(Flag.String("project-key"));
 const registerAgentSubcommand = Command.make("register-agent", {
 	hostKind: hostKindOpt,
 	agentType: agentTypeOpt,
@@ -85,14 +82,11 @@ const registerAgentSubcommand = Command.make("register-agent", {
 	projectKeyOverride: projectKeyOverrideOpt
 }, (opts) => Effect.gen(function* () {
 	const projectKey = Option.isSome(opts.projectKeyOverride) ? opts.projectKeyOverride.value : resolveProjectKeyFromCwd(opts.cwd);
-	const perProjectDbPath = join(resolveProjectDataDir(projectKey), DATA_DB_FILENAME);
-	const registryDbPath = join(resolveRegistryDir(), REGISTRY_DB_FILENAME);
-	const sessionMapDbPath = yield* resolveSessionMapPath().pipe(Effect.catchCause(mapDefectToExit));
-	const sidecar = SidecarLive({
-		perProjectDbPath,
-		sessionMapDbPath,
-		registryDbPath
-	});
+	const paths = yield* resolveHookPaths({
+		env: process.env,
+		projectKey
+	}).pipe(Effect.catchCause(mapDefectToExit));
+	const sidecar = SidecarPlatformLive(paths, process.env);
 	const result = yield* registerAgentEffect({
 		hostSessionId: opts.hostSessionId,
 		transcriptPath: opts.transcriptPath,
@@ -111,11 +105,11 @@ const registerAgentSubcommand = Command.make("register-agent", {
 		idempotencyHit: result.idempotencyHit
 	}));
 }).pipe(Effect.provide(NodeServices.layer))).pipe(Command.withDescription("Register an agent invocation in the per-project store and the per-client session map"));
-const agentIdOpt = Flag.string("agent-id").pipe(Flag.withDescription("The agent_id (UUID) returned by an earlier register-agent call"));
-const endedAtOpt = Flag.optional(Flag.integer("ended-at"));
-const endHostSessionIdOpt = Flag.optional(Flag.string("host-session-id"));
-const endCwdOpt = Flag.string("cwd").pipe(Flag.withDefault(process.cwd()), Flag.withDescription("Workspace root, used to locate the per-project data.db"));
-const endProjectKeyOverrideOpt = Flag.optional(Flag.string("project-key"));
+const agentIdOpt = Flag.String("agent-id").pipe(Flag.withDescription("The agent_id (UUID) returned by an earlier register-agent call"));
+const endedAtOpt = Flag.optional(Flag.Int("ended-at"));
+const endHostSessionIdOpt = Flag.optional(Flag.String("host-session-id"));
+const endCwdOpt = Flag.String("cwd").pipe(Flag.withDefault(process.cwd()), Flag.withDescription("Workspace root, used to locate the per-project data.db"));
+const endProjectKeyOverrideOpt = Flag.optional(Flag.String("project-key"));
 const endAgentSubcommand = Command.make("end-agent", {
 	agentId: agentIdOpt,
 	endedAt: endedAtOpt,
@@ -124,14 +118,11 @@ const endAgentSubcommand = Command.make("end-agent", {
 	projectKeyOverride: endProjectKeyOverrideOpt
 }, (opts) => Effect.gen(function* () {
 	const projectKey = Option.isSome(opts.projectKeyOverride) ? opts.projectKeyOverride.value : resolveProjectKeyFromCwd(opts.cwd);
-	const perProjectDbPath = join(resolveProjectDataDir(projectKey), DATA_DB_FILENAME);
-	const registryDbPath = join(resolveRegistryDir(), REGISTRY_DB_FILENAME);
-	const sessionMapDbPath = yield* resolveSessionMapPath().pipe(Effect.catchCause(mapDefectToExit));
-	const sidecar = SidecarLive({
-		perProjectDbPath,
-		sessionMapDbPath,
-		registryDbPath
-	});
+	const paths = yield* resolveHookPaths({
+		env: process.env,
+		projectKey
+	}).pipe(Effect.catchCause(mapDefectToExit));
+	const sidecar = SidecarPlatformLive(paths, process.env);
 	const endedAt = Option.isSome(opts.endedAt) ? opts.endedAt.value : Math.floor(Date.now() / 1e3);
 	yield* endAgentEffect({
 		agentId: opts.agentId,
@@ -139,8 +130,8 @@ const endAgentSubcommand = Command.make("end-agent", {
 		...Option.isSome(opts.hostSessionId) && { hostSessionId: opts.hostSessionId.value }
 	}).pipe(Effect.provide(sidecar), Effect.catchCause(mapDefectToExit));
 }).pipe(Effect.provide(NodeServices.layer))).pipe(Command.withDescription("Mark an agent (and optionally its session) as ended"));
-const commandOpt = Flag.string("command").pipe(Flag.withDescription("The Bash command to (possibly) rewrite with VITEST_AGENT_* env-prefix"));
-const cwdInjectOpt = Flag.string("cwd").pipe(Flag.withDefault(process.cwd()), Flag.withDescription("Working directory; used to find package.json scripts"));
+const commandOpt = Flag.String("command").pipe(Flag.withDescription("The Bash command to (possibly) rewrite with VITEST_AGENT_* env-prefix"));
+const cwdInjectOpt = Flag.String("cwd").pipe(Flag.withDefault(process.cwd()), Flag.withDescription("Working directory; used to find package.json scripts"));
 const injectEnvSubcommand = Command.make("inject-env", {
 	command: commandOpt,
 	cwd: cwdInjectOpt
@@ -148,7 +139,8 @@ const injectEnvSubcommand = Command.make("inject-env", {
 	const out = injectEnv({
 		command: opts.command,
 		cwd: opts.cwd,
-		env: process.env
+		env: process.env,
+		readFile: (path) => readFileSync(path, "utf-8")
 	});
 	process.stdout.write(`${out}\n`);
 })).pipe(Command.withDescription("Rewrite a Bash command to prepend VITEST_AGENT_* env vars when it invokes Vitest"));
@@ -157,7 +149,7 @@ const sidecarPathSubcommand = Command.make("sidecar-path", {}, () => Effect.sync
 	if (path === null) process.exit(1);
 	process.stdout.write(`${path}\n`);
 })).pipe(Command.withDescription("Print the absolute path of the platform sidecar binary resolved via require.resolve"));
-const testPathArg = Argument.string("path").pipe(Argument.withDescription("Path to classify against the workspace test layout; relative paths resolve against VITEST_AGENT_PROJECT_DIR, or cwd when that is unset"));
+const testPathArg = Argument.String("path").pipe(Argument.withDescription("Path to classify against the workspace test layout; relative paths resolve against VITEST_AGENT_PROJECT_DIR, or cwd when that is unset"));
 /**
 * True when any directory between `ownerPath` and `filePath`'s own directory
 * declares its own `package.json`.

package/commands/db.js

@@ -1,11 +1,11 @@
 import { formatDbQuery } from "../lib/format-db-query.js";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { layer } from "@effect/sql-sqlite-node/SqliteClient";
-import { DataStore, resolveDataPath } from "@vitest-agent/sdk";
+import { DataStore, resolveDataPath } from "@vitest-agent/engine";
 import { Effect, FileSystem } from "effect";
 import { Argument, Command, Flag } from "effect/unstable/cli";
-import { SqlClient } from "effect/unstable/sql/SqlClient";
 import * as readline from "node:readline";
+import { layer } from "@effect/sql-sqlite-node/SqliteClient";
+import { SqlClient } from "effect/unstable/sql/SqlClient";
 
 //#region src/commands/db.ts
 /**
@@ -17,12 +17,12 @@ const pathCommand = Command.make("path", {}, () => Effect.gen(function* () {
 	const dbPath = yield* resolveDataPath(process.env.VITEST_AGENT_PROJECT_DIR ?? process.cwd());
 	yield* Effect.sync(() => process.stdout.write(`${dbPath}\n`));
 })).pipe(Command.withDescription("Print the resolved database path"));
-const keepRecentOption = Flag.withDefault(Flag.integer("keep-recent"), 30).pipe(Flag.withDescription("Number of most-recent sessions to keep in full"));
+const keepRecentOption = Flag.withDefault(Flag.Int("keep-recent"), 30).pipe(Flag.withDescription("Number of most-recent sessions to keep in full"));
 const pruneCommand = Command.make("prune", { keepRecent: keepRecentOption }, ({ keepRecent }) => Effect.gen(function* () {
 	const result = yield* (yield* DataStore).pruneSessions(keepRecent);
 	yield* Effect.sync(() => process.stdout.write(`Pruned ${result.prunedTurns} turn row(s) across ${result.affectedSessions} session(s); session rows retained.\n`));
 })).pipe(Command.withDescription("Drop old sessions' turn history (W1 retention; keeps the last N in full)"));
-const yesOption = Flag.boolean("yes").pipe(Flag.withDefault(false), Flag.withDescription("Skip the interactive confirmation prompt"));
+const yesOption = Flag.Boolean("yes").pipe(Flag.withDefault(false), Flag.withDescription("Skip the interactive confirmation prompt"));
 const resetCommand = Command.make("reset", { yes: yesOption }, ({ yes }) => Effect.gen(function* () {
 	const agentId = process.env.VITEST_AGENT_AGENT_ID;
 	if (agentId !== void 0 && agentId.length > 0) {
@@ -68,8 +68,8 @@ const resetCommand = Command.make("reset", { yes: yesOption }, ({ yes }) => Effe
 		process.stdout.write(`Deleted database at ${dbPath}\n`);
 	});
 }).pipe(Effect.provide(NodeServices.layer))).pipe(Command.withDescription("Wipe the database (human-only; blocked in agent contexts)"));
-const queryFormatOption = Flag.choice("format", ["table", "json"]).pipe(Flag.withDefault("table"), Flag.withDescription("Output format for query results"));
-const sqlArg = Argument.string("sql").pipe(Argument.withDescription("Read-only SQL statement to execute against data.db"));
+const queryFormatOption = Flag.Literals("format", ["table", "json"]).pipe(Flag.withDefault("table"), Flag.withDescription("Output format for query results"));
+const sqlArg = Argument.String("sql").pipe(Argument.withDescription("Read-only SQL statement to execute against data.db"));
 /**
 * Flatten an error and its cause chain into a single message so the
 * driver's `attempt to write a readonly database` text surfaces to

package/commands/doctor.js

@@ -1,5 +1,5 @@
 import { formatDoctor } from "../lib/format-doctor.js";
-import { DataReader, resolveDataPath } from "@vitest-agent/sdk";
+import { DataReader, resolveDataPath } from "@vitest-agent/engine";
 import { Effect, Option } from "effect";
 import { Command, Flag } from "effect/unstable/cli";
 
@@ -9,7 +9,7 @@ import { Command, Flag } from "effect/unstable/cli";
 *
 * @packageDocumentation
 */
-const formatOption = Flag.withDefault(Flag.choice("format", ["markdown", "json"]), "markdown");
+const formatOption = Flag.withDefault(Flag.Literals("format", ["markdown", "json"]), "markdown");
 const writeOutput = (results, format) => Effect.sync(() => {
 	if (format === "json") process.stdout.write(`${JSON.stringify(results, null, 2)}\n`);
 	else process.stdout.write(`${formatDoctor(results)}\n`);

package/commands/record.js

@@ -1,19 +1,15 @@
-import { recordSessionEnd, recordSessionStart } from "../lib/record-session.js";
-import { dispatchRecordTddArtifactEffect } from "../lib/record-tdd-artifact.js";
-import { recordTurnEffect } from "../lib/record-turn.js";
-import { recordRunWorkspaceChangesEffect } from "../lib/record-workspace-changes.js";
-import { DataReader, DataStore } from "@vitest-agent/sdk";
+import { DataReader, DataStore, dispatchRecordTddArtifactEffect, recordRunWorkspaceChangesEffect, recordSessionEnd, recordSessionStart, recordTurnEffect } from "@vitest-agent/engine";
 import { Effect, Option } from "effect";
 import { Argument, Command, Flag } from "effect/unstable/cli";
 
 //#region src/commands/record.ts
-const chatId = Flag.string("chat-id").pipe(Flag.withDescription("Host chat id (`session_id` in the Claude Code hook envelope; equivalent in other clients)"));
-const occurredAt = Flag.string("occurred-at").pipe(Flag.withDefault((/* @__PURE__ */ new Date()).toISOString()), Flag.withDescription("ISO 8601 timestamp; defaults to now"));
-const payloadArg = Argument.string("payload-json").pipe(Argument.withDescription("Stringified JSON payload (validated against TurnPayload)"));
-const project = Flag.string("project");
-const cwd = Flag.string("cwd");
-const projectOptional = Flag.optional(Flag.string("project"));
-const cwdOptional = Flag.optional(Flag.string("cwd"));
+const chatId = Flag.String("chat-id").pipe(Flag.withDescription("Host chat id (`session_id` in the Claude Code hook envelope; equivalent in other clients)"));
+const occurredAt = Flag.String("occurred-at").pipe(Flag.withDefault((/* @__PURE__ */ new Date()).toISOString()), Flag.withDescription("ISO 8601 timestamp; defaults to now"));
+const payloadArg = Argument.String("payload-json").pipe(Argument.withDescription("Stringified JSON payload (validated against TurnPayload)"));
+const project = Flag.String("project");
+const cwd = Flag.String("cwd");
+const projectOptional = Flag.optional(Flag.String("project"));
+const cwdOptional = Flag.optional(Flag.String("cwd"));
 const turnSubcommand = Command.make("turn", {
 	chatId,
 	occurredAt,
@@ -25,16 +21,16 @@ const turnSubcommand = Command.make("turn", {
 	payloadJson: payload,
 	occurredAt,
 	...project._tag === "Some" && { project: project.value },
-	...cwd._tag === "Some" && { cwd: cwd.value }
+	cwd: cwd._tag === "Some" ? cwd.value : process.cwd()
 }).pipe(Effect.flatMap((result) => Effect.sync(() => process.stdout.write(`${JSON.stringify(result)}\n`))), Effect.catch((err) => Effect.sync(() => {
 	process.stderr.write(`record turn: ${err instanceof Error ? err.message : String(err)}\n`);
 	process.exit(1);
 })))).pipe(Command.withDescription("Validate a TurnPayload JSON and write a turn row"));
-const agentKind = Flag.choice("agent-kind", ["main", "subagent"]).pipe(Flag.withDefault("main"));
-const agentType = Flag.optional(Flag.string("agent-type"));
-const parentChatId = Flag.optional(Flag.string("parent-chat-id"));
-const triageWasNonEmpty = Flag.boolean("triage-was-non-empty").pipe(Flag.withDefault(false));
-const startedAt = Flag.string("started-at").pipe(Flag.withDefault((/* @__PURE__ */ new Date()).toISOString()));
+const agentKind = Flag.Literals("agent-kind", ["main", "subagent"]).pipe(Flag.withDefault("main"));
+const agentType = Flag.optional(Flag.String("agent-type"));
+const parentChatId = Flag.optional(Flag.String("parent-chat-id"));
+const triageWasNonEmpty = Flag.Boolean("triage-was-non-empty").pipe(Flag.withDefault(false));
+const startedAt = Flag.String("started-at").pipe(Flag.withDefault((/* @__PURE__ */ new Date()).toISOString()));
 const sessionStartSubcommand = Command.make("session-start", {
 	chatId,
 	project,
@@ -57,8 +53,8 @@ const sessionStartSubcommand = Command.make("session-start", {
 	process.stderr.write(`record session-start: ${err instanceof Error ? err.message : String(err)}\n`);
 	process.exit(1);
 })))).pipe(Command.withDescription("Insert a new sessions row"));
-const endedAt = Flag.string("ended-at").pipe(Flag.withDefault((/* @__PURE__ */ new Date()).toISOString()));
-const endReason = Flag.optional(Flag.string("end-reason"));
+const endedAt = Flag.String("ended-at").pipe(Flag.withDefault((/* @__PURE__ */ new Date()).toISOString()));
+const endReason = Flag.optional(Flag.String("end-reason"));
 const sessionEndSubcommand = Command.make("session-end", {
 	chatId,
 	endedAt,
@@ -71,7 +67,7 @@ const sessionEndSubcommand = Command.make("session-end", {
 	process.stderr.write(`record session-end: ${err instanceof Error ? err.message : String(err)}\n`);
 	process.exit(1);
 })))).pipe(Command.withDescription("Update sessions.ended_at + end_reason"));
-const artifactKindOpt = Flag.choice("artifact-kind", [
+const artifactKindOpt = Flag.Literals("artifact-kind", [
 	"test_written",
 	"test_failed_run",
 	"code_written",
@@ -79,15 +75,15 @@ const artifactKindOpt = Flag.choice("artifact-kind", [
 	"refactor",
 	"test_weakened"
 ]);
-const filePathOpt = Flag.optional(Flag.string("file-path"));
-const testCaseIdOpt = Flag.optional(Flag.integer("test-case-id"));
-const testRunIdOpt = Flag.optional(Flag.integer("test-run-id"));
-const testFirstFailureRunIdOpt = Flag.optional(Flag.integer("test-first-failure-run-id"));
-const diffExcerptOpt = Flag.optional(Flag.string("diff-excerpt"));
-const recordedAtOpt = Flag.string("recorded-at").pipe(Flag.withDefault((/* @__PURE__ */ new Date()).toISOString()));
-const chatIdOptional = Flag.optional(Flag.string("chat-id")).pipe(Flag.withDescription("Host chat id; omit when --tdd-task-id is supplied instead"));
-const tddTaskIdOpt = Flag.optional(Flag.integer("tdd-task-id")).pipe(Flag.withDescription("Explicit TDD task id escape hatch (issue #144): bypasses chat-id -> session -> task resolution entirely"));
-const suiteOpt = Flag.choice("suite", ["vitest", "bats"]).pipe(Flag.withDefault("vitest"), Flag.withDescription("Explicit test-runner marker (issue #363): 'vitest' (default) or 'bats'. Distinguishes a bats run-level artifact (no test_case_id) from a vitest one for the D2 phase-transition validator."));
+const filePathOpt = Flag.optional(Flag.String("file-path"));
+const testCaseIdOpt = Flag.optional(Flag.Int("test-case-id"));
+const testRunIdOpt = Flag.optional(Flag.Int("test-run-id"));
+const testFirstFailureRunIdOpt = Flag.optional(Flag.Int("test-first-failure-run-id"));
+const diffExcerptOpt = Flag.optional(Flag.String("diff-excerpt"));
+const recordedAtOpt = Flag.String("recorded-at").pipe(Flag.withDefault((/* @__PURE__ */ new Date()).toISOString()));
+const chatIdOptional = Flag.optional(Flag.String("chat-id")).pipe(Flag.withDescription("Host chat id; omit when --tdd-task-id is supplied instead"));
+const tddTaskIdOpt = Flag.optional(Flag.Int("tdd-task-id")).pipe(Flag.withDescription("Explicit TDD task id escape hatch (issue #144): bypasses chat-id -> session -> task resolution entirely"));
+const suiteOpt = Flag.Literals("suite", ["vitest", "bats"]).pipe(Flag.withDefault("vitest"), Flag.withDescription("Explicit test-runner marker (issue #363): 'vitest' (default) or 'bats'. Distinguishes a bats run-level artifact (no test_case_id) from a vitest one for the D2 phase-transition validator."));
 const tddArtifactSubcommand = Command.make("tdd-artifact", {
 	chatId: chatIdOptional,
 	tddTaskId: tddTaskIdOpt,
@@ -108,7 +104,7 @@ const tddArtifactSubcommand = Command.make("tdd-artifact", {
 		...opts.chatId._tag === "Some" && { chatId: opts.chatId.value },
 		...opts.tddTaskId._tag === "Some" && { tddTaskId: opts.tddTaskId.value },
 		...opts.project._tag === "Some" && { project: opts.project.value },
-		...opts.cwd._tag === "Some" && { cwd: opts.cwd.value },
+		cwd: opts.cwd._tag === "Some" ? opts.cwd.value : process.cwd(),
 		artifactKind: opts.artifactKind,
 		...fileId !== void 0 && { fileId },
 		...opts.testCaseId._tag === "Some" && { testCaseId: opts.testCaseId.value },
@@ -135,7 +131,7 @@ const testCaseTurnsSubcommand = Command.make("test-case-turns", { chatId }, ({ c
 	process.stderr.write(`record test-case-turns: ${err instanceof Error ? err.message : String(err)}\n`);
 	process.exit(1);
 })))).pipe(Command.withDescription("Backfill test_cases.created_turn_id from file_edits in the current session (BUG-2 fix)"));
-const invocationMethodOpt = Flag.choice("invocation-method", [
+const invocationMethodOpt = Flag.Literals("invocation-method", [
 	"bash",
 	"mcp",
 	"cli"
@@ -152,14 +148,14 @@ const runTriggerSubcommand = Command.make("run-trigger", {
 	process.stderr.write(`record run-trigger: ${err instanceof Error ? err.message : String(err)}\n`);
 	process.exit(1);
 })))).pipe(Command.withDescription("Associate the latest test run with the current Claude Code session"));
-const shaOpt = Flag.string("sha");
-const parentShaOpt = Flag.optional(Flag.string("parent-sha"));
-const messageOpt = Flag.optional(Flag.string("message"));
-const authorOpt = Flag.optional(Flag.string("author"));
-const committedAtOpt = Flag.optional(Flag.string("committed-at"));
-const branchOpt = Flag.optional(Flag.string("branch"));
-const projectOpt = Flag.optional(Flag.string("project"));
-const filesArg = Argument.string("files-json").pipe(Argument.withDescription("JSON array of {\"filePath\",\"changeKind\"} objects"));
+const shaOpt = Flag.String("sha");
+const parentShaOpt = Flag.optional(Flag.String("parent-sha"));
+const messageOpt = Flag.optional(Flag.String("message"));
+const authorOpt = Flag.optional(Flag.String("author"));
+const committedAtOpt = Flag.optional(Flag.String("committed-at"));
+const branchOpt = Flag.optional(Flag.String("branch"));
+const projectOpt = Flag.optional(Flag.String("project"));
+const filesArg = Argument.String("files-json").pipe(Argument.withDescription("JSON array of {\"filePath\",\"changeKind\"} objects"));
 const runWorkspaceChangesSubcommand = Command.make("run-workspace-changes", {
 	sha: shaOpt,
 	parentSha: parentShaOpt,

package/commands/triage.js

@@ -1,4 +1,4 @@
-import { formatTriageEffect } from "@vitest-agent/sdk";
+import { formatTriageEffect } from "@vitest-agent/engine";
 import { Effect } from "effect";
 import { Command, Flag } from "effect/unstable/cli";
 
@@ -12,13 +12,13 @@ import { Command, Flag } from "effect/unstable/cli";
 *
 * @packageDocumentation
 */
-const formatOption = Flag.withDefault(Flag.choice("format", [
+const formatOption = Flag.withDefault(Flag.Literals("format", [
 	"markdown",
 	"json",
 	"silent"
 ]), "markdown");
-const projectOption = Flag.optional(Flag.string("project"));
-const maxLinesOption = Flag.optional(Flag.integer("max-lines"));
+const projectOption = Flag.optional(Flag.String("project"));
+const maxLinesOption = Flag.optional(Flag.Int("max-lines"));
 const triageCommand = Command.make("triage", {
 	format: formatOption,
 	project: projectOption,

package/commands/wrapup.js

@@ -1,4 +1,4 @@
-import { formatWrapupEffect } from "@vitest-agent/sdk";
+import { formatWrapupEffect } from "@vitest-agent/engine";
 import { Effect } from "effect";
 import { Command, Flag } from "effect/unstable/cli";
 
@@ -13,17 +13,17 @@ import { Command, Flag } from "effect/unstable/cli";
 *
 * @packageDocumentation
 */
-const rowIdOption = Flag.optional(Flag.integer("row-id"));
-const chatIdOption = Flag.optional(Flag.string("chat-id"));
-const kindOption = Flag.withDefault(Flag.choice("kind", [
+const rowIdOption = Flag.optional(Flag.Int("row-id"));
+const chatIdOption = Flag.optional(Flag.String("chat-id"));
+const kindOption = Flag.withDefault(Flag.Literals("kind", [
 	"stop",
 	"session_end",
 	"pre_compact",
 	"tdd_handoff",
 	"user_prompt_nudge"
 ]), "session_end");
-const userPromptHintOption = Flag.optional(Flag.string("user-prompt-hint"));
-const formatOption = Flag.withDefault(Flag.choice("format", ["markdown", "json"]), "markdown");
+const userPromptHintOption = Flag.optional(Flag.String("user-prompt-hint"));
+const formatOption = Flag.withDefault(Flag.Literals("format", ["markdown", "json"]), "markdown");
 const wrapupCommand = Command.make("wrapup", {
 	rowId: rowIdOption,
 	chatId: chatIdOption,

package/index.d.ts

@@ -1,167 +1,12 @@
-import * as NodeServices from "@effect/platform-node/NodeServices";
-import * as SqliteMigrator from "@effect/sql-sqlite-node/SqliteMigrator";
-import { Effect, Layer, LogLevel } from "effect";
-import { DataReader, DataStore, PerClientSessionMapWriter, ProjectIdentityNotResolvableError } from "@vitest-agent/sdk";
-//#region src/layers/CliLive.d.ts
-/**
- * Composition layer for the CLI runtime.
- *
- * Wires `DataReader`, `ProjectDiscovery`, `HistoryTracker`,
- * `OutputPipeline`, `SqliteClient`, the DB migrator, the Node platform
- * services, and `Logger` into a single layer the `vitest-agent`
- * bin provides to `Command.run`.
- *
- * @param dbPath - absolute path to the per-project `data.db`
- * @param logLevel - optional log level override; defaults to `Info`
- * @param logFile - optional path for structured log output
- * @public
- */
-export declare const CliLive: (dbPath: string, logLevel?: LogLevel.LogLevel, logFile?: string) => Layer.Layer<import("@vitest-agent/sdk").DataReader | import("@vitest-agent/sdk").DataStore | import("@vitest-agent/sdk").DetailResolver | import("@vitest-agent/sdk").EnvironmentDetector | import("@vitest-agent/sdk").ExecutorResolver | import("@vitest-agent/sdk").FormatSelector | import("@vitest-agent/sdk").HistoryTracker | import("@vitest-agent/sdk").OutputRenderer | import("@vitest-agent/sdk").ProjectDiscovery | import("effect/unstable/sql/SqlClient").SqlClient | import("@effect/sql-sqlite-node/SqliteClient").SqliteClient | NodeServices.NodeServices, SqliteMigrator.MigrationError | import("effect/unstable/sql/SqlError").SqlError, never>;
-//#endregion
-//#region src/layers/SidecarLive.d.ts
-/**
- * SQLite database paths consumed by {@link SidecarLive}.
- *
- * @public
- */
-interface SidecarPaths {
-  /** Absolute path to the per-project `data.db`. */
-  readonly perProjectDbPath: string;
-  /** Absolute path to the per-client `sessions.db`. */
-  readonly sessionMapDbPath: string;
-  /** Absolute path to the global `registry.db`. */
-  readonly registryDbPath: string;
-}
-/**
- * Build the sidecar Live layer for the supplied SQLite paths.
- *
- * Each store gets its own `SqlClient` connection (separate scopes,
- * independent migrators) so concurrent operations on the three
- * stores don't share lock state.
- *
- * @param paths - the three SQLite database paths to open
- * @public
- */
-export declare const SidecarLive: (paths: SidecarPaths) => Layer.Layer<import("@vitest-agent/sdk").DataReader | import("@vitest-agent/sdk").DataStore | import("@vitest-agent/sdk").DiscoveryRegistry | import("@vitest-agent/sdk").PerClientSessionMapReader | import("@vitest-agent/sdk").PerClientSessionMapWriter | import("@vitest-agent/sdk").RunContext$ | NodeServices.NodeServices, SqliteMigrator.MigrationError | import("effect/unstable/sql/SqlError").SqlError, never>;
-//#endregion
-//#region src/lib/internal-register-agent.d.ts
-/**
- * Input for the end-to-end agent registration effect.
- *
- * @public
- */
-interface RegisterAgentInput {
-  /** The host's native session identifier (e.g. Claude's `session_id`). */
-  readonly hostSessionId: string;
-  /** Absolute path to the host's conversation transcript file. */
-  readonly transcriptPath: string;
-  /** Working directory of the agent process. */
-  readonly cwd: string;
-  /** Host kind string (e.g. `"claude-code"`). */
-  readonly hostKind: string;
-  /** Agent type label (e.g. `"main"` or `"subagent"`). */
-  readonly agentType: string;
-  /** Normalized project key derived from the workspace root `package.json#name`. */
-  readonly projectKey: string;
-  /** Agent ID of the parent when registering a subagent. */
-  readonly parentAgentId?: string;
-  /** Optional idempotency nonce; derived from `hostSessionId + agentType + parentAgentId` when omitted. */
-  readonly clientNonce?: string;
-}
-/**
- * Output of the end-to-end agent registration effect.
- *
- * @public
- */
-interface RegisterAgentOutput {
-  /** Canonical UUID assigned to this agent in the per-project store. */
-  readonly agentId: string;
-  /** UUID of the conversation this agent belongs to. */
-  readonly conversationId: string;
-  /** Idempotency key used for the `registerAgent` upsert. */
-  readonly idempotencyKey: string;
-  /** `true` when an existing agent row was recovered rather than inserted. */
-  readonly idempotencyHit: boolean;
-}
-/**
- * End-to-end agent registration.
- *
- * Returns the canonical `agentId` + the conversation it belongs to +
- * the resolved `idempotencyKey`. The `idempotencyHit` flag is `true`
- * when the per-project store recovered an existing agent row instead
- * of inserting a new one.
- *
- * @param input - registration inputs including host identifiers and agent metadata
- * @returns an Effect resolving to `RegisterAgentOutput`
- * @public
- */
-export declare const registerAgentEffect: (input: RegisterAgentInput) => Effect.Effect<{
-  agentId: string;
-  conversationId: string;
-  mainAgentId: string;
-  idempotencyKey: string;
-  idempotencyHit: boolean;
-}, import("@vitest-agent/sdk").DataStoreError | import("@vitest-agent/sdk").RegistrationConflictError, DataReader | DataStore | PerClientSessionMapWriter | import("@vitest-agent/sdk").RunContext$>;
-//#endregion
-//#region src/lib/sidecar-paths.d.ts
-/**
- * Filename of the per-project test-data SQLite database.
- *
- * @public
- */
-export declare const DATA_DB_FILENAME = "data.db";
-/**
- * Filename of the per-client session-map SQLite database.
- *
- * @public
- */
-export declare const SESSIONS_DB_FILENAME = "sessions.db";
-/**
- * Filename of the global discovery-registry SQLite database.
- *
- * @public
- */
-export declare const REGISTRY_DB_FILENAME = "registry.db";
-/**
- * Resolve (and create) the per-project data directory for the supplied
- * normalized `projectKey`. Returns the directory; callers join
- * {@link DATA_DB_FILENAME} onto it for the `data.db` path.
- *
- * @param projectKey - normalized project key (e.g. `@org__pkg`)
- * @returns absolute path to the resolved (and created) data directory
- * @public
- */
-export declare const resolveProjectDataDir: (projectKey: string) => string;
-/**
- * Resolve (and create) the directory holding the global `registry.db`.
- * Callers join {@link REGISTRY_DB_FILENAME} onto it.
- *
- * @returns absolute path to the resolved (and created) registry directory
- * @public
- */
-export declare const resolveRegistryDir: () => string;
-/**
- * Resolve the per-client `sessions.db` path.
- *
- * Precedence: the `CLAUDE_PLUGIN_DATA` env var, then
- * `VITEST_AGENT_SESSION_MAP_DIR`, then `~/.vitest-agent/`. Fails
- * with `ProjectIdentityNotResolvableError` when no home directory
- * is resolvable.
- *
- * @returns an Effect resolving to the absolute `sessions.db` path
- * @public
- */
-export declare const resolveSessionMapPath: () => Effect.Effect<string, ProjectIdentityNotResolvableError>;
-//#endregion
-//#region src/index.d.ts
+//#region src/version.d.ts
 /**
  * The version of this package, inlined at build time from
  * `package.json#version` via rslib-builder's `__PACKAGE_VERSION__` substitution.
- * Exported for version introspection by downstream tooling.
+ * Exported for version introspection by downstream tooling, and consumed by
+ * `main.ts` to back `Command.run`'s `version` option.
  *
  * @public
  */
 export declare const CURRENT_CLI_VERSION: string;
 //#endregion
-export type { RegisterAgentInput, RegisterAgentOutput, SidecarPaths };
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -1,17 +1,3 @@
-import { CliLive } from "./layers/CliLive.js";
-import { SidecarLive } from "./layers/SidecarLive.js";
-import { registerAgentEffect } from "./lib/internal-register-agent.js";
-import { DATA_DB_FILENAME, REGISTRY_DB_FILENAME, SESSIONS_DB_FILENAME, resolveProjectDataDir, resolveRegistryDir, resolveSessionMapPath } from "./lib/sidecar-paths.js";
+import { CURRENT_CLI_VERSION } from "./version.js";
 
-//#region src/index.ts
-/**
-* The version of this package, inlined at build time from
-* `package.json#version` via rslib-builder's `__PACKAGE_VERSION__` substitution.
-* Exported for version introspection by downstream tooling.
-*
-* @public
-*/
-const CURRENT_CLI_VERSION = "2.2.18";
-
-//#endregion
-export { CURRENT_CLI_VERSION, CliLive, DATA_DB_FILENAME, REGISTRY_DB_FILENAME, SESSIONS_DB_FILENAME, SidecarLive, registerAgentEffect, resolveProjectDataDir, resolveRegistryDir, resolveSessionMapPath };
+export { CURRENT_CLI_VERSION };

package/main.d.ts

@@ -0,0 +1,22 @@
+//#region src/main.d.ts
+/**
+ * Assembled CLI program. Owns the process: resolves the data path, wires the
+ * engine's platform layers, and runs the root command via
+ * `NodeRuntime.runMain`.
+ *
+ * `bin.ts` is the published bin shim (`#!/usr/bin/env node` +
+ * `main()`); this module is also published as the `./main` subpath so a
+ * consumer can invoke the assembled program without going through the shim.
+ *
+ * @packageDocumentation
+ */
+/**
+ * Assembles and runs the CLI program, taking over the process. Not
+ * re-exported from `index.ts` — a library consumer's import graph must not
+ * pull in the process-owning module.
+ *
+ * @public
+ */
+export declare const main: () => void;
+//#endregion
+//# sourceMappingURL=main.d.ts.map