@okfit/cli 0.2.0 → 0.3.0

package/bin/okfit.js

@@ -1,14 +1,5 @@
 #!/usr/bin/env node
-import { renderFailure } from "../errors.js";
-import { CLI_VERSION } from "../version.js";
-import { Now } from "../validate/run.js";
-import { rootCommand } from "../commands/root.js";
-import { Command } from "effect/unstable/cli";
-import { DateTime, Effect, Layer, Option } from "effect";
-import { CliLogger, CliRuntime } from "@effected/cli";
-import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
-import * as NodeServices from "@effect/platform-node/NodeServices";
-import { AppDirs, Xdg } from "@effected/xdg";
+import { main } from "../main.js";
 
 //#region src/bin.ts
 /**
@@ -16,47 +7,7 @@ import { AppDirs, Xdg } from "@effected/xdg";
 *
 * @packageDocumentation
 */
-/**
-* K-9: `AppConfig.layer` only, built by Group B's `config/layer.ts` —
-* `Xdg` and `AppDirs` are provided once, here, for both commands; no
-* `Store`, no `Cache`, so no `store.db`/`cache.db` is ever created.
-*
-* `AppDirs.layer(options)` requires `Xdg | FileSystem | Path`
-* (`XDG/index.d.ts:320`), so `Layer.provide(Xdg.layer)` alone does not close
-* it: `Layer.provideMerge(NodeServices.layer)` supplies `FileSystem`/`Path`
-* to both members and keeps every service in the output. `NodeServices.layer`
-* provides `ChildProcessSpawner | Crypto | FileSystem | Path | Stdio |
-* Terminal`, a superset of `Command.Environment`.
-*
-* `Xdg.layer` fails with `XdgEnvError` when `HOME` is unset (K-13). That
-* error reaches `reportFailures` and takes its `exitCode: 3` fallback, with
-* no special case anywhere — but only because `Effect.provide(PlatformLayer)`
-* is applied INSIDE the region `CliRuntime.reportFailures` wraps, below.
-* `@effected/cli`'s own doc example provides its layer after
-* `reportFailures`; doing that here would let a failure while building this
-* layer (an unset `HOME`, say) escape reportFailures entirely and fall to
-* `NodeRuntime.runMain`'s own fatal-error path — a stack trace on stdout and
-* exit `1`, not the rendered `exitCode: 3` this module promises.
-*/
-const PlatformLayer = Layer.mergeAll(Xdg.layer, AppDirs.layer({ namespace: "okfit" }).pipe(Layer.provide(Xdg.layer))).pipe(Layer.provideMerge(NodeServices.layer));
-/**
-* K-47: an ISO-8601 `OKFIT_NOW` when set, else the wall clock. A documented
-* test hook, not user-facing. Resolved exactly once, here, and provided to
-* the whole command tree through the `Now` tag so no command handler ever
-* reads `process.env["OKFIT_NOW"]` itself.
-*/
-const nowEffect = Option.fromNullishOr(process.env.OKFIT_NOW).pipe(Option.flatMap((iso) => DateTime.make(iso)), Option.match({
-	onNone: () => DateTime.now,
-	onSome: Effect.succeed
-}));
-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(PlatformLayer), CliRuntime.reportFailures({
-	exitCode: 3,
-	render: renderFailure
-}));
-NodeRuntime.runMain(program.pipe(Effect.provide(CliLogger.layer())));
+main();
 
 //#endregion
 export {  };

package/commands/context.js

@@ -1,11 +1,8 @@
-import { provideConfig } from "../config/layer.js";
-import { resolveProjectConfig } from "../config/resolve.js";
-import { runContext } from "../context/run.js";
 import { setExitCode } from "../internal/exit.js";
-import { ContextEnvelope, contextEnvelope, humanContext } from "../render/context.js";
-import { jsonError } from "../render/json.js";
+import { humanContext } from "../render/context.js";
 import { CLI_VERSION } from "../version.js";
 import { Argument, Command, Flag } from "effect/unstable/cli";
