great 1.2.2 → 1.3.0

package/dist/migrate/index.js

@@ -1,11 +1,15 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import chalk from 'chalk';
+import { camelCase } from 'change-case';
 import parseJson from '../utils/parseJson.js';
 import hashContent from '../utils/hashContent.js';
 import { currentIntegrationKey } from '../utils/fetchLocal.js';
-import { ELEMENT_FOLDERS, elementKeyFromFileName, } from '../utils/elementFiles.js';
+import { ELEMENT_FOLDERS, elementKeyFromFileName, readElementFolder, } from '../utils/elementFiles.js';
+import { ENDPOINTS_FOLDER, SERVICES_FOLDER, classifyEndpoints, mergeServiceFile, } from '../utils/serviceFile.js';
+import { SHADOW_MARKER, isShadowMarker } from '../utils/shadowMarker.js';
 import { readGreatFile, writeGreatFile, getElementRecord, setElementRecord, } from '../utils/greatFile.js';
+const MAX_KEY_LENGTH = 50;
 const hasMetaProps = (data) => '__id' in data || '__key' in data || '__timestamp' in data;
 function migrateIntegrationFile(great, log, fsImpl) {
     const filePath = 'integration.json';
@@ -77,7 +81,95 @@ function migrateElementFiles(great, fsImpl) {
     }
     return count;
 }
