@vibesdotdev/storage 0.0.1

package/dist/cli/commands/sync/pull/storage.sync.pull.cli-command.impl.js

@@ -0,0 +1,136 @@
+/**
+ * vibes storage sync pull [manifest-id]
+ *
+ * Pulls cloud data to local for storage manifests AND sync-bridges.
+ * Uses pullFromCloud() for storage manifests and SyncBridge.execute() for bridges.
+ *
+ * The manifest-id argument matches both manifest IDs and bridge IDs.
+ */
+import { getVibesRuntime } from '@vibesdotdev/runtime';
+import { pullFromCloud } from '../../../../sync/cloud-pull.js';
+import { SyncBridge } from '../../../../sync/sync-bridge.js';
+import { resolveSyncTarget } from '../../../../sync/resolve-sync-target.js';
+import { createRecordSyncBridgeDescriptor, isSyncableStorageRecord } from '../../../../sync/record-sync-bridge.js';
+export default {
+    async execute(args, opts) {
+        const runtime = getVibesRuntime();
+        const ui = (await runtime.context('cli/ui'));
+        const targetId = args['manifest-id'];
+        const force = opts.force;
+        const dryRun = opts.dryRun;
+        try {
+            // ── Sync Bridges ──
+            const allBridges = runtime
+                .query('storage/sync-bridge')
+                .descriptors();
+            const allRecords = runtime.query('storage/record').descriptors();
+            const eligibleRecords = allRecords.filter(isSyncableStorageRecord);
+            const recordTargets = targetId
+                ? eligibleRecords.filter((descriptor) => descriptor.id === targetId)
+                : eligibleRecords;
+            const syntheticRecordBridges = recordTargets.map(createRecordSyncBridgeDescriptor);
+            const isBridgeOnly = targetId &&
+                (allBridges.some((bridge) => bridge.id === targetId) ||
+                    eligibleRecords.some((descriptor) => descriptor.id === targetId));
+            // ── Storage Manifests ──
+            if (!isBridgeOnly) {
+                const pullOpts = {
+                    force: force ?? false,
+                    dryRun: dryRun ?? false
+                };
+                if (targetId) {
+                    pullOpts.manifestIds = [targetId];
+                }
+                const result = await pullFromCloud(pullOpts);
+                if (dryRun && result.details.length > 0) {
+                    ui.info('[dry-run] No manifest changes were written.');
+                }
+                for (const detail of result.details) {
+                    switch (detail.action) {
+                        case 'pulled':
+                            ui.success(`Pulled: ${detail.manifestId}`);
+                            break;
+                        case 'skipped':
+                            ui.info(`Skipped: ${detail.manifestId} — ${detail.message ?? 'already in-sync'}`);
+                            break;
+                        case 'conflict':
+                            ui.warn(`Conflict: ${detail.manifestId} — ${detail.message}`);
+                            break;
+                        case 'error':
+                            ui.error(`Error: ${detail.manifestId} — ${detail.message}`);
+                            break;
+                    }
+                }
+                if (!targetId && result.details.length > 0) {
+                    ui.info(`Manifests: ${result.pulled} pulled, ${result.skipped} skipped, ${result.conflicts} conflicts, ${result.errors} errors`);
+                }
+            }
+            // ── Sync Bridges ──
+            const bridgeTargets = targetId ? allBridges.filter((b) => b.id === targetId) : allBridges;
+            const syncTargets = [...syntheticRecordBridges, ...bridgeTargets];
+            if (syncTargets.length > 0) {
+                const { syncTarget, apiToken } = await resolveSyncTarget();
+                if (!syncTarget || syncTarget === 'unknown') {
+                    ui.error('No sync target configured. Set VIBES_API_URL or select an environment.');
+                }
+                else {
+                    for (const bridgeDesc of syncTargets) {
+                        try {
+                            const bridge = new SyncBridge(bridgeDesc);
+                            const bridgeResult = await bridge.execute(syncTarget, {
+                                dryRun: dryRun ?? false,
+                                force: force ?? false,
+                                direction: 'pull'
+                            }, apiToken);
+                            for (const detail of bridgeResult.details) {
+                                const label = `${bridgeDesc.id}:${detail.entityId}`;
+                                if (!dryRun) {
+                                    switch (detail.action) {
+                                        case 'pulled':
+                                            ui.success(`Pulled: ${label}`);
+                                            break;
+                                        case 'skipped':
+                                            ui.info(`Skipped: ${label} — ${detail.message ?? 'in sync'}`);
+                                            break;
+                                        case 'conflict':
+                                            ui.warn(`Conflict: ${label} — ${detail.message}`);
+                                            break;
+                                        case 'error':
+                                            ui.error(`Error: ${label} — ${detail.message}`);
+                                            break;
+                                    }
+                                }
+                                else {
+                                    ui.info(`[dry-run] ${label}: ${detail.action} — ${detail.message ?? ''}`);
+                                }
+                            }
+                            const { pushed, pulled, skipped, conflicts, errors } = bridgeResult;
+                            ui.info(`Sync ${bridgeDesc.id}: ${pulled} pulled, ${pushed} pushed, ${skipped} skipped, ${conflicts} conflicts, ${errors} errors`);
+                        }
+                        catch (e) {
+                            const msg = e.message;
+                            ui.error(`Sync ${bridgeDesc.id} failed: ${msg}`);
+                        }
+                    }
+                }
+            }
+            // Check if nothing was found at all
+            if (targetId) {
+                const manifests = runtime.query('storage/manifest').descriptors();
+                const manifestMatch = manifests.some((d) => d.id === targetId &&
+                    d.enabled !== false &&
+                    d.allowedAdapters?.includes('storage.cloud-api'));
+                const bridgeMatch = allBridges.some((b) => b.id === targetId);
+                const recordMatch = eligibleRecords.some((descriptor) => descriptor.id === targetId);
+                if (!manifestMatch && !bridgeMatch && !recordMatch) {
+                    ui.warn(`'${targetId}' not found as a manifest, record, or sync-bridge.`);
+                }
+            }
+        }
+        catch (e) {
+            ui.error(`Pull failed: ${e}`);
+            process.exit(1);
+        }
+    }
+};
+//# sourceMappingURL=storage.sync.pull.cli-command.impl.js.map

