reposets 4.0.1 → 4.0.3

package/bin/reposets.js

@@ -1,22 +1,22 @@
 #!/usr/bin/env node
-import { Invocation } from "../services/Invocation.js";
 import { CredentialsFilesLive } from "../services/ConfigFiles.js";
+import { Invocation } from "../services/Invocation.js";
 import { CACHE_OPTIONS, STORE_OPTIONS } from "../store/files.js";
 import { SyncJournalLive } from "../store/SyncJournal.js";
 import { credentialsCommand } from "../cli/commands/credentials.js";
 import { doctorCommand } from "../cli/commands/doctor.js";
-import { syncCommand } from "../cli/commands/sync.js";
 import { driftCommand } from "../cli/commands/drift.js";
 import { historyCommand } from "../cli/commands/history.js";
 import { initCommand } from "../cli/commands/init.js";
 import { listCommand } from "../cli/commands/list.js";
 import { nukeCommand } from "../cli/commands/nuke.js";
+import { syncCommand } from "../cli/commands/sync.js";
 import { validateCommand } from "../cli/commands/validate.js";
 import { ConfigFlag, ConfigLive } from "../cli/flags.js";
 import { Effect, Layer, Predicate } from "effect";
 import { App, AppCache, AppStore } from "@effected/app";
-import { NodeRuntime, NodeServices } from "@effect/platform-node";
-import { CliAudience, CliRuntime, ConfigIssueRenderer, Fmt } from "@effected/cli";
+import { NodeCrypto, NodeRuntime, NodeServices } from "@effect/platform-node";
+import { CliAudience, CliRuntime, ConfigIssueRenderer, Fmt } from "@effected/cli-kit";
 import { Command } from "effect/cli";
 
 // src/cli/index.ts
@@ -31,7 +31,7 @@ import { Command } from "effect/cli";
 * `0.0.0 (dev build)` from every build until the version was threaded down
 * from here through {@link Invocation}.
 */
-const VERSION = "4.0.1";
+const VERSION = "4.0.3";
 /**
 * The application's directories: XDG resolution and the `reposets` namespace
 * under it.
@@ -121,8 +121,9 @@ const cli = Command.make("reposets", {}, () => Effect.void).pipe(Command.withDes
 	credentialsCommand
 ]), Command.provide(ConfigLive), Command.provide(CredentialsFilesLive), Command.withGlobalFlags([ConfigFlag]), Command.withSharedFlags(CliAudience.flags()));
 /**
-* The platform: Node's services, the application's directories over them, and
-* the invocation facts.
+* The platform: Node's services, `SecureRandom` (which `NodeServices` no longer
+* carries; the journal mints run ids with it), the application's directories
+* over them, and the invocation facts.
 *
 * @remarks
 * `provideMerge` rather than `provide`, because commands require the platform
@@ -133,7 +134,7 @@ const cli = Command.make("reposets", {}, () => Effect.void).pipe(Command.withDes
 * colour-aware help formatter itself, closer to the program, and one set here
 * would be shadowed.
 */
