@vitest-agent/cli 4.1.2 → 4.1.4

package/commands/agent.js

@@ -1,15 +1,16 @@
+import { currentCwd } from "./flag-defaults.js";
 import { recordCommand } from "./record.js";
 import { triageCommand } from "./triage.js";
 import { wrapupCommand } from "./wrapup.js";
-import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { SidecarPlatformLive, endAgentEffect, registerAgentEffect, resolveHookPaths, resolveProjectKeyFromCwd } from "@vitest-agent/engine";
 import { Cause, Effect, Option } from "effect";
 import { Argument, Command, Flag } from "effect/cli";
 import { existsSync, readFileSync } from "node:fs";
+import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { findWorkspaceRootSync, getWorkspacePackagesSync } from "@effected/workspaces";
 import { nodeSyncOps } from "@effected/workspaces/node-sync";
-import { classifyTestPath, detectNonDefaultDiscoverStrategy, findOwningWorkspace } from "@vitest-agent/sdk";
+import { VITEST_CONFIG_FILES, classifyTestPath, detectNonDefaultDiscoverStrategy, findOwningWorkspace } from "@vitest-agent/sdk";
 import { exitCodeForTag, injectEnv } from "@vitest-agent/sdk/dispatch";
 import { resolveSidecarBinaryPath } from "@vitest-agent/sidecar";
 
