@effect-app/cli 2.1.0-beta.31 → 2.1.0-beta.33

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @effect-app/cli
 
+## 2.1.0-beta.33
+
+### Patch Changes
+
+- 32f05c8: Remove unused dependency declarations from package manifests.
+
+## 2.1.0-beta.32
+
+### Patch Changes
+
+- b9312df: Prevent subtree sync commands from importing upstream git tags.
+
 ## 2.1.0-beta.31
 
 ### Patch Changes

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

@@ -1 +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;AA0ED,eAAO,MAAM,oBAAoB,4JA6K/B,CAAA"}
+{"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

@@ -23,6 +23,7 @@ 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);
@@ -60,11 +61,39 @@ export const syncEffectAppSubtree = Effect.fnUntraced(function* (config) {
             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}`);
-        return yield* run(`git -c status.showUntrackedFiles=no subtree pull --prefix=${shellQuote(config.subtreePrefix)} ${shellQuote(config.url)} ${shellQuote(ref)} --squash`);
+        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) {
@@ -116,10 +145,12 @@ export const syncEffectAppSubtree = Effect.fnUntraced(function* (config) {
         }
     }
     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}`);
-        return yield* run(`git -c status.showUntrackedFiles=no subtree pull --prefix=${shellQuote(config.subtreePrefix)} ${shellQuote(config.url)} ${shellQuote(remoteRef)} --squash`);
+        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({
@@ -131,7 +162,7 @@ export const syncEffectAppSubtree = Effect.fnUntraced(function* (config) {
     if (!(yield* fs.exists(cachePath))) {
         yield* run(`git init --bare ${shellQuote(cachePath)}`);
     }
-    yield* run(`git --git-dir=${shellQuote(cachePath)} fetch --prune ${shellQuote(config.url)} ${shellQuote(`+refs/heads/${defaultBranch}:refs/heads/${defaultBranch}`)}`);
+    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")
@@ -164,4 +195,4 @@ export const syncEffectAppSubtree = Effect.fnUntraced(function* (config) {
     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":"AAAA,OAAO,KAAK,GAAG,MAAM,cAAc,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAiBnD,MAAM,WAAW,GAAG,CAAC,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,sBAAsB,CAAU,CAAA;AAE5G,MAAM,oBAAoB,GAA2B;IACnD,YAAY,EAAE,kCAAkC;IAChD,mBAAmB,EAAE,6BAA6B;IAClD,iBAAiB,EAAE,2BAA2B;IAC9C,4BAA4B,EAAE,sCAAsC;IACpE,iBAAiB,EAAE,2BAA2B;IAC9C,kCAAkC,EAAE,4CAA4C;IAChF,kCAAkC,EAAE,4CAA4C;CACjF,CAAA;AAED,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;AAE3D,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAoC,EAAE,CACpE,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAEtE,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAA;AAErG,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,KAAK,EAAE,CAAA;AAExD,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAA;AAE3E,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE;IACzC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAA;IAC9D,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAA;AAE5E,MAAM,mBAAmB,GAAG,CAAC,MAAc,EAAE,WAAmB,EAAE,EAAE;IAClE,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAC1C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CAAC,+BAA+B,WAAW,EAAE,CAAC,CAAA;IAC/D,CAAC;IACD,OAAO,MAAM,CAAC,SAAS,CAAC,CAAA;AAC1B,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAE,EAAE;IAC5C,MAAM,IAAI,GAAG,MAAM;SAChB,KAAK,CAAC,IAAI,CAAC;SACX,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEjF,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAA;IACpF,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AAChE,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,QAA2C,EAAE,EAAE;IAC5E,KAAK,MAAM,WAAW,IAAI,iBAAiB,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAA;QAC3E,IAAI,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC;YAAE,OAAO,QAAQ,CAAA;IACpD,CAAC;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAC,QAAuC,EAAE,EAAE,CACnE,QAAQ;KACL,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,YAAY,KAAK,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC;KAClG,IAAI,CAAC,IAAI,CAAC,CAAA;AAEf,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,MAA2B;IACzF,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAA;IACvC,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAA;IAEjE,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,OAAe;QACrD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;QAC/C,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,iCAAiC,QAAQ,KAAK,OAAO,EAAE,CAAC,CAAC,CAAA;QAC/F,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;QACf,MAAM,GAAG,GAAG,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC3C,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAA;QAC7D,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,iCAAiC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAA;QACpE,OAAO,KAAK,CAAC,CAAC,GAAG,CACf,6DAA6D,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,IAC3F,UAAU,CAAC,MAAM,CAAC,GAAG,CACvB,IAAI,UAAU,CAAC,GAAG,CAAC,WAAW,CAC/B,CAAA;IACH,CAAC;IAED,MAAM,eAAe,GAA0B,EAAE,CAAA;IAEjD,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QAChD,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAAE,SAAQ;QAE/C,MAAM,QAAQ,GAAY,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAA;QAC5E,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAAE,SAAQ;QAEjC,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;YAClC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;YAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAAE,SAAQ;YAE7B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ;oBAAE,SAAQ;gBAEpE,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;gBAC1C,IAAI,CAAC,UAAU;oBAAE,SAAQ;gBAEzB,eAAe,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAA;YAC1E,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,KAAK,CAAC,4EAA4E,CAAC,CACxF,CAAA;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,eAAe,CAAC,CAAA;IAC/D,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;IAEpF,IAAI,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,KAAK,CAAC,4DAA4D,gBAAgB,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAC5G,CAAA;IACH,CAAC;IAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;IAC9C,MAAM,WAAW,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAC5C,MAAM,WAAW,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAA;IAErD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,KAAK,CAAC,mDAAmD,WAAW,EAAE,CAAC,CAC5E,CAAA;IACH,CAAC;IAED,MAAM,aAAa,GAAG;QACpB,GAAG,WAAW,IAAI,OAAO,EAAE;QAC3B,IAAI,OAAO,EAAE;QACb,OAAO;KACR,CAAA;IAED,IAAI,SAA6B,CAAA;IACjC,KAAK,MAAM,SAAS,IAAI,aAAa,EAAE,CAAC;QACtC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,YAAY,CACnC,oCAAoC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,aAAa,SAAS,EAAE,CAAC,EAAE,CACrG;aACE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAEtB,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,SAAS,GAAG,SAAS,CAAA;YACrB,MAAK;QACP,CAAC;IACH,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,6BAA6B,WAAW,IAAI,OAAO,EAAE,CAAC,CAAA;QAC5E,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,iCAAiC,SAAS,EAAE,CAAC,CAAA;QACnE,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,iCAAiC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAA;QACpE,OAAO,KAAK,CAAC,CAAC,GAAG,CACf,6DAA6D,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,IAC3F,UAAU,CAAC,MAAM,CAAC,GAAG,CACvB,IAAI,UAAU,CAAC,SAAS,CAAC,WAAW,CACrC,CAAA;IACH,CAAC;IAED,MAAM,mBAAmB,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,0BAA0B,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACxG,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;QACtC,GAAG,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,mBAAmB,CAAC;QAClD,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC5E,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,wDAAwD,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IACxG,KAAK,CAAC,CAAC,GAAG,CAAC,YAAY,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAA;IAE7D,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QACnC,KAAK,CAAC,CAAC,GAAG,CAAC,mBAAmB,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IACxD,CAAC;IAED,KAAK,CAAC,CAAC,GAAG,CACR,iBAAiB,UAAU,CAAC,SAAS,CAAC,kBAAkB,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAC5E,UAAU,CAAC,eAAe,aAAa,eAAe,aAAa,EAAE,CACvE,EAAE,CACH,CAAA;IAED,MAAM,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,YAAY,CAClC,iBAAiB,UAAU,CAAC,SAAS,CAAC,aAAa,UAAU,CAAC,cAAc,aAAa,EAAE,CAAC,EAAE,CAC/F,CAAC;SACC,IAAI,EAAE;SACN,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,gBAAgB,CAAC,CAAA;IAE3B,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,KAAK,CAAC,uBAAuB,aAAa,QAAQ,MAAM,CAAC,GAAG,EAAE,CAAC,CACpE,CAAA;IACH,CAAC;IAED,IAAI,MAA0B,CAAA;IAC9B,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE,CAAC;QAChC,MAAM,iBAAiB,GAAG,KAAK,CAAC,CAAC,YAAY,CAC3C,iBAAiB,UAAU,CAAC,SAAS,CAAC,SAAS,UAAU,CAAC,GAAG,SAAS,IAAI,WAAW,EAAE,CAAC,EAAE,CAC3F;aACE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAEtB,IAAI,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC;YAAE,SAAQ;QAE9C,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;YACzC,GAAG,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,KAAK,EAAE,WAAW,CAAC;YACpE,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC5E,CAAC,CAAA;QAEF,IAAI,gBAAgB,KAAK,OAAO,EAAE,CAAC;YACjC,MAAM,GAAG,SAAS,CAAA;YAClB,MAAK;QACP,CAAC;IACH,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,KAAK,CACP,sBAAsB,aAAa,UAAU,WAAW,gBAAgB,OAAO,iBAC7E,aAAa,CAAC,IAAI,CAAC,IAAI,CACzB,EAAE,CACH,CACF,CAAA;IACH,CAAC;IAED,MAAM,OAAO,GAAG,oCAAoC,CAAA;IACpD,KAAK,CAAC,CAAC,GAAG,CAAC,iBAAiB,UAAU,CAAC,SAAS,CAAC,eAAe,UAAU,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAE5G,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,6BAA6B,WAAW,IAAI,OAAO,EAAE,CAAC,CAAA;IAC5E,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,oCAAoC,MAAM,EAAE,CAAC,CAAA;IACnE,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,iCAAiC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAA;IACpE,KAAK,CAAC,CAAC,GAAG,CACR,6DAA6D,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,IAC3F,UAAU,CAAC,SAAS,CACtB,IAAI,UAAU,CAAC,OAAO,CAAC,WAAW,CACnC,CAAA;AACH,CAAC,CAAC,CAAA"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sync-effect-app-subtree.js","sourceRoot":"","sources":["../src/sync-effect-app-subtree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,cAAc,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAiBnD,MAAM,WAAW,GAAG,CAAC,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,sBAAsB,CAAU,CAAA;AAE5G,MAAM,oBAAoB,GAA2B;IACnD,YAAY,EAAE,kCAAkC;IAChD,mBAAmB,EAAE,6BAA6B;IAClD,iBAAiB,EAAE,2BAA2B;IAC9C,4BAA4B,EAAE,sCAAsC;IACpE,iBAAiB,EAAE,2BAA2B;IAC9C,kCAAkC,EAAE,4CAA4C;IAChF,kCAAkC,EAAE,4CAA4C;CACjF,CAAA;AAED,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;AAE3D,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAoC,EAAE,CACpE,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAEtE,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAA;AAErG,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,KAAK,EAAE,CAAA;AAExD,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAA;AAE3E,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE;IACzC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAA;IAC9D,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAE9D,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAA;AAE5E,MAAM,mBAAmB,GAAG,CAAC,MAAc,EAAE,WAAmB,EAAE,EAAE;IAClE,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAC1C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CAAC,+BAA+B,WAAW,EAAE,CAAC,CAAA;IAC/D,CAAC;IACD,OAAO,MAAM,CAAC,SAAS,CAAC,CAAA;AAC1B,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAE,EAAE;IAC5C,MAAM,IAAI,GAAG,MAAM;SAChB,KAAK,CAAC,IAAI,CAAC;SACX,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEjF,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAA;IACpF,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AAChE,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,QAA2C,EAAE,EAAE;IAC5E,KAAK,MAAM,WAAW,IAAI,iBAAiB,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAA;QAC3E,IAAI,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC;YAAE,OAAO,QAAQ,CAAA;IACpD,CAAC;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAC,QAAuC,EAAE,EAAE,CACnE,QAAQ;KACL,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,YAAY,KAAK,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC;KAClG,IAAI,CAAC,IAAI,CAAC,CAAA;AAEf,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,MAA2B;IACzF,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAA;IACvC,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAA;IAEjE,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,OAAe;QACrD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;QAC/C,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,iCAAiC,QAAQ,KAAK,OAAO,EAAE,CAAC,CAAC,CAAA;QAC/F,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,SAAiB,EAAE,QAAgB;QACpF,MAAM,MAAM,GAAG,GAAG,QAAQ,MAAM,CAAA;QAEhC,KAAK,CAAC,CAAC,GAAG,CACR,uBAAuB,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC,EAAE,CACzF,CAAA;QAED,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,oBAAoB,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QACrF,KAAK,CAAC,CAAC,GAAG,CAAC,kBAAkB,UAAU,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC5E,CAAC,CAAC,CAAA;IAEF,MAAM,iBAAiB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,YAAoB,EAAE,QAAgB;QAC1F,IAAI,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC;YAC5B,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,YAAY,CACrC,0BAA0B,UAAU,CAAC,GAAG,YAAY,WAAW,CAAC,EAAE,CACnE;iBACE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAEtB,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC/B,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC,kBAAkB,UAAU,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;YACrG,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC;YACjD,CAAC,CAAC,CAAC,YAAY,CAAC;YAChB,CAAC,CAAC,CAAC,cAAc,YAAY,EAAE,EAAE,aAAa,YAAY,EAAE,EAAE,YAAY,CAAC,CAAA;QAE7E,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,YAAY,CAChC,6BAA6B,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,SAAS,CAAC,EAAE,CAC/E;iBACE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAEtB,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1B,OAAO,KAAK,CAAC,CAAC,cAAc,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;YACnD,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,qCAAqC,YAAY,EAAE,CAAC,CAAC,CAAA;IAC3F,CAAC,CAAC,CAAA;IAEF,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;QACf,MAAM,GAAG,GAAG,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC3C,MAAM,OAAO,GAAG,qCAAqC,CAAA;QACrD,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAA;QAC7D,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,iCAAiC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAA;QACpE,KAAK,CAAC,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QACtC,OAAO,KAAK,CAAC,CAAC,GAAG,CACf,6DAA6D,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,MAC3F,UAAU,CAAC,OAAO,CACpB,WAAW,CACZ,CAAA;IACH,CAAC;IAED,MAAM,eAAe,GAA0B,EAAE,CAAA;IAEjD,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QAChD,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAAE,SAAQ;QAE/C,MAAM,QAAQ,GAAY,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAA;QAC5E,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAAE,SAAQ;QAEjC,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;YAClC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;YAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAAE,SAAQ;YAE7B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ;oBAAE,SAAQ;gBAEpE,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;gBAC1C,IAAI,CAAC,UAAU;oBAAE,SAAQ;gBAEzB,eAAe,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAA;YAC1E,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,KAAK,CAAC,4EAA4E,CAAC,CACxF,CAAA;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,eAAe,CAAC,CAAA;IAC/D,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;IAEpF,IAAI,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,KAAK,CAAC,4DAA4D,gBAAgB,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAC5G,CAAA;IACH,CAAC;IAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;IAC9C,MAAM,WAAW,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAC5C,MAAM,WAAW,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAA;IAErD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,KAAK,CAAC,mDAAmD,WAAW,EAAE,CAAC,CAC5E,CAAA;IACH,CAAC;IAED,MAAM,aAAa,GAAG;QACpB,GAAG,WAAW,IAAI,OAAO,EAAE;QAC3B,IAAI,OAAO,EAAE;QACb,OAAO;KACR,CAAA;IAED,IAAI,SAA6B,CAAA;IACjC,KAAK,MAAM,SAAS,IAAI,aAAa,EAAE,CAAC;QACtC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,YAAY,CACnC,oCAAoC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,aAAa,SAAS,EAAE,CAAC,EAAE,CACrG;aACE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAEtB,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,SAAS,GAAG,SAAS,CAAA;YACrB,MAAK;QACP,CAAC;IACH,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,OAAO,GAAG,+BAA+B,CAAA;QAC/C,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,6BAA6B,WAAW,IAAI,OAAO,EAAE,CAAC,CAAA;QAC5E,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,iCAAiC,SAAS,EAAE,CAAC,CAAA;QACnE,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,iCAAiC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAA;QACpE,KAAK,CAAC,CAAC,cAAc,CAAC,aAAa,SAAS,EAAE,EAAE,OAAO,CAAC,CAAA;QACxD,OAAO,KAAK,CAAC,CAAC,GAAG,CACf,6DAA6D,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,MAC3F,UAAU,CAAC,OAAO,CACpB,WAAW,CACZ,CAAA;IACH,CAAC;IAED,MAAM,mBAAmB,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,0BAA0B,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACxG,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;QACtC,GAAG,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,mBAAmB,CAAC;QAClD,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC5E,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,wDAAwD,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IACxG,KAAK,CAAC,CAAC,GAAG,CAAC,YAAY,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAA;IAE7D,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QACnC,KAAK,CAAC,CAAC,GAAG,CAAC,mBAAmB,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IACxD,CAAC;IAED,KAAK,CAAC,CAAC,GAAG,CACR,iBAAiB,UAAU,CAAC,SAAS,CAAC,4BAA4B,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IACtF,UAAU,CAAC,eAAe,aAAa,eAAe,aAAa,EAAE,CACvE,EAAE,CACH,CAAA;IAED,MAAM,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,YAAY,CAClC,iBAAiB,UAAU,CAAC,SAAS,CAAC,aAAa,UAAU,CAAC,cAAc,aAAa,EAAE,CAAC,EAAE,CAC/F,CAAC;SACC,IAAI,EAAE;SACN,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,gBAAgB,CAAC,CAAA;IAE3B,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,KAAK,CAAC,uBAAuB,aAAa,QAAQ,MAAM,CAAC,GAAG,EAAE,CAAC,CACpE,CAAA;IACH,CAAC;IAED,IAAI,MAA0B,CAAA;IAC9B,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE,CAAC;QAChC,MAAM,iBAAiB,GAAG,KAAK,CAAC,CAAC,YAAY,CAC3C,iBAAiB,UAAU,CAAC,SAAS,CAAC,SAAS,UAAU,CAAC,GAAG,SAAS,IAAI,WAAW,EAAE,CAAC,EAAE,CAC3F;aACE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAEtB,IAAI,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC;YAAE,SAAQ;QAE9C,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;YACzC,GAAG,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,KAAK,EAAE,WAAW,CAAC;YACpE,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC5E,CAAC,CAAA;QAEF,IAAI,gBAAgB,KAAK,OAAO,EAAE,CAAC;YACjC,MAAM,GAAG,SAAS,CAAA;YAClB,MAAK;QACP,CAAC;IACH,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,KAAK,CACP,sBAAsB,aAAa,UAAU,WAAW,gBAAgB,OAAO,iBAC7E,aAAa,CAAC,IAAI,CAAC,IAAI,CACzB,EAAE,CACH,CACF,CAAA;IACH,CAAC;IAED,MAAM,OAAO,GAAG,oCAAoC,CAAA;IACpD,KAAK,CAAC,CAAC,GAAG,CAAC,iBAAiB,UAAU,CAAC,SAAS,CAAC,eAAe,UAAU,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAE5G,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,6BAA6B,WAAW,IAAI,OAAO,EAAE,CAAC,CAAA;IAC5E,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,oCAAoC,MAAM,EAAE,CAAC,CAAA;IACnE,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,iCAAiC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAA;IACpE,KAAK,CAAC,CAAC,GAAG,CACR,6DAA6D,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,IAC3F,UAAU,CAAC,SAAS,CACtB,IAAI,UAAU,CAAC,OAAO,CAAC,WAAW,CACnC,CAAA;AACH,CAAC,CAAC,CAAA"}

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

@@ -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,GAAG,EAAE,MAAM,CAAA;CACrB;AAWD,eAAO,MAAM,iBAAiB,yJAmG5B,CAAA"}
+{"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

@@ -11,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)))
@@ -69,6 +81,8 @@ export const syncEffectSubtree = Effect.fnUntraced(function* (config) {
     yield* Effect.logInfo(`Using effect version: ${version}`);
     yield* Effect.logInfo(`Using subtree ref: ${ref}`);
     yield* Effect.logInfo(`Using subtree url: ${config.url}`);
-    yield* runGetExitCode(`git -c status.showUntrackedFiles=no subtree pull --prefix=${shellQuote(config.subtreePrefix)} ${url} ${shellQuote(ref)} --squash`);
+    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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luYy1lZmZlY3Qtc3VidHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9zeW5jLWVmZmVjdC1zdWJ0cmVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxNQUFNLE1BQU0sZUFBZSxDQUFBO0FBQ3ZDLE9BQU8sS0FBSyxVQUFVLE1BQU0sbUJBQW1CLENBQUE7QUFDL0MsT0FBTyxLQUFLLE1BQU0sTUFBTSxlQUFlLENBQUE7QUFDdkMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFRbkQsTUFBTSxXQUFXLEdBQUcsQ0FBQyxjQUFjLEVBQUUsaUJBQWlCLEVBQUUsa0JBQWtCLEVBQUUsc0JBQXNCLENBQVUsQ0FBQTtBQUU1RyxNQUFNLFVBQVUsR0FBRyxDQUFDLEtBQWEsRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFBO0FBRTNFLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxLQUFhLEVBQUUsRUFBRTtJQUN6QyxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLG1DQUFtQyxDQUFDLENBQUE7SUFDOUQsT0FBTyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNuQixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFDLE1BQXdCO0lBQ25GLE1BQU0sRUFBRSxHQUFHLEtBQUssQ0FBQyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUE7SUFDdkMsTUFBTSxFQUFFLGNBQWMsRUFBRSxZQUFZLEVBQUUsR0FBRyxLQUFLLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQTtJQUVqRSxNQUFNLGVBQWUsR0FNaEIsRUFBRSxDQUFBO0lBRVAsS0FBSyxNQUFNLFlBQVksSUFBSSxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7UUFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luYy1lZmZlY3Qtc3VidHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9zeW5jLWVmZmVjdC1zdWJ0cmVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxNQUFNLE1BQU0sZUFBZSxDQUFBO0FBQ3ZDLE9BQU8sS0FBSyxVQUFVLE1BQU0sbUJBQW1CLENBQUE7QUFDL0MsT0FBTyxLQUFLLE1BQU0sTUFBTSxlQUFlLENBQUE7QUFDdkMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFRbkQsTUFBTSxXQUFXLEdBQUcsQ0FBQyxjQUFjLEVBQUUsaUJBQWlCLEVBQUUsa0JBQWtCLEVBQUUsc0JBQXNCLENBQVUsQ0FBQTtBQUU1RyxNQUFNLFVBQVUsR0FBRyxDQUFDLEtBQWEsRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFBO0FBRTNFLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxLQUFhLEVBQUUsRUFBRTtJQUN6QyxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLG1DQUFtQyxDQUFDLENBQUE7SUFDOUQsT0FBTyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNuQixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFDLE1BQXdCO0lBQ25GLE1BQU0sRUFBRSxHQUFHLEtBQUssQ0FBQyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUE7SUFDdkMsTUFBTSxFQUFFLGNBQWMsRUFBRSxZQUFZLEVBQUUsR0FBRyxLQUFLLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQTtJQUVqRSxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFDLE9BQWU7UUFDckQsTUFBTSxRQUFRLEdBQUcsS0FBSyxDQUFDLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQy9DLElBQUksUUFBUSxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQ25CLE9BQU8sS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLEtBQUssQ0FBQyxpQ0FBaUMsUUFBUSxLQUFLLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUMvRixDQUFDO0lBQ0gsQ0FBQyxDQUFDLENBQUE7SUFFRixNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFDLFNBQWlCLEVBQUUsUUFBZ0I7UUFDcEYsTUFBTSxNQUFNLEdBQUcsR0FBRyxRQUFRLE1BQU0sQ0FBQTtRQUVoQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQ1IsdUJBQXVCLFVBQVUsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLElBQUksVUFBVSxDQUFDLElBQUksU0FBUyxJQUFJLE1BQU0sRUFBRSxDQUFDLEVBQUUsQ0FDekYsQ0FBQTtRQUVELE1BQU0sTUFBTSxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsWUFBWSxDQUFDLG9CQUFvQixVQUFVLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUE7UUFDckYsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLGtCQUFrQixVQUFVLENBQUMsUUFBUSxDQUFDLElBQUksVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUM1RSxDQUFDLENBQUMsQ0FBQTtJQUVGLE1BQU0sZUFBZSxHQU1oQixFQUFFLENBQUE7SUFFUCxLQUFLLE1BQU0sWUFBWSxJQUFJLE1BQU0sQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUNoRCxJQUFJLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDO1lBQUUsU0FBUTtRQUUvQyxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQTtRQUVuRSxLQUFLLE1BQU0sT0FBTyxJQUFJLFdBQVcsRUFBRSxDQUFDO1lBQ2xDLE1BQU0sSUFBSSxHQUFHLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBMkIsQ0FBQTtZQUVoRSxLQUFLLE1BQU0sQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLElBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO2dCQUNqRCxJQUFJLElBQUksS0FBSyxRQUFRLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQztvQkFBRSxTQUFRO2dCQUUvRCxNQUFNLFVBQVUsR0FBRyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQTtnQkFDbEQsSUFBSSxDQUFDLFVBQVU7b0JBQUUsU0FBUTtnQkFFekIsZUFBZSxDQUFDLElBQUksQ0FBQyxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsVUFBVSxFQUFFLENBQUMsQ0FBQTtZQUN6RixDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRCxNQUFNLHFCQUFxQixHQUFHLGVBQWUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssUUFBUSxDQUFDLENBQUE7SUFFaEYsTUFBTSx5QkFBeUIsR0FBRyxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMscUJBQXFCLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBRTlGLE1BQU0sdUJBQXVCLEdBQUc7UUFDOUIsR0FBRyxJQUFJLEdBQUcsQ0FDUixlQUFlO2FBQ1osTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQzthQUM3RSxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FDNUI7S0FDRixDQUFBO0lBRUQsTUFBTSxRQUFRLEdBQUcseUJBQXlCLENBQUMsTUFBTSxHQUFHLENBQUM7UUFDbkQsQ0FBQyxDQUFDLHlCQUF5QjtRQUMzQixDQUFDLENBQUMsdUJBQXVCLENBQUE7SUFFM0IsSUFBSSxRQUFRLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQzFCLE9BQU8sS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDdkIsSUFBSSxLQUFLLENBQUMsb0VBQW9FLENBQUMsQ0FDaEYsQ0FBQTtJQUNILENBQUM7SUFFRCxJQUFJLFFBQVEsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDeEIsTUFBTSxPQUFPLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsZUFBZSxDQUFDO2FBQ3pGLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsWUFBWSxLQUFLLENBQUMsQ0FBQyxPQUFPLEtBQUssQ0FBQyxDQUFDLElBQUksS0FBSyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7YUFDcEUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO1FBRWIsT0FBTyxLQUFLLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUN2QixJQUFJLEtBQUssQ0FBQyx3REFBd0QsT0FBTyxFQUFFLENBQUMsQ0FDN0UsQ0FBQTtJQUNILENBQUM7SUFFRCxNQUFNLE9BQU8sR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDM0IsTUFBTSxhQUFhLEdBQUc7UUFDcEIsVUFBVSxPQUFPLEVBQUU7UUFDbkIsa0JBQWtCLE9BQU8sRUFBRTtRQUMzQix3QkFBd0IsT0FBTyxFQUFFO0tBQ2xDLENBQUE7SUFFRCxNQUFNLEdBQUcsR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBRWxDLElBQUksR0FBdUIsQ0FBQTtJQUMzQixLQUFLLE1BQU0sU0FBUyxJQUFJLGFBQWEsRUFBRSxDQUFDO1FBQ3RDLE1BQU0sU0FBUyxHQUFHLEtBQUssQ0FBQyxDQUFDLFlBQVksQ0FDbkMsb0NBQW9DLEdBQUcsSUFBSSxVQUFVLENBQUMsYUFBYSxTQUFTLEVBQUUsQ0FBQyxFQUFFLENBQ2xGO2FBQ0UsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUV0QixJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQztZQUM3QixHQUFHLEdBQUcsU0FBUyxDQUFBO1lBQ2YsTUFBSztRQUNQLENBQUM7SUFDSCxDQUFDO0lBRUQsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ1QsT0FBTyxLQUFLLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUN2QixJQUFJLEtBQUssQ0FBQyxxQ0FBcUMsT0FBTyxZQUFZLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUM5RixDQUFBO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMseUJBQXlCLE9BQU8sRUFBRSxDQUFDLENBQUE7SUFDekQsS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxzQkFBc0IsR0FBRyxFQUFFLENBQUMsQ0FBQTtJQUNsRCxLQUFLLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLHNCQUFzQixNQUFNLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQTtJQUN6RCxNQUFNLE9BQU8sR0FBRyxnQ0FBZ0MsQ0FBQTtJQUNoRCxLQUFLLENBQUMsQ0FBQyxjQUFjLENBQUMsYUFBYSxHQUFHLEVBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQTtJQUNsRCxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQ1IsNkRBQTZELFVBQVUsQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLE1BQzNGLFVBQVUsQ0FBQyxPQUFPLENBQ3BCLFdBQVcsQ0FDWixDQUFBO0FBQ0gsQ0FBQyxDQUFDLENBQUEifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/cli",
-  "version": "2.1.0-beta.31",
+  "version": "2.1.0-beta.33",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -11,16 +11,13 @@
   "dependencies": {
     "@effect/platform-node": "4.0.0-beta.84",
     "effect": "4.0.0-beta.84",
-    "js-yaml": "4.2.0",
-    "node-watch": "^0.7.4"
+    "js-yaml": "4.2.0"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
     "@types/node": "25.9.1",
-    "json5": "^2.2.3",
     "typescript": "npm:@typescript/native-preview@beta",
-    "vitest": "^4.1.7",
-    "effect-app": "4.0.0-beta.271"
+    "vitest": "^4.1.7"
   },
   "typesVersions": {
     "*": {

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

@@ -48,6 +48,8 @@ const normalizeVersion = (range: string) => {
   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) => {
@@ -95,14 +97,57 @@ export const syncEffectAppSubtree = Effect.fnUntraced(function*(config: SyncEffe
     }
   })
 
+  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(config.url)
-      } ${shellQuote(ref)} --squash`
+      `git -c status.showUntrackedFiles=no subtree pull --prefix=${shellQuote(config.subtreePrefix)} . ${
+        shellQuote(syncRef)
+      } --squash`
     )
   }
 
@@ -174,13 +219,15 @@ export const syncEffectAppSubtree = Effect.fnUntraced(function*(config: SyncEffe
   }
 
   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(config.url)
-      } ${shellQuote(remoteRef)} --squash`
+      `git -c status.showUntrackedFiles=no subtree pull --prefix=${shellQuote(config.subtreePrefix)} . ${
+        shellQuote(syncRef)
+      } --squash`
     )
   }
 
@@ -198,7 +245,7 @@ export const syncEffectAppSubtree = Effect.fnUntraced(function*(config: SyncEffe
   }
 
   yield* run(
-    `git --git-dir=${shellQuote(cachePath)} fetch --prune ${shellQuote(config.url)} ${
+    `git --git-dir=${shellQuote(cachePath)} fetch --no-tags --prune ${shellQuote(config.url)} ${
       shellQuote(`+refs/heads/${defaultBranch}:refs/heads/${defaultBranch}`)
     }`
   )

package/src/sync-effect-subtree.ts

@@ -22,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
@@ -112,9 +130,11 @@ export const syncEffectSubtree = Effect.fnUntraced(function*(config: SyncEffectC
   yield* Effect.logInfo(`Using effect version: ${version}`)
   yield* Effect.logInfo(`Using subtree ref: ${ref}`)
   yield* Effect.logInfo(`Using subtree url: ${config.url}`)
-  yield* runGetExitCode(
-    `git -c status.showUntrackedFiles=no subtree pull --prefix=${shellQuote(config.subtreePrefix)} ${url} ${
-      shellQuote(ref)
+  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`
   )
 })