+import { ContextEnvelope, contextEnvelope, jsonError, provideConfig, resolveProjectConfig, runContext } from "@okfit/engine";
 import { Console, Effect, Option, Schema } from "effect";
 
 //#region src/commands/context.ts
@@ -20,7 +17,7 @@ const formatFlag = Flag.choice("format", ["human", "json"]).pipe(Flag.withDefaul
 *
 * Handler order fixed by the contract (§8.3): steps 1–7 are
 * `validateCommand`'s handler in substance (both now share
-* `config/resolve.ts#resolveProjectConfig` — A4) — stat `--config` (K-1) via
+* `@okfit/engine`'s `resolveProjectConfig` — A4) — stat `--config` (K-1) via
 * `provideConfig`, discover (`OkfitConfigFile.discover`), resolve the
 * profile with the K-4 warning, merge `DEFAULTS < profile < file` (D-28),
 * warn on an `okf_version` mismatch (K-15), resolve the project and bundle

package/commands/init.js

@@ -1,19 +1,13 @@
-import { InitOverwriteError } from "../errors.js";
-import { provideConfig } from "../config/layer.js";
-import { resolveBundleRoot, resolveProjectRoot } from "../config/anchor.js";
 import { setExitCode } from "../internal/exit.js";
-import { forDiagnostics } from "../render/exit.js";
-import { collect } from "../render/sort.js";
-import { CONFIG_RELATIVE_PATH, SCHEMA_DIRECTIVE, configValue, files, targetPaths } from "../init/scaffold.js";
 import { useColor } from "../internal/tty.js";
 import { displayRoot, human, summary } from "../render/human.js";
-import { Now, run } from "../validate/run.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 { Console, DateTime, Effect, FileSystem, Layer, Option, Path, Schema } from "effect";
 import { TomlCodec } from "@effected/config-file";
+import { Git } from "@effected/git";
 import { OKF_SPEC_VERSION, OkfitConfig, OkfitConfigFile } from "@okfit/core";
 import { GitHistory, Profiles } from "@okfit/profiles";
-import { Git } from "@effected/git";
 
 //#region src/commands/init.ts
 /**
@@ -74,7 +68,7 @@ const countsOf = (diagnostics, concepts) => ({
 *     fileConfig)`, `profileConfig` falling back to `NO_PROFILE_CONFIG` when
 *     no profile resolved.
 *  6. `merged.okf_version !== OKF_SPEC_VERSION` warns (K-15).
-*  7. `projectRoot`/`bundleRoot` via `config/anchor.ts`; `now = yield* Now`;
+*  7. `projectRoot`/`bundleRoot` via `@okfit/engine`'s `config/anchor.ts`; `now = yield* Now`;
 *     `layout` falls back to `Profiles.softwareProject.layout` when no
 *     profile resolved (this file's own decision 2 above — `Layout` has no
 *     `DEFAULTS` equivalent).

package/commands/sync.js

@@ -1,15 +1,12 @@
-import { provideConfig } from "../config/layer.js";
-import { resolveProjectConfig } from "../config/resolve.js";
 import { setExitCode } from "../internal/exit.js";
-import { jsonError } from "../render/json.js";
 import { CLI_VERSION } from "../version.js";
 import { displayRoot } from "../render/human.js";
-import { runSync } from "../sync/run.js";
-import { SyncEnvelope, humanSync, syncEnvelope } from "../render/sync.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 { GitHistory } from "@okfit/profiles";
 import { Git } from "@effected/git";
+import { GitHistory } from "@okfit/profiles";
 
 //#region src/commands/sync.ts
 /** K-2: `[path]` is the PROJECT root, byte-identical to validate/init/context/verify's. */

package/commands/validate.js

@@ -1,18 +1,13 @@
-import { provideConfig } from "../config/layer.js";
-import { resolveProjectConfig } from "../config/resolve.js";
 import { setExitCode } from "../internal/exit.js";