package/dist/cli/commands/sync/pull/storage.sync.pull.cli-command.impl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.sync.pull.cli-command.impl.js","sourceRoot":"","sources":["../../../../../src/cli/commands/sync/pull/storage.sync.pull.cli-command.impl.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/sync/push/storage.sync.push.cli-command.descriptor.d.ts

@@ -0,0 +1,4 @@
+import type { CLICommandAssetDescriptor } from '@vibesdotdev/runtime/schemas/asset';
+declare const descriptor: CLICommandAssetDescriptor;
+export default descriptor;
+//# sourceMappingURL=storage.sync.push.cli-command.descriptor.d.ts.map

package/dist/cli/commands/sync/push/storage.sync.push.cli-command.descriptor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.sync.push.cli-command.descriptor.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/sync/push/storage.sync.push.cli-command.descriptor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAEpF,QAAA,MAAM,UAAU,EAAE,yBAuBjB,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/cli/commands/sync/push/storage.sync.push.cli-command.descriptor.js

@@ -0,0 +1,26 @@
+const descriptor = {
+    kind: 'cli/command',
+    id: 'storage.sync.push',
+    name: 'push',
+    description: 'Push local storage manifests to cloud',
+    group: 'storage.sync',
+    arguments: [
+        {
+            name: 'manifest-id',
+            description: 'Manifest ID to push (omit for all)',
+            required: false,
+            variadic: false
+        }
+    ],
+    options: [
+        { flags: '--force', description: 'Force re-push even if already in-sync' },
+        { flags: '--dry-run', description: 'Show what would be synced without making changes' },
+        { flags: '--json', description: 'Output results as JSON' }
+    ],
+    aliases: [],
+    surfaces: ['cli'],
+    hardware: ['consumer'],
+    enabled: true
+};
+export default descriptor;
+//# sourceMappingURL=storage.sync.push.cli-command.descriptor.js.map

