@okfit/cli 0.5.3 → 0.6.0

package/README.md

@@ -14,6 +14,13 @@ okfit context [path] [--config <file>] [--format human|json] [--help]
 okfit verify <id> [path] [--config <file>] [--at <iso>] [--dry-run] [--format human|json] [--help]
 ```
 
+`okfit --version` prints `okfit <cli> (engine <engine>, okf <okf>,
+config-schema <schema>)` — for example `okfit 0.5.4 (engine 0.6.0, okf 0.2,
+config-schema 1.0)`, or `okfit 0.5.4 via @okfit/plugin 0.3.7 (engine 0.6.0,
+okf 0.2, config-schema 1.0)` when installed through the meta-package. The
+engine, OKF, and config-schema versions decide what a report says and what
+a config may contain; the CLI version is packaging.
+
 `[path]` is the **project root** on every subcommand — the directory discovery
 starts from, and, for `init`, where `.config/okfit.toml` is written.
 It is never the bundle root; the bundle root is `<project root>/<bundle.path>`
@@ -277,8 +284,10 @@ nothing else (no summary line, no warnings — those still go to stderr):
 ```json
 {
  "schema": 1,
- "okfit_version": "0.1.0",
+ "okfit_version": "0.5.4",
+ "engine_version": "0.6.0",
  "producer": "okfit",
+ "distribution": null,
  "okf_version": "0.2",
  "root": "/abs/path/to/my-repo/okf",
  "profile": "software-project",
@@ -311,15 +320,21 @@ nothing else (no summary line, no warnings — those still go to stderr):
 }
 ```
 
-`profile` is `null` when the config sets `bundle.profile = "none"` or names a
-profile `okfit` does not recognise. `range` is zero-based, exactly as
+`engine_version` and `okf_version` are the pair to compare across reports:
+the MCP server's `validate_bundle` tool returns this same envelope with the
+same two values over one bundle, and differs only in `okfit_version` (its own
+version) and `producer` (`@okfit/mcp`). `distribution` names the
+meta-package the bin was installed through (`{ "name": "@okfit/plugin",
+"version": "0.3.7" }`) and is `null` for a direct install. `profile` is
+`null` when the config sets `bundle.profile = "none"` or names a profile
+`okfit` does not recognise. `range` is zero-based, exactly as
 `@okfit/core` computed it, and omitted for a range-less diagnostic.
 
 An infrastructure failure under `--format json` prints a different, smaller
 envelope to stdout and exits `3`:
 
 ```json