-import { forDiagnostics } from "../render/exit.js";
-import { collect } from "../render/sort.js";
-import { JsonEnvelope, json, jsonError } from "../render/json.js";
 import { CLI_VERSION } from "../version.js";
 import { useColor } from "../internal/tty.js";
 import { displayRoot, human, summary } from "../render/human.js";
-import { Now, run } from "../validate/run.js";
 import { Argument, Command, Flag } from "effect/unstable/cli";
+import { JsonEnvelope, Now, collect, forDiagnostics, json, jsonError, provideConfig, resolveProjectConfig, run } from "@okfit/engine";
 import { Console, Effect, Layer, Option, Path, Schema } from "effect";
+import { Git } from "@effected/git";
 import { OKF_SPEC_VERSION } from "@okfit/core";
 import { GitHistory } from "@okfit/profiles";
-import { Git } from "@effected/git";
 
 //#region src/commands/validate.ts
 /** `[path]` is the PROJECT root (K-2), never the bundle root. Absolute at parse time (K-50). */
@@ -30,7 +25,7 @@ const skipProvenanceFlag = Flag.boolean("skip-provenance").pipe(Flag.withDefault
 * stat `--config` (K-1) via `provideConfig`, discover (`OkfitConfigFile.discover`),
 * resolve the profile with the K-4 warning, merge `DEFAULTS < profile < file`
 * (D-28), warn on an `okf_version` mismatch (K-15), resolve the project and
-* bundle roots (K-12), run (`validate/run.ts#run`), collect and sort the
+* bundle roots (K-12), run (`@okfit/engine`'s `validate/run.ts#run`), collect and sort the
 * diagnostics, render per `--format` (K-18, K-20 to K-22), and set the exit
 * code without failing the Effect (K-7, K-8).
 *

package/commands/verify.js

@@ -1,16 +1,12 @@
-import { provideConfig } from "../config/layer.js";
-import { resolveProjectConfig } from "../config/resolve.js";
 import { setExitCode } from "../internal/exit.js";
-import { jsonError } from "../render/json.js";
 import { CLI_VERSION } from "../version.js";
 import { displayRoot } from "../render/human.js";
-import { Now } from "../validate/run.js";
-import { VerifyEnvelope, humanVerify, verifyEnvelope } from "../render/verify.js";
-import { runVerify } from "../verify/run.js";
+import { humanVerify } from "../render/verify.js";
 import { Argument, Command, Flag } from "effect/unstable/cli";
+import { Now, VerifyEnvelope, jsonError, provideConfig, resolveProjectConfig, runVerify, verifyEnvelope } from "@okfit/engine";
 import { Console, DateTime, Effect, Option, Path, Schema } from "effect";
-import { Timestamp } from "@okfit/core";
 import { Git } from "@effected/git";
+import { Timestamp } from "@okfit/core";
 
 //#region src/commands/verify.ts
 /** V-6: tolerant id, normalised through `ConceptId.normalize`; never `Argument.path`. */

package/errors.js

@@ -1,111 +1,8 @@
-import { Runtime, Schema } from "effect";
+import { ConfigMalformedError, ConfigPathNotFoundError, InitOverwriteError, VerifyConceptNotFoundError, VerifyUnsupportedFrontmatterError } from "@okfit/engine";
 import { ConfigIssueRenderer } from "@effected/cli";
 
 //#region src/errors.ts
-/**
-* `--config <path>` named a path that does not exist. Every `ConfigResolver`
-* has a `never` error channel and `explicitPath` absorbs a missing target
-* into `Option.none()`, so a bad `--config` would otherwise fall through to
-* the XDG file silently. The CLI checks it itself before building any layer
-* (K-1, spec 4.1).
-*
-* @public
-*/
-var ConfigPathNotFoundError = class extends Schema.TaggedError()("ConfigPathNotFoundError", { path: Schema.String }) {
-	[Runtime.errorExitCode] = 3;
-	get message() {
-		return `config path not found: ${this.path}`;
-	}
-};
-/**
-* `okfit init` found one or more of its target paths already present (K-28).
-* Carries the whole conflicting-path list so the renderer prints every one.
-* `paths` are absolute; `renderFailure` relativises them to `cwd` (K-51).
-*
-* @public
-*/
-var InitOverwriteError = class extends Schema.TaggedError()("InitOverwriteError", {
-	paths: Schema.Array(Schema.String),
-	cwd: Schema.String
-}) {
-	[Runtime.errorExitCode] = 3;
-	get message() {
-		return "refusing to overwrite existing files";
-	}
-};
-/**
-* V-9: `<id>` did not resolve to a verifiable concept. `reason` is
-* `"not-a-concept"` (no such file, or an id that normalises to nothing),
-* `"reserved"` (the id names `index.md` or `log.md`), or `"undecodable"`
-* (a file exists but `bundle.diagnostics` names it — `diagnosticCode`
-* carries which). `root` is the absolute bundle root, kept OFF `message`
-* so K-51's relativisation rule has nothing to apply to and the human
-* line and the JSON envelope's `message` are identical.
-*
-* @public
-*/
-var VerifyConceptNotFoundError = class extends Schema.TaggedError()("VerifyConceptNotFoundError", {
-	id: Schema.String,
-	root: Schema.String,
-	reason: Schema.Literals([
-		"not-a-concept",
-		"reserved",
-		"undecodable"
-	]),
-	diagnosticCode: Schema.optionalKey(Schema.String)
-}) {
-	[Runtime.errorExitCode] = 3;
-	get message() {
-		const detail = this.diagnosticCode === void 0 ? this.reason : `${this.reason}: ${this.diagnosticCode}`;
-		return `no concept "${this.id}" in this bundle (${detail})`;
-	}
-};
-/**
-* V-14: fail closed on a `verified` shape the classifier does not name.
-* `shape` is one of `"alias"`, `"merge-key"`, `"scalar"`, `"empty"` (and,
-* defensively, `"no-frontmatter"` or `"not-a-mapping"`, neither reachable
-* for a concept that reached `bundle.concepts`). The file is never opened
-* for writing when this is raised.
-*
-* @public
-*/
-var VerifyUnsupportedFrontmatterError = class extends Schema.TaggedError()("VerifyUnsupportedFrontmatterError", {
-	id: Schema.String,
-	shape: Schema.String
-}) {
-	[Runtime.errorExitCode] = 3;
-	get message() {
-		return `"${this.id}"'s verified value is a shape okfit verify cannot edit (${this.shape}); edit it by hand`;
-	}
-};
 const hasTag = (error, tag) => typeof error === "object" && error !== null && "_tag" in error && error._tag === tag;
-/** The error's `message` when it has one as a string, else `String(error)`. */
-const messageOf = (error) => {
-	if (typeof error === "object" && error !== null && "message" in error) {
-		const message = error.message;
-		if (typeof message === "string") return message;
-	}
-	return String(error);
-};
-/**
-* A config file at a KNOWN path failed to parse or validate (K-46's own
-* intent — "each class' message already names the offending path" does not
-* hold for `@effected/config-file`'s `ConfigCodecError`, which carries no
-* `path` field at all; this wraps it, and `ConfigValidationError`, with the
-* path the caller already knows). `cause` is the original config-file error,
-* preserved structurally, never stringified early.
-*
-* @public
-*/
-var ConfigMalformedError = class extends Schema.TaggedError()("ConfigMalformedError", {
-	path: Schema.String,
-	cause: Schema.Defect()
-}) {
-	[Runtime.errorExitCode] = 3;
-	get message() {
-		return `malformed config ${this.path}: ${messageOf(this.cause)}`;
-	}
-};
 /** `path` relative to `cwd` when it is under it, else the absolute path unchanged (K-51). */
 const relativeToCwd = (path, cwd) => {
 	if (path === cwd) return ".";
@@ -170,4 +67,4 @@ const renderFailure = (error) => {
 };
 
 //#endregion
-export { ConfigMalformedError, ConfigPathNotFoundError, InitOverwriteError, VerifyConceptNotFoundError, VerifyUnsupportedFrontmatterError, renderFailure };
+export { renderFailure };