package/dist/cli/commands/sync/push/storage.sync.push.cli-command.descriptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.sync.push.cli-command.descriptor.js","sourceRoot":"","sources":["../../../../../src/cli/commands/sync/push/storage.sync.push.cli-command.descriptor.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,GAA8B;IAC7C,IAAI,EAAE,aAAa;IACnB,EAAE,EAAE,mBAAmB;IACvB,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,uCAAuC;IACpD,KAAK,EAAE,cAAc;IACrB,SAAS,EAAE;QACV;YACC,IAAI,EAAE,aAAa;YACnB,WAAW,EAAE,oCAAoC;YACjD,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE,KAAK;SACf;KACD;IACD,OAAO,EAAE;QACR,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,uCAAuC,EAAE;QAC1E,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,kDAAkD,EAAE;QACvF,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,wBAAwB,EAAE;KAC1D;IACD,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,CAAC,KAAK,CAAC;IACjB,QAAQ,EAAE,CAAC,UAAU,CAAC;IACtB,OAAO,EAAE,IAAI;CACb,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/cli/commands/sync/push/storage.sync.push.cli-command.impl.d.ts

@@ -0,0 +1,13 @@
+/**
+ * vibes storage sync push [manifest-id]
+ *
+ * Pushes local data to the cloud API for storage manifests AND sync-bridges.
+ * Uses syncManifest() for storage manifests and SyncBridge.execute() for bridges.
+ *
+ * The manifest-id argument matches both manifest IDs and bridge IDs.
+ */
+declare const _default: {
+    execute(args: Record<string, unknown>, opts: Record<string, unknown>): Promise<void>;
+};
+export default _default;
+//# sourceMappingURL=storage.sync.push.cli-command.impl.d.ts.map

package/dist/cli/commands/sync/push/storage.sync.push.cli-command.impl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.sync.push.cli-command.impl.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/sync/push/storage.sync.push.cli-command.impl.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;;kBAiCkB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;;AAD3F,wBA6KE"}

package/dist/cli/commands/sync/push/storage.sync.push.cli-command.impl.js