-{ "schema": 1, "okfit_version": "0.1.0", "exit_code": 3, "error": { "tag": "ConfigPathNotFoundError", "message": "config path not found: /abs/ci-config.toml" } }
+{ "schema": 1, "okfit_version": "0.5.4", "engine_version": "0.6.0", "distribution": null, "exit_code": 3, "error": { "tag": "ConfigPathNotFoundError", "message": "config path not found: /abs/ci-config.toml" } }
 ```
 
 `init` has no `--format`; it is human output only.
@@ -330,6 +345,7 @@ one above:
 ```json
 {
  "schema": 1,
+ "config_schema_version": "1.0",
  "project_root": "/abs/path/to/my-repo",
  "bundle_root": "/abs/path/to/my-repo/okf",
  "config_path": null,

package/commands/context.js

@@ -1,3 +1,4 @@
+import { Distribution } from "../internal/distribution.js";
 import { setExitCode } from "../internal/exit.js";
 import { humanContext } from "../render/context.js";
 import { CLI_VERSION } from "../version.js";
@@ -35,6 +36,7 @@ const contextCommand = Command.make("context", {
 }, (input) => Effect.gen(function* () {
 	const cwd = process.cwd();
 	const discoveryCwd = Option.getOrElse(input.path, () => cwd);
+	const distribution = yield* Distribution;
 	const body = Effect.gen(function* () {
 		const { projectRoot, bundleRoot, config: merged, profile, profileName, discovered } = yield* resolveProjectConfig({
 			pathArg: input.path,
@@ -67,7 +69,7 @@ const contextCommand = Command.make("context", {
 		explicitConfigPath: input.config,
 		discoveryCwd
 	}));
-	if (input.format === "json") return yield* body.pipe(Effect.tapError((error) => Console.log(JSON.stringify(jsonError(error, CLI_VERSION)))));
+	if (input.format === "json") return yield* body.pipe(Effect.tapError((error) => Console.log(JSON.stringify(jsonError(error, CLI_VERSION, Option.getOrUndefined(distribution))))));
 	return yield* body;
 })).pipe(Command.withDescription("Print the resolved project root, bundle root, config path, profile, and type/tag vocabulary without loading the bundle."));
 

package/commands/graph.js

@@ -1,3 +1,4 @@
+import { Distribution } from "../internal/distribution.js";
 import { setExitCode } from "../internal/exit.js";
 import { CLI_VERSION } from "../version.js";
 import { Argument, Command, Flag } from "effect/unstable/cli";
@@ -39,6 +40,7 @@ const graphCommand = Command.make("graph", {
 }, (input) => Effect.gen(function* () {
 	const cwd = process.cwd();
 	const discoveryCwd = Option.getOrElse(input.path, () => cwd);
+	const distribution = yield* Distribution;
 	const body = Effect.gen(function* () {
 		const { bundleRoot, config: merged, profile } = yield* resolveProjectConfig({
 			pathArg: input.path,
@@ -57,7 +59,8 @@ const graphCommand = Command.make("graph", {
 					onSome: (p) => p.name
 				}),
 				nodes: result.graph.nodes,
-				edges: result.graph.edges
+				edges: result.graph.edges,
+				...Option.isSome(distribution) ? { distribution: distribution.value } : {}
 			});
 			yield* Console.log(JSON.stringify(Schema.encodeSync(GraphEnvelope)(envelope)));
 		} else if (input.format === "dot") yield* Console.log(result.graph.toGraphViz());
@@ -67,7 +70,7 @@ const graphCommand = Command.make("graph", {
 		explicitConfigPath: input.config,
 		discoveryCwd
 	}));
-	if (input.format === "json") return yield* body.pipe(Effect.tapError((error) => Console.log(JSON.stringify(jsonError(error, CLI_VERSION)))));
+	if (input.format === "json") return yield* body.pipe(Effect.tapError((error) => Console.log(JSON.stringify(jsonError(error, CLI_VERSION, Option.getOrUndefined(distribution))))));
 	return yield* body;
 })).pipe(Command.withDescription("Render the bundle's link graph: frontmatter path fields and body links, as Mermaid, DOT, or JSON."));
 

package/commands/init.js

@@ -2,9 +2,9 @@ import { setExitCode } from "../internal/exit.js";
 import { useColor } from "../internal/tty.js";
 import { displayRoot, human, summary } from "../render/human.js";
 import { Argument, Command, Flag } from "effect/unstable/cli";
-import { CONFIG_RELATIVE_PATH, InitOverwriteError, Now, SCHEMA_DIRECTIVE, collect, configValue, files, forDiagnostics, provideConfig, resolveBundleRoot, resolveProjectRoot, run, targetPaths } from "@okfit/engine";
+import { CONFIG_RELATIVE_PATH, InitOverwriteError, Now, collect, configValue, files, forDiagnostics, provideConfig, resolveBundleRoot, resolveProjectRoot, run, targetPaths } from "@okfit/engine";
 import { Console, DateTime, Effect, FileSystem, Layer, Option, Path } from "effect";
-import { OKF_SPEC_VERSION, OkfitConfig, OkfitConfigFile } from "@okfit/core";
+import { OKF_SPEC_VERSION, OkfitConfig, OkfitConfigFile, SCHEMA_DIRECTIVE } from "@okfit/core";
 import { Git } from "@effected/git";
 import { GitHistory, Profiles } from "@okfit/profiles";
 

package/commands/lint.js

@@ -1,3 +1,4 @@
+import { Distribution } from "../internal/distribution.js";
 import { setExitCode } from "../internal/exit.js";
 import { CLI_VERSION } from "../version.js";
 import { useColor } from "../internal/tty.js";
@@ -42,6 +43,7 @@ const lintCommand = Command.make("lint", {
 	const discoveryCwd = Option.getOrElse(input.path, () => cwd);
 	const now = yield* Now;
 	const path = yield* Path.Path;
+	const distribution = yield* Distribution;
 	const body = Effect.gen(function* () {
 		const { bundleRoot, config: merged, profile } = yield* resolveProjectConfig({
 			pathArg: input.path,
@@ -69,7 +71,8 @@ const lintCommand = Command.make("lint", {
 				}),
 				exitCode: code,
 				concepts: result.bundle.concepts.size,
-				diagnostics
+				diagnostics,
+				...Option.isSome(distribution) ? { distribution: distribution.value } : {}
 			});
 			yield* Console.log(JSON.stringify(Schema.encodeSync(JsonEnvelope)(envelope)));
 		} else {
@@ -87,7 +90,7 @@ const lintCommand = Command.make("lint", {
 		explicitConfigPath: input.config,
 		discoveryCwd
 	}));
-	if (input.format === "json") return yield* body.pipe(Effect.tapError((error) => Console.log(JSON.stringify(jsonError(error, CLI_VERSION)))));
+	if (input.format === "json") return yield* body.pipe(Effect.tapError((error) => Console.log(JSON.stringify(jsonError(error, CLI_VERSION, Option.getOrUndefined(distribution))))));
 	return yield* body;
 })).pipe(Command.withDescription("Load config and bundle, run lint checks (and the profile check), and render the diagnostics; never conformance."));
 

package/commands/stale.js

@@ -1,3 +1,4 @@
+import { Distribution } from "../internal/distribution.js";
 import { setExitCode } from "../internal/exit.js";
 import { CLI_VERSION } from "../version.js";
 import { displayRoot } from "../render/human.js";
@@ -35,6 +36,7 @@ const staleCommand = Command.make("stale", {
 	const discoveryCwd = Option.getOrElse(input.path, () => cwd);
 	const now = yield* Now;
 	const path = yield* Path.Path;
+	const distribution = yield* Distribution;
 	const body = Effect.gen(function* () {
 		const { bundleRoot, config: merged, profile } = yield* resolveProjectConfig({
 			pathArg: input.path,
@@ -56,7 +58,8 @@ const staleCommand = Command.make("stale", {
 			}),
 			now,
 			concepts: result.bundle.concepts.size,
-			items: result.items
+			items: result.items,
+			...Option.isSome(distribution) ? { distribution: distribution.value } : {}
 		});
 		if (input.format === "json") yield* Console.log(JSON.stringify(Schema.encodeSync(StaleEnvelope)(envelope)));
 		else {
@@ -68,7 +71,7 @@ const staleCommand = Command.make("stale", {
 		explicitConfigPath: input.config,
 		discoveryCwd
 	}));
-	if (input.format === "json") return yield* body.pipe(Effect.tapError((error) => Console.log(JSON.stringify(jsonError(error, CLI_VERSION)))));
+	if (input.format === "json") return yield* body.pipe(Effect.tapError((error) => Console.log(JSON.stringify(jsonError(error, CLI_VERSION, Option.getOrUndefined(distribution))))));
 	return yield* body;
 })).pipe(Command.withDescription("List every concept whose stale_after instant has passed as of now, with how many whole days past it."));
 

package/commands/sync.js

@@ -1,10 +1,11 @@
+import { Distribution } from "../internal/distribution.js";
 import { setExitCode } from "../internal/exit.js";
 import { CLI_VERSION } from "../version.js";
 import { displayRoot } from "../render/human.js";
 import { humanSync } from "../render/sync.js";
 import { Argument, Command, Flag } from "effect/unstable/cli";
-import { SyncEnvelope, jsonError, provideConfig, resolveProjectConfig, runSync, syncEnvelope } from "@okfit/engine";
-import { Console, Effect, Layer, Option, Path, Schema } from "effect";
+import { Now, SyncEnvelope, jsonError, provideConfig, resolveProjectConfig, runSync, syncEnvelope } from "@okfit/engine";
+import { Console, DateTime, Effect, Layer, Option, Path, Schema } from "effect";
 import { Git } from "@effected/git";
 import { GitHistory } from "@okfit/profiles";
 
@@ -38,23 +39,30 @@ const onlyFlag = Flag.Literals("only", [
 ]).pipe(Flag.atLeast(0), Flag.withDescription("restrict the run to these modes (repeatable: --only generated --only index); default: all three"));
 const dryRunFlag = Flag.Boolean("dry-run").pipe(Flag.withDefault(false), Flag.withDescription("compute every result and write nothing"));
 const formatFlag = Flag.Literals("format", ["human", "json"]).pipe(Flag.withDefault("human"), Flag.withDescription("output format: human (default) or json"));
+/** #18: log mode's inclusive floor; a malformed value fails at parse time (`ShowHelp` -> exit `64`). */
+const ISO_DATE = Schema.String.pipe(Schema.check(Schema.isPattern(/^\d{4}-\d{2}-\d{2}$/, { message: "Expected a YYYY-MM-DD date" })));
+const sinceFlag = Flag.String("since").pipe(Flag.withSchema(ISO_DATE), Flag.optional, Flag.withDescription("log mode's inclusive floor (YYYY-MM-DD): consider every committed concept dated on or after it; default: the newest date already in log.md"));
+const stagedFlag = Flag.Boolean("staged").pipe(Flag.withDefault(false), Flag.withDescription("pre-commit mode: stamp only the concepts in the git index, with now as generated.at, and re-add what was written; log mode is excluded (default modes: generated, index)"));
 /**
 * `okfit sync [path] [--config <file>] [--only <mode>]... [--dry-run]
-* [--format human|json]`.
+* [--format human|json] [--since <YYYY-MM-DD>] [--staged]`.
 *
 * Handler order fixed by contract §4.3. Steps 1–3 are `context`'s/
 * `validate`'s handler in substance — stat `--config` (K-1) via
 * `provideConfig`, resolve the project and bundle roots through
 * `resolveProjectConfig` — then it diverges: build the `--only` mode
-* set (default: all three, order irrelevant — `runSync`'s own fixed
-* order wins, not `--only`'s occurrence order), run `runSync` with BOTH
-* `Git.layer` and `GitHistory.layer` provided (S-16, mirroring
-* `verify.ts:134`'s `Git.layer`-alone provision one layer up: here two
-* layers are needed because `GitHistory.layer` does not re-expose `Git`
-* even though it is built on it), render, and always exit `0`. There is
-* no content tier: every typed failure is exit `3` through `bin.ts`'s
-* existing `reportFailures`; an unknown `--only` token never reaches
-* this handler at all — it fails at parse time, exit `64`.
+* set (default: all three modes, or `generated`+`index` under `--staged`;
+* order irrelevant either way — `runSync`'s own fixed order wins, not
+* `--only`'s occurrence order), run `runSync` with BOTH `Git.layer` and
+* `GitHistory.layer` provided (S-16, mirroring `verify.ts:134`'s
+* `Git.layer`-alone provision one layer up: here two layers are needed
+* because `GitHistory.layer` does not re-expose `Git` even though it is
+* built on it), render, and always exit `0`. There is no content tier:
+* every typed failure is exit `3` through `bin.ts`'s existing
+* `reportFailures`, EXCEPT `SyncStagedLogError` (`--staged` combined with
+* `--only log`), which carries its own `[Runtime.errorExitCode] = 64`;
+* an unknown `--only` token never reaches this handler at all — it fails
+* at parse time, exit `64`.
 *
 * @public
 */
@@ -63,10 +71,13 @@ const syncCommand = Command.make("sync", {
 	config: configFlag,
 	only: onlyFlag,
 	dryRun: dryRunFlag,
-	format: formatFlag
+	format: formatFlag,
+	since: sinceFlag,
+	staged: stagedFlag
 }, (input) => Effect.gen(function* () {
 	const cwd = process.cwd();
 	const discoveryCwd = Option.getOrElse(input.path, () => cwd);
+	const distribution = yield* Distribution;
 	const body = Effect.gen(function* () {
 		const path = yield* Path.Path;
 		const resolved = yield* resolveProjectConfig({
@@ -74,16 +85,19 @@ const syncCommand = Command.make("sync", {
 			explicitConfigPath: input.config,
 			cwd
 		});
-		const modes = input.only.length === 0 ? /* @__PURE__ */ new Set([
+		const modes = input.only.length > 0 ? new Set(input.only) : input.staged ? /* @__PURE__ */ new Set(["generated", "index"]) : /* @__PURE__ */ new Set([
 			"generated",
 			"index",
 			"log"
-		]) : new Set(input.only);
+		]);
+		const staged = input.staged ? { at: DateTime.startOf(yield* Now, "second") } : void 0;
 		const result = yield* runSync({
 			bundleRoot: resolved.bundleRoot,
 			config: resolved.config,
 			modes,
-			dryRun: input.dryRun
+			dryRun: input.dryRun,
+			...Option.isSome(input.since) ? { logSince: input.since.value } : {},
+			...staged === void 0 ? {} : { staged }
 		}).pipe(Effect.provide(Layer.mergeAll(Git.layer, GitHistory.layer)));
 		const displayPath = displayRoot(cwd, result.bundleRoot, path);
 		if (input.format === "json") {
@@ -91,7 +105,8 @@ const syncCommand = Command.make("sync", {
 				okfitVersion: CLI_VERSION,
 				root: displayPath,
 				dryRun: result.dryRun,
-				result
+				result,
+				...Option.isSome(distribution) ? { distribution: distribution.value } : {}
 			});
 			yield* Console.log(JSON.stringify(Schema.encodeSync(SyncEnvelope)(envelope)));
 		} else for (const line of humanSync(result)) yield* Console.log(line);
@@ -100,7 +115,7 @@ const syncCommand = Command.make("sync", {
 		explicitConfigPath: input.config,
 		discoveryCwd
 	}));
-	if (input.format === "json") return yield* body.pipe(Effect.tapError((error) => Console.log(JSON.stringify(jsonError(error, CLI_VERSION)))));
+	if (input.format === "json") return yield* body.pipe(Effect.tapError((error) => Console.log(JSON.stringify(jsonError(error, CLI_VERSION, Option.getOrUndefined(distribution))))));
 	return yield* body;
 })).pipe(Command.withDescription("Regenerate the derived-content families that no other command produces: generated.at, index.md, and log.md, all from git history and the bundle's own concepts. Mechanical and agent-runnable; never an attestation and never touches verified."));
 

package/commands/validate.js

@@ -1,3 +1,4 @@
+import { Distribution } from "../internal/distribution.js";
 import { setExitCode } from "../internal/exit.js";
 import { CLI_VERSION } from "../version.js";
 import { useColor } from "../internal/tty.js";
@@ -41,6 +42,7 @@ const validateCommand = Command.make("validate", {
 	const discoveryCwd = Option.getOrElse(input.path, () => cwd);
 	const now = yield* Now;
 	const path = yield* Path.Path;
+	const distribution = yield* Distribution;
 	const body = Effect.gen(function* () {
 		const { bundleRoot, config: merged, profile } = yield* resolveProjectConfig({
 			pathArg: input.path,
@@ -68,7 +70,8 @@ const validateCommand = Command.make("validate", {
 				}),
 				exitCode: code,
 				concepts: result.bundle.concepts.size,
-				diagnostics
+				diagnostics,
+				...Option.isSome(distribution) ? { distribution: distribution.value } : {}
 			});
 			yield* Console.log(JSON.stringify(Schema.encodeSync(JsonEnvelope)(envelope)));
 		} else {
@@ -86,7 +89,7 @@ const validateCommand = Command.make("validate", {
 		explicitConfigPath: input.config,
 		discoveryCwd
 	}));
-	if (input.format === "json") return yield* body.pipe(Effect.tapError((error) => Console.log(JSON.stringify(jsonError(error, CLI_VERSION)))));
+	if (input.format === "json") return yield* body.pipe(Effect.tapError((error) => Console.log(JSON.stringify(jsonError(error, CLI_VERSION, Option.getOrUndefined(distribution))))));
 	return yield* body;
 })).pipe(Command.withDescription("Load config and bundle, run conformance and lint checks, and render the diagnostics."));
 

package/commands/verify.js

@@ -1,16 +1,25 @@
+import { Distribution } from "../internal/distribution.js";
 import { setExitCode } from "../internal/exit.js";
 import { CLI_VERSION } from "../version.js";
 import { displayRoot } from "../render/human.js";
-import { humanVerify } from "../render/verify.js";
+import { humanVerify, humanVerifyBatch } from "../render/verify.js";
 import { Argument, Command, Flag } from "effect/unstable/cli";
-import { Now, VerifyEnvelope, jsonError, provideConfig, resolveProjectConfig, runVerify, verifyEnvelope } from "@okfit/engine";
+import { Now, VerifyBatchEnvelope, VerifyEnvelope, VerifySelectionError, jsonError, provideConfig, resolveProjectConfig, runVerify, runVerifyBatch, verifyBatchEnvelope, verifyEnvelope } from "@okfit/engine";
 import { Console, DateTime, Effect, Option, Path, Schema } from "effect";
 import { Timestamp } from "@okfit/core";
 import { Git } from "@effected/git";
 
 //#region src/commands/verify.ts
-/** V-6: tolerant id, normalised through `ConceptId.normalize`; never `Argument.Path`. */
-const idArg = Argument.String("id").pipe(Argument.withDescription("concept id to verify, with or without a leading slash or trailing .md"));
+/**
+* V-6: tolerant id, normalised through `ConceptId.normalize`; never
+* `Argument.Path`. Issue #138 makes it optional: `--all`/`--type` select a
+* batch instead of a single concept.
+*/
+const idArg = Argument.String("id").pipe(Argument.optional, Argument.withDescription("concept id to verify, with or without a leading slash or trailing .md; omit with --all or --type"));
+/** Issue #138: attest every unverified concept whose type sets `require_verified`. */
+const allFlag = Flag.Boolean("all").pipe(Flag.withDefault(false), Flag.withDescription("verify every concept whose type sets require_verified and that you have not verified yet; drafts are skipped"));
+/** Issue #138: narrow (or, without --all, define) the batch to these types. */
+const typeFlag = Flag.String("type").pipe(Flag.atLeast(0), Flag.withDescription("verify every unverified concept of this type (repeatable); implies --all's selection rule for the named types"));
 /** K-2: `[path]` is the PROJECT root, byte-identical to validate/init/context's. */
 const pathArg = Argument.Path("path", { pathType: "directory" }).pipe(Argument.optional, Argument.withDescription("project root to start config discovery from (default: current directory); never the bundle root"));
 /** K-1: no `mustExist`; the handler stats it via `provideConfig`. */
@@ -21,8 +30,8 @@ const atFlag = Flag.String("at").pipe(Flag.optional, Flag.withDescription("ISO 8
 const dryRunFlag = Flag.Boolean("dry-run").pipe(Flag.withDefault(false), Flag.withDescription("print the exact fragment a real run would splice in; write nothing"));
 const formatFlag = Flag.Literals("format", ["human", "json"]).pipe(Flag.withDefault("human"), Flag.withDescription("output format: human (default) or json"));
 /**
-* `okfit verify <id> [path] [--config <file>] [--at <iso>] [--dry-run]
-* [--format human|json]`.
+* `okfit verify [<id>] [path] [--all] [--type <Type>]... [--config <file>]
+* [--at <iso>] [--dry-run] [--format human|json]`.
 *
 * Handler order fixed by contract §2.3. Steps 1–3 are `context`'s handler
 * in substance — stat `--config` (K-1) via `provideConfig`, discover,
@@ -40,22 +49,64 @@ const verifyCommand = Command.make("verify", {
 	id: idArg,
 	path: pathArg,
 	config: configFlag,
+	all: allFlag,
+	type: typeFlag,
 	at: atFlag,
 	dryRun: dryRunFlag,
 	format: formatFlag
 }, (input) => Effect.gen(function* () {
 	const cwd = process.cwd();
-	const discoveryCwd = Option.getOrElse(input.path, () => cwd);
+	const batch = input.all || input.type.length > 0;
+	const effectivePath = batch && Option.isSome(input.id) && Option.isNone(input.path) ? input.id : input.path;
+	const discoveryCwd = Option.getOrElse(effectivePath, () => cwd);
+	const distribution = yield* Distribution;
 	const body = Effect.gen(function* () {
 		const path = yield* Path.Path;
 		const resolved = yield* resolveProjectConfig({
-			pathArg: input.path,
+			pathArg: effectivePath,
 			explicitConfigPath: input.config,
 			cwd
 		});
 		const at = Option.isNone(input.at) ? DateTime.startOf(yield* Now, "second") : yield* Schema.decodeUnknownEffect(Timestamp)(input.at.value);
+		if (Option.isSome(input.id) && Option.isSome(input.path) && batch) return yield* new VerifySelectionError({ reason: "id-and-batch" });
+		if (Option.isNone(input.id) && !batch) return yield* new VerifySelectionError({ reason: "no-selection" });
+		if (batch) {
+			const result = yield* runVerifyBatch({
+				bundleRoot: resolved.bundleRoot,
+				projectRoot: resolved.projectRoot,
+				config: resolved.config,
+				at,
+				dryRun: input.dryRun,
+				types: input.type
+			});
+			const root = displayRoot(cwd, result.bundleRoot, path);
+			if (input.format === "json") {
+				const envelope = verifyBatchEnvelope({
+					okfitVersion: CLI_VERSION,
+					by: result.by,
+					at: result.at,
+					concepts: result.verified.map((entry) => ({
+						id: entry.id,
+						path: `${root}/${entry.conceptPath}`
+					})),
+					skipped: result.skipped,
+					dryRun: result.dryRun,
+					...Option.isSome(distribution) ? { distribution: distribution.value } : {}
+				});
+				yield* Console.log(JSON.stringify(Schema.encodeSync(VerifyBatchEnvelope)(envelope)));
+			} else for (const line of humanVerifyBatch({
+				by: result.by,
+				at: result.at,
+				dryRun: result.dryRun,
+				verified: result.verified,
+				skipped: result.skipped
+			})) yield* Console.log(line);
+			setExitCode(0);
+			return;
+		}
+		if (Option.isNone(input.id)) return yield* new VerifySelectionError({ reason: "no-selection" });
 		const result = yield* runVerify({
-			id: input.id,
+			id: input.id.value,
 			bundleRoot: resolved.bundleRoot,
 			projectRoot: resolved.projectRoot,
 			config: resolved.config,
@@ -70,7 +121,8 @@ const verifyCommand = Command.make("verify", {
 				path: displayPath,
 				by: result.by,
 				at: result.at,
-				dryRun: result.dryRun
+				dryRun: result.dryRun,
+				...Option.isSome(distribution) ? { distribution: distribution.value } : {}
 			});
 			yield* Console.log(JSON.stringify(Schema.encodeSync(VerifyEnvelope)(envelope)));
 		} else for (const line of humanVerify({
@@ -86,9 +138,9 @@ const verifyCommand = Command.make("verify", {
 		explicitConfigPath: input.config,
 		discoveryCwd
 	}));
-	if (input.format === "json") return yield* body.pipe(Effect.tapError((error) => Console.log(JSON.stringify(jsonError(error, CLI_VERSION)))));
+	if (input.format === "json") return yield* body.pipe(Effect.tapError((error) => Console.log(JSON.stringify(jsonError(error, CLI_VERSION, Option.getOrUndefined(distribution))))));
 	return yield* body;
-})).pipe(Command.withDescription("Record a human's attestation that a concept has been reviewed: append one verified entry, { by: human:<id>, at: <now> }, to its frontmatter. The actor is always your own git identity; there is no --by. This is a human-run command: no agent, hook, or MCP tool ever invokes it."));
+})).pipe(Command.withDescription("Record a human's attestation that a concept has been reviewed: append one verified entry, { by: human:<id>, at: <now> }, to its frontmatter. The actor is always your own git identity; there is no --by. Give a concept id, or --all/--type <Type> (repeatable) to attest a batch of unverified concepts at once; exactly one of the two selections is required. This is a human-run command: no agent, hook, or MCP tool ever invokes it."));
 
 //#endregion
 export { verifyCommand };

package/errors.js

@@ -1,4 +1,4 @@
-import { ConfigMalformedError, ConfigPathNotFoundError, InitOverwriteError, VerifyConceptNotFoundError, VerifyUnsupportedFrontmatterError } from "@okfit/engine";
+import { ConfigMalformedError, ConfigPathNotFoundError, InitOverwriteError, SyncStagedLogError, VerifyConceptNotFoundError, VerifySelectionError, VerifyUnsupportedFrontmatterError } from "@okfit/engine";
 import { ConfigIssueRenderer } from "@effected/cli";
 
 //#region src/errors.ts
@@ -39,6 +39,12 @@ const relativeToCwd = (path, cwd) => {
 *    each render as their own `error: <message>` line; both messages
 *    already name the concept id and what to do about it, and neither
 *    carries a filesystem path needing K-51 relativisation.
+* 5a. `SyncStagedLogError` (issue #140) renders the same way, one
+*    `error: <message>` line naming why `--staged` and `--only log` cannot
+*    combine.
+* 5b. `VerifySelectionError` (issue #138) renders the same way, one
+*    `error: <message>` line naming why `okfit verify`'s selection was
+*    contradictory, empty, or named an undeclared type.
 * 6. Everything else — core's `BundleRootNotFoundError`/`BundleReadError`/
 *    `BundleDepthExceededError`, config-file's other errors, `XdgEnvError`
 *    (the K-13 `HOME`-unset case) — renders as the single line
@@ -59,6 +65,8 @@ const renderFailure = (error) => {
 	];
 	if (error instanceof VerifyConceptNotFoundError) return [`error: ${error.message}`];
 	if (error instanceof VerifyUnsupportedFrontmatterError) return [`error: ${error.message}`];
+	if (error instanceof SyncStagedLogError) return [`error: ${error.message}`];
+	if (error instanceof VerifySelectionError) return [`error: ${error.message}`];
 	if (hasTag(error, "ConfigValidationError")) {
 		const validationError = error;
 		return [`error: ${String(validationError)}`, ...ConfigIssueRenderer.render(validationError).map((line) => `  ${line}`)];

package/index.d.ts

@@ -20,7 +20,7 @@ import "effect";
  *
  * @public
  */
-export declare const rootCommand: Command.Command<"okfit", {} | {}, {}, import("@okfit/profiles").AgentActorUnconfiguredError | import("@okfit/core").BundleDepthExceededError | import("@okfit/core").BundleReadError | import("@okfit/core").BundleRootNotFoundError | import("@effected/config-file").ConfigCodecError | import("@effected/config-file").ConfigFileReadError | import("@effected/config-file").ConfigFileWriteError | import("@okfit/engine").ConfigMalformedError | import("@okfit/engine").ConfigPathNotFoundError | import("@effected/config-file").ConfigValidationError | import("@effected/markdown").FrontmatterEncodeError | import("@effected/markdown").FrontmatterFormatMismatchError | import("@effected/markdown").FrontmatterValidationError | import("@effected/git").GitCommandError | import("@okfit/profiles").GitHistoryError | import("@okfit/profiles").HumanActorUnresolvedError | import("@okfit/engine").InitOverwriteError | import("@effected/markdown").MarkdownParseError | import("@effected/git").NotARepositoryError | import("effect/PlatformError").PlatformError | import("effect/Schema").SchemaError | import("@effected/git").UnknownRefError | import("@okfit/engine").VerifyConceptNotFoundError | import("@okfit/engine").VerifyUnsupportedFrontmatterError | import("@effected/yaml").YamlParseError, import("@effected/xdg").AppDirs | import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner | import("effect/Crypto").Crypto | import("effect/FileSystem").FileSystem | import("@okfit/engine").Now | import("effect/Path").Path | import("@effected/xdg").Xdg>;
+export declare const rootCommand: Command.Command<"okfit", {} | {}, {}, import("@okfit/profiles").AgentActorUnconfiguredError | import("@okfit/core").BundleDepthExceededError | import("@okfit/core").BundleReadError | import("@okfit/core").BundleRootNotFoundError | import("@effected/config-file").ConfigCodecError | import("@effected/config-file").ConfigFileReadError | import("@effected/config-file").ConfigFileWriteError | import("@okfit/engine").ConfigMalformedError | import("@okfit/engine").ConfigPathNotFoundError | import("@effected/config-file").ConfigValidationError | import("@effected/markdown").FrontmatterEncodeError | import("@effected/markdown").FrontmatterFormatMismatchError | import("@effected/markdown").FrontmatterValidationError | import("@effected/git").GitCommandError | import("@okfit/profiles").GitHistoryError | import("@okfit/profiles").HumanActorUnresolvedError | import("@okfit/engine").InitOverwriteError | import("@effected/markdown").MarkdownParseError | import("@effected/git").NotARepositoryError | import("effect/PlatformError").PlatformError | import("effect/Schema").SchemaError | import("@okfit/engine").SyncStagedLogError | import("@effected/git").UnknownRefError | import("@okfit/engine").VerifyConceptNotFoundError | import("@okfit/engine").VerifySelectionError | import("@okfit/engine").VerifyUnsupportedFrontmatterError | import("@effected/yaml").YamlParseError, import("@effected/xdg").AppDirs | import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner | import("effect/Crypto").Crypto | import("effect/FileSystem").FileSystem | import("@okfit/engine").Now | import("effect/Path").Path | import("@effected/xdg").Xdg>;
 //#endregion
 //#region src/errors.d.ts
 /**
@@ -53,6 +53,12 @@ export declare const rootCommand: Command.Command<"okfit", {} | {}, {}, import("
  *    each render as their own `error: <message>` line; both messages
  *    already name the concept id and what to do about it, and neither
  *    carries a filesystem path needing K-51 relativisation.
+ * 5a. `SyncStagedLogError` (issue #140) renders the same way, one
+ *    `error: <message>` line naming why `--staged` and `--only log` cannot
+ *    combine.
+ * 5b. `VerifySelectionError` (issue #138) renders the same way, one
+ *    `error: <message>` line naming why `okfit verify`'s selection was
+ *    contradictory, empty, or named an undeclared type.
  * 6. Everything else — core's `BundleRootNotFoundError`/`BundleReadError`/
  *    `BundleDepthExceededError`, config-file's other errors, `XdgEnvError`
  *    (the K-13 `HOME`-unset case) — renders as the single line
@@ -147,11 +153,14 @@ export declare const humanVerify: (input: VerifyLines) => ReadonlyArray<string>;
 //#endregion
 //#region src/version.d.ts
 /**
- * The version string reported by `okfit --version`. `@savvy-web/bundler`
- * replaces `process.env.__PACKAGE_VERSION__` with this package's own
- * version at build time (K-32), so a release can never desync from the
- * printed version. `"0.0.0"` is the unbuilt-source fallback and reads as
- * dev mode.
+ * The version string reported by `okfit --version`, alongside `@okfit/engine`'s
+ * `ENGINE_VERSION` and `@okfit/core`'s `OKF_SPEC_VERSION` (and, when `main()`
+ * was given a distribution, `via <name> <version>`) --
+ * `internal/versionFormatter.ts` assembles the full line (okfit #137).
+ * `@savvy-web/bundler` replaces `process.env.__PACKAGE_VERSION__` with this
+ * package's own version at build time (K-32), so a release can never desync
+ * from the printed version. `"0.0.0"` is the unbuilt-source fallback and
+ * reads as dev mode.
  *
  * @public
  */

package/internal/distribution.js

@@ -0,0 +1,21 @@
+import { Context, Option } from "effect";
+
+//#region src/internal/distribution.ts
+/**
+* The meta-package this run's bins were installed through (currently only
+* `@okfit/plugin`), threaded from `main(options)` down to every command
+* that builds a JSON envelope or the custom `--version` formatter (okfit
+* #137). Defaults to `Option.none()` for a direct install of `@okfit/cli`;
+* `main()` provides `Option.some(options.distribution)` exactly once, at
+* the top of the command tree, when the caller supplied one.
+*
+* A `Context.Reference`, not a `Context.Service` (unlike `Now`): it carries
+* its own default, so a command can read it with no explicit provision at
+* all when no distribution was given.
+*
+* @internal
+*/
+const Distribution = Context.Reference("@okfit/cli/Distribution", { defaultValue: () => Option.none() });
+
+//#endregion
+export { Distribution };

package/internal/versionFormatter.js

@@ -0,0 +1,32 @@
+import { useColor } from "./tty.js";
+import { CliOutput } from "effect/unstable/cli";
+import { ENGINE_VERSION } from "@okfit/engine";
+import { CONFIG_SCHEMA_VERSION, OKF_SPEC_VERSION } from "@okfit/core";
+
+//#region src/internal/versionFormatter.ts
+/**
+* `okfit --version`'s full text (okfit #137):
+* `<name> <version>[ via <distName> <distVersion>] (engine <ENGINE_VERSION>, okf <OKF_SPEC_VERSION>, config-schema <CONFIG_SCHEMA_VERSION>)`.
+* `GlobalFlag.Version`'s built-in `run` calls `formatter.formatVersion(command.name,
+* version)` (`command.name` is always `"okfit"`, `version` is `CLI_VERSION` --
+* `unstable/cli/GlobalFlag.ts:180-186`), so those two arguments alone are
+* exactly `okfit <CLI_VERSION>`; this appends the engine, okf, and
+* distribution parts.
+*
+* Only `formatVersion` is overridden -- every other `Formatter` method
+* (help, error rendering) is `CliOutput.defaultFormatter`'s own, built with
+* the SAME colour decision (`internal/tty.ts#useColor`, "exactly the
+* framework's own colour rule") the rest of this package already uses, so
+* help/error output is byte-identical to the built-in formatter.
+*
+* @internal
+*/
+const versionFormatter = (distribution) => ({
+	...CliOutput.defaultFormatter({ colors: useColor() }),
+	formatVersion: (name, version) => {
+		return `${name} ${version}${distribution === void 0 ? "" : ` via ${distribution.name} ${distribution.version}`} (engine ${ENGINE_VERSION}, okf ${OKF_SPEC_VERSION}, config-schema ${CONFIG_SCHEMA_VERSION})`;
+	}
+});
+
+//#endregion
+export { versionFormatter };

package/main.d.ts

@@ -1,15 +1,22 @@
+import { Distribution } from "@okfit/engine";
 //#region src/main.d.ts
 /**
- * The assembled okfit CLI program.
+ * Options `@okfit/plugin`'s bin shims (and only they, today) pass to
+ * {@link main}. `distribution` names the meta-package the `okfit` bin was
+ * installed through; omitted (or `undefined`) for a direct install of
+ * `@okfit/cli` (okfit #137).
  *
- * @packageDocumentation
+ * @public
  */
+export interface MainOptions {
+  readonly distribution?: Distribution;
+}
 /**
  * Run the okfit CLI. Owns the process: installs the runtime teardown and
  * sets the exit code. `NodeRuntime.runMain` does not return a promise.
  *
  * @public
  */
-export declare const main: () => void;
+export declare const main: (options?: MainOptions) => void;
 //#endregion
 //# sourceMappingURL=main.d.ts.map

package/main.js

@@ -1,7 +1,9 @@
+import { Distribution } from "./internal/distribution.js";
 import { CLI_VERSION } from "./version.js";
 import { rootCommand } from "./commands/root.js";
 import { renderFailure } from "./errors.js";
-import { Command } from "effect/unstable/cli";
+import { versionFormatter } from "./internal/versionFormatter.js";
+import { CliOutput, Command } from "effect/unstable/cli";
 import { Now, OkfitPlatform } from "@okfit/engine";
 import { DateTime, Effect, Option } from "effect";
 import { CliLogger, CliRuntime } from "@effected/cli";
@@ -29,11 +31,12 @@ const nowEffect = Option.fromNullishOr(process.env.OKFIT_NOW).pipe(Option.flatMa
 *
 * @public
 */
-const main = () => {
+const main = (options = {}) => {
+	const distribution = Option.fromNullishOr(options.distribution);
 	const program = Effect.gen(function* () {
 		const now = yield* nowEffect;
-		return yield* Command.run(rootCommand, { version: CLI_VERSION }).pipe(Effect.provideService(Now, now), Effect.catchTag("ShowHelp", (help) => Effect.fail(CliRuntime.reported(help, help.errors.length > 0 ? 64 : 0))));
-	}).pipe(Effect.provide(OkfitPlatform), CliRuntime.reportFailures({
+		return yield* Command.run(rootCommand, { version: CLI_VERSION }).pipe(Effect.provideService(Now, now), Effect.provideService(Distribution, distribution), Effect.catchTag("ShowHelp", (help) => Effect.fail(CliRuntime.reported(help, help.errors.length > 0 ? 64 : 0))));
+	}).pipe(Effect.provide(CliOutput.layer(versionFormatter(options.distribution))), Effect.provide(OkfitPlatform), CliRuntime.reportFailures({
 		exitCode: 3,
 		render: renderFailure
 	}));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@okfit/cli",
-	"version": "0.5.3",
+	"version": "0.6.0",
 	"private": false,
 	"description": "The okfit command line: validate, lint, index, and inspect Open Knowledge Format (OKF) bundles.",
 	"keywords": [
@@ -52,9 +52,9 @@
 		"@effected/toml": "^0.7.0",
 		"@effected/walker": "^0.9.0",
 		"@effected/yaml": "^0.15.1",
-		"@okfit/core": "0.5.0",
-		"@okfit/engine": "0.5.0",
-		"@okfit/profiles": "0.7.0",
+		"@okfit/core": "0.7.0",
+		"@okfit/engine": "0.7.0",
+		"@okfit/profiles": "0.7.2",
 		"effect": "4.0.0-rc.115"
 	},
 	"engines": {

package/render/sync.js

@@ -4,7 +4,7 @@ const REASON_SENTENCE = {
 	untracked: "not tracked by git",
 	dirty: "has uncommitted changes",
 	unborn: "the repository has no commits yet",
-	"generated-missing": "has no generated block",
+	"generated-missing": "has no generated block and actors.agent is not configured; set generated.by by hand or configure actors.agent",
 	"generated-unsupported": "generated.at is a shape sync cannot edit; edit it by hand",
 	"log-unparseable": "log.md could not be parsed; see okfit validate"
 };

package/render/verify.js

@@ -24,6 +24,21 @@ const humanVerify = (input) => [
 	input.dryRun ? `would verify ${input.id} by ${input.by} at ${input.at} (dry run, nothing written)` : `verified ${input.id} by ${input.by} at ${input.at}`,
 	...input.dryRun ? ["would write:", ...indentFragment(input.fragment)] : []
 ];
+/**
+* V-11-at-batch-scale (#138): one line per skipped candidate, then one line
+* (or, under `--dry-run`, three) per verified concept, then a trailing tally.
+*
+* @public
+*/
+const humanVerifyBatch = (input) => [
+	...input.skipped.map((entry) => entry.reason === "draft" ? `skipped ${entry.id}: draft` : `skipped ${entry.id}: already verified by ${input.by}`),
+	...input.verified.flatMap((entry) => input.dryRun ? [
+		`would verify ${entry.id} by ${input.by} at ${input.at}`,
+		"would write:",
+		...indentFragment(entry.fragment)
+	] : [`verified ${entry.id} by ${input.by} at ${input.at}`]),
+	input.dryRun ? `would verify ${input.verified.length}, skipped ${input.skipped.length} (dry run, nothing written)` : `verified ${input.verified.length}, skipped ${input.skipped.length}`
+];
 
 //#endregion
-export { humanVerify };
+export { humanVerify, humanVerifyBatch };

package/version.js

@@ -1,14 +1,17 @@
 //#region src/version.ts
 /**
-* The version string reported by `okfit --version`. `@savvy-web/bundler`
-* replaces `process.env.__PACKAGE_VERSION__` with this package's own
-* version at build time (K-32), so a release can never desync from the
-* printed version. `"0.0.0"` is the unbuilt-source fallback and reads as
-* dev mode.
+* The version string reported by `okfit --version`, alongside `@okfit/engine`'s
+* `ENGINE_VERSION` and `@okfit/core`'s `OKF_SPEC_VERSION` (and, when `main()`
+* was given a distribution, `via <name> <version>`) --
+* `internal/versionFormatter.ts` assembles the full line (okfit #137).
+* `@savvy-web/bundler` replaces `process.env.__PACKAGE_VERSION__` with this
+* package's own version at build time (K-32), so a release can never desync
+* from the printed version. `"0.0.0"` is the unbuilt-source fallback and
+* reads as dev mode.
 *
 * @public
 */
-const CLI_VERSION = "0.5.3";
+const CLI_VERSION = "0.6.0";
 
 //#endregion
 export { CLI_VERSION };