@vitest-agent/cli 1.0.7 → 2.0.0

package/bin/vitest-agent.js

@@ -3,10 +3,11 @@ 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 { NodeContext, NodeRuntime } from "@effect/platform-node";
+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 { Command } from "@effect/cli";
+import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
+import { Command } from "effect/unstable/cli";
 
 //#region src/bin.ts
 /**
@@ -19,15 +20,12 @@ const rootCommand = Command.make("vitest-agent").pipe(Command.withSubcommands([
 	doctorCommand,
 	agentCommand
 ]));
-const cli = Command.run(rootCommand, {
-	name: "vitest-agent",
-	version: "0.0.0"
-});
+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) => Effect.suspend(() => cli(process.argv)).pipe(Effect.provide(CliLive(dbPath, logLevel, logFile)))), Effect.provide(PathResolutionLive(projectDir)), Effect.provide(NodeContext.layer), Effect.catchAllCause((cause) => {
-	if (Cause.defects(cause).length > 0) return Console.error(`vitest-agent: ${formatFatalError(cause)}`).pipe(Effect.andThen(Effect.failCause(cause)));
+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);

package/commands/agent.js

@@ -5,11 +5,11 @@ import { endAgentEffect } from "../lib/internal-end-agent.js";
 import { recordCommand } from "./record.js";
 import { triageCommand } from "./triage.js";
 import { wrapupCommand } from "./wrapup.js";
-import { NodeContext } from "@effect/platform-node";
+import * as NodeServices from "@effect/platform-node/NodeServices";
 import { resolveProjectKeyFromCwd } from "@vitest-agent/sdk";
-import { Cause, Chunk, Effect, Option } from "effect";
+import { Cause, Effect, Option } from "effect";
 import { join } from "node:path";
-import { Command, Options } from "@effect/cli";
+import { Command, Flag } from "effect/unstable/cli";
 import { exitCodeForTag, injectEnv } from "@vitest-agent/sdk/dispatch";
 import { resolveSidecarBinaryPath } from "@vitest-agent/sidecar";
 
@@ -46,26 +46,27 @@ const writeStderrAndExit = (exitCode, tag, message) => Effect.sync(() => {
 	process.exit(exitCode);
 });
 const mapDefectToExit = (cause) => {
-	const failures = Chunk.toReadonlyArray(Cause.failures(cause));
+	const failures = cause.reasons.filter(Cause.isFailReason);
 	if (failures.length > 0) {
-		const tagged = failures[0];
+		const error = failures[0].error;
+		const tagged = error;
 		const tag = tagged._tag ?? "UnknownError";
-		const message = tagged.reason ?? tagged.message ?? String(failures[0]);
+		const message = tagged.reason ?? tagged.message ?? String(error);
 		const exitCode = exitCodeForTag(tag);
 		return writeStderrAndExit(exitCode, tag, message);
 	}
-	const defect = Chunk.toReadonlyArray(Cause.defects(cause))[0];
+	const defect = cause.reasons.filter(Cause.isDieReason)[0]?.defect;
 	const message = defect instanceof Error ? defect.message : String(defect ?? "unknown defect");
 	return writeStderrAndExit(5, "Defect", message);
 };
-const hostKindOpt = Options.text("host-kind").pipe(Options.withDescription("Host vendor identifier; e.g. 'claude-code', 'cursor', 'goose'"));
-const agentTypeOpt = Options.text("agent-type").pipe(Options.withDescription("Agent type, must begin with the host-kind prefix"));
-const hostSessionIdOpt = Options.text("host-session-id").pipe(Options.withDescription("Host's native session id (host chat UUID; `session_id` in the CC hook payload)"));
-const transcriptPathOpt = Options.text("transcript-path").pipe(Options.withDescription("Path to the host's transcript file (basename UUID is the conversation key)"));
-const cwdOpt = Options.text("cwd").pipe(Options.withDescription("Workspace root directory the agent is running in"));
-const parentAgentIdOpt = Options.optional(Options.text("parent-agent-id"));
-const clientNonceOpt = Options.optional(Options.text("client-nonce"));
-const projectKeyOverrideOpt = Options.optional(Options.text("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,
@@ -81,7 +82,7 @@ const registerAgentSubcommand = Command.make("register-agent", {
 	const registryDbPath = join(resolveRegistryDir(), REGISTRY_DB_FILENAME);
 	const sidecar = SidecarLive({
 		perProjectDbPath,
-		sessionMapDbPath: yield* resolveSessionMapPath().pipe(Effect.catchAllCause(mapDefectToExit)),
+		sessionMapDbPath: yield* resolveSessionMapPath().pipe(Effect.catchCause(mapDefectToExit)),
 		registryDbPath
 	});
 	const result = yield* registerAgentEffect({
@@ -93,7 +94,7 @@ const registerAgentSubcommand = Command.make("register-agent", {
 		projectKey,
 		...Option.isSome(opts.parentAgentId) && { parentAgentId: opts.parentAgentId.value },
 		...Option.isSome(opts.clientNonce) && { clientNonce: opts.clientNonce.value }
-	}).pipe(Effect.provide(sidecar), Effect.catchAllCause(mapDefectToExit));
+	}).pipe(Effect.provide(sidecar), Effect.catchCause(mapDefectToExit));
 	yield* writeStdout(JSON.stringify({
 		agentId: result.agentId,
 		conversationId: result.conversationId,
@@ -101,12 +102,12 @@ const registerAgentSubcommand = Command.make("register-agent", {
 		idempotencyKey: result.idempotencyKey,
 		idempotencyHit: result.idempotencyHit
 	}));
-}).pipe(Effect.provide(NodeContext.layer))).pipe(Command.withDescription("Register an agent invocation in the per-project store and the per-client session map"));
-const agentIdOpt = Options.text("agent-id").pipe(Options.withDescription("The agent_id (UUID) returned by an earlier register-agent call"));
-const endedAtOpt = Options.optional(Options.integer("ended-at"));
-const endHostSessionIdOpt = Options.optional(Options.text("host-session-id"));
-const endCwdOpt = Options.text("cwd").pipe(Options.withDefault(process.cwd()), Options.withDescription("Workspace root, used to locate the per-project data.db"));
-const endProjectKeyOverrideOpt = Options.optional(Options.text("project-key"));
+}).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 endAgentSubcommand = Command.make("end-agent", {
 	agentId: agentIdOpt,
 	endedAt: endedAtOpt,
@@ -118,7 +119,7 @@ const endAgentSubcommand = Command.make("end-agent", {
 	const registryDbPath = join(resolveRegistryDir(), REGISTRY_DB_FILENAME);
 	const sidecar = SidecarLive({
 		perProjectDbPath,
-		sessionMapDbPath: yield* resolveSessionMapPath().pipe(Effect.catchAllCause(mapDefectToExit)),
+		sessionMapDbPath: yield* resolveSessionMapPath().pipe(Effect.catchCause(mapDefectToExit)),
 		registryDbPath
 	});
 	const endedAt = Option.isSome(opts.endedAt) ? opts.endedAt.value : Math.floor(Date.now() / 1e3);
@@ -126,10 +127,10 @@ const endAgentSubcommand = Command.make("end-agent", {
 		agentId: opts.agentId,
 		endedAt,
 		...Option.isSome(opts.hostSessionId) && { hostSessionId: opts.hostSessionId.value }
-	}).pipe(Effect.provide(sidecar), Effect.catchAllCause(mapDefectToExit));
-}).pipe(Effect.provide(NodeContext.layer))).pipe(Command.withDescription("Mark an agent (and optionally its session) as ended"));
-const commandOpt = Options.text("command").pipe(Options.withDescription("The Bash command to (possibly) rewrite with VITEST_AGENT_* env-prefix"));
-const cwdInjectOpt = Options.text("cwd").pipe(Options.withDefault(process.cwd()), Options.withDescription("Working directory; used to find package.json scripts"));
+	}).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 injectEnvSubcommand = Command.make("inject-env", {
 	command: commandOpt,
 	cwd: cwdInjectOpt

package/commands/db.js

@@ -1,12 +1,11 @@
 import { formatDbQuery } from "../lib/format-db-query.js";
-import { NodeContext } from "@effect/platform-node";
+import * as NodeServices from "@effect/platform-node/NodeServices";
 import { layer } from "@effect/sql-sqlite-node/SqliteClient";
 import { DataStore, resolveDataPath } from "@vitest-agent/sdk";
-import { Effect } from "effect";
-import { Args, Command, Options } from "@effect/cli";
-import { SqlClient } from "@effect/sql/SqlClient";
+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 { FileSystem } from "@effect/platform";
 
 //#region src/commands/db.ts
 /**
@@ -18,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 = Options.withDefault(Options.integer("keep-recent"), 30).pipe(Options.withDescription("Number of most-recent sessions to keep in full"));
+const keepRecentOption = Flag.withDefault(Flag.integer("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 = Options.boolean("yes").pipe(Options.withDefault(false), Options.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) {
@@ -62,15 +61,15 @@ const resetCommand = Command.make("reset", { yes: yesOption }, ({ yes }) => Effe
 		}
 	}
 	const fs = yield* FileSystem.FileSystem;
-	yield* fs.remove(dbPath).pipe(Effect.catchAll(() => Effect.void));
-	yield* fs.remove(`${dbPath}-shm`).pipe(Effect.catchAll(() => Effect.void));
-	yield* fs.remove(`${dbPath}-wal`).pipe(Effect.catchAll(() => Effect.void));
+	yield* fs.remove(dbPath).pipe(Effect.catch(() => Effect.void));
+	yield* fs.remove(`${dbPath}-shm`).pipe(Effect.catch(() => Effect.void));
+	yield* fs.remove(`${dbPath}-wal`).pipe(Effect.catch(() => Effect.void));
 	yield* Effect.sync(() => {
 		process.stdout.write(`Deleted database at ${dbPath}\n`);
 	});
-}).pipe(Effect.provide(NodeContext.layer))).pipe(Command.withDescription("Wipe the database (human-only; blocked in agent contexts)"));
-const queryFormatOption = Options.choice("format", ["table", "json"]).pipe(Options.withDefault("table"), Options.withDescription("Output format for query results"));
-const sqlArg = Args.text({ name: "sql" }).pipe(Args.withDescription("Read-only SQL statement to execute against data.db"));
+}).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"));
 /**
 * Flatten an error and its cause chain into a single message so the
 * driver's `attempt to write a readonly database` text surfaces to
@@ -78,13 +77,15 @@ const sqlArg = Args.text({ name: "sql" }).pipe(Args.withDescription("Read-only S
 */
 const describeError = (error) => {
 	if (!(error instanceof Error)) return String(error);
-	const parts = [error.message];
-	let cause = error.cause;
-	while (cause instanceof Error && !parts.includes(cause.message)) {
-		parts.push(cause.message);
-		cause = cause.cause;
+	const parts = [];
+	const seen = /* @__PURE__ */ new Set();
+	let current = error;
+	while (current instanceof Error && !seen.has(current)) {
+		seen.add(current);
+		if (current.message.length > 0 && !parts.includes(current.message)) parts.push(current.message);
+		current = current.cause;
 	}
-	return parts.filter((part) => part.length > 0).join(": ");
+	return parts.join(": ");
 };
 const queryCommand = Command.make("query", {
 	sql: sqlArg,
@@ -106,7 +107,7 @@ const queryCommand = Command.make("query", {
 	}).pipe(Effect.provide(layer({
 		filename: dbPath,
 		readonly: true
-	})), Effect.catchAll((error) => Effect.sync(() => {
+	})), Effect.catch((error) => Effect.sync(() => {
 		process.stderr.write(`db query: ${describeError(error)}\n`);
 		process.exit(3);
 	})));

package/commands/doctor.js

@@ -1,7 +1,7 @@
 import { formatDoctor } from "../lib/format-doctor.js";
 import { DataReader, resolveDataPath } from "@vitest-agent/sdk";
 import { Effect, Option } from "effect";
-import { Command, Options } from "@effect/cli";
+import { Command, Flag } from "effect/unstable/cli";
 
 //#region src/commands/doctor.ts
 /**
@@ -9,7 +9,7 @@ import { Command, Options } from "@effect/cli";
 *
 * @packageDocumentation
 */
-const formatOption = Options.withDefault(Options.choice("format", ["markdown", "json"]), "markdown");
+const formatOption = Flag.withDefault(Flag.choice("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`);
@@ -23,7 +23,7 @@ const doctorCommand = Command.make("doctor", { format: formatOption }, ({ format
 		passed: true,
 		detail: `\`${dbPath}\``
 	});
-	const manifestOpt = yield* reader.getManifest().pipe(Effect.catchAll(() => Effect.succeed(Option.none())));
+	const manifestOpt = yield* reader.getManifest().pipe(Effect.catch(() => Effect.succeed(Option.none())));
 	if (Option.isNone(manifestOpt)) {
 		results.push({
 			name: "Manifest",
@@ -44,7 +44,7 @@ const doctorCommand = Command.make("doctor", { format: formatOption }, ({ format
 	const reportIssues = [];
 	for (const entry of manifest.projects) {
 		const project = entry.project;
-		const reportOpt = yield* reader.getLatestRun(project).pipe(Effect.catchAll(() => Effect.succeed(Option.none())));
+		const reportOpt = yield* reader.getLatestRun(project).pipe(Effect.catch(() => Effect.succeed(Option.none())));
 		if (Option.isNone(reportOpt)) reportIssues.push(`\`${entry.project}\` no report data`);
 		else validReports++;
 	}
@@ -68,7 +68,7 @@ const doctorCommand = Command.make("doctor", { format: formatOption }, ({ format
 		if (!(yield* reader.getHistory(project).pipe(Effect.map((h) => ({
 			ok: true,
 			record: h
-		})), Effect.catchAll(() => Effect.succeed({
+		})), Effect.catch(() => Effect.succeed({
 			ok: false,
 			record: null
 		})))).ok) historyIssues.push(`\`${entry.project}\` history read error`);

package/commands/record.js

@@ -4,25 +4,16 @@ import { recordTurnEffect } from "../lib/record-turn.js";
 import { recordRunWorkspaceChangesEffect } from "../lib/record-workspace-changes.js";
 import { DataReader, DataStore } from "@vitest-agent/sdk";
 import { Effect, Option } from "effect";
-import { Args, Command, Options } from "@effect/cli";
+import { Argument, Command, Flag } from "effect/unstable/cli";
 
 //#region src/commands/record.ts
-/**
-* CLI record command -- write session/turn data to the database.
-*
-* Hook scripts in plugin/hooks/ shell out to these subcommands. The
-* record-turn and record-session libs (in ../lib) implement the actual
-* write effects; commands here are thin \@effect/cli wrappers.
-*
-* @packageDocumentation
-*/
-const chatId = Options.text("chat-id").pipe(Options.withDescription("Host chat id (`session_id` in the Claude Code hook envelope; equivalent in other clients)"));
-const occurredAt = Options.text("occurred-at").pipe(Options.withDefault((/* @__PURE__ */ new Date()).toISOString()), Options.withDescription("ISO 8601 timestamp; defaults to now"));
-const payloadArg = Args.text({ name: "payload-json" }).pipe(Args.withDescription("Stringified JSON payload (validated against TurnPayload)"));
-const project = Options.text("project");
-const cwd = Options.text("cwd");
-const projectOptional = Options.optional(Options.text("project"));
-const cwdOptional = Options.optional(Options.text("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,
@@ -35,15 +26,15 @@ const turnSubcommand = Command.make("turn", {
 	occurredAt,
 	...project._tag === "Some" && { project: project.value },
 	...cwd._tag === "Some" && { cwd: cwd.value }
-}).pipe(Effect.flatMap((result) => Effect.sync(() => process.stdout.write(`${JSON.stringify(result)}\n`))), Effect.catchAll((err) => Effect.sync(() => {
+}).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 = Options.choice("agent-kind", ["main", "subagent"]).pipe(Options.withDefault("main"));
-const agentType = Options.optional(Options.text("agent-type"));
-const parentChatId = Options.optional(Options.text("parent-chat-id"));
-const triageWasNonEmpty = Options.boolean("triage-was-non-empty").pipe(Options.withDefault(false));
-const startedAt = Options.text("started-at").pipe(Options.withDefault((/* @__PURE__ */ new Date()).toISOString()));
+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 sessionStartSubcommand = Command.make("session-start", {
 	chatId,
 	project,
@@ -62,12 +53,12 @@ const sessionStartSubcommand = Command.make("session-start", {
 	...opts.parentChatId._tag === "Some" && { parentChatId: opts.parentChatId.value },
 	triageWasNonEmpty: opts.triageWasNonEmpty,
 	startedAt: opts.startedAt
-}).pipe(Effect.flatMap((result) => Effect.sync(() => process.stdout.write(`${JSON.stringify(result)}\n`))), Effect.catchAll((err) => Effect.sync(() => {
+}).pipe(Effect.flatMap((result) => Effect.sync(() => process.stdout.write(`${JSON.stringify(result)}\n`))), Effect.catch((err) => Effect.sync(() => {
 	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 = Options.text("ended-at").pipe(Options.withDefault((/* @__PURE__ */ new Date()).toISOString()));
-const endReason = Options.optional(Options.text("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,
@@ -76,11 +67,11 @@ const sessionEndSubcommand = Command.make("session-end", {
 	chatId: opts.chatId,
 	endedAt: opts.endedAt,
 	endReason: opts.endReason._tag === "Some" ? opts.endReason.value : null
-}).pipe(Effect.flatMap(() => Effect.sync(() => process.stdout.write(`{"ok":true}\n`))), Effect.catchAll((err) => Effect.sync(() => {
+}).pipe(Effect.flatMap(() => Effect.sync(() => process.stdout.write(`{"ok":true}\n`))), Effect.catch((err) => Effect.sync(() => {
 	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 = Options.choice("artifact-kind", [
+const artifactKindOpt = Flag.choice("artifact-kind", [
 	"test_written",
 	"test_failed_run",
 	"code_written",
@@ -88,12 +79,12 @@ const artifactKindOpt = Options.choice("artifact-kind", [
 	"refactor",
 	"test_weakened"
 ]);
-const filePathOpt = Options.optional(Options.text("file-path"));
-const testCaseIdOpt = Options.optional(Options.integer("test-case-id"));
-const testRunIdOpt = Options.optional(Options.integer("test-run-id"));
-const testFirstFailureRunIdOpt = Options.optional(Options.integer("test-first-failure-run-id"));
-const diffExcerptOpt = Options.optional(Options.text("diff-excerpt"));
-const recordedAtOpt = Options.text("recorded-at").pipe(Options.withDefault((/* @__PURE__ */ new Date()).toISOString()));
+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 tddArtifactSubcommand = Command.make("tdd-artifact", {
 	chatId,
 	project: projectOptional,
@@ -120,7 +111,7 @@ const tddArtifactSubcommand = Command.make("tdd-artifact", {
 		...opts.diffExcerpt._tag === "Some" && { diffExcerpt: opts.diffExcerpt.value },
 		recordedAt: opts.recordedAt
 	});
-}).pipe(Effect.flatMap((result) => Effect.sync(() => process.stdout.write(`${JSON.stringify(result)}\n`))), Effect.catchAll((err) => Effect.sync(() => {
+}).pipe(Effect.flatMap((result) => Effect.sync(() => process.stdout.write(`${JSON.stringify(result)}\n`))), Effect.catch((err) => Effect.sync(() => {
 	process.stderr.write(`record tdd-artifact: ${err instanceof Error ? err.message : String(err)}\n`);
 	process.exit(1);
 })))).pipe(Command.withDescription("Record a TDD artifact (D7: CLI-only)"));
@@ -133,15 +124,15 @@ const testCaseTurnsSubcommand = Command.make("test-case-turns", { chatId }, ({ c
 		updated,
 		latestTestCaseId: Option.getOrNull(latestId)
 	};
-}).pipe(Effect.flatMap((result) => Effect.sync(() => process.stdout.write(`${JSON.stringify(result)}\n`))), Effect.catchAll((err) => Effect.sync(() => {
+}).pipe(Effect.flatMap((result) => Effect.sync(() => process.stdout.write(`${JSON.stringify(result)}\n`))), Effect.catch((err) => Effect.sync(() => {
 	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 = Options.choice("invocation-method", [
+const invocationMethodOpt = Flag.choice("invocation-method", [
 	"bash",
 	"mcp",
 	"cli"
-]).pipe(Options.withDescription("How tests were invoked: \"bash\", \"mcp\", or \"cli\""), Options.withDefault("bash"));
+]).pipe(Flag.withDescription("How tests were invoked: \"bash\", \"mcp\", or \"cli\""), Flag.withDefault("bash"));
 const runTriggerSubcommand = Command.make("run-trigger", {
 	chatId,
 	invocationMethod: invocationMethodOpt
@@ -150,18 +141,18 @@ const runTriggerSubcommand = Command.make("run-trigger", {
 		chatId,
 		invocationMethod
 	});
-}).pipe(Effect.catchAll((err) => Effect.sync(() => {
+}).pipe(Effect.catch((err) => Effect.sync(() => {
 	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 = Options.text("sha");
-const parentShaOpt = Options.optional(Options.text("parent-sha"));
-const messageOpt = Options.optional(Options.text("message"));
-const authorOpt = Options.optional(Options.text("author"));
-const committedAtOpt = Options.optional(Options.text("committed-at"));
-const branchOpt = Options.optional(Options.text("branch"));
-const projectOpt = Options.optional(Options.text("project"));
-const filesArg = Args.text({ name: "files-json" }).pipe(Args.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,
@@ -186,7 +177,7 @@ const runWorkspaceChangesSubcommand = Command.make("run-workspace-changes", {
 		...opts.project._tag === "Some" && { project: opts.project.value },
 		files: parsed
 	});
-}).pipe(Effect.flatMap((result) => Effect.sync(() => process.stdout.write(`${JSON.stringify(result)}\n`))), Effect.catchAll((err) => Effect.sync(() => {
+}).pipe(Effect.flatMap((result) => Effect.sync(() => process.stdout.write(`${JSON.stringify(result)}\n`))), Effect.catch((err) => Effect.sync(() => {
 	process.stderr.write(`record run-workspace-changes: ${err instanceof Error ? err.message : String(err)}\n`);
 	process.exit(1);
 })))).pipe(Command.withDescription("Record a commit + its changed files (driven by post-commit hook)"));

package/commands/triage.js

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

package/commands/wrapup.js

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

package/index.d.ts

@@ -1,4 +1,4 @@
-import * as NodeContext from "@effect/platform-node/NodeContext";
+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";
@@ -7,8 +7,8 @@ import { DataReader, DataStore, PerClientSessionMapWriter, ProjectIdentityNotRes
  * Composition layer for the CLI runtime.
  *
  * Wires `DataReader`, `ProjectDiscovery`, `HistoryTracker`,
- * `OutputPipeline`, `SqliteClient`, the DB migrator, `NodeContext`,
- * `NodeFileSystem`, and `Logger` into a single layer the `vitest-agent`
+ * `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`
@@ -16,7 +16,7 @@ import { DataReader, DataStore, PerClientSessionMapWriter, ProjectIdentityNotRes
  * @param logFile - optional path for structured log output
  * @public
  */
-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/sql/SqlClient").SqlClient | import("@effect/sql-sqlite-node/SqliteClient").SqliteClient | NodeContext.NodeContext, SqliteMigrator.MigrationError | import("@effect/sql/SqlError").SqlError | import("effect/ConfigError").ConfigError, never>;
+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
 /**
@@ -42,7 +42,7 @@ interface SidecarPaths {
  * @param paths - the three SQLite database paths to open
  * @public
  */
-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$ | NodeContext.NodeContext, SqliteMigrator.MigrationError | import("@effect/sql/SqlError").SqlError | import("effect/ConfigError").ConfigError, never>;
+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
 /**

package/index.js

@@ -11,7 +11,7 @@ import { DATA_DB_FILENAME, REGISTRY_DB_FILENAME, SESSIONS_DB_FILENAME, resolvePr
 *
 * @public
 */
-const CURRENT_CLI_VERSION = "1.0.7";
+const CURRENT_CLI_VERSION = "2.0.0";
 
 //#endregion
 export { CURRENT_CLI_VERSION, CliLive, DATA_DB_FILENAME, REGISTRY_DB_FILENAME, SESSIONS_DB_FILENAME, SidecarLive, registerAgentEffect, resolveProjectDataDir, resolveRegistryDir, resolveSessionMapPath };

package/layers/CliLive.js

@@ -1,5 +1,4 @@
-import { NodeFileSystem } from "@effect/platform-node";
-import * as NodeContext$1 from "@effect/platform-node/NodeContext";
+import * as NodeServices from "@effect/platform-node/NodeServices";
 import { layer } from "@effect/sql-sqlite-node/SqliteClient";
 import * as SqliteMigrator from "@effect/sql-sqlite-node/SqliteMigrator";
 import { DataReaderLive, DataStoreLive, HistoryTrackerLive, LoggerLive, OutputPipelineLive, ProjectDiscoveryLive, migration0001 } from "@vitest-agent/sdk";
@@ -10,8 +9,8 @@ import { Layer } from "effect";
 * Composition layer for the CLI runtime.
 *
 * Wires `DataReader`, `ProjectDiscovery`, `HistoryTracker`,
-* `OutputPipeline`, `SqliteClient`, the DB migrator, `NodeContext`,
-* `NodeFileSystem`, and `Logger` into a single layer the `vitest-agent`
+* `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`
@@ -21,9 +20,9 @@ import { Layer } from "effect";
 */
 const CliLive = (dbPath, logLevel, logFile) => {
 	const SqliteLayer = layer({ filename: dbPath });
-	const PlatformLayer = NodeContext$1.layer;
+	const PlatformLayer = NodeServices.layer;
 	const MigratorLayer = SqliteMigrator.layer({ loader: SqliteMigrator.fromRecord({ "0001_initial": migration0001 }) }).pipe(Layer.provide(Layer.merge(SqliteLayer, PlatformLayer)));
-	return Layer.mergeAll(ProjectDiscoveryLive, HistoryTrackerLive, OutputPipelineLive).pipe(Layer.provideMerge(DataReaderLive), Layer.provideMerge(DataStoreLive), Layer.provideMerge(MigratorLayer), Layer.provideMerge(SqliteLayer), Layer.provideMerge(PlatformLayer), Layer.provideMerge(NodeFileSystem.layer), Layer.provideMerge(LoggerLive(logLevel, logFile)));
+	return Layer.mergeAll(ProjectDiscoveryLive, HistoryTrackerLive, OutputPipelineLive).pipe(Layer.provideMerge(DataReaderLive), Layer.provideMerge(DataStoreLive), Layer.provideMerge(MigratorLayer), Layer.provideMerge(SqliteLayer), Layer.provideMerge(PlatformLayer), Layer.provideMerge(LoggerLive(logLevel, logFile)));
 };
 
 //#endregion

package/layers/SidecarLive.js

@@ -1,5 +1,4 @@
-import { NodeFileSystem } from "@effect/platform-node";
-import * as NodeContext$1 from "@effect/platform-node/NodeContext";
+import * as NodeServices from "@effect/platform-node/NodeServices";
 import { layer } from "@effect/sql-sqlite-node/SqliteClient";
 import * as SqliteMigrator from "@effect/sql-sqlite-node/SqliteMigrator";
 import { DataReaderLive, DataStoreLive, DiscoveryRegistryLive, LoggerLive, PerClientSessionMapWriterLive, RunContextLive, migration0001, registryMigration0001, sessionMapMigration0001 } from "@vitest-agent/sdk";
@@ -17,7 +16,7 @@ import { Layer } from "effect";
 * @public
 */
 const SidecarLive = (paths) => {
-	const PlatformLayer = NodeContext$1.layer;
+	const PlatformLayer = NodeServices.layer;
 	const ProjectSqliteLayer = layer({ filename: paths.perProjectDbPath });
 	const ProjectMigratorLayer = SqliteMigrator.layer({ loader: SqliteMigrator.fromRecord({ "0001_initial": migration0001 }) }).pipe(Layer.provide(Layer.merge(ProjectSqliteLayer, PlatformLayer)));
 	const ProjectStoreLayer = Layer.mergeAll(DataStoreLive.pipe(Layer.provide(ProjectSqliteLayer)), DataReaderLive.pipe(Layer.provide(ProjectSqliteLayer)), ProjectMigratorLayer);
@@ -27,7 +26,7 @@ const SidecarLive = (paths) => {
 	const RegistrySqliteLayer = layer({ filename: paths.registryDbPath });
 	const RegistryMigratorLayer = SqliteMigrator.layer({ loader: SqliteMigrator.fromRecord({ "0001_initial": registryMigration0001 }) }).pipe(Layer.provide(Layer.merge(RegistrySqliteLayer, PlatformLayer)));
 	const RegistryLayer = Layer.mergeAll(DiscoveryRegistryLive.pipe(Layer.provide(RegistrySqliteLayer)), RegistryMigratorLayer);
-	return Layer.mergeAll(ProjectStoreLayer, SessionMapLayer, RegistryLayer, RunContextLive).pipe(Layer.provideMerge(PlatformLayer), Layer.provideMerge(NodeFileSystem.layer), Layer.provideMerge(LoggerLive()));
+	return Layer.mergeAll(ProjectStoreLayer, SessionMapLayer, RegistryLayer, RunContextLive).pipe(Layer.provideMerge(PlatformLayer), Layer.provideMerge(LoggerLive()));
 };
 
 //#endregion

package/lib/record-turn.js

@@ -13,14 +13,14 @@ const parseAndValidateTurnPayload = (raw) => {
 			error: `Invalid JSON: ${e instanceof Error ? e.message : String(e)}`
 		};
 	}
-	const decoded = Schema.decodeUnknownEither(TurnPayload)(parsed);
-	if (decoded._tag === "Left") return {
+	const decoded = Schema.decodeUnknownResult(TurnPayload)(parsed);
+	if (decoded._tag === "Failure") return {
 		ok: false,
-		error: `Invalid TurnPayload: ${decoded.left.message}`
+		error: `Invalid TurnPayload: ${decoded.failure.message}`
 	};
 	return {
 		ok: true,
-		payload: decoded.right
+		payload: decoded.success
 	};
 };
 const recordTurnEffect = (input) => Effect.gen(function* () {

package/lib/record-workspace-changes.js

@@ -1,23 +1,9 @@
 import { DataStore } from "@vitest-agent/sdk";
 import { Effect } from "effect";
-import { SqlClient } from "@effect/sql/SqlClient";
+import { SqlClient } from "effect/unstable/sql/SqlClient";
 
 //#region src/lib/record-workspace-changes.ts
 /**
-* Lib function for the `record run-workspace-changes` CLI subcommand.
-*
-* Driven by the PostToolUse hook on `git commit` / `git push`. Writes a
-* commits row (idempotent on sha via ON CONFLICT DO NOTHING in
-* DataStore.writeCommit) and zero or more run_changed_files rows.
-*
-* Optionally associates the changed files with a test_run_id; for the
-* commit-side write path we don't have a run, so we associate the files
-* with the most-recent test_run for the project (best-effort) or skip
-* the file rows entirely if no test_run exists yet.
-*
-* @packageDocumentation
-*/
-/**
 * `ProjectRunSummary` doesn't expose `lastRunId`, so we query it directly
 * via SqlClient. This is the run id of the most-recent test run for a
 * given project (or any project, when `project` is unspecified). Used

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vitest-agent/cli",
-	"version": "1.0.7",
+	"version": "2.0.0",
 	"private": false,
 	"description": "On-demand CLI for vitest-agent. Reads cached test data and reports status, overview, coverage, history, trends, and cache health.",
 	"keywords": [
@@ -29,7 +29,8 @@
 	"exports": {
 		".": {
 			"types": "./index.d.ts",
-			"import": "./index.js"
+			"import": "./index.js",
+			"default": "./index.js"
 		},
 		"./package.json": "./package.json"
 	},
@@ -37,21 +38,11 @@
 		"vitest-agent": "bin/vitest-agent.js"
 	},
 	"dependencies": {
-		"@effect/cli": "^0.75.2",
-		"@effect/cluster": "^0.59.0",
-		"@effect/experimental": "^0.60.0",
-		"@effect/platform": "^0.96.2",
-		"@effect/platform-node": "^0.107.0",
-		"@effect/printer": "^0.49.0",
-		"@effect/printer-ansi": "^0.49.0",
-		"@effect/rpc": "^0.75.1",
-		"@effect/sql": "^0.51.1",
-		"@effect/sql-sqlite-node": "^0.52.0",
-		"@effect/typeclass": "^0.40.0",
-		"@effect/workflow": "^0.18.2",
-		"@vitest-agent/sdk": "1.3.3",
-		"@vitest-agent/sidecar": "1.0.2",
-		"effect": "^3.21.4"
+		"@effect/platform-node": "4.0.0-beta.98",
+		"@effect/sql-sqlite-node": "4.0.0-beta.98",
+		"@vitest-agent/sdk": "2.0.0",
+		"@vitest-agent/sidecar": "2.0.0",
+		"effect": "4.0.0-beta.98"
 	},
 	"engines": {
 		"node": ">=24.11.0"

package/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.58.9"
+      "packageVersion": "7.58.10"
     }
   ]
 }