@@ -0,0 +1,165 @@
+/**
+ * vibes storage sync push [manifest-id]
+ *
+ * Pushes local data to the cloud API for storage manifests AND sync-bridges.
+ * Uses syncManifest() for storage manifests and SyncBridge.execute() for bridges.
+ *
+ * The manifest-id argument matches both manifest IDs and bridge IDs.
+ */
+import { getVibesRuntime } from '@vibesdotdev/runtime';
+import { syncManifest } from '../../../../sync/sync-manifest';
+import { loadSyncState, saveSyncState, computeHash, getManifestSyncState, markSynced, markConflict, markError, markLocalAhead, markRemoteAhead } from '../../../../sync/sync-state.consumer';
+import { SyncBridge } from '../../../../sync/sync-bridge';
+import { resolveSyncTarget } from '../../../../sync/resolve-sync-target';
+import { createRecordSyncBridgeDescriptor, isSyncableStorageRecord } from '../../../../sync/record-sync-bridge';
+export default {
+    async execute(args, opts) {
+        const runtime = getVibesRuntime();
+        const ui = (await runtime.context('cli/ui'));
+        const targetId = args['manifest-id'];
+        const force = opts.force;
+        const dryRun = opts.dryRun;
+        try {
+            // ── Storage Manifests ──
+            const descriptors = runtime.query('storage/manifest').descriptors();
+            const eligible = descriptors.filter((d) => d.enabled !== false && d.allowedAdapters?.includes('storage.cloud-api'));
+            const manifestTargets = targetId ? eligible.filter((d) => d.id === targetId) : eligible;
+            const recordDescriptors = runtime
+                .query('storage/record')
+                .descriptors();
+            const eligibleRecords = recordDescriptors.filter(isSyncableStorageRecord);
+            const recordTargets = targetId
+                ? eligibleRecords.filter((descriptor) => descriptor.id === targetId)
+                : eligibleRecords;
+            // ── Sync Bridges ──
+            const allBridges = runtime
+                .query('storage/sync-bridge')
+                .descriptors();
+            const bridgeTargets = targetId ? allBridges.filter((b) => b.id === targetId) : allBridges;
+            if (manifestTargets.length === 0 &&
+                bridgeTargets.length === 0 &&
+                recordTargets.length === 0) {
+                ui.warn(targetId
+                    ? `'${targetId}' not found as a manifest, record, or sync-bridge.`
+                    : 'No manifests, records, or sync-bridges have cloud sync enabled.');
+                return;
+            }
+            const syncState = await loadSyncState();
+            const helpers = {
+                computeHash,
+                getManifestSyncState,
+                markSynced,
+                markConflict,
+                markError,
+                markLocalAhead,
+                markRemoteAhead,
+                dryRun: dryRun ?? false
+            };
+            const results = [];
+            // Push storage manifests
+            for (const descriptor of manifestTargets) {
+                try {
+                    const result = await syncManifest(descriptor.id, syncState, helpers);
+                    results.push(result);
+                    if (!dryRun) {
+                        switch (result.action) {
+                            case 'pushed':
+                                ui.success(`Pushed: ${descriptor.id}`);
+                                break;
+                            case 'pulled':
+                                ui.info(`Pulled (remote was newer): ${descriptor.id}`);
+                                break;
+                            case 'conflict':
+                                ui.warn(`Conflict: ${descriptor.id} — ${result.message}`);
+                                break;
+                            case 'skipped':
+                                ui.info(`Skipped: ${descriptor.id} — ${result.message}`);
+                                break;
+                            case 'error':
+                                ui.error(`Error: ${descriptor.id} — ${result.message}`);
+                                break;
+                        }
+                    }
+                    else {
+                        ui.info(`[dry-run] ${descriptor.id}: ${result.action} — ${result.message ?? ''}`);
+                    }
+                }
+                catch (e) {
+                    const msg = e.message;
+                    ui.error(`Failed to sync ${descriptor.id}: ${msg}`);
+                    results.push({ manifestId: descriptor.id, action: 'error', message: msg });
+                }
+            }
+            // Push sync bridges and syncable records
+            const syntheticRecordBridges = recordTargets.map(createRecordSyncBridgeDescriptor);
+            const syncTargets = [...syntheticRecordBridges, ...bridgeTargets];
+            if (syncTargets.length > 0) {
+                const { syncTarget, apiToken } = await resolveSyncTarget();
+                if (!syncTarget || syncTarget === 'unknown') {
+                    ui.error('No sync target configured. Set VIBES_API_URL or select an environment.');
+                }
+                else {
+                    for (const bridgeDesc of syncTargets) {
+                        try {
+                            const bridge = new SyncBridge(bridgeDesc);
+                            const bridgeResult = await bridge.execute(syncTarget, {
+                                dryRun: dryRun ?? false,
+                                force: force ?? false,
+                                direction: 'push'
+                            }, apiToken);
+                            // Report per-entity results
+                            for (const detail of bridgeResult.details) {
+                                const label = `${bridgeDesc.id}:${detail.entityId}`;
+                                results.push({
+                                    manifestId: label,
+                                    action: detail.action,
+                                    message: detail.message
+                                });
+                                if (!dryRun) {
+                                    switch (detail.action) {
+                                        case 'pushed':
+                                            ui.success(`Pushed: ${label}`);
+                                            break;
+                                        case 'skipped':
+                                            ui.info(`Skipped: ${label} — ${detail.message ?? 'in sync'}`);
+                                            break;
+                                        case 'conflict':
+                                            ui.warn(`Conflict: ${label} — ${detail.message}`);
+                                            break;
+                                        case 'error':
+                                            ui.error(`Error: ${label} — ${detail.message}`);
+                                            break;
+                                    }
+                                }
+                                else {
+                                    ui.info(`[dry-run] ${label}: ${detail.action} — ${detail.message ?? ''}`);
+                                }
+                            }
+                            // Summary line
+                            const { pushed, skipped, conflicts, errors } = bridgeResult;
+                            ui.info(`Sync ${bridgeDesc.id}: ${pushed} pushed, ${skipped} skipped, ${conflicts} conflicts, ${errors} errors`);
+                        }
+                        catch (e) {
+                            const msg = e.message;
+                            ui.error(`Sync ${bridgeDesc.id} failed: ${msg}`);
+                            results.push({ manifestId: bridgeDesc.id, action: 'error', message: msg });
+                        }
+                    }
+                }
+            }
+            if (!dryRun) {
+                const persistedState = await loadSyncState();
+                syncState.manifests = { ...persistedState.manifests, ...syncState.manifests };
+                await saveSyncState(syncState);
+            }
+            if (opts.json) {
+                ui.render(results, { format: 'json' });
+            }
+        }
+        catch (e) {
+            ui.error(`Push failed: ${e}`);
+            process.exit(1);
+        }
+    }
+};
+//# sourceMappingURL=storage.sync.push.cli-command.impl.js.map