-export const action = (log, fsImpl = fs) => async function migrate() {
+function collectEndpointKeys(services, great, fsImpl) {
+    const keys = new Set();
+    for (const { key } of readElementFolder(ENDPOINTS_FOLDER, undefined, fsImpl)) {
+        keys.add(key);
+    }
+    for (const recordKey of Object.keys(great.elements)) {
+        if (recordKey.startsWith(`${ENDPOINTS_FOLDER}/`)) {
+            keys.add(recordKey.slice(ENDPOINTS_FOLDER.length + 1));
+        }
+    }
+    for (const { data } of services) {
+        if (Array.isArray(data.endpoints)) {
+            for (const entry of data.endpoints) {
+                if (typeof entry === 'string') {
+                    keys.add(entry);
+                }
+            }
+        }
+    }
+    return keys;
+}
+function endpointKeyFor(serviceKey, endpoint, index, prefix) {
+    const base = typeof endpoint.id === 'string' && endpoint.id
+        ? endpoint.id
+        : `endpoint${index + 1}`;
+    const key = prefix
+        ? `${camelCase(serviceKey)}-${camelCase(base)}`
+        : camelCase(base);
+    return key.slice(0, MAX_KEY_LENGTH);
+}
+function uniqueKey(key, existing) {
+    if (!existing.has(key)) {
+        return key;
+    }
+    for (let n = 2;; n++) {
+        const suffix = String(n);
+        const candidate = `${key.slice(0, MAX_KEY_LENGTH - suffix.length)}${suffix}`;
+        if (!existing.has(candidate)) {
+            return candidate;
+        }
+    }
+}
+const isObject = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+function extractEndpoints(serviceKey, endpoints, existingKeys, prefix, fsImpl) {
+    const keys = [];
+    let extracted = 0;
+    endpoints.forEach((entry, index) => {
+        if (typeof entry === 'string') {
+            keys.push(entry);
+            return;
+        }
+        if (!isObject(entry)) {
+            return;
+        }
+        const key = uniqueKey(endpointKeyFor(serviceKey, entry, index, prefix), existingKeys);
+        existingKeys.add(key);
+        const { id: _id, ...content } = entry;
+        fsImpl.writeFileSync(path.join(ENDPOINTS_FOLDER, `${key}.json`), JSON.stringify(content, undefined, 2));
+        keys.push(key);
+        extracted++;
+    });
+    return { keys, extracted };
+}
+function migrateInlineEndpoints(great, options, log, fsImpl) {
+    const services = readElementFolder(SERVICES_FOLDER, undefined, fsImpl);
+    const existingKeys = collectEndpointKeys(services, great, fsImpl);
+    const prefix = options.prefix !== false;
+    let count = 0;
+    for (const { key, filePath, data } of services) {
+        const kind = classifyEndpoints(data.endpoints);
+        if (kind !== 'inline' && kind !== 'mixed') {
+            continue;
+        }
+        if (getElementRecord(great, SERVICES_FOLDER, key)?.source) {
+            log(chalk.yellow(`Skipping ${filePath}: it is a shadow element, so its inline endpoints belong to the source`));
+            continue;
+        }
+        if (!fsImpl.existsSync(ENDPOINTS_FOLDER)) {
+            fsImpl.mkdirSync(ENDPOINTS_FOLDER, { recursive: true });
+        }
+        const { keys, extracted } = extractEndpoints(key, data.endpoints, existingKeys, prefix, fsImpl);
+        const { [SHADOW_MARKER]: marker, endpoints: _endpoints, ...service } = data;
+        fsImpl.writeFileSync(filePath, JSON.stringify(mergeServiceFile({ service, list: { endpoints: keys } }, isShadowMarker(marker) ? marker : undefined), undefined, 2));
+        log(`  ${filePath}: ${extracted} endpoint(s) extracted`);
+        count += extracted;
+    }
+    return count;
+}
+export const action = (log, fsImpl = fs) => async function migrate(options = {}) {
     if (!fsImpl.existsSync('integration.json')) {
         log(chalk.red('No integration.json found in this directory'));
         return;
@@ -85,10 +177,15 @@ export const action = (log, fsImpl = fs) => async function migrate() {
     const great = readGreatFile(undefined, fsImpl);
     const integrationMigrated = migrateIntegrationFile(great, log, fsImpl);
     const elementCount = migrateElementFiles(great, fsImpl);
+    const endpointCount = migrateInlineEndpoints(great, options, log, fsImpl);
     writeGreatFile(great, undefined, fsImpl);
-    if (integrationMigrated || elementCount > 0) {
+    if (integrationMigrated || elementCount > 0 || endpointCount > 0) {
         log(chalk.green('✓ Migrated to .great.json'));
         log(`  Elements migrated: ${elementCount}`);
+        log(`  Endpoints extracted: ${endpointCount}`);
+        if (endpointCount > 0) {
+            log(`Run ${chalk.bold('great push')} to create the endpoints in Integreat`);
+        }
     }
     else {
         log(chalk.green('Already migrated — nothing to do'));
@@ -96,6 +193,7 @@ export const action = (log, fsImpl = fs) => async function migrate() {
 };
 export default (program) => program
     .command('migrate')
-    .description('Migrate sync bookkeeping from inline __id/__key/__timestamp props to .great.json')
+    .description('Migrate the workspace to the newest layout: sync bookkeeping in .great.json and endpoints as separate elements')
+    .option('--no-prefix', 'do not prefix extracted endpoint keys with the service key')
     .action(action(console.log));
 //# sourceMappingURL=index.js.map

package/dist/migrate/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/migrate/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/migrate/index.ts"],"names":[],"mappings":"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"}

package/dist/pull/index.d.ts

@@ -1,9 +1,9 @@
-import fs from 'node:fs';
 import Conf from 'conf';
 import { type GraphQLRequestClient } from '../utils/graphqlClient.js';
 import type { ConfigSchema } from '../utils/config.js';
 import type { Command } from 'commander';
-export declare const action: (log: (message: string) => void, apiToken?: string, client?: GraphQLRequestClient, fsImpl?: typeof fs, config?: Conf<ConfigSchema>) => (options?: {
+import type { GreatFs } from '../types.js';
+export declare const action: (log: (message: string) => void, apiToken?: string, client?: GraphQLRequestClient, fsImpl?: GreatFs, config?: Conf<ConfigSchema>) => (options?: {
     force?: boolean;
 }) => Promise<void>;
 declare const _default: (program: Command, apiToken?: string) => Command;

package/dist/pull/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/pull/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,eAAe,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAE,SAAS,EAA6B,MAAM,2BAA2B,CAAA;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAA;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,mBAAmB,MAAM,iCAAiC,CAAA;AAKjE,SAAS,eAAe,CACtB,SAAyB,EACzB,GAA8B;IAE9B,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAA;IAE/C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QACvC,GAAG,CAAC,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;IAC7B,CAAC;IAED,GAAG,CACD,iDAAiD,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,qBAAqB,CACvG,CAAA;AACH,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,CACpB,GAA8B,EAC9B,QAAiB,EACjB,MAA6B,EAC7B,MAAkB,EAClB,MAA2B,EAC3B,EAAE,CACF,KAAK,UAAU,eAAe,CAAC,UAA+B,EAAE;IAE9D,MAAM,EAAE,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAA;IACrC,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC,CAAA;QACpD,GAAG,CACD,OAAO,KAAK,CAAC,IAAI,CAAC,8BAA8B,CAAC,0CAA0C,CAC5F,CAAA;QACD,OAAM;IACR,CAAC;IAED,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IACzD,MAAM,WAAW,GAAG,MAAM,0BAA0B,CAAC,aAAa,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IAC5E,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAM;IACR,CAAC;IAID,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,UAAU,GAAG,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QACnD,MAAM,SAAS,GAAG,mBAAmB,CACnC,WAAW,CAAC,MAAM,EAClB,UAAU,EACV,SAAS,EACT,MAAM,CACP,CAAA;QACD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,eAAe,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;YAC/B,OAAM;QACR,CAAC;IACH,CAAC;IAED,eAAe,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;AACrE,CAAC,CAAA;AAEH,eAAe,CAAC,OAAgB,EAAE,QAAiB,EAAE,EAAE,CACrD,OAAO;KACJ,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,uDAAuD,CAAC;KACpE,MAAM,CAAC,aAAa,EAAE,gDAAgD,CAAC;KACvE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/pull/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,eAAe,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAE,SAAS,EAA6B,MAAM,2BAA2B,CAAA;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAA;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,mBAAmB,MAAM,iCAAiC,CAAA;AAMjE,SAAS,eAAe,CACtB,SAAyB,EACzB,GAA8B;IAE9B,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAA;IAE/C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QACvC,GAAG,CAAC,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;IAC7B,CAAC;IAED,GAAG,CACD,iDAAiD,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,qBAAqB,CACvG,CAAA;AACH,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,CACpB,GAA8B,EAC9B,QAAiB,EACjB,MAA6B,EAC7B,MAAgB,EAChB,MAA2B,EAC3B,EAAE,CACF,KAAK,UAAU,eAAe,CAAC,UAA+B,EAAE;IAE9D,MAAM,EAAE,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAA;IACrC,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC,CAAA;QACpD,GAAG,CACD,OAAO,KAAK,CAAC,IAAI,CAAC,8BAA8B,CAAC,0CAA0C,CAC5F,CAAA;QACD,OAAM;IACR,CAAC;IAED,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IACzD,MAAM,WAAW,GAAG,MAAM,0BAA0B,CAAC,aAAa,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IAC5E,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAM;IACR,CAAC;IAID,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,UAAU,GAAG,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QACnD,MAAM,SAAS,GAAG,mBAAmB,CACnC,WAAW,CAAC,MAAM,EAClB,UAAU,EACV,SAAS,EACT,MAAM,CACP,CAAA;QACD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,eAAe,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;YAC/B,OAAM;QACR,CAAC;IACH,CAAC;IAED,eAAe,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;AACrE,CAAC,CAAA;AAEH,eAAe,CAAC,OAAgB,EAAE,QAAiB,EAAE,EAAE,CACrD,OAAO;KACJ,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,uDAAuD,CAAC;KACpE,MAAM,CAAC,aAAa,EAAE,gDAAgD,CAAC;KACvE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAA"}

package/dist/push/index.d.ts

@@ -1,10 +1,11 @@
-import fs from 'node:fs';
 import Conf from 'conf';
+import { promptForDetach } from '../utils/promptForDetach.js';
 import { type GraphQLRequestClient } from '../utils/graphqlClient.js';
 import type { ConfigSchema } from '../utils/config.js';
 import { promptForValueSetting } from '../utils/promptForValue.js';
 import type { Command } from 'commander';
-export declare const action: (log: (message: string) => void, apiToken?: string, client?: GraphQLRequestClient, fsImpl?: typeof fs, config?: Conf<ConfigSchema>, promptForValueSettingFn?: typeof promptForValueSetting) => (options?: {
+import type { GreatFs } from '../types.js';
+export declare const action: (log: (message: string) => void, apiToken?: string, client?: GraphQLRequestClient, fsImpl?: GreatFs, config?: Conf<ConfigSchema>, promptForValueSettingFn?: typeof promptForValueSetting, promptForDetachFn?: typeof promptForDetach) => (options?: {
     account?: string;
 }) => Promise<void>;
 declare const _default: (program: Command, apiToken?: string) => Command;

package/dist/push/index.js

@@ -1,19 +1,20 @@
 import fs from 'node:fs';
 import chalk from 'chalk';
-import parseJson from '../utils/parseJson.js';
 import { sentenceCase } from 'change-case';
 import { fetchIntegrationFromFile } from '../utils/fetchLocal.js';
 import { readGreatFile, writeGreatFile, getElementRecord, setElementRecord, removeElementRecordById, sameProvenance, } from '../utils/greatFile.js';
-import { readElementFolder, folderToElementType, } from '../utils/elementFiles.js';
+import { readWorkspaceElements, writeElementFile, folderToElementType, } from '../utils/elementFiles.js';
+import { ENDPOINT_LISTS_FOLDER, validateEndpointReferences, } from '../utils/serviceFile.js';
+import { promptForDetach } from '../utils/promptForDetach.js';
+import { fetchElementById } from '../utils/resolveElement.js';
 import createIntegrationFromFile from '../utils/createIntegrationFromFile.js';
 import { typeToFolder } from '../utils/saveIntegration.js';
 import { getClient } from '../utils/graphqlClient.js';
-import { getGraphQLErrorMessage, handleGraphQLError, } from '../utils/graphqlError.js';
+import { getGraphQLErrorMessage, handleGraphQLError, isNotFoundError, } from '../utils/graphqlError.js';
 import hashContent from '../utils/hashContent.js';
 import { VALID_VALUE_TYPES, isValidValueElementType, } from '../utils/valueTypes.js';
 import { setValueForElement } from '../values/set.js';
 import { promptForValueSetting } from '../utils/promptForValue.js';
-import { SHADOW_MARKER } from '../utils/writeShadowElement.js';
 import resolveIntegrationType from '../utils/integrationType.js';
 import { ElementType } from '../generated/schema.js';
 import { gql } from 'graphql-tag';
@@ -158,14 +159,39 @@ const SetSecretRefMutationDocument = gql `
     setSecretRef(id: $id, secretRef: $secretRef)
   }
 `;
-function readLocalElements(fsImpl) {
-    const elements = [];
-    for (const folder of Object.keys(folderToElementType)) {
-        for (const { key, filePath, data } of readElementFolder(folder, undefined, fsImpl)) {
-            elements.push({ folder, key, filePath, data });
-        }
+const readLocalElements = (fsImpl) => readWorkspaceElements(undefined, fsImpl);
+const isEndpointList = (element) => element.folder === ENDPOINT_LISTS_FOLDER;
+const hasShadowContentChanged = (local) => local.hash !== undefined && hashContent(local.data) !== local.hash;
+function compareShadow(local, remote, source) {
+    const localName = local.data.name || '';
+    const localDesc = local.data.description || '';
+    const isList = isEndpointList(local);
+    const hasNameChanged = !isList && localName !== (remote.name || '');
+    const hasDescriptionChanged = !isList && localDesc !== (remote.description || '');
+    const hasPinChanged = (source.timestamp ?? null) !== (remote.sourceTimestamp ?? null);
+    const hasProvenanceChanged = !sameProvenance(local.provenance, remote.provenance);
+    const hasRemoteMoved = local.timestamp !== remote.contentCreatedAt;
+    if (hasShadowContentChanged(local)) {
+        return hasRemoteMoved
+            ? {
+                category: 'conflict',
+                reason: '  Shadow content changed locally and shadow changed remotely',
+            }
+            : { category: 'detach' };
+    }
+    if (!hasNameChanged &&
+        !hasDescriptionChanged &&
+        !hasPinChanged &&
+        !hasProvenanceChanged) {
+        return { category: 'unchanged' };
+    }
+    if (hasPinChanged && hasRemoteMoved) {
+        return {
+            category: 'conflict',
+            reason: '  Shadow pin changed both local and remote',
+        };
     }
-    return elements;
+    return { category: 'update' };
 }
 function compareLocalAndRemote(local, remote) {
     if (!remote) {
@@ -174,27 +200,12 @@ function compareLocalAndRemote(local, remote) {
             reason: 'Element exists locally with an id but not found in Integreat',
         };
     }
-    const localName = local.data.name || '';
-    const localDesc = local.data.description || '';
     if (local.source) {
-        const hasNameChanged = localName !== (remote.name || '');
-        const hasDescriptionChanged = localDesc !== (remote.description || '');
-        const hasPinChanged = (local.source.timestamp ?? null) !== (remote.sourceTimestamp ?? null);
-        const hasProvenanceChanged = !sameProvenance(local.provenance, remote.provenance);
-        if (!hasNameChanged &&
-            !hasDescriptionChanged &&
-            !hasPinChanged &&
-            !hasProvenanceChanged) {
-            return { category: 'unchanged' };
-        }
-        if (hasPinChanged && local.timestamp !== remote.contentCreatedAt) {
-            return {
-                category: 'conflict',
-                reason: '  Shadow pin changed both local and remote',
-            };
-        }
-        return { category: 'update' };
+        return compareShadow(local, remote, local.source);
     }
+    const localName = local.data.name || '';
+    const localDesc = local.data.description || '';
+    const isList = isEndpointList(local);
     const localChecksum = hashContent(local.data);
     const localTimestamp = local.timestamp ? new Date(local.timestamp) : undefined;
     const remoteChecksum = remote.checksum || '';
@@ -204,8 +215,8 @@ function compareLocalAndRemote(local, remote) {
         ? new Date(remote.createdAt)
         : undefined;
     const hasContentChanged = localChecksum !== remoteChecksum;
-    const hasNameChanged = localName !== remoteName;
-    const hasDescriptionChanged = localDesc !== remoteDesc;
+    const hasNameChanged = !isList && localName !== remoteName;
+    const hasDescriptionChanged = !isList && localDesc !== remoteDesc;
     if (!hasContentChanged && !hasNameChanged && !hasDescriptionChanged) {
         return { category: 'unchanged' };
     }
@@ -234,6 +245,7 @@ function categorizeElements(localElements, remoteElementsMap) {
     const toCreate = [];
     const toInclude = [];
     const toUpdate = [];
+    const toDetach = [];
     const toDelete = [];
     const conflicts = [];
     const localElementIds = new Set();
@@ -256,13 +268,18 @@ function categorizeElements(localElements, remoteElementsMap) {
         else if (result.category === 'update') {
             toUpdate.push({ ...local, remoteId: remote?.id });
         }
+        else if (result.category === 'detach') {
+            toDetach.push({ ...local, remoteId: remote?.id });
+        }
     }
     for (const [id, remoteLement] of remoteElementsMap) {
         if (!localElementIds.has(id)) {
             toDelete.push(remoteLement);
         }
     }
-    return { toCreate, toInclude, toUpdate, toDelete, conflicts };
+    toDelete.sort((a, b) => Number(b.folder === ENDPOINT_LISTS_FOLDER) -
+        Number(a.folder === ENDPOINT_LISTS_FOLDER));
+    return { toCreate, toInclude, toUpdate, toDetach, toDelete, conflicts };
 }
 const prepareContentForApi = ({ name, description, ...content }, elementType) => {
     if (elementType === ElementType.Value) {
@@ -283,7 +300,9 @@ const prepareContentForApi = ({ name, description, ...content }, elementType) =>
 };
 async function createElementOnApi(client, integrationId, element) {
     const elementType = folderToElementType[element.folder];
-    const name = element.data.name || sentenceCase(element.key);
+    const name = element.data.name ||
+        element.defaultName ||
+        sentenceCase(element.key);
     const description = element.data.description;
     const result = await client.request(CreateElementMutationDocument, {
         integrationId,
@@ -301,28 +320,30 @@ async function createElementOnApi(client, integrationId, element) {
     }
     return { id, name };
 }
+function buildShadowData(element, name, description, data) {
+    if (isEndpointList(element)) {
+        return { ...data };
+    }
+    const finalName = element.data.name || name;
+    const finalDescription = element.data.description || description || undefined;
+    return {
+        ...(finalName ? { name: finalName } : {}),
+        ...(finalDescription ? { description: finalDescription } : {}),
+        ...data,
+    };
+}
 function writeShadowFileAndRecord(fsImpl, element, great, source, included) {
-    const name = element.data.name || included.name;
-    const description = element.data.description ||
-        included.description ||
-        undefined;
     const content = included.content;
-    const fileData = {
-        [SHADOW_MARKER]: true,
-        ...(name ? { name } : {}),
-        ...(description ? { description } : {}),
-        ...content?.data,
-    };
-    fsImpl.writeFileSync(element.filePath, JSON.stringify(fileData, null, 2));
     setElementRecord(great, element.folder, element.key, {
         id: included.id,
         ...(content?.createdAt ? { timestamp: content.createdAt } : {}),
-        ...(content?.checksum ? { hash: content.checksum } : {}),
+        hash: hashContent({ ...content?.data }),
         source,
         ...(element.provenance && element.provenance.length > 0
             ? { provenance: element.provenance }
             : {}),
     });
+    writeElementFile(undefined, element.folder, element.key, buildShadowData(element, included.name, included.description, content?.data), great, fsImpl, element.filePath);
 }
 async function includeShadowElement(element, graphqlClient, integrationId, fsImpl, log, great) {
     const source = element.source;
@@ -347,7 +368,7 @@ async function includeShadowElement(element, graphqlClient, integrationId, fsImp
     const localDesc = element.data.description || '';
     const nameDiffers = localName !== (included.name || '');
     const descDiffers = localDesc !== (included.description || '');
-    if (nameDiffers || descDiffers) {
+    if (!isEndpointList(element) && (nameDiffers || descDiffers)) {
         const updateResult = await graphqlClient.request(UpdateElementMutationDocument, {
             id: included.id,
             name: nameDiffers ? localName : undefined,
@@ -371,13 +392,11 @@ async function updateElementContent(client, elementId, content) {
     return result.data?.setElementContent?.content?.createdAt;
 }
 function updateLocalFile(fsImpl, element, great, updatedId, updatedTimestamp, generatedName, keepValue = false) {
-    const content = fsImpl.readFileSync(element.filePath, 'utf8');
-    const parsed = parseJson(content);
-    const { name, description, value, ref, ...data } = parsed;
+    const { name, description, value, ref, ...data } = element.data;
     const existing = getElementRecord(great, element.folder, element.key);
     const id = updatedId ?? existing?.id;
     const timestamp = updatedTimestamp ?? existing?.timestamp;
-    const finalName = generatedName || name;
+    const finalName = isEndpointList(element) ? undefined : generatedName || name;
     const orderedData = {
         ...(finalName ? { name: finalName } : {}),
         ...(description ? { description } : {}),
@@ -385,12 +404,24 @@ function updateLocalFile(fsImpl, element, great, updatedId, updatedTimestamp, ge
         ...(keepValue && value !== undefined ? { value } : {}),
         ...(keepValue && ref !== undefined ? { ref } : {}),
     };
-    fsImpl.writeFileSync(element.filePath, JSON.stringify(orderedData, null, 2));
     setElementRecord(great, element.folder, element.key, {
         ...(id ? { id } : {}),
         ...(timestamp ? { timestamp } : {}),
         hash: hashContent(orderedData),
     });
+    writeElementFile(undefined, element.folder, element.key, orderedData, great, fsImpl, element.filePath);
+}
+async function restoreShadowFile(element, graphqlClient, fsImpl, great, log) {
+    const remote = element.id
+        ? await fetchElementById(graphqlClient, element.id, log)
+        : undefined;
+    if (!remote) {
+        log(chalk.red(`Could not restore ${element.folder}/${element.key} from its source — the local changes are kept but not pushed`));
+        return;
+    }
+    const data = (remote.content?.data ?? {});
+    writeElementFile(undefined, element.folder, element.key, buildShadowData(element, undefined, undefined, data), great, fsImpl, element.filePath);
+    log(chalk.yellow(`Restored ${element.folder}/${element.key} from its source — the local changes were discarded`));
 }
 function recordElementProgress(great, element, fields) {
     const existing = getElementRecord(great, element.folder, element.key);
@@ -402,10 +433,14 @@ function recordElementProgress(great, element, fields) {
 function buildRemoteElementsMap(elements) {
     const remoteElements = new Map();
     for (const element of elements) {
+        const folder = typeToFolder[element.__typename];
+        if (!folder) {
+            continue;
+        }
         remoteElements.set(element.id, {
             id: element.id,
             key: element.key,
-            folder: typeToFolder[element.__typename],
+            folder,
             checksum: element.content?.checksum,
             contentCreatedAt: element.content?.createdAt,
             name: element.name,
@@ -440,7 +475,7 @@ async function createOrUpdateElement(element, graphqlClient, integrationId, fsIm
     }
     else {
         const apiElement = apiElementsMap.get(id);
-        if (apiElement) {
+        if (apiElement && !isEndpointList(element)) {
             const localName = element.data.name || '';
             const localDesc = element.data.description;
             const apiName = apiElement.name || '';
@@ -459,7 +494,7 @@ async function createOrUpdateElement(element, graphqlClient, integrationId, fsIm
             }
         }
     }
-    if (element.source) {
+    if (element.source && !element.detach) {
         const remote = apiElementsMap.get(id);
         const pinChanged = (element.source.timestamp ?? null) !== (remote?.sourceTimestamp ?? null);
         const provenanceChanged = !sameProvenance(element.provenance, remote?.provenance);
@@ -513,12 +548,31 @@ async function deleteElement(element, graphqlClient, log) {
     const result = await graphqlClient.request(DeleteElementMutationDocument, {
         id: element.id,
     });
-    if (result.error) {
+    if (result.error && !isNotFoundError(result.error)) {
         log(chalk.red(`Failed to delete element ${element.id}`));
         return false;
     }
     return true;
 }
+async function resolveDetaches(toDetach, promptForDetachFn, graphqlClient, fsImpl, great, log) {
+    const detached = [];
+    for (const element of toDetach) {
+        let shouldDetach;
+        try {
+            shouldDetach = await promptForDetachFn(element, log);
+        }
+        catch {
+            return undefined;
+        }
+        if (shouldDetach) {
+            detached.push({ ...element, detach: true });
+        }
+        else {
+            await restoreShadowFile(element, graphqlClient, fsImpl, great, log);
+        }
+    }
+    return detached;
+}
 function buildRemoteImportsMap(templateImports) {
     const map = new Map();
     for (const templateImport of templateImports) {
@@ -597,12 +651,12 @@ function logSummary(createdCount, includedCount, updatedCount, deletedCount, reg
         log(`\n${chalk.green('✓')} ${parts.join(', ')}`);
     }
 }
-export const action = (log, apiToken, client, fsImpl = fs, config, promptForValueSettingFn = promptForValueSetting) => async function pushIntegration(options) {
+export const action = (log, apiToken, client, fsImpl = fs, config, promptForValueSettingFn = promptForValueSetting, promptForDetachFn = promptForDetach) => async function pushIntegration(options) {
     const great = readGreatFile(undefined, fsImpl);
     let integrationId = great.id;
     if (!integrationId) {
         log(chalk.yellow('No integration ID found'));
-        log('Creating integration on server...\n');
+        log('Creating integration in Integreat...\n');
         const graphqlClient = getClient(apiToken, client, config);
         const result = await createIntegrationFromFile(graphqlClient, apiToken ?? '', options ?? {}, config, fsImpl);
         if (!result.success || !result.integration) {
@@ -640,7 +694,7 @@ export const action = (log, apiToken, client, fsImpl = fs, config, promptForValu
         };
         writeGreatFile(great, undefined, fsImpl);
         integrationId = integration.id;
-        log(chalk.green('✓ Updated integration.json with server details\n'));
+        log(chalk.green('✓ Updated integration.json with the details from Integreat\n'));
     }
     const graphqlClient = getClient(apiToken, client, config);
     const result = await graphqlClient.request(IntegrationForPushQueryDocument, { id: integrationId });
@@ -668,14 +722,32 @@ export const action = (log, apiToken, client, fsImpl = fs, config, promptForValu
         const record = getElementRecord(great, local.folder, local.key);
         local.id = record?.id;
         local.timestamp = record?.timestamp;
+        local.hash = record?.hash;
         local.source = record?.source;
         local.provenance = record?.provenance;
     }
-    const { toCreate, toInclude, toUpdate, toDelete, conflicts } = categorizeElements(localElements, apiElementsMap);
+    const serviceNames = new Map(localElements
+        .filter((el) => el.folder === 'services' && el.data.name)
+        .map((el) => [el.key, String(el.data.name)]));
+    for (const local of localElements) {
+        if (isEndpointList(local)) {
+            local.defaultName = serviceNames.get(local.key);
+        }
+    }
+    for (const warning of validateEndpointReferences(localElements, great)) {
+        log(chalk.yellow(`Warning: ${warning}`));
+    }
+    const { toCreate, toInclude, toUpdate, toDetach, toDelete, conflicts } = categorizeElements(localElements, apiElementsMap);
     if (conflicts.length > 0) {
         handleConflicts(conflicts, log);
         return;
     }
+    const detached = await resolveDetaches(toDetach, promptForDetachFn, graphqlClient, fsImpl, great, log);
+    if (!detached) {
+        log(chalk.yellow('\nPush cancelled'));
+        return;
+    }
+    toUpdate.push(...detached);
     const remoteImportsMap = buildRemoteImportsMap(integration.templateImports ?? []);
     const importsToRegister = findImportsToRegister(great, remoteImportsMap);
     if (toCreate.length +
@@ -687,7 +759,7 @@ export const action = (log, apiToken, client, fsImpl = fs, config, promptForValu
         log(chalk.green('No changes to push'));
         return;
     }
-    let shouldSetValue = false;
+    let shouldSetValue;
     try {
         shouldSetValue = await promptForValueSettingFn([...toCreate, ...toUpdate], log);
     }