-const PlatformLive = Layer.mergeAll(DirsLive, InvocationLive).pipe(Layer.provideMerge(NodeServices.layer));
+const PlatformLive = Layer.mergeAll(DirsLive, InvocationLive).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layerSecureRandom)));
 /**
 * Render a failure that escaped a command, one line at a time, to stderr.
 *

package/cli/commands/credentials.js

@@ -1,9 +1,9 @@
 import { profileOwner } from "../../schemas/credentials.js";
 import { ReposetsCredentialsFile } from "../../services/ConfigFiles.js";
 import { Effect, Option } from "effect";
-import { CliInteractive, CliMessage, Doc } from "@effected/cli";
+import { CliInteractive, CliMessage, Doc } from "@effected/cli-kit";
 import { CliError, Command, Flag } from "effect/cli";
-import { CliUi, Select, TextInput } from "@effected/cli/ui";
+import { CliUi, Select, TextInput } from "@effected/cli-kit/ui";
 import { AppDirs } from "@effected/xdg";
 
 // src/cli/commands/credentials.ts

package/cli/commands/doctor.js

@@ -1,13 +1,13 @@
 import { SettingsGroupSchema } from "../../schemas/config.js";
 import { profileOwner } from "../../schemas/credentials.js";
-import { Invocation } from "../../services/Invocation.js";
 import { CREDENTIALS_FILENAME, ReposetsConfigFile, ReposetsCredentialsFile } from "../../services/ConfigFiles.js";
-import { STORE_OPTIONS } from "../../store/files.js";
-import { OP_SERVICE_ACCOUNT_TOKEN, OnePasswordClientLive } from "../../services/OnePasswordClient.js";
 import { CredentialResolver, CredentialResolverLive } from "../../services/CredentialResolver.js";
+import { Invocation } from "../../services/Invocation.js";
+import { OP_SERVICE_ACCOUNT_TOKEN, OnePasswordClientLive } from "../../services/OnePasswordClient.js";
+import { STORE_OPTIONS } from "../../store/files.js";
 import { Config, Console, Effect, FileSystem, Layer, Option, Path, Predicate, Result } from "effect";
 import { AppStore } from "@effected/app";
-import { CliMessage, Doc, Fmt, SchemaIssueRenderer, Status } from "@effected/cli";
+import { CliMessage, Doc, Fmt, SchemaIssueRenderer, Status } from "@effected/cli-kit";
 import { Command } from "effect/cli";
 import { AppDirs } from "@effected/xdg";
 import { GitHubClient } from "@effected/github";

package/cli/commands/history.js

@@ -1,8 +1,8 @@
 import { SyncJournal } from "../../store/SyncJournal.js";
 import { Effect, Option } from "effect";
-import { CliInteractive, CliMessage, Doc, Fmt, Status } from "@effected/cli";
+import { CliInteractive, CliMessage, Doc, Fmt, Status } from "@effected/cli-kit";
 import { CliError, Command, Flag } from "effect/cli";
-import { CliUi, Select } from "@effected/cli/ui";
+import { CliUi, Select } from "@effected/cli-kit/ui";
 
 // src/cli/commands/history.ts
 const limitFlag = Flag.Int("limit").pipe(Flag.withDefault(20), Flag.withDescription("How many runs to show, newest first"));

package/cli/commands/init.js

@@ -1,10 +1,10 @@
-import { Invocation } from "../../services/Invocation.js";
-import { CONFIG_FILENAME, CREDENTIALS_FILENAME } from "../../services/ConfigFiles.js";
 import { configSchemaHost, credentialsSchemaHost, schemaDirective } from "../../schemas/hosted.js";
+import { CONFIG_FILENAME, CREDENTIALS_FILENAME } from "../../services/ConfigFiles.js";
+import { Invocation } from "../../services/Invocation.js";
 import { Effect, FileSystem, Option, Path } from "effect";
-import { CliExit, CliMessage } from "@effected/cli";
+import { CliExit, CliMessage } from "@effected/cli-kit";
 import { Command, Flag } from "effect/cli";
-import { CliUi, Select } from "@effected/cli/ui";
+import { CliUi, Select } from "@effected/cli-kit/ui";
 import { AppDirs } from "@effected/xdg";
 
 // src/cli/commands/init.ts

package/cli/commands/list.js

@@ -1,7 +1,7 @@
 import { profileOwner } from "../../schemas/credentials.js";
 import { ReposetsConfigFile, ReposetsCredentialsFile } from "../../services/ConfigFiles.js";
 import { Effect } from "effect";
-import { CliExit, CliMessage, Doc } from "@effected/cli";
+import { CliExit, CliMessage, Doc } from "@effected/cli-kit";
 import { Command } from "effect/cli";
 
 // src/cli/commands/list.ts

package/cli/commands/nuke.js

@@ -1,11 +1,11 @@
-import { Invocation } from "../../services/Invocation.js";
 import { CONFIG_FILENAME, CREDENTIALS_FILENAME } from "../../services/ConfigFiles.js";
+import { Invocation } from "../../services/Invocation.js";
 import { CACHE_OPTIONS, STORE_OPTIONS } from "../../store/files.js";
 import { Effect, FileSystem, Path } from "effect";
 import { AppCache, AppStore } from "@effected/app";
-import { CliExit, CliInteractive, CliMessage, Doc, Fmt } from "@effected/cli";
+import { CliExit, CliInteractive, CliMessage, Doc, Fmt } from "@effected/cli-kit";
 import { CliError, Command, Flag } from "effect/cli";
-import { CliUi, Confirm, MultiSelect } from "@effected/cli/ui";
+import { CliUi, Confirm, MultiSelect } from "@effected/cli-kit/ui";
 import { AppDirs, Xdg } from "@effected/xdg";
 import { Walker } from "@effected/walker";
 

package/cli/commands/sync.js

@@ -1,20 +1,20 @@
+import { danglingReferences } from "../../lib/config-refs.js";
 import { ReposetsConfigFile, ReposetsCredentialsFile } from "../../services/ConfigFiles.js";
-import { SyncJournal, SyncJournalLive } from "../../store/SyncJournal.js";
-import { OnePasswordClientLive } from "../../services/OnePasswordClient.js";
 import { CredentialResolver, CredentialResolverLive } from "../../services/CredentialResolver.js";
-import { danglingReferences } from "../../lib/config-refs.js";
+import { OnePasswordClientLive } from "../../services/OnePasswordClient.js";
 import { SyncLogger, SyncLoggerLive } from "../../services/SyncLogger.js";
 import { AppliedStateLive } from "../../store/AppliedState.js";
 import { RepoCacheLive } from "../../store/RepoCache.js";
+import { SyncJournal, SyncJournalLive } from "../../store/SyncJournal.js";
 import { PHASE_NAMES } from "../../sync/phase.js";
 import { allPhases } from "../../sync/phases/index.js";
 import { SyncEngine, SyncEngineLive } from "../../sync/SyncEngine.js";
 import { syncSummaryBlock } from "../views/sync-progress-model.js";
 import { syncProgressView } from "../views/sync-progress-view.js";
 import { Console, Effect, Exit, Layer, Option, PubSub } from "effect";
-import { CliExit, CliInteractive, CliMessage, Doc } from "@effected/cli";
+import { CliExit, CliInteractive, CliMessage, Doc } from "@effected/cli-kit";
 import { CliError, Command, Flag } from "effect/cli";
-import { CliUi } from "@effected/cli/ui";
+import { CliUi } from "@effected/cli-kit/ui";
 import { CodeScanning, DeploymentEnvironment, GitHubClient, GitHubRepository, RepositorySecret, RepositorySecurity, RepositoryVariable, Ruleset, WorkflowDispatch } from "@effected/github";
 
 // src/cli/commands/sync.ts

package/cli/commands/validate.js

@@ -1,9 +1,9 @@
-import { ReposetsConfigFile, ReposetsCredentialsFile } from "../../services/ConfigFiles.js";
 import { danglingReferences } from "../../lib/config-refs.js";
 import { undefinedCredentialLabels } from "../../lib/credential-labels.js";
 import { orgOnlyViolations } from "../../lib/org-only.js";
+import { ReposetsConfigFile, ReposetsCredentialsFile } from "../../services/ConfigFiles.js";
 import { Effect } from "effect";
-import { CliExit, CliMessage, Doc, Status } from "@effected/cli";
+import { CliExit, CliMessage, Doc, Status } from "@effected/cli-kit";
 import { Command } from "effect/cli";
 
 // src/cli/commands/validate.ts

package/cli/views/sync-progress-model.js

@@ -1,4 +1,4 @@
-import { Doc, Status } from "@effected/cli";
+import { Doc, Status } from "@effected/cli-kit";
 
 // src/cli/views/sync-progress-model.ts
 /**

package/cli/views/sync-progress-view.js

@@ -1,5 +1,5 @@
 import { initialSyncProgress, isSyncRunEnd, isSyncRunStart, reduceSyncProgress } from "./sync-progress-model.js";
-import { CliUi } from "@effected/cli/ui";
+import { CliUi } from "@effected/cli-kit/ui";
 
 // src/cli/views/sync-progress-view.ts
 /**

package/cli/views/sync-progress.js

@@ -1,6 +1,6 @@
 import { syncSummaryBlock } from "./sync-progress-model.js";
-import { Fmt } from "@effected/cli";
-import { DocView, Styled, useGlyphs } from "@effected/cli/ui";
+import { Fmt } from "@effected/cli-kit";
+import { DocView, Styled, useGlyphs } from "@effected/cli-kit/ui";
 import { Box, Text } from "ink";
 import { jsx, jsxs } from "react/jsx-runtime";
 

package/index.js

@@ -1,5 +1,5 @@
 import { ConfigSchema } from "./schemas/config.js";
-import { Invocation } from "./services/Invocation.js";
 import { CONFIG_FILENAME, ConfigFlagMissingConfig, ConfigFlagNotFound, ReposetsConfigFile, makeConfigFilesLive } from "./services/ConfigFiles.js";
+import { Invocation } from "./services/Invocation.js";
 
 export { CONFIG_FILENAME, ConfigFlagMissingConfig, ConfigFlagNotFound, ConfigSchema, Invocation, ReposetsConfigFile, makeConfigFilesLive };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "reposets",
-	"version": "4.0.1",
+	"version": "4.0.3",
 	"private": false,
 	"description": "CLI tool to sync GitHub repo settings, secrets and rulesets across personal repositories",
 	"keywords": [
@@ -48,22 +48,22 @@
 	},
 	"dependencies": {
 		"@1password/sdk": "^0.5.0",
-		"@effect/platform-node": "^4.0.7",
-		"@effected/app": "^0.29.0",
-		"@effected/cli": "^0.24.0",
-		"@effected/config-file": "^0.22.0",
-		"@effected/env": "^0.7.0",
-		"@effected/github": "^0.26.0",
-		"@effected/glob": "^0.16.0",
-		"@effected/jsonc": "^0.21.0",
-		"@effected/schemastore": "^0.27.0",
-		"@effected/store": "^0.21.0",
-		"@effected/toml": "^0.17.0",
-		"@effected/walker": "^0.22.0",
-		"@effected/xdg": "^0.17.0",
-		"@effected/yaml": "^0.26.0",
+		"@effect/platform-node": "~4.1.2",
+		"@effected/app": "^0.31.0",
+		"@effected/cli-kit": "^0.26.0",
+		"@effected/config-file": "^0.24.0",
+		"@effected/env": "^0.10.0",
+		"@effected/github": "^0.28.0",
+		"@effected/glob": "^0.18.0",
+		"@effected/jsonc": "^0.23.0",
+		"@effected/schemastore": "^0.29.0",
+		"@effected/store": "^0.23.0",
+		"@effected/toml": "^0.19.0",
+		"@effected/walker": "^0.25.0",
+		"@effected/xdg": "^0.19.0",
+		"@effected/yaml": "^0.28.0",
 		"blakejs": "^1.2.1",
-		"effect": "^4.0.7",
+		"effect": "~4.1.2",
 		"ink": "^8.0.0",
 		"react": "^19.3.1"
 	},

package/services/OnePasswordClient.js

@@ -1,5 +1,5 @@
 import { Config, Context, Data, Effect, Layer, Option, Redacted } from "effect";
-import { Fmt } from "@effected/cli";
+import { Fmt } from "@effected/cli-kit";
 
 // src/services/OnePasswordClient.ts
 /**

package/services/SyncLogger.js

@@ -1,5 +1,5 @@
 import { Console, Context, Effect, Layer, PubSub, Ref } from "effect";
-import { CliLog, CliTheme, Fmt, Status } from "@effected/cli";
+import { CliLog, CliTheme, Fmt, Status } from "@effected/cli-kit";
 import { Audience } from "@effected/env";
 
 // src/services/SyncLogger.ts

package/store/SyncJournal.js

@@ -1,5 +1,6 @@
-import { Context, Crypto, DateTime, Effect, Layer } from "effect";
+import { Context, DateTime, Effect, Layer } from "effect";
 import { Store } from "@effected/store";
+import { SecureRandom } from "effect/crypto";
 
 // src/store/SyncJournal.ts
 /**
@@ -15,11 +16,11 @@ import { Store } from "@effected/store";
 */
 var SyncJournal = class extends Context.Service()("reposets/SyncJournal", { make: Effect.gen(function* () {
 	const store = yield* Store;
-	const crypto = yield* Crypto.Crypto;
+	const random = yield* SecureRandom.SecureRandom;
 	const sql = store.client;
 	return {
 		startRun: (options) => Effect.gen(function* () {
-			const id = yield* crypto.randomUUIDv7();
+			const id = yield* random.uuidV7();
 			const startedAt = yield* DateTime.now;
 			yield* sql`
 						INSERT INTO sync_run (id, started_at, group_name, dry_run)

package/sync/SyncEngine.js

@@ -1,8 +1,8 @@
 import { profileOwner } from "../schemas/credentials.js";
-import { SyncJournal } from "../store/SyncJournal.js";
 import { CredentialResolver } from "../services/CredentialResolver.js";
 import { SyncLogger } from "../services/SyncLogger.js";
 import { RepoCache } from "../store/RepoCache.js";
+import { SyncJournal } from "../store/SyncJournal.js";
 import { emptyResult, mergeResults, selectPhases } from "./phase.js";
 import { Context, Effect, Layer } from "effect";
 import { GitHubRepository, Repo, RepoRef } from "@effected/github";

package/sync/phase.js

@@ -1,5 +1,5 @@
 import { Effect } from "effect";
-import { Fmt } from "@effected/cli";
+import { Fmt } from "@effected/cli-kit";
 
 // src/sync/phase.ts
 /** A phase that touched nothing and failed at nothing. */

package/sync/phases/code-scanning.js

@@ -1,11 +1,11 @@
+import { fingerprint } from "../../lib/fingerprint.js";
 import { SyncLogger } from "../../services/SyncLogger.js";
 import { AppliedState, lookup } from "../../store/AppliedState.js";
 import { RepoCache } from "../../store/RepoCache.js";
-import { read } from "./resource.js";
-import { fingerprint } from "../../lib/fingerprint.js";
 import { decide, isDrift, needsApply } from "../decide.js";
+import { read } from "./resource.js";
 import { Effect, Option } from "effect";
-import { Fmt } from "@effected/cli";
+import { Fmt } from "@effected/cli-kit";
 import { CodeScanning, WorkflowDispatch } from "@effected/github";
 
 // src/sync/phases/code-scanning.ts

package/sync/phases/environments.js

@@ -1,9 +1,9 @@
+import { fingerprint } from "../../lib/fingerprint.js";
 import { SyncLogger } from "../../services/SyncLogger.js";
 import { AppliedState, lookup } from "../../store/AppliedState.js";
-import { fingerprint } from "../../lib/fingerprint.js";
 import { decide, isDrift, needsApply } from "../decide.js";
 import { Effect, Option } from "effect";
-import { Fmt } from "@effected/cli";
+import { Fmt } from "@effected/cli-kit";
 import { DeploymentEnvironment } from "@effected/github";
 
 // src/sync/phases/environments.ts

package/sync/phases/index.js

@@ -1,4 +1,3 @@
-import { capture, declaredNames, resolveGroups } from "./resource.js";
 import { cleanupPhase } from "./cleanup.js";
 import { codeScanningPhase } from "./code-scanning.js";
 import { environmentsPhase } from "./environments.js";
@@ -7,6 +6,7 @@ import { secretsPhase } from "./secrets.js";
 import { securityPhase } from "./security.js";
 import { settingsPhase } from "./settings.js";
 import { variablesPhase } from "./variables.js";
+import { capture, declaredNames, resolveGroups } from "./resource.js";
 import { Effect } from "effect";
 
 // src/sync/phases/index.ts

package/sync/phases/resource.js

@@ -1,5 +1,5 @@
 import { Effect, Redacted } from "effect";
-import { Fmt } from "@effected/cli";
+import { Fmt } from "@effected/cli-kit";
 
 // src/sync/phases/resource.ts
 /**

package/sync/phases/rulesets.js

@@ -1,10 +1,10 @@
+import { fingerprint } from "../../lib/fingerprint.js";
 import { buildRulesetPayload } from "../../schemas/ruleset.js";
 import { SyncLogger } from "../../services/SyncLogger.js";
 import { AppliedState, lookup } from "../../store/AppliedState.js";
 import { RepoCache } from "../../store/RepoCache.js";
-import { capture, read } from "./resource.js";
-import { fingerprint } from "../../lib/fingerprint.js";
 import { decide, isDrift, needsApply } from "../decide.js";
+import { capture, read } from "./resource.js";
 import { Effect, Option, Redacted } from "effect";
 import { Ruleset } from "@effected/github";
 

package/sync/phases/secrets.js

@@ -1,8 +1,8 @@
+import { fingerprint } from "../../lib/fingerprint.js";
 import { SyncLogger } from "../../services/SyncLogger.js";
 import { AppliedState, lookup } from "../../store/AppliedState.js";
-import { capture, resolveGroups } from "./resource.js";
-import { fingerprint } from "../../lib/fingerprint.js";
 import { decide, isDrift, needsApply } from "../decide.js";
+import { capture, resolveGroups } from "./resource.js";
 import { Effect, FileSystem, Option, Path, Redacted } from "effect";
 import { RepositorySecret } from "@effected/github";
 

package/sync/phases/security.js

@@ -1,9 +1,9 @@
+import { fingerprint } from "../../lib/fingerprint.js";
 import { SyncLogger } from "../../services/SyncLogger.js";
 import { AppliedState, lookup } from "../../store/AppliedState.js";
-import { fingerprint } from "../../lib/fingerprint.js";
 import { decide, isDrift, needsApply } from "../decide.js";
 import { Effect, Option } from "effect";
-import { Fmt } from "@effected/cli";
+import { Fmt } from "@effected/cli-kit";
 import { RepositorySecurity } from "@effected/github";
 
 // src/sync/phases/security.ts

package/sync/phases/settings.js

@@ -1,9 +1,9 @@
+import { fingerprint } from "../../lib/fingerprint.js";
 import { SyncLogger } from "../../services/SyncLogger.js";
 import { AppliedState, lookup } from "../../store/AppliedState.js";
 import { RepoCache } from "../../store/RepoCache.js";
-import { read } from "./resource.js";
-import { fingerprint } from "../../lib/fingerprint.js";
 import { decide, isDrift, needsApply } from "../decide.js";
+import { read } from "./resource.js";
 import { Effect, Option } from "effect";
 import { GitHubRepository, Ruleset } from "@effected/github";
 

package/sync/phases/variables.js

@@ -1,8 +1,8 @@
+import { fingerprint } from "../../lib/fingerprint.js";
 import { SyncLogger } from "../../services/SyncLogger.js";
 import { AppliedState, lookup } from "../../store/AppliedState.js";
-import { capture, resolveGroups } from "./resource.js";
-import { fingerprint } from "../../lib/fingerprint.js";
 import { decide, isDrift, needsApply } from "../decide.js";
+import { capture, resolveGroups } from "./resource.js";
 import { Effect, FileSystem, Option, Path, Redacted } from "effect";
 import { RepositoryVariable } from "@effected/github";
 

package/tsdoc-metadata.json

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