package/dist/cli/commands/sync/push/storage.sync.push.cli-command.impl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.sync.push.cli-command.impl.js","sourceRoot":"","sources":["../../../../../src/cli/commands/sync/push/storage.sync.push.cli-command.impl.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/sync/resolve/storage.sync.resolve.cli-command.descriptor.d.ts

@@ -0,0 +1,4 @@
+import type { CLICommandAssetDescriptor } from '@vibesdotdev/runtime/schemas/asset';
+declare const descriptor: CLICommandAssetDescriptor;
+export default descriptor;
+//# sourceMappingURL=storage.sync.resolve.cli-command.descriptor.d.ts.map

package/dist/cli/commands/sync/resolve/storage.sync.resolve.cli-command.descriptor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.sync.resolve.cli-command.descriptor.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/sync/resolve/storage.sync.resolve.cli-command.descriptor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAEpF,QAAA,MAAM,UAAU,EAAE,yBAiBjB,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/cli/commands/sync/resolve/storage.sync.resolve.cli-command.descriptor.js

@@ -0,0 +1,20 @@
+const descriptor = {
+    kind: 'cli/command',
+    id: 'storage.sync.resolve',
+    name: 'resolve',
+    description: 'Resolve a storage manifest sync conflict',
+    group: 'storage.sync',
+    arguments: [
+        { name: 'manifest-id', description: 'Manifest ID to resolve', required: true, variadic: false }
+    ],
+    options: [
+        { flags: '--keep <which>', description: 'Keep local or remote version (default: local)' },
+        { flags: '--json', description: 'Output result as JSON' }
+    ],
+    aliases: [],
+    surfaces: ['cli'],
+    hardware: ['consumer'],
+    enabled: true
+};
+export default descriptor;
+//# sourceMappingURL=storage.sync.resolve.cli-command.descriptor.js.map

package/dist/cli/commands/sync/resolve/storage.sync.resolve.cli-command.descriptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.sync.resolve.cli-command.descriptor.js","sourceRoot":"","sources":["../../../../../src/cli/commands/sync/resolve/storage.sync.resolve.cli-command.descriptor.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,GAA8B;IAC7C,IAAI,EAAE,aAAa;IACnB,EAAE,EAAE,sBAAsB;IAC1B,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,0CAA0C;IACvD,KAAK,EAAE,cAAc;IACrB,SAAS,EAAE;QACV,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;KAC/F;IACD,OAAO,EAAE;QACR,EAAE,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,+CAA+C,EAAE;QACzF,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,uBAAuB,EAAE;KACzD;IACD,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,CAAC,KAAK,CAAC;IACjB,QAAQ,EAAE,CAAC,UAAU,CAAC;IACtB,OAAO,EAAE,IAAI;CACb,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/cli/commands/sync/resolve/storage.sync.resolve.cli-command.impl.d.ts