@@ -80,7 +81,7 @@ const registerAgentSubcommand = Command.make("register-agent", {
 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 endCwdOpt = Flag.String("cwd").pipe(Flag.withDefault(currentCwd), 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,
@@ -103,7 +104,7 @@ const endAgentSubcommand = Command.make("end-agent", {
 	}).pipe(Effect.provide(sidecar, { local: true }), 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 cwdInjectOpt = Flag.String("cwd").pipe(Flag.withDefault(currentCwd), Flag.withDescription("Working directory; used to find package.json scripts"));
 const injectEnvSubcommand = Command.make("inject-env", {
 	command: commandOpt,
 	cwd: cwdInjectOpt
@@ -147,29 +148,9 @@ function crossesNestedPackageBoundary(ownerPath, filePath) {
 	return false;
 }
 /**
-* Candidate Vitest/Vite config filenames at a workspace root, in the order
-* Vitest itself would prefer them. `vite.config.*` is a fallback for a
-* workspace that configures the plugin through Vite directly rather than a
-* dedicated `vitest.config.*`.
-* @internal
-*/
-const VITEST_CONFIG_CANDIDATES = [
-	"vitest.config.ts",
-	"vitest.config.mts",
-	"vitest.config.js",
-	"vitest.config.mjs",
-	"vitest.workspace.ts",
-	"vitest.workspace.mts",
-	"vitest.workspace.js",
-	"vitest.workspace.mjs",
-	"vite.config.ts",
-	"vite.config.mts",
-	"vite.config.js",
-	"vite.config.mjs"
-];
-/**
 * Reads the first Vitest/Vite config file found at `root`, returning its
-* source text, or `null` when none of {@link VITEST_CONFIG_CANDIDATES} exists
+* source text, or `null` when none of sdk's `VITEST_CONFIG_FILES` (the names
+* Vitest 5 itself loads, in its order) exists
 * or the file that does exist cannot be read.
 *
 * A `null` result is deliberately indistinguishable between "no config file"
@@ -178,7 +159,7 @@ const VITEST_CONFIG_CANDIDATES = [
 * @internal
 */
 function readWorkspaceVitestConfigSource(root) {
-	for (const candidate of VITEST_CONFIG_CANDIDATES) {
+	for (const candidate of VITEST_CONFIG_FILES) {
 		const candidatePath = join(root, candidate);
 		if (!existsSync(candidatePath)) continue;
 		try {

package/commands/flag-defaults.js

@@ -0,0 +1,9 @@
+import { DateTime, Effect } from "effect";
+
+// src/commands/flag-defaults.ts
+/** The current instant as an ISO 8601 string, read from the `Clock` when the flag is absent. */
+const nowIso = Effect.map(DateTime.now, DateTime.formatIso);
+/** The process working directory, read when the flag is absent. */
+const currentCwd = Effect.sync(() => process.cwd());
+
+export { currentCwd, nowIso };

package/commands/record.js

@@ -1,11 +1,13 @@
+import { nowIso } from "./flag-defaults.js";
 import { ProjectDataLive } from "../layers/project-data.js";
+import { Fmt } from "@effected/cli";
 import { DataReader, DataStore, dispatchRecordTddArtifactEffect, recordRunWorkspaceChangesEffect, recordSessionEnd, recordSessionStart, recordTurnEffect } from "@vitest-agent/engine";
 import { Effect, Option } from "effect";
 import { Argument, Command, Flag } from "effect/cli";
 
 // 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 occurredAt = Flag.String("occurred-at").pipe(Flag.withDefault(nowIso), 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");
@@ -24,14 +26,14 @@ const turnSubcommand = Command.make("turn", {
 	...project._tag === "Some" && { project: project.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.stderr.write(`record turn: ${Fmt.describe(err)}\n`);
 	process.exit(1);
 })))).pipe(Command.withDescription("Validate a TurnPayload JSON and write a turn row"));
 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 startedAt = Flag.String("started-at").pipe(Flag.withDefault(nowIso));
 const sessionStartSubcommand = Command.make("session-start", {
 	chatId,
 	project,
@@ -51,10 +53,10 @@ const sessionStartSubcommand = Command.make("session-start", {
 	triageWasNonEmpty: opts.triageWasNonEmpty,
 	startedAt: opts.startedAt
 }).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.stderr.write(`record session-start: ${Fmt.describe(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 endedAt = Flag.String("ended-at").pipe(Flag.withDefault(nowIso));
 const endReason = Flag.optional(Flag.String("end-reason"));
 const sessionEndSubcommand = Command.make("session-end", {
 	chatId,
@@ -65,7 +67,7 @@ const sessionEndSubcommand = Command.make("session-end", {
 	endedAt: opts.endedAt,
 	endReason: opts.endReason._tag === "Some" ? opts.endReason.value : null
 }).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.stderr.write(`record session-end: ${Fmt.describe(err)}\n`);
 	process.exit(1);
 })))).pipe(Command.withDescription("Update sessions.ended_at + end_reason"));
 const artifactKindOpt = Flag.Literals("artifact-kind", [
@@ -81,7 +83,7 @@ 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 recordedAtOpt = Flag.String("recorded-at").pipe(Flag.withDefault(nowIso));
 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."));
@@ -116,7 +118,7 @@ const tddArtifactSubcommand = Command.make("tdd-artifact", {
 		suite: opts.suite
 	});
 }).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.stderr.write(`record tdd-artifact: ${Fmt.describe(err)}\n`);
 	process.exit(1);
 })))).pipe(Command.withDescription("Record a TDD artifact (D7: CLI-only)"));
 const testCaseTurnsSubcommand = Command.make("test-case-turns", { chatId }, ({ chatId }) => Effect.gen(function* () {
@@ -129,7 +131,7 @@ const testCaseTurnsSubcommand = Command.make("test-case-turns", { chatId }, ({ c
 		latestTestCaseId: Option.getOrNull(latestId)
 	};
 }).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.stderr.write(`record test-case-turns: ${Fmt.describe(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.Literals("invocation-method", [
@@ -146,7 +148,7 @@ const runTriggerSubcommand = Command.make("run-trigger", {
 		invocationMethod
 	});
 }).pipe(Effect.catch((err) => Effect.sync(() => {
-	process.stderr.write(`record run-trigger: ${err instanceof Error ? err.message : String(err)}\n`);
+	process.stderr.write(`record run-trigger: ${Fmt.describe(err)}\n`);
 	process.exit(1);
 })))).pipe(Command.withDescription("Associate the latest test run with the current Claude Code session"));
 const shaOpt = Flag.String("sha");
@@ -169,7 +171,7 @@ const runWorkspaceChangesSubcommand = Command.make("run-workspace-changes", {
 }, (opts) => Effect.gen(function* () {
 	const parsed = yield* Effect.try({
 		try: () => JSON.parse(opts.files),
-		catch: (e) => /* @__PURE__ */ new Error(`Invalid files-json: ${e instanceof Error ? e.message : String(e)}`)
+		catch: (e) => /* @__PURE__ */ new Error(`Invalid files-json: ${Fmt.describe(e)}`)
 	});
 	return yield* recordRunWorkspaceChangesEffect({
 		sha: opts.sha,
@@ -182,7 +184,7 @@ const runWorkspaceChangesSubcommand = Command.make("run-workspace-changes", {
 		files: parsed
 	});
 }).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.stderr.write(`record run-workspace-changes: ${Fmt.describe(err)}\n`);
 	process.exit(1);
 })))).pipe(Command.withDescription("Record a commit + its changed files (driven by post-commit hook)"));
 const recordCommand = Command.make("record").pipe(Command.withSubcommands([

package/lib/format-db-query.js

@@ -1,3 +1,5 @@
+import { Fmt } from "@effected/cli";
+
 // src/lib/format-db-query.ts
 const renderCell = (value) => {
 	if (value === null || value === void 0) return "NULL";
@@ -8,7 +10,8 @@ const renderCell = (value) => {
 * Render query rows as whitespace-padded tabular text or a JSON array.
 *
 * Table format: column headers in the first line, one row per line,
-* each cell padded to its column's widest value. An empty result set
+* each cell padded to its column's widest value, measured in terminal
+* columns (`Fmt.width`: a wide character counts two). An empty result set
 * renders as `(0 rows)`. JSON format emits a single array of row
 * objects keyed by column name; an empty result set is `[]`.
 */
@@ -17,8 +20,8 @@ const formatDbQuery = (rows, format) => {
 	if (rows.length === 0) return "(0 rows)";
 	const columns = Object.keys(rows[0]);
 	const cells = rows.map((row) => columns.map((col) => renderCell(row[col])));
-	const widths = columns.map((col, i) => Math.max(col.length, ...cells.map((row) => row[i].length)));
-	const renderLine = (values) => values.map((value, i) => value.padEnd(widths[i])).join("  ").trimEnd();
+	const widths = columns.map((col, i) => Math.max(Fmt.width(col), ...cells.map((row) => Fmt.width(row[i]))));
+	const renderLine = (values) => values.map((value, i) => Fmt.pad(value, widths[i])).join("  ").trimEnd();
 	return [renderLine(columns), ...cells.map(renderLine)].join("\n");
 };
 

package/lib/version-formatter.js

@@ -1,11 +1,13 @@
-import { distributionSuffix } from "@effected/engine";
-
 // src/lib/version-formatter.ts
 /**
-* The `CliOutput.Formatter` methods `main.ts` replaces through
+* The `CliOutput.Formatter` method `main.ts` replaces through
 * `CliRuntime.main`'s `env.formatter`: only `formatVersion`, so `--version`
-* prints `vitest-agent <cli version>` plus ` via <name> <version>` when a
-* carrier (`@vitest-agent/plugin`'s bin shim) passed its identity to `main`.
+* prints `vitest-agent <cli version>` (core's default formatter writes
+* `<name> v<version>`, and the published output has no `v`).
+*
+* The carrier's ` via <name> <version>` is not added here: `CliRuntime.main`'s
+* `distribution` option wraps whichever `formatVersion` is in effect, this
+* one included, and provides `CurrentDistribution` alongside.
 *
 * `env.formatter` is the kit's one way to keep a formatter method of our own:
 * `main` installs its coloured default formatter inside the platform, which
@@ -13,15 +15,8 @@ import { distributionSuffix } from "@effected/engine";
 * kit's coloured default, and `helpOnUsageError: "stderr"` still wraps the
 * result, so usage-error help keeps going to stderr.
 *
-* `distribution` is the same value `main.ts` provides as `CurrentDistribution`;
-* it is known when `main` is called, so it is read here directly rather than
-* from the context when `--version` runs.
-*
 * @internal
 */
-const carrierVersionFormatter = (distribution) => {
-	const suffix = distributionSuffix(distribution);
-	return { formatVersion: (name, version) => `${name} ${version}${suffix}` };
-};
+const plainVersionFormatter = { formatVersion: (name, version) => `${name} ${version}` };
 
-export { carrierVersionFormatter };
+export { plainVersionFormatter };

package/main.d.ts

@@ -23,9 +23,10 @@ export interface MainOptions {
  * `@effected/env` services (`Audience` with the `VITEST_AGENT_AUDIENCE`
  * override, `TerminalEnv`, `CliTheme`, `CliInteractive`, the gated `Terminal`)
  * plus the kit's colour-decided help formatter, inside failure reporting.
- * `env.formatter` replaces only that formatter's `formatVersion`, so
- * `--version` names the carrier (`via @vitest-agent/plugin <version>`) when
- * `options.distribution` is given; the same value is provided as
+ * `env.formatter` replaces only that formatter's `formatVersion` (no `v`
+ * before the version), and `CliRuntime.main`'s `distribution` option wraps
+ * it, so `--version` names the carrier (`via @vitest-agent/plugin <version>`)
+ * when `options.distribution` is given; the kit provides the same value as
  * `CurrentDistribution`. An audience flag recomputes `CliInteractive` from the
  * TTY facts, so `--human` in an agent-detected shell (Claude Code's terminal)
  * at a real terminal may prompt.

package/main.js

@@ -4,14 +4,12 @@ import { agentCommand } from "./commands/agent.js";
 import { dbCommand } from "./commands/db.js";
 import { doctorCommand } from "./commands/doctor.js";
 import { renderFailure } from "./lib/render-failure.js";
-import { carrierVersionFormatter } from "./lib/version-formatter.js";
-import { isAbsolute, relative } from "node:path";
+import { plainVersionFormatter } from "./lib/version-formatter.js";
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { CliAudience, CliRuntime } from "@effected/cli";
-import { CurrentDistribution } from "@effected/engine";
 import { PathResolutionLive, resolveProjectDir } from "@vitest-agent/engine";
-import { Effect, Layer, Option } from "effect";
+import { Layer } from "effect";
 import { Command } from "effect/cli";
 
 // src/main.ts
@@ -52,9 +50,10 @@ const rootCommand = Command.make("vitest-agent").pipe(Command.withSharedFlags(Cl
 * `@effected/env` services (`Audience` with the `VITEST_AGENT_AUDIENCE`
 * override, `TerminalEnv`, `CliTheme`, `CliInteractive`, the gated `Terminal`)
 * plus the kit's colour-decided help formatter, inside failure reporting.
-* `env.formatter` replaces only that formatter's `formatVersion`, so
-* `--version` names the carrier (`via @vitest-agent/plugin <version>`) when
-* `options.distribution` is given; the same value is provided as
+* `env.formatter` replaces only that formatter's `formatVersion` (no `v`
+* before the version), and `CliRuntime.main`'s `distribution` option wraps
+* it, so `--version` names the carrier (`via @vitest-agent/plugin <version>`)
+* when `options.distribution` is given; the kit provides the same value as
 * `CurrentDistribution`. An audience flag recomputes `CliInteractive` from the
 * TTY facts, so `--human` in an agent-detected shell (Claude Code's terminal)
 * at a real terminal may prompt.
@@ -102,19 +101,15 @@ const main = (options = {}) => {
 		dir: projectDir,
 		env
 	}), PathResolutionLive(projectDir)).pipe(Layer.provideMerge(NodeServices.layer));
-	const distribution = Option.fromNullishOr(options.distribution);
-	const displayPath = (absolute) => {
-		const rel = relative(projectDir, absolute);
-		return rel === "" || rel.startsWith("..") || isAbsolute(rel) ? absolute : rel;
-	};
 	const program = CliRuntime.main(CliAudience.run(rootCommand, { version: CURRENT_CLI_VERSION }), {
 		platform,
 		render: renderFailure,
 		helpOnUsageError: "stderr",
+		...options.distribution !== void 0 ? { distribution: options.distribution } : {},
 		env: {
 			audienceEnvVar: AUDIENCE_ENV_VAR,
-			formatter: carrierVersionFormatter(distribution),
-			displayPath,
+			formatter: plainVersionFormatter,
+			displayPath: { relativeTo: projectDir },
 			log: {
 				envVar: "VITEST_REPORTER_LOG_LEVEL",
 				format: "auto",
@@ -122,7 +117,7 @@ const main = (options = {}) => {
 				file: { envVar: "VITEST_REPORTER_LOG_FILE" }
 			}
 		}
-	}).pipe(Effect.provideService(CurrentDistribution, distribution));
+	});
 	NodeRuntime.runMain(program);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vitest-agent/cli",
-	"version": "4.1.2",
+	"version": "4.1.4",
 	"private": false,
 	"description": "On-demand CLI for vitest-agent. Reads cached test data and reports status, overview, coverage, history, trends, and cache health.",
 	"keywords": [
@@ -45,16 +45,16 @@
 	"dependencies": {
 		"@effect/platform-node": "^4.0.6",
 		"@effect/sql-sqlite-node": "^4.0.6",
-		"@effected/cli": "^0.22.1",
-		"@effected/config-file": "^0.20.0",
-		"@effected/engine": "^0.8.0",
-		"@effected/env": "^0.5.0",
-		"@effected/glob": "^0.14.0",
-		"@effected/walker": "^0.20.0",
-		"@effected/workspaces": "^0.38.1",
-		"@vitest-agent/engine": "2.0.1",
-		"@vitest-agent/sdk": "8.0.0",
-		"@vitest-agent/sidecar": "2.2.14",
+		"@effected/cli": "^0.23.0",
+		"@effected/config-file": "^0.21.0",
+		"@effected/engine": "^0.9.0",
+		"@effected/env": "^0.6.0",
+		"@effected/glob": "^0.15.0",
+		"@effected/walker": "^0.21.0",
+		"@effected/workspaces": "^0.39.1",
+		"@vitest-agent/engine": "3.0.0",
+		"@vitest-agent/sdk": "9.0.0",
+		"@vitest-agent/sidecar": "2.2.15",
 		"effect": "^4.0.6"
 	},
 	"engines": {

package/version.js

@@ -7,6 +7,6 @@
 *
 * @public
 */
-const CURRENT_CLI_VERSION = "4.1.2";
+const CURRENT_CLI_VERSION = "4.1.4";
 
 export { CURRENT_CLI_VERSION };