npm - @effect-app/cli - Versions diffs - 2.1.0-beta.30 → 2.1.0-beta.32 - Mend

@effect-app/cli 2.1.0-beta.30 → 2.1.0-beta.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/CHANGELOG.md +14 -0
package/dist/index.js +27 -6
package/dist/sync-effect-app-subtree.d.ts +11 -0
package/dist/sync-effect-app-subtree.d.ts.map +1 -0
package/dist/sync-effect-app-subtree.js +198 -0
package/dist/sync-effect-subtree.d.ts +1 -2
package/dist/sync-effect-subtree.d.ts.map +1 -1
package/dist/sync-effect-subtree.js +20 -9
package/package.json +5 -1
package/src/index.ts +49 -9
package/src/sync-effect-app-subtree.ts +307 -0
package/src/sync-effect-subtree.ts +30 -13

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,19 @@
 # @effect-app/cli
+## 2.1.0-beta.32
+### Patch Changes
+- b9312df: Prevent subtree sync commands from importing upstream git tags.
+## 2.1.0-beta.31
+### Patch Changes
+- e7ad78c: Add `sync-effect-app` to sync vendored Effect App libs by pinned package version.
+  The command prefers package-version git tags and supports `--ref latest` for main.
+- e7ad78c: Sync Effect subtrees from a repository URL without requiring a local git remote.
 ## 2.1.0-beta.30
 ### Patch Changes

package/dist/index.js CHANGED Viewed

@@ -14,6 +14,7 @@ import { GistHandler } from "./gist.js";
 import { RunCommandService } from "./os-command.js";
 import { packages } from "./shared.js";
 import { patchArgvForWrapCommands } from "./argv-patch.js";
+import { syncEffectAppSubtree } from "./sync-effect-app-subtree.js";
 import { syncEffectSubtree } from "./sync-effect-subtree.js";
 import { syncDiff, syncPush, syncShared } from "./sync-shared.js";
 patchArgvForWrapCommands(process.argv);
@@ -464,20 +465,39 @@ NodeRuntime.runMain(Effect
         .make("sync-effect", {
         manifests: Flag.string("manifests").pipe(Flag.withAlias("m"), Flag.optional, Flag.withDescription("Comma-separated list of package.json paths to scan (default: package.json)")),
         prefix: Flag.string("prefix").pipe(Flag.optional, Flag.withDescription("Subtree prefix (default: repos/effect)")),
-        remote: Flag.string("remote").pipe(Flag.optional, Flag.withDescription("Git remote name (default: effect-smol)")),
-        remoteUrl: Flag.string("remote-url").pipe(Flag.optional, Flag.withDescription("Git remote URL (default: https://github.com/Effect-TS/effect-smol.git)"))
-    }, Effect.fn("effa-cli.sync-effect")(function* ({ manifests, prefix, remote, remoteUrl }) {
+        url: Flag.string("url").pipe(Flag.optional, Flag.withDescription("Git repository URL (default: https://github.com/Effect-TS/effect-smol.git)"))
+    }, Effect.fn("effa-cli.sync-effect")(function* ({ manifests, prefix, url }) {
         yield* syncEffectSubtree({
             manifestPaths: Option.match(manifests, {
                 onNone: () => ["package.json"],
                 onSome: (m) => m.split(",").map((p) => p.trim())
             }),
             subtreePrefix: Option.getOrElse(prefix, () => "repos/effect"),
-            remoteName: Option.getOrElse(remote, () => "effect-smol"),
-            remoteUrl: Option.getOrElse(remoteUrl, () => "https://github.com/Effect-TS/effect-smol.git")
+            url: Option.getOrElse(url, () => "https://github.com/Effect-TS/effect-smol.git")
         });
     }))
         .pipe(Command.withDescription("Sync the Effect subtree to the version pinned in package.json"));
+    const syncEffectApp = Command
+        .make("sync-effect-app", {
+        manifests: Flag.string("manifests").pipe(Flag.withAlias("m"), Flag.optional, Flag.withDescription("Comma-separated list of package.json paths to scan (default: package.json)")),
+        prefix: Flag.string("prefix").pipe(Flag.optional, Flag.withDescription("Subtree prefix (default: repos/libs)")),
+        url: Flag.string("url").pipe(Flag.optional, Flag.withDescription("Git repository URL (default: https://github.com/effect-app/libs.git)")),
+        ref: Flag.string("ref").pipe(Flag.optional, Flag.withDescription("Ref escape hatch (branch/tag/sha/latest); latest means main"))
+    }, Effect.fn("effa-cli.sync-effect-app")(function* ({ manifests, prefix, ref, url }) {
+        yield* syncEffectAppSubtree({
+            manifestPaths: Option.match(manifests, {
+                onNone: () => ["package.json"],
+                onSome: (m) => m.split(",").map((p) => p.trim())
+            }),
+            ...Option.match(ref, {
+                onNone: () => ({}),
+                onSome: (ref) => ({ ref })
+            }),
+            subtreePrefix: Option.getOrElse(prefix, () => "repos/libs"),
+            url: Option.getOrElse(url, () => "https://github.com/effect-app/libs.git")
+        });
+    }))
+        .pipe(Command.withDescription("Sync the Effect App libs subtree to the version pinned in package.json"));
     const SharedLockfileFlag = Flag.file("lockfile").pipe(Flag.optional, Flag.withDescription("Path to lockfile (default: .shared.json)"));
     const sync = Command
         .make("sync", {
@@ -528,6 +548,7 @@ NodeRuntime.runMain(Effect
         gist,
         nuke,
         syncEffect,
+        syncEffectApp,
         sync,
         syncDiffCmd,
         syncPushCmd
@@ -536,4 +557,4 @@ NodeRuntime.runMain(Effect
     });
 })()
     .pipe(Effect.scoped, Effect.provide(Layer.provideMerge(Layer.merge(GistHandler.Default, RunCommandService.Default), NodeServices.layer))));
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/sync-effect-app-subtree.d.ts ADDED Viewed

@@ -0,0 +1,11 @@
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import { RunCommandService } from "./os-command.js";
+export interface SyncEffectAppConfig {
+    readonly manifestPaths: ReadonlyArray<string>;
+    readonly subtreePrefix: string;
+    readonly url: string;
+    readonly ref?: string;
+}
+export declare const syncEffectAppSubtree: (config: SyncEffectAppConfig) => Effect.Effect<undefined, Error | import("effect/PlatformError").PlatformError, FileSystem.FileSystem | RunCommandService>;
+//# sourceMappingURL=sync-effect-app-subtree.d.ts.map

package/dist/sync-effect-app-subtree.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"sync-effect-app-subtree.d.ts","sourceRoot":"","sources":["../src/sync-effect-app-subtree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAG/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEnD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IAC7C,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CACtB;AA4ED,eAAO,MAAM,oBAAoB,4JA0N/B,CAAA"}

package/dist/sync-effect-app-subtree.js ADDED Viewed

@@ -0,0 +1,198 @@
+import * as Arr from "effect/Array";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Path from "node:path";
+import { RunCommandService } from "./os-command.js";
+const depSections = ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"];
+const packageManifestPaths = {
+    "effect-app": "packages/effect-app/package.json",
+    "@effect-app/infra": "packages/infra/package.json",
+    "@effect-app/vue": "packages/vue/package.json",
+    "@effect-app/vue-components": "packages/vue-components/package.json",
+    "@effect-app/cli": "packages/cli/package.json",
+    "@effect-app/eslint-codegen-model": "packages/eslint-codegen-model/package.json",
+    "@effect-app/eslint-shared-config": "packages/eslint-shared-config/package.json"
+};
+const packagePreference = Object.keys(packageManifestPaths);
+const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const isEffectAppPackage = (name) => name === "effect-app" || name.startsWith("@effect-app/");
+const isNonEmptyString = (value) => value !== "";
+const shellQuote = (value) => `'${value.replaceAll("'", "'\\''")}'`;
+const normalizeVersion = (range) => {
+    const match = range.match(/\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?/);
+    return match?.[0];
+};
+const isFullSha = (ref) => /^[0-9a-f]{40}$/i.test(ref);
+const resolveRequestedRef = (ref) => ref === "latest" ? "main" : ref;
+const parsePackageVersion = (source, packagePath) => {
+    const parsed = JSON.parse(source);
+    if (!isRecord(parsed) || typeof parsed["version"] !== "string") {
+        throw new Error(`Could not read version from ${packagePath}`);
+    }
+    return parsed["version"];
+};
+const parseDefaultBranch = (source) => {
+    const line = source
+        .split("\n")
+        .find((line) => line.startsWith("ref: refs/heads/") && line.endsWith("\tHEAD"));
+    if (!line) {
+        throw new Error("Could not resolve default branch for effect-app libs repository");
+    }
+    return line.slice("ref: refs/heads/".length, -"\tHEAD".length);
+};
+const selectVersionMentions = (mentions) => {
+    for (const packageName of packagePreference) {
+        const selected = mentions.filter((mention) => mention.name === packageName);
+        if (Arr.isArrayNonEmpty(selected))
+            return selected;
+    }
+    return mentions;
+};
+const describeMentions = (mentions) => mentions
+    .map((mention) => `${mention.manifestPath} (${mention.section}) ${mention.name}: ${mention.range}`)
+    .join("\n");
+export const syncEffectAppSubtree = Effect.fnUntraced(function* (config) {
+    const fs = yield* FileSystem.FileSystem;
+    const { runGetExitCode, runGetString } = yield* RunCommandService;
+    const run = Effect.fnUntraced(function* (command) {
+        const exitCode = yield* runGetExitCode(command);
+        if (exitCode !== 0) {
+            return yield* Effect.fail(new Error(`Command failed with exit code ${exitCode}: ${command}`));
+        }
+    });
+    const fetchRemoteRef = Effect.fnUntraced(function* (remoteRef, localRef) {
+        const rawRef = `${localRef}-raw`;
+        yield* run(`git fetch --no-tags ${shellQuote(config.url)} ${shellQuote(`+${remoteRef}:${rawRef}`)}`);
+        const commit = (yield* runGetString(`git rev-list -n1 ${shellQuote(rawRef)}`)).trim();
+        yield* run(`git update-ref ${shellQuote(localRef)} ${shellQuote(commit)}`);
+    });
+    const fetchRequestedRef = Effect.fnUntraced(function* (requestedRef, localRef) {
+        if (isFullSha(requestedRef)) {
+            const localCommit = yield* runGetString(`git rev-parse --verify ${shellQuote(`${requestedRef}^{commit}`)}`)
+                .pipe(Effect.option);
+            if (Option.isSome(localCommit)) {
+                return yield* run(`git update-ref ${shellQuote(localRef)} ${shellQuote(localCommit.value.trim())}`);
+            }
+        }
+        const remoteRefs = requestedRef.startsWith("refs/")
+            ? [requestedRef]
+            : [`refs/heads/${requestedRef}`, `refs/tags/${requestedRef}`, requestedRef];
+        for (const remoteRef of remoteRefs) {
+            const exists = yield* runGetString(`git ls-remote --exit-code ${shellQuote(config.url)} ${shellQuote(remoteRef)}`)
+                .pipe(Effect.option);
+            if (Option.isSome(exists)) {
+                return yield* fetchRemoteRef(remoteRef, localRef);
+            }
+        }
+        return yield* Effect.fail(new Error(`Could not resolve effect-app ref: ${requestedRef}`));
+    });
+    if (config.ref) {
+        const ref = resolveRequestedRef(config.ref);
+        const syncRef = "refs/effa-sync/effect-app-requested";
+        yield* Effect.logInfo(`Using effect-app subtree ref: ${ref}`);
+        yield* Effect.logInfo(`Using effect-app subtree url: ${config.url}`);
+        yield* fetchRequestedRef(ref, syncRef);
+        return yield* run(`git -c status.showUntrackedFiles=no subtree pull --prefix=${shellQuote(config.subtreePrefix)} . ${shellQuote(syncRef)} --squash`);
+    }
+    const versionMentions = [];
+    for (const manifestPath of config.manifestPaths) {
+        if (!(yield* fs.exists(manifestPath)))
+            continue;
+        const manifest = JSON.parse(yield* fs.readFileString(manifestPath));
+        if (!isRecord(manifest))
+            continue;
+        for (const section of depSections) {
+            const deps = manifest[section];
+            if (!isRecord(deps))
+                continue;
+            for (const [name, range] of Object.entries(deps)) {
+                if (!isEffectAppPackage(name) || typeof range !== "string")
+                    continue;
+                const normalized = normalizeVersion(range);
+                if (!normalized)
+                    continue;
+                versionMentions.push({ manifestPath, section, name, range, normalized });
+            }
+        }
+    }
+    if (!Arr.isArrayNonEmpty(versionMentions)) {
+        return yield* Effect.fail(new Error("Could not find any effect-app/@effect-app dependency versions in manifests"));
+    }
+    const selectedMentions = selectVersionMentions(versionMentions);
+    const versions = [...new Set(selectedMentions.map((mention) => mention.normalized))];
+    if (Arr.isArrayNonEmpty(versions.slice(1))) {
+        return yield* Effect.fail(new Error(`Found multiple Effect App versions. Please align first:\n${describeMentions(selectedMentions)}`));
+    }
+    const version = selectedMentions[0].normalized;
+    const packageName = selectedMentions[0].name;
+    const packagePath = packageManifestPaths[packageName];
+    if (!packagePath) {
+        return yield* Effect.fail(new Error(`No effect-app libs package manifest mapping for ${packageName}`));
+    }
+    const tagCandidates = [
+        `${packageName}@${version}`,
+        `v${version}`,
+        version
+    ];
+    let remoteRef;
+    for (const candidate of tagCandidates) {
+        const tagResult = yield* runGetString(`git ls-remote --exit-code --tags ${shellQuote(config.url)} ${shellQuote(`refs/tags/${candidate}`)}`)
+            .pipe(Effect.option);
+        if (Option.isSome(tagResult)) {
+            remoteRef = candidate;
+            break;
+        }
+    }
+    if (remoteRef) {
+        const syncRef = "refs/effa-sync/effect-app-tag";
+        yield* Effect.logInfo(`Using effect-app package: ${packageName}@${version}`);
+        yield* Effect.logInfo(`Using effect-app subtree ref: ${remoteRef}`);
+        yield* Effect.logInfo(`Using effect-app subtree url: ${config.url}`);
+        yield* fetchRemoteRef(`refs/tags/${remoteRef}`, syncRef);
+        return yield* run(`git -c status.showUntrackedFiles=no subtree pull --prefix=${shellQuote(config.subtreePrefix)} . ${shellQuote(syncRef)} --squash`);
+    }
+    const defaultBranchOutput = yield* runGetString(`git ls-remote --symref ${shellQuote(config.url)} HEAD`);
+    const defaultBranch = yield* Effect.try({
+        try: () => parseDefaultBranch(defaultBranchOutput),
+        catch: (cause) => cause instanceof Error ? cause : new Error(String(cause))
+    });
+    const cachePath = (yield* runGetString("git rev-parse --git-path effa-sync/effect-app-libs.git")).trim();
+    yield* run(`mkdir -p ${shellQuote(Path.dirname(cachePath))}`);
+    if (!(yield* fs.exists(cachePath))) {
+        yield* run(`git init --bare ${shellQuote(cachePath)}`);
+    }
+    yield* run(`git --git-dir=${shellQuote(cachePath)} fetch --no-tags --prune ${shellQuote(config.url)} ${shellQuote(`+refs/heads/${defaultBranch}:refs/heads/${defaultBranch}`)}`);
+    const commits = (yield* runGetString(`git --git-dir=${shellQuote(cachePath)} rev-list ${shellQuote(`refs/heads/${defaultBranch}`)}`))
+        .trim()
+        .split("\n")
+        .filter(isNonEmptyString);
+    if (!Arr.isArrayNonEmpty(commits)) {
+        return yield* Effect.fail(new Error(`No commits found on ${defaultBranch} for ${config.url}`));
+    }
+    let commit;
+    for (const candidate of commits) {
+        const packageJsonResult = yield* runGetString(`git --git-dir=${shellQuote(cachePath)} show ${shellQuote(`${candidate}:${packagePath}`)}`)
+            .pipe(Effect.option);
+        if (Option.isNone(packageJsonResult))
+            continue;
+        const candidateVersion = yield* Effect.try({
+            try: () => parsePackageVersion(packageJsonResult.value, packagePath),
+            catch: (cause) => cause instanceof Error ? cause : new Error(String(cause))
+        });
+        if (candidateVersion === version) {
+            commit = candidate;
+            break;
+        }
+    }
+    if (!commit) {
+        return yield* Effect.fail(new Error(`No commit found on ${defaultBranch} where ${packagePath} has version ${version}. Tried tags: ${tagCandidates.join(", ")}`));
+    }
+    const syncRef = "refs/effa-sync/effect-app-selected";
+    yield* run(`git --git-dir=${shellQuote(cachePath)} update-ref ${shellQuote(syncRef)} ${shellQuote(commit)}`);
+    yield* Effect.logInfo(`Using effect-app package: ${packageName}@${version}`);
+    yield* Effect.logInfo(`Using effect-app subtree commit: ${commit}`);
+    yield* Effect.logInfo(`Using effect-app subtree url: ${config.url}`);
+    yield* run(`git -c status.showUntrackedFiles=no subtree pull --prefix=${shellQuote(config.subtreePrefix)} ${shellQuote(cachePath)} ${shellQuote(syncRef)} --squash`);
+});
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sync-effect-app-subtree.js","sourceRoot":"","sources":["../src/sync-effect-app-subtree.ts"],"names":[],"mappings":"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"}

package/dist/sync-effect-subtree.d.ts CHANGED Viewed

@@ -4,8 +4,7 @@ import { RunCommandService } from "./os-command.js";
 export interface SyncEffectConfig {
     readonly manifestPaths: ReadonlyArray<string>;
     readonly subtreePrefix: string;
-    readonly remoteName: string;
-    readonly remoteUrl: string;
+    readonly url: string;
 }
 export declare const syncEffectSubtree: (config: SyncEffectConfig) => Effect.Effect<undefined, Error | import("effect/PlatformError").PlatformError, FileSystem.FileSystem | RunCommandService>;
 //# sourceMappingURL=sync-effect-subtree.d.ts.map

package/dist/sync-effect-subtree.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sync-effect-subtree.d.ts","sourceRoot":"","sources":["../src/sync-effect-subtree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEnD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IAC7C,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,~~UAAU~~,EAAE,MAAM,CAAA;~~IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA~~;~~CAC3B;AASD~~,eAAO,MAAM,iBAAiB,~~yJAuG5B~~,CAAA"}
1	+ {"version":3,"file":"sync-effect-subtree.d.ts","sourceRoot":"","sources":["../src/sync-effect-subtree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEnD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IAC7C,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CACrB;AAWD,eAAO,MAAM,iBAAiB,yJAuH5B,CAAA"}

package/dist/sync-effect-subtree.js CHANGED Viewed

@@ -3,6 +3,7 @@ import * as FileSystem from "effect/FileSystem";
 import * as Option from "effect/Option";
 import { RunCommandService } from "./os-command.js";
 const depSections = ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"];
+const shellQuote = (value) => `'${value.replaceAll("'", "'\\''")}'`;
 const normalizeVersion = (range) => {
     const match = range.match(/\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?/);
     return match?.[0];
@@ -10,6 +11,18 @@ const normalizeVersion = (range) => {
 export const syncEffectSubtree = Effect.fnUntraced(function* (config) {
     const fs = yield* FileSystem.FileSystem;
     const { runGetExitCode, runGetString } = yield* RunCommandService;
+    const run = Effect.fnUntraced(function* (command) {
+        const exitCode = yield* runGetExitCode(command);
+        if (exitCode !== 0) {
+            return yield* Effect.fail(new Error(`Command failed with exit code ${exitCode}: ${command}`));
+        }
+    });
+    const fetchRemoteRef = Effect.fnUntraced(function* (remoteRef, localRef) {
+        const rawRef = `${localRef}-raw`;
+        yield* run(`git fetch --no-tags ${shellQuote(config.url)} ${shellQuote(`+${remoteRef}:${rawRef}`)}`);
+        const commit = (yield* runGetString(`git rev-list -n1 ${shellQuote(rawRef)}`)).trim();
+        yield* run(`git update-ref ${shellQuote(localRef)} ${shellQuote(commit)}`);
+    });
     const versionMentions = [];
     for (const manifestPath of config.manifestPaths) {
         if (!(yield* fs.exists(manifestPath)))
@@ -52,15 +65,10 @@ export const syncEffectSubtree = Effect.fnUntraced(function* (config) {
         `@effect/effect@${version}`,
         `@effect/ai-anthropic@${version}`
     ];
-    // ensure remote exists
-    const remoteResult = yield* runGetString(`git remote get-url ${config.remoteName}`).pipe(Effect.option);
-    if (Option.isNone(remoteResult)) {
-        yield* runGetExitCode(`git remote add ${config.remoteName} ${config.remoteUrl}`);
-    }
-    yield* runGetExitCode(`git fetch ${config.remoteName} --tags`);
+    const url = shellQuote(config.url);
     let ref;
     for (const candidate of candidateRefs) {
-        const tagResult = yield* runGetString(`git ls-remote --exit-code --tags ${config.remoteName} refs/tags/${candidate}`)
+        const tagResult = yield* runGetString(`git ls-remote --exit-code --tags ${url} ${shellQuote(`refs/tags/${candidate}`)}`)
             .pipe(Effect.option);
         if (Option.isSome(tagResult)) {
             ref = candidate;
@@ -72,6 +80,9 @@ export const syncEffectSubtree = Effect.fnUntraced(function* (config) {
     }
     yield* Effect.logInfo(`Using effect version: ${version}`);
     yield* Effect.logInfo(`Using subtree ref: ${ref}`);
-    yield* runGetExitCode(`git -c status.showUntrackedFiles=no subtree pull --prefix=${config.subtreePrefix} ${config.remoteName} ${ref} --squash`);
+    yield* Effect.logInfo(`Using subtree url: ${config.url}`);
+    const syncRef = "refs/effa-sync/effect-selected";
+    yield* fetchRemoteRef(`refs/tags/${ref}`, syncRef);
+    yield* run(`git -c status.showUntrackedFiles=no subtree pull --prefix=${shellQuote(config.subtreePrefix)} . ${shellQuote(syncRef)} --squash`);
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luYy1lZmZlY3Qtc3VidHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9zeW5jLWVmZmVjdC1zdWJ0cmVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxNQUFNLE1BQU0sZUFBZSxDQUFBO0FBQ3ZDLE9BQU8sS0FBSyxVQUFVLE1BQU0sbUJBQW1CLENBQUE7QUFDL0MsT0FBTyxLQUFLLE1BQU0sTUFBTSxlQUFlLENBQUE7QUFDdkMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFTbkQsTUFBTSxXQUFXLEdBQUcsQ0FBQyxjQUFjLEVBQUUsaUJBQWlCLEVBQUUsa0JBQWtCLEVBQUUsc0JBQXNCLENBQVUsQ0FBQTtBQUU1RyxNQUFNLGdCQUFnQixHQUFHLENBQUMsS0FBYSxFQUFFLEVBQUU7SUFDekMsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxtQ0FBbUMsQ0FBQyxDQUFBO0lBQzlELE9BQU8sS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDbkIsQ0FBQyxDQUFBO0FBRUQsTUFBTSxDQUFDLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsRUFBQyxNQUF3QjtJQUNuRixNQUFNLEVBQUUsR0FBRyxLQUFLLENBQUMsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFBO0lBQ3ZDLE1BQU0sRUFBRSxjQUFjLEVBQUUsWUFBWSxFQUFFLEdBQUcsS0FBSyxDQUFDLENBQUMsaUJBQWlCLENBQUE7SUFFakUsTUFBTSxlQUFlLEdBTWhCLEVBQUUsQ0FBQTtJQUVQLEtBQUssTUFBTSxZQUFZLElBQUksTUFBTSxDQUFDLGFBQWEsRUFBRSxDQUFDO1FBQ2hELElBQUksQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUM7WUFBRSxTQUFRO1FBRS9DLE1BQU0sUUFBUSxHQUFHLElB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luYy1lZmZlY3Qtc3VidHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9zeW5jLWVmZmVjdC1zdWJ0cmVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxNQUFNLE1BQU0sZUFBZSxDQUFBO0FBQ3ZDLE9BQU8sS0FBSyxVQUFVLE1BQU0sbUJBQW1CLENBQUE7QUFDL0MsT0FBTyxLQUFLLE1BQU0sTUFBTSxlQUFlLENBQUE7QUFDdkMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFRbkQsTUFBTSxXQUFXLEdBQUcsQ0FBQyxjQUFjLEVBQUUsaUJBQWlCLEVBQUUsa0JBQWtCLEVBQUUsc0JBQXNCLENBQVUsQ0FBQTtBQUU1RyxNQUFNLFVBQVUsR0FBRyxDQUFDLEtBQWEsRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFBO0FBRTNFLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxLQUFhLEVBQUUsRUFBRTtJQUN6QyxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLG1DQUFtQyxDQUFDLENBQUE7SUFDOUQsT0FBTyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNuQixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFDLE1BQXdCO0lBQ25GLE1BQU0sRUFBRSxHQUFHLEtBQUssQ0FBQyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUE7SUFDdkMsTUFBTSxFQUFFLGNBQWMsRUFBRSxZQUFZLEVBQUUsR0FBRyxLQUFLLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQTtJQUVqRSxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFDLE9BQWU7UUFDckQsTUFBTSxRQUFRLEdBQUcsS0FB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

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/cli",
-  "version": "2.1.0-beta.30",
+  "version": "2.1.0-beta.32",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -58,6 +58,10 @@
       "types": "./dist/sync-effect-subtree.d.ts",
       "default": "./dist/sync-effect-subtree.js"
     },
+    "./sync-effect-app-subtree": {
+      "types": "./dist/sync-effect-app-subtree.d.ts",
+      "default": "./dist/sync-effect-app-subtree.js"
+    },
     "./sync-shared": {
       "types": "./dist/sync-shared.d.ts",
       "default": "./dist/sync-shared.js"

package/src/index.ts CHANGED Viewed

@@ -16,6 +16,7 @@ import { RunCommandService } from "./os-command.js"
 import { packages } from "./shared.js"
 import { patchArgvForWrapCommands } from "./argv-patch.js"
+import { syncEffectAppSubtree } from "./sync-effect-app-subtree.js"
 import { syncEffectSubtree } from "./sync-effect-subtree.js"
 import { syncDiff, syncPush, syncShared } from "./sync-shared.js"
@@ -727,31 +728,69 @@ NodeRuntime.runMain(
               Flag.optional,
               Flag.withDescription("Subtree prefix (default: repos/effect)")
             ),
-            remote: Flag.string("remote").pipe(
-              Flag.optional,
-              Flag.withDescription("Git remote name (default: effect-smol)")
-            ),
-            remoteUrl: Flag.string("remote-url").pipe(
+            url: Flag.string("url").pipe(
               Flag.optional,
               Flag.withDescription(
-                "Git remote URL (default: https://github.com/Effect-TS/effect-smol.git)"
+                "Git repository URL (default: https://github.com/Effect-TS/effect-smol.git)"
               )
             )
           },
-          Effect.fn("effa-cli.sync-effect")(function*({ manifests, prefix, remote, remoteUrl }) {
+          Effect.fn("effa-cli.sync-effect")(function*({ manifests, prefix, url }) {
             yield* syncEffectSubtree({
               manifestPaths: Option.match(manifests, {
                 onNone: () => ["package.json"],
                 onSome: (m) => m.split(",").map((p) => p.trim())
               }),
               subtreePrefix: Option.getOrElse(prefix, () => "repos/effect"),
-              remoteName: Option.getOrElse(remote, () => "effect-smol"),
-              remoteUrl: Option.getOrElse(remoteUrl, () => "https://github.com/Effect-TS/effect-smol.git")
+              url: Option.getOrElse(url, () => "https://github.com/Effect-TS/effect-smol.git")
             })
           })
         )
         .pipe(Command.withDescription("Sync the Effect subtree to the version pinned in package.json"))
+      const syncEffectApp = Command
+        .make(
+          "sync-effect-app",
+          {
+            manifests: Flag.string("manifests").pipe(
+              Flag.withAlias("m"),
+              Flag.optional,
+              Flag.withDescription(
+                "Comma-separated list of package.json paths to scan (default: package.json)"
+              )
+            ),
+            prefix: Flag.string("prefix").pipe(
+              Flag.optional,
+              Flag.withDescription("Subtree prefix (default: repos/libs)")
+            ),
+            url: Flag.string("url").pipe(
+              Flag.optional,
+              Flag.withDescription(
+                "Git repository URL (default: https://github.com/effect-app/libs.git)"
+              )
+            ),
+            ref: Flag.string("ref").pipe(
+              Flag.optional,
+              Flag.withDescription("Ref escape hatch (branch/tag/sha/latest); latest means main")
+            )
+          },
+          Effect.fn("effa-cli.sync-effect-app")(function*({ manifests, prefix, ref, url }) {
+            yield* syncEffectAppSubtree({
+              manifestPaths: Option.match(manifests, {
+                onNone: () => ["package.json"],
+                onSome: (m) => m.split(",").map((p) => p.trim())
+              }),
+              ...Option.match(ref, {
+                onNone: () => ({}),
+                onSome: (ref) => ({ ref })
+              }),
+              subtreePrefix: Option.getOrElse(prefix, () => "repos/libs"),
+              url: Option.getOrElse(url, () => "https://github.com/effect-app/libs.git")
+            })
+          })
+        )
+        .pipe(Command.withDescription("Sync the Effect App libs subtree to the version pinned in package.json"))
       const SharedLockfileFlag = Flag.file("lockfile").pipe(
         Flag.optional,
         Flag.withDescription("Path to lockfile (default: .shared.json)")
@@ -838,6 +877,7 @@ NodeRuntime.runMain(
             gist,
             nuke,
             syncEffect,
+            syncEffectApp,
             sync,
             syncDiffCmd,
             syncPushCmd

package/src/sync-effect-app-subtree.ts ADDED Viewed

@@ -0,0 +1,307 @@
+import * as Arr from "effect/Array"
+import * as Effect from "effect/Effect"
+import * as FileSystem from "effect/FileSystem"
+import * as Option from "effect/Option"
+import * as Path from "node:path"
+import { RunCommandService } from "./os-command.js"
+export interface SyncEffectAppConfig {
+  readonly manifestPaths: ReadonlyArray<string>
+  readonly subtreePrefix: string
+  readonly url: string
+  readonly ref?: string
+}
+interface VersionMention {
+  readonly manifestPath: string
+  readonly section: string
+  readonly name: string
+  readonly range: string
+  readonly normalized: string
+}
+const depSections = ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"] as const
+const packageManifestPaths: Record<string, string> = {
+  "effect-app": "packages/effect-app/package.json",
+  "@effect-app/infra": "packages/infra/package.json",
+  "@effect-app/vue": "packages/vue/package.json",
+  "@effect-app/vue-components": "packages/vue-components/package.json",
+  "@effect-app/cli": "packages/cli/package.json",
+  "@effect-app/eslint-codegen-model": "packages/eslint-codegen-model/package.json",
+  "@effect-app/eslint-shared-config": "packages/eslint-shared-config/package.json"
+}
+const packagePreference = Object.keys(packageManifestPaths)
+const isRecord = (value: unknown): value is Record<string, unknown> =>
+  typeof value === "object" && value !== null && !Array.isArray(value)
+const isEffectAppPackage = (name: string) => name === "effect-app" || name.startsWith("@effect-app/")
+const isNonEmptyString = (value: string) => value !== ""
+const shellQuote = (value: string) => `'${value.replaceAll("'", "'\\''")}'`
+const normalizeVersion = (range: string) => {
+  const match = range.match(/\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?/)
+  return match?.[0]
+}
+const isFullSha = (ref: string) => /^[0-9a-f]{40}$/i.test(ref)
+const resolveRequestedRef = (ref: string) => ref === "latest" ? "main" : ref
+const parsePackageVersion = (source: string, packagePath: string) => {
+  const parsed: unknown = JSON.parse(source)
+  if (!isRecord(parsed) || typeof parsed["version"] !== "string") {
+    throw new Error(`Could not read version from ${packagePath}`)
+  }
+  return parsed["version"]
+}
+const parseDefaultBranch = (source: string) => {
+  const line = source
+    .split("\n")
+    .find((line) => line.startsWith("ref: refs/heads/") && line.endsWith("\tHEAD"))
+  if (!line) {
+    throw new Error("Could not resolve default branch for effect-app libs repository")
+  }
+  return line.slice("ref: refs/heads/".length, -"\tHEAD".length)
+}
+const selectVersionMentions = (mentions: Arr.NonEmptyArray<VersionMention>) => {
+  for (const packageName of packagePreference) {
+    const selected = mentions.filter((mention) => mention.name === packageName)
+    if (Arr.isArrayNonEmpty(selected)) return selected
+  }
+  return mentions
+}
+const describeMentions = (mentions: ReadonlyArray<VersionMention>) =>
+  mentions
+    .map((mention) => `${mention.manifestPath} (${mention.section}) ${mention.name}: ${mention.range}`)
+    .join("\n")
+export const syncEffectAppSubtree = Effect.fnUntraced(function*(config: SyncEffectAppConfig) {
+  const fs = yield* FileSystem.FileSystem
+  const { runGetExitCode, runGetString } = yield* RunCommandService
+  const run = Effect.fnUntraced(function*(command: string) {
+    const exitCode = yield* runGetExitCode(command)
+    if (exitCode !== 0) {
+      return yield* Effect.fail(new Error(`Command failed with exit code ${exitCode}: ${command}`))
+    }
+  })
+  const fetchRemoteRef = Effect.fnUntraced(function*(remoteRef: string, localRef: string) {
+    const rawRef = `${localRef}-raw`
+    yield* run(
+      `git fetch --no-tags ${shellQuote(config.url)} ${shellQuote(`+${remoteRef}:${rawRef}`)}`
+    )
+    const commit = (yield* runGetString(`git rev-list -n1 ${shellQuote(rawRef)}`)).trim()
+    yield* run(`git update-ref ${shellQuote(localRef)} ${shellQuote(commit)}`)
+  })
+  const fetchRequestedRef = Effect.fnUntraced(function*(requestedRef: string, localRef: string) {
+    if (isFullSha(requestedRef)) {
+      const localCommit = yield* runGetString(
+        `git rev-parse --verify ${shellQuote(`${requestedRef}^{commit}`)}`
+      )
+        .pipe(Effect.option)
+      if (Option.isSome(localCommit)) {
+        return yield* run(`git update-ref ${shellQuote(localRef)} ${shellQuote(localCommit.value.trim())}`)
+      }
+    }
+    const remoteRefs = requestedRef.startsWith("refs/")
+      ? [requestedRef]
+      : [`refs/heads/${requestedRef}`, `refs/tags/${requestedRef}`, requestedRef]
+    for (const remoteRef of remoteRefs) {
+      const exists = yield* runGetString(
+        `git ls-remote --exit-code ${shellQuote(config.url)} ${shellQuote(remoteRef)}`
+      )
+        .pipe(Effect.option)
+      if (Option.isSome(exists)) {
+        return yield* fetchRemoteRef(remoteRef, localRef)
+      }
+    }
+    return yield* Effect.fail(new Error(`Could not resolve effect-app ref: ${requestedRef}`))
+  })
+  if (config.ref) {
+    const ref = resolveRequestedRef(config.ref)
+    const syncRef = "refs/effa-sync/effect-app-requested"
+    yield* Effect.logInfo(`Using effect-app subtree ref: ${ref}`)
+    yield* Effect.logInfo(`Using effect-app subtree url: ${config.url}`)
+    yield* fetchRequestedRef(ref, syncRef)
+    return yield* run(
+      `git -c status.showUntrackedFiles=no subtree pull --prefix=${shellQuote(config.subtreePrefix)} . ${
+        shellQuote(syncRef)
+      } --squash`
+    )
+  }
+  const versionMentions: Array<VersionMention> = []
+  for (const manifestPath of config.manifestPaths) {
+    if (!(yield* fs.exists(manifestPath))) continue
+    const manifest: unknown = JSON.parse(yield* fs.readFileString(manifestPath))
+    if (!isRecord(manifest)) continue
+    for (const section of depSections) {
+      const deps = manifest[section]
+      if (!isRecord(deps)) continue
+      for (const [name, range] of Object.entries(deps)) {
+        if (!isEffectAppPackage(name) || typeof range !== "string") continue
+        const normalized = normalizeVersion(range)
+        if (!normalized) continue
+        versionMentions.push({ manifestPath, section, name, range, normalized })
+      }
+    }
+  }
+  if (!Arr.isArrayNonEmpty(versionMentions)) {
+    return yield* Effect.fail(
+      new Error("Could not find any effect-app/@effect-app dependency versions in manifests")
+    )
+  }
+  const selectedMentions = selectVersionMentions(versionMentions)
+  const versions = [...new Set(selectedMentions.map((mention) => mention.normalized))]
+  if (Arr.isArrayNonEmpty(versions.slice(1))) {
+    return yield* Effect.fail(
+      new Error(`Found multiple Effect App versions. Please align first:\n${describeMentions(selectedMentions)}`)
+    )
+  }
+  const version = selectedMentions[0].normalized
+  const packageName = selectedMentions[0].name
+  const packagePath = packageManifestPaths[packageName]
+  if (!packagePath) {
+    return yield* Effect.fail(
+      new Error(`No effect-app libs package manifest mapping for ${packageName}`)
+    )
+  }
+  const tagCandidates = [
+    `${packageName}@${version}`,
+    `v${version}`,
+    version
+  ]
+  let remoteRef: string | undefined
+  for (const candidate of tagCandidates) {
+    const tagResult = yield* runGetString(
+      `git ls-remote --exit-code --tags ${shellQuote(config.url)} ${shellQuote(`refs/tags/${candidate}`)}`
+    )
+      .pipe(Effect.option)
+    if (Option.isSome(tagResult)) {
+      remoteRef = candidate
+      break
+    }
+  }
+  if (remoteRef) {
+    const syncRef = "refs/effa-sync/effect-app-tag"
+    yield* Effect.logInfo(`Using effect-app package: ${packageName}@${version}`)
+    yield* Effect.logInfo(`Using effect-app subtree ref: ${remoteRef}`)
+    yield* Effect.logInfo(`Using effect-app subtree url: ${config.url}`)
+    yield* fetchRemoteRef(`refs/tags/${remoteRef}`, syncRef)
+    return yield* run(
+      `git -c status.showUntrackedFiles=no subtree pull --prefix=${shellQuote(config.subtreePrefix)} . ${
+        shellQuote(syncRef)
+      } --squash`
+    )
+  }
+  const defaultBranchOutput = yield* runGetString(`git ls-remote --symref ${shellQuote(config.url)} HEAD`)
+  const defaultBranch = yield* Effect.try({
+    try: () => parseDefaultBranch(defaultBranchOutput),
+    catch: (cause) => cause instanceof Error ? cause : new Error(String(cause))
+  })
+  const cachePath = (yield* runGetString("git rev-parse --git-path effa-sync/effect-app-libs.git")).trim()
+  yield* run(`mkdir -p ${shellQuote(Path.dirname(cachePath))}`)
+  if (!(yield* fs.exists(cachePath))) {
+    yield* run(`git init --bare ${shellQuote(cachePath)}`)
+  }
+  yield* run(
+    `git --git-dir=${shellQuote(cachePath)} fetch --no-tags --prune ${shellQuote(config.url)} ${
+      shellQuote(`+refs/heads/${defaultBranch}:refs/heads/${defaultBranch}`)
+    }`
+  )
+  const commits = (yield* runGetString(
+    `git --git-dir=${shellQuote(cachePath)} rev-list ${shellQuote(`refs/heads/${defaultBranch}`)}`
+  ))
+    .trim()
+    .split("\n")
+    .filter(isNonEmptyString)
+  if (!Arr.isArrayNonEmpty(commits)) {
+    return yield* Effect.fail(
+      new Error(`No commits found on ${defaultBranch} for ${config.url}`)
+    )
+  }
+  let commit: string | undefined
+  for (const candidate of commits) {
+    const packageJsonResult = yield* runGetString(
+      `git --git-dir=${shellQuote(cachePath)} show ${shellQuote(`${candidate}:${packagePath}`)}`
+    )
+      .pipe(Effect.option)
+    if (Option.isNone(packageJsonResult)) continue
+    const candidateVersion = yield* Effect.try({
+      try: () => parsePackageVersion(packageJsonResult.value, packagePath),
+      catch: (cause) => cause instanceof Error ? cause : new Error(String(cause))
+    })
+    if (candidateVersion === version) {
+      commit = candidate
+      break
+    }
+  }
+  if (!commit) {
+    return yield* Effect.fail(
+      new Error(
+        `No commit found on ${defaultBranch} where ${packagePath} has version ${version}. Tried tags: ${
+          tagCandidates.join(", ")
+        }`
+      )
+    )
+  }
+  const syncRef = "refs/effa-sync/effect-app-selected"
+  yield* run(`git --git-dir=${shellQuote(cachePath)} update-ref ${shellQuote(syncRef)} ${shellQuote(commit)}`)
+  yield* Effect.logInfo(`Using effect-app package: ${packageName}@${version}`)
+  yield* Effect.logInfo(`Using effect-app subtree commit: ${commit}`)
+  yield* Effect.logInfo(`Using effect-app subtree url: ${config.url}`)
+  yield* run(
+    `git -c status.showUntrackedFiles=no subtree pull --prefix=${shellQuote(config.subtreePrefix)} ${
+      shellQuote(cachePath)
+    } ${shellQuote(syncRef)} --squash`
+  )
+})

package/src/sync-effect-subtree.ts CHANGED Viewed

@@ -6,12 +6,13 @@ import { RunCommandService } from "./os-command.js"
 export interface SyncEffectConfig {
   readonly manifestPaths: ReadonlyArray<string>
   readonly subtreePrefix: string
-  readonly remoteName: string
-  readonly remoteUrl: string
+  readonly url: string
 }
 const depSections = ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"] as const
+const shellQuote = (value: string) => `'${value.replaceAll("'", "'\\''")}'`
 const normalizeVersion = (range: string) => {
   const match = range.match(/\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?/)
   return match?.[0]
@@ -21,6 +22,24 @@ export const syncEffectSubtree = Effect.fnUntraced(function*(config: SyncEffectC
   const fs = yield* FileSystem.FileSystem
   const { runGetExitCode, runGetString } = yield* RunCommandService
+  const run = Effect.fnUntraced(function*(command: string) {
+    const exitCode = yield* runGetExitCode(command)
+    if (exitCode !== 0) {
+      return yield* Effect.fail(new Error(`Command failed with exit code ${exitCode}: ${command}`))
+    }
+  })
+  const fetchRemoteRef = Effect.fnUntraced(function*(remoteRef: string, localRef: string) {
+    const rawRef = `${localRef}-raw`
+    yield* run(
+      `git fetch --no-tags ${shellQuote(config.url)} ${shellQuote(`+${remoteRef}:${rawRef}`)}`
+    )
+    const commit = (yield* runGetString(`git rev-list -n1 ${shellQuote(rawRef)}`)).trim()
+    yield* run(`git update-ref ${shellQuote(localRef)} ${shellQuote(commit)}`)
+  })
   const versionMentions: Array<{
     manifestPath: string
     section: string
@@ -87,19 +106,12 @@ export const syncEffectSubtree = Effect.fnUntraced(function*(config: SyncEffectC
     `@effect/ai-anthropic@${version}`
   ]
-  // ensure remote exists
-  const remoteResult = yield* runGetString(`git remote get-url ${config.remoteName}`).pipe(Effect.option)
-  if (Option.isNone(remoteResult)) {
-    yield* runGetExitCode(`git remote add ${config.remoteName} ${config.remoteUrl}`)
-  }
-  yield* runGetExitCode(`git fetch ${config.remoteName} --tags`)
+  const url = shellQuote(config.url)
   let ref: string | undefined
   for (const candidate of candidateRefs) {
     const tagResult = yield* runGetString(
-      `git ls-remote --exit-code --tags ${config.remoteName} refs/tags/${candidate}`
+      `git ls-remote --exit-code --tags ${url} ${shellQuote(`refs/tags/${candidate}`)}`
     )
       .pipe(Effect.option)
@@ -117,7 +129,12 @@ export const syncEffectSubtree = Effect.fnUntraced(function*(config: SyncEffectC
   yield* Effect.logInfo(`Using effect version: ${version}`)
   yield* Effect.logInfo(`Using subtree ref: ${ref}`)
-  yield* runGetExitCode(
-    `git -c status.showUntrackedFiles=no subtree pull --prefix=${config.subtreePrefix} ${config.remoteName} ${ref} --squash`
+  yield* Effect.logInfo(`Using subtree url: ${config.url}`)
+  const syncRef = "refs/effa-sync/effect-selected"
+  yield* fetchRemoteRef(`refs/tags/${ref}`, syncRef)
+  yield* run(
+    `git -c status.showUntrackedFiles=no subtree pull --prefix=${shellQuote(config.subtreePrefix)} . ${
+      shellQuote(syncRef)
+    } --squash`
   )
 })