@@ -0,0 +1,12 @@
+/**
+ * vibes storage sync resolve <manifest-id>
+ *
+ * Resolves a sync conflict by keeping either local or remote version.
+ * When --keep=local, re-pushes local data and marks as in-sync.
+ * When --keep=remote, re-pulls remote data and marks as in-sync.
+ */
+declare const _default: {
+    execute(args: Record<string, unknown>, opts: Record<string, unknown>): Promise<void>;
+};
+export default _default;
+//# sourceMappingURL=storage.sync.resolve.cli-command.impl.d.ts.map

package/dist/cli/commands/sync/resolve/storage.sync.resolve.cli-command.impl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.sync.resolve.cli-command.impl.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/sync/resolve/storage.sync.resolve.cli-command.impl.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;kBA4BkB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;;AAD3F,wBA+FE"}

package/dist/cli/commands/sync/resolve/storage.sync.resolve.cli-command.impl.js

@@ -0,0 +1,95 @@
+/**
+ * vibes storage sync resolve <manifest-id>
+ *
+ * Resolves a sync conflict by keeping either local or remote version.
+ * When --keep=local, re-pushes local data and marks as in-sync.
+ * When --keep=remote, re-pulls remote data and marks as in-sync.
+ */
+import { getVibesRuntime } from '@vibesdotdev/runtime';
+import { loadSyncState, saveSyncState, getManifestSyncState, markSynced } from '../../../../sync/sync-state.consumer';
+import { syncManifest } from '../../../../sync/sync-manifest';
+import { pullFromCloud } from '../../../../sync/cloud-pull';
+import { computeHash, markConflict, markError, markLocalAhead, markRemoteAhead } from '../../../../sync/sync-state.consumer';
+export default {
+    async execute(args, opts) {
+        const runtime = getVibesRuntime();
+        const ui = (await runtime.context('cli/ui'));
+        const manifestId = args['manifest-id'];
+        const keep = opts.keep ?? 'local';
+        if (keep !== 'local' && keep !== 'remote') {
+            ui.error(`Invalid --keep value: '${keep}'. Must be 'local' or 'remote'.`);
+            process.exit(1);
+        }
+        try {
+            const syncState = await loadSyncState();
+            const manifestState = getManifestSyncState(syncState, manifestId);
+            if (manifestState.syncStatus !== 'conflict') {
+                ui.warn(`Manifest '${manifestId}' is not in conflict (status: ${manifestState.syncStatus}).`);
+                return;
+            }
+            // Verify the manifest exists and is cloud-eligible
+            const descriptors = runtime.query('storage/manifest').descriptors();
+            const descriptor = descriptors.find((d) => d.id === manifestId &&
+                d.enabled !== false &&
+                d.allowedAdapters?.includes('storage.cloud-api'));
+            if (!descriptor) {
+                ui.error(`Manifest '${manifestId}' not found or not cloud-sync eligible.`);
+                return;
+            }
+            let result;
+            if (keep === 'local') {
+                // Re-push local version (force sync with push preference)
+                const helpers = {
+                    computeHash,
+                    getManifestSyncState,
+                    markSynced,
+                    markConflict,
+                    markError,
+                    markLocalAhead,
+                    markRemoteAhead,
+                    dryRun: false
+                };
+                result = await syncManifest(manifestId, syncState, helpers);
+                if (result.action === 'pushed' || result.action === 'skipped') {
+                    // Force mark as synced if the sync itself skipped but we resolved
+                    const hash = manifestState.localHash ?? '';
+                    markSynced(syncState, manifestId, hash, 'push');
+                    result = { action: 'resolved', message: 'Kept local version, pushed to cloud' };
+                }
+            }
+            else {
+                // Pull remote version (force overwrite local)
+                const pullResult = await pullFromCloud({
+                    manifestIds: [manifestId],
+                    force: true,
+                    dryRun: false
+                });
+                const detail = pullResult.details.find((d) => d.manifestId === manifestId);
+                if (detail?.action === 'pulled') {
+                    result = { action: 'resolved', message: 'Kept remote version, overwrote local' };
+                }
+                else {
+                    result = {
+                        action: detail?.action ?? 'error',
+                        message: detail?.message ?? 'Failed to pull remote version'
+                    };
+                }
+            }
+            await saveSyncState(syncState);
+            if (result.action === 'resolved') {
+                ui.success(`Resolved: ${manifestId} — ${result.message}`);
+            }
+            else {
+                ui.error(`Resolution failed: ${manifestId} — ${result.message}`);
+            }
+            if (opts.json) {
+                ui.render({ manifestId, keep, ...result }, { format: 'json' });
+            }
+        }
+        catch (e) {
+            ui.error(`Resolve failed: ${e}`);
+            process.exit(1);
+        }
+    }
+};
+//# sourceMappingURL=storage.sync.resolve.cli-command.impl.js.map

package/dist/cli/commands/sync/resolve/storage.sync.resolve.cli-command.impl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.sync.resolve.cli-command.impl.js","sourceRoot":"","sources":["../../../../../src/cli/commands/sync/resolve/storage.sync.resolve.cli-command.impl.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/sync/status/storage.sync.status.cli-command.descriptor.d.ts

@@ -0,0 +1,4 @@
+import type { CLICommandAssetDescriptor } from '@vibesdotdev/runtime/schemas/asset';
+declare const descriptor: CLICommandAssetDescriptor;
+export default descriptor;
+//# sourceMappingURL=storage.sync.status.cli-command.descriptor.d.ts.map

package/dist/cli/commands/sync/status/storage.sync.status.cli-command.descriptor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.sync.status.cli-command.descriptor.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/sync/status/storage.sync.status.cli-command.descriptor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAEpF,QAAA,MAAM,UAAU,EAAE,yBAYjB,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/cli/commands/sync/status/storage.sync.status.cli-command.descriptor.js

@@ -0,0 +1,15 @@
+const descriptor = {
+    kind: 'cli/command',
+    id: 'storage.sync.status',
+    name: 'status',
+    description: 'Show synchronization status for all storage manifests',
+    group: 'storage.sync',
+    arguments: [],
+    options: [{ flags: '--json', description: 'Output as JSON' }],
+    aliases: [],
+    surfaces: ['cli'],
+    hardware: ['consumer'],
+    enabled: true
+};
+export default descriptor;
+//# sourceMappingURL=storage.sync.status.cli-command.descriptor.js.map

package/dist/cli/commands/sync/status/storage.sync.status.cli-command.descriptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.sync.status.cli-command.descriptor.js","sourceRoot":"","sources":["../../../../../src/cli/commands/sync/status/storage.sync.status.cli-command.descriptor.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,GAA8B;IAC7C,IAAI,EAAE,aAAa;IACnB,EAAE,EAAE,qBAAqB;IACzB,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,uDAAuD;IACpE,KAAK,EAAE,cAAc;IACrB,SAAS,EAAE,EAAE;IACb,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAC7D,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,CAAC,KAAK,CAAC;IACjB,QAAQ,EAAE,CAAC,UAAU,CAAC;IACtB,OAAO,EAAE,IAAI;CACb,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/cli/commands/sync/status/storage.sync.status.cli-command.impl.d.ts

@@ -0,0 +1,13 @@
+/**
+ * vibes storage sync status
+ *
+ * Displays the sync state for all cloud-eligible storage manifests
+ * AND all registered sync-bridge descriptors.
+ * Shows the current environment's sync target URL, per-item sync status,
+ * last sync time, direction, and any errors.
+ */
+declare const _default: {
+    execute(_args: Record<string, unknown>, opts: Record<string, unknown>): Promise<void>;
+};
+export default _default;
+//# sourceMappingURL=storage.sync.status.cli-command.impl.d.ts.map

package/dist/cli/commands/sync/status/storage.sync.status.cli-command.impl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.sync.status.cli-command.impl.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/sync/status/storage.sync.status.cli-command.impl.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;;mBAqDmB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;;AAD5F,wBAoIE"}