@vibesdotdev/storage 0.0.2 → 1.0.0-rc.4

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

@@ -5,24 +5,62 @@
  * Uses pullFromCloud() for storage manifests and SyncBridge.execute() for bridges.
  *
  * The manifest-id argument matches both manifest IDs and bridge IDs.
+ *
+ * Machine contract (`--json` / `--format json`):
+ * - stdout is a single JSON document (success: results array; failure: CapabilityError envelope)
+ * - no human per-item lines on stdout/stderr during the run
+ * - non-zero exit when any target reports error or conflict (including dry-run)
  */
-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';
+import { CapabilityError, CaughtFailureSchema } from '@vibesdotdev/kernel';
+import { settleStorage } from "../../../../client/storage-failure.js";
+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";
+import { bridgeOwnerApp, SyncRunOptionsSchema, SyncTargetArgsSchema, syncTargetFailureMessage, wantsJson } from "../sync-command-input.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;
+    async execute(args, opts, context) {
+        const runtime = context.runtime;
+        const ui = await runtime.context('cli/ui');
+        const targetId = SyncTargetArgsSchema.parse(args)['manifest-id'];
+        const options = SyncRunOptionsSchema.parse(opts);
+        const { force, dryRun } = options;
+        const asJson = wantsJson(options);
+        const results = [];
+        const failures = [];
+        const report = (row) => {
+            results.push(row);
+            if (row.action === 'error' || row.action === 'conflict') {
+                failures.push(`${row.manifestId}: ${row.message ?? row.action}`);
+            }
+            if (asJson)
+                return;
+            const label = row.manifestId;
+            const msg = row.message ?? '';
+            if (dryRun) {
+                ui.info(`[dry-run] ${label}: ${row.action} — ${msg}`);
+                return;
+            }
+            switch (row.action) {
+                case 'pulled':
+                    ui.success(`Pulled: ${label}`);
+                    break;
+                case 'skipped':
+                    ui.info(`Skipped: ${label} — ${msg || 'already in-sync'}`);
+                    break;
+                case 'conflict':
+                    ui.warn(`Conflict: ${label} — ${msg}`);
+                    break;
+                case 'error':
+                    ui.error(`Error: ${label} — ${msg}`);
+                    break;
+                default:
+                    ui.info(`${row.action}: ${label}${msg ? ` — ${msg}` : ''}`);
+            }
+        };
         try {
             // ── Sync Bridges ──
-            const allBridges = runtime
-                .query('storage/sync-bridge')
-                .descriptors();
+            const allBridges = runtime.query('storage/sync-bridge').descriptors();
             const allRecords = runtime.query('storage/record').descriptors();
             const eligibleRecords = allRecords.filter(isSyncableStorageRecord);
             const recordTargets = targetId
@@ -41,27 +79,18 @@ export default {
                 if (targetId) {
                     pullOpts.manifestIds = [targetId];
                 }
-                const result = await pullFromCloud(pullOpts);
-                if (dryRun && result.details.length > 0) {
+                const result = await pullFromCloud(runtime, pullOpts);
+                if (!asJson && 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;
-                    }
+                    report({
+                        manifestId: detail.manifestId,
+                        action: detail.action,
+                        message: detail.message
+                    });
                 }
-                if (!targetId && result.details.length > 0) {
+                if (!asJson && !targetId && result.details.length > 0) {
                     ui.info(`Manifests: ${result.pulled} pulled, ${result.skipped} skipped, ${result.conflicts} conflicts, ${result.errors} errors`);
                 }
             }
@@ -69,48 +98,39 @@ export default {
             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}`);
-                        }
+                for (const bridgeDesc of syncTargets) {
+                    const ownerApp = bridgeOwnerApp(bridgeDesc);
+                    const { syncTarget, apiToken } = await resolveSyncTarget(runtime, ownerApp);
+                    if (!syncTarget || syncTarget === 'unknown') {
+                        throw new CapabilityError(`No sync target configured for app '${ownerApp}'.`, 'UNAVAILABLE', { recoveryHint: `Declare the '${ownerApp}' infra/service origin for the selected service environment.` });
+                    }
+                    const attempt = await settleStorage(() => new SyncBridge(bridgeDesc, { runtime }).execute(syncTarget, {
+                        dryRun: dryRun ?? false,
+                        force: force ?? false,
+                        direction: 'pull'
+                    }, apiToken));
+                    if (!attempt.ok) {
+                        // A typed failure ends the run; an untyped one is this bridge's error row.
+                        if (attempt.cause instanceof CapabilityError)
+                            throw attempt.cause;
+                        report({
+                            manifestId: bridgeDesc.id,
+                            action: 'error',
+                            message: syncTargetFailureMessage('Pull failed:', attempt.cause)
+                        });
+                        continue;
+                    }
+                    const bridgeResult = attempt.value;
+                    for (const detail of bridgeResult.details) {
+                        report({
+                            manifestId: `${bridgeDesc.id}:${detail.entityId}`,
+                            action: detail.action,
+                            message: detail.message
+                        });
+                    }
+                    if (!asJson) {
+                        const { pushed, pulled, skipped, conflicts, errors } = bridgeResult;
+                        ui.info(`Sync ${bridgeDesc.id}: ${pulled} pulled, ${pushed} pushed, ${skipped} skipped, ${conflicts} conflicts, ${errors} errors`);
                     }
                 }
             }
@@ -123,13 +143,27 @@ export default {
                 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.`);
+                    throw new CapabilityError(`'${targetId}' not found as a manifest, record, or sync-bridge.`, 'NOT_FOUND');
                 }
             }
+            // Some items were reported as errors/conflicts — the pull as a whole failed.
+            // Throw so CLISurface maps exit code + (under --json) the envelope; include
+            // full results so scripts can inspect per-target outcomes without scraping.
+            if (failures.length > 0) {
+                throw new CapabilityError(`Pull completed with ${failures.length} error${failures.length === 1 ? '' : 's'}: ${failures.slice(0, 5).join('; ')}${failures.length > 5 ? '; …' : ''}`, 'INTERNAL', { details: { results, failures } });
+            }
+            if (asJson) {
+                ui.render(results, { format: 'json' });
+            }
         }
         catch (e) {
-            ui.error(`Pull failed: ${e}`);
-            process.exit(1);
+            if (e instanceof CapabilityError)
+                throw e;
+            // The failure travels as `cause`; its text (a remote body, a URL) never reaches the message.
+            throw new CapabilityError('The storage pull failed.', 'INTERNAL', {
+                reason: 'storage-sync-pull-failed',
+                cause: CaughtFailureSchema.parse(e)
+            });
         }
     }
 };

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

@@ -1 +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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"}
+{"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

@@ -1,4 +1,4 @@
-import type { CLICommandAssetDescriptor } from '@vibesdotdev/runtime/schemas/asset';
+import type { CLICommandAssetDescriptor } from '@vibesdotdev/kernel/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

@@ -1 +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"}
+{"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,mCAAmC,CAAC;AAEnF,QAAA,MAAM,UAAU,EAAE,yBAuBjB,CAAC;AAEF,eAAe,UAAU,CAAC"}

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

@@ -5,9 +5,17 @@
  * Uses syncManifest() for storage manifests and SyncBridge.execute() for bridges.
  *
  * The manifest-id argument matches both manifest IDs and bridge IDs.
+ *
+ * Machine contract (`--json` / `--format json`):
+ * - stdout is a single JSON document (success: results array; failure: CapabilityError envelope)
+ * - no human per-item lines on stdout during the run
+ * - non-zero exit when any target reports error or conflict (including dry-run)
  */
+import type { CommandContext } from '@vibesdotdev/cli-contracts';
+import type * as z from 'zod/v4';
+import { SyncRunOptionsSchema, SyncTargetArgsSchema } from '../sync-command-input.ts';
 declare const _default: {
-    execute(args: Record<string, unknown>, opts: Record<string, unknown>): Promise<void>;
+    execute(args: z.input<typeof SyncTargetArgsSchema>, opts: z.input<typeof SyncRunOptionsSchema>, context: CommandContext): 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

@@ -1 +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"}
+{"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;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,KAAK,CAAC,MAAM,QAAQ,CAAC;AA4BjC,OAAO,EAEN,oBAAoB,EACpB,oBAAoB,EAGpB,MAAM,0BAA0B,CAAC;;kBAU1B,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,QACpC,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,WACjC,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;;AALjB,wBAiNE"}

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

@@ -5,160 +5,183 @@
  * Uses syncManifest() for storage manifests and SyncBridge.execute() for bridges.
  *
  * The manifest-id argument matches both manifest IDs and bridge IDs.
+ *
+ * Machine contract (`--json` / `--format json`):
+ * - stdout is a single JSON document (success: results array; failure: CapabilityError envelope)
+ * - no human per-item lines on stdout during the run
+ * - non-zero exit when any target reports error or conflict (including dry-run)
  */
-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';
+import { CapabilityError, CaughtFailureSchema } from '@vibesdotdev/kernel';
+import { settleStorage } from "../../../../client/storage-failure.js";
+import { syncManifest } from "../../../../sync/sync-manifest.js";
+import { loadSyncState, saveSyncState, computeHash, getManifestSyncState, markSynced, markConflict, markError, clearError, markLocalAhead, markRemoteAhead, mergeSyncStateSnapshots } from "../../../../sync/sync-state.consumer.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";
+import { bridgeOwnerApp, SyncRunOptionsSchema, SyncTargetArgsSchema, syncTargetFailureMessage, wantsJson } from "../sync-command-input.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;
+    async execute(args, opts, context) {
+        const runtime = context.runtime;
+        const ui = await runtime.context('cli/ui');
+        const targetId = SyncTargetArgsSchema.parse(args)['manifest-id'];
+        const options = SyncRunOptionsSchema.parse(opts);
+        const { force, dryRun } = options;
+        const asJson = wantsJson(options);
         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 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 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.');
+                // A specific --manifest-id that matches nothing is a failure; an
+                // unfiltered run with nothing cloud-eligible is a benign no-op.
+                if (targetId) {
+                    throw new CapabilityError(`'${targetId}' not found as a manifest, record, or sync-bridge.`, 'NOT_FOUND');
+                }
+                if (asJson) {
+                    ui.render([], { format: 'json' });
+                }
+                else {
+                    ui.warn('No manifests, records, or sync-bridges have cloud sync enabled.');
+                }
                 return;
             }
-            const syncState = await loadSyncState();
+            const syncState = await loadSyncState(runtime);
             const helpers = {
                 computeHash,
                 getManifestSyncState,
                 markSynced,
                 markConflict,
                 markError,
+                clearError,
                 markLocalAhead,
                 markRemoteAhead,
                 dryRun: dryRun ?? false
             };
             const results = [];
+            const executedBridgeIds = new Set();
+            const report = (row) => {
+                results.push(row);
+                if (asJson)
+                    return;
+                const label = row.manifestId;
+                const msg = row.message ?? '';
+                if (dryRun) {
+                    ui.info(`[dry-run] ${label}: ${row.action} — ${msg}`);
+                    return;
+                }
+                switch (row.action) {
+                    case 'pushed':
+                        ui.success(`Pushed: ${label}`);
+                        break;
+                    case 'pulled':
+                        ui.info(`Pulled (remote was newer): ${label}`);
+                        break;
+                    case 'conflict':
+                        ui.warn(`Conflict: ${label} — ${msg}`);
+                        break;
+                    case 'skipped':
+                        ui.info(`Skipped: ${label} — ${msg}`);
+                        break;
+                    case 'error':
+                        ui.error(`Error: ${label} — ${msg}`);
+                        break;
+                    default:
+                        ui.info(`${row.action}: ${label}${msg ? ` — ${msg}` : ''}`);
+                }
+            };
             // 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 });
+                const attempt = await settleStorage(() => syncManifest(runtime, descriptor.id, syncState, helpers));
+                if (attempt.ok) {
+                    report(attempt.value);
+                    continue;
                 }
+                // A typed failure ends the run; an untyped one is this manifest's error row.
+                if (attempt.cause instanceof CapabilityError)
+                    throw attempt.cause;
+                report({ manifestId: descriptor.id, action: 'error', message: syncTargetFailureMessage('Push failed:', attempt.cause) });
             }
             // 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 });
-                        }
+                for (const bridgeDesc of syncTargets) {
+                    const ownerApp = bridgeOwnerApp(bridgeDesc);
+                    const { syncTarget, apiToken } = await resolveSyncTarget(runtime, ownerApp);
+                    if (!syncTarget || syncTarget === 'unknown') {
+                        throw new CapabilityError(`No sync target configured for app '${ownerApp}'.`, 'UNAVAILABLE', { recoveryHint: `Declare the '${ownerApp}' infra/service origin for the selected service environment.` });
+                    }
+                    executedBridgeIds.add(bridgeDesc.id);
+                    const attempt = await settleStorage(() => new SyncBridge(bridgeDesc, { runtime }).execute(syncTarget, {
+                        dryRun: dryRun ?? false,
+                        force: force ?? false,
+                        direction: 'push'
+                    }, apiToken));
+                    if (!attempt.ok) {
+                        // A typed failure ends the run; an untyped one is this bridge's error row.
+                        if (attempt.cause instanceof CapabilityError)
+                            throw attempt.cause;
+                        report({ manifestId: bridgeDesc.id, action: 'error', message: syncTargetFailureMessage('Push failed:', attempt.cause) });
+                        continue;
+                    }
+                    const bridgeResult = attempt.value;
+                    // Report per-entity results
+                    for (const detail of bridgeResult.details) {
+                        report({
+                            manifestId: `${bridgeDesc.id}:${detail.entityId}`,
+                            action: detail.action,
+                            message: detail.message
+                        });
+                    }
+                    if (!asJson) {
+                        const { pushed, skipped, conflicts, errors } = bridgeResult;
+                        ui.info(`Sync ${bridgeDesc.id}: ${pushed} pushed, ${skipped} skipped, ${conflicts} conflicts, ${errors} errors`);
                     }
                 }
             }
             if (!dryRun) {
-                const persistedState = await loadSyncState();
-                syncState.manifests = { ...persistedState.manifests, ...syncState.manifests };
-                await saveSyncState(syncState);
+                // SyncBridge.execute persists per-entity keys itself. Retain those fresh
+                // transitions while also saving any manifest transitions made from the
+                // snapshot loaded before bridge execution.
+                const persistedState = await loadSyncState(runtime);
+                const mergedState = mergeSyncStateSnapshots(syncState, persistedState, executedBridgeIds);
+                await saveSyncState(mergedState, runtime);
+            }
+            // Routines branch on exit code — propagate a failure when any target
+            // reported an error or conflict. Conflicts surface as failures too so
+            // scripts can detect "needs human" outcomes. Under --json the surface
+            // owns the envelope (CapabilityError.toEnvelope); human mode prints
+            // the message to stderr.
+            const failed = results.filter((r) => r.action === 'error' || r.action === 'conflict');
+            if (failed.length > 0) {
+                throw new CapabilityError(`Push completed with ${failed.length} failure${failed.length === 1 ? '' : 's'} (${failed
+                    .map((f) => `${f.manifestId}:${f.action}`)
+                    .slice(0, 5)
+                    .join(', ')}${failed.length > 5 ? ', …' : ''}).`, 'INTERNAL', { details: { results } });
             }
-            if (opts.json) {
+            if (asJson) {
                 ui.render(results, { format: 'json' });
             }
         }
         catch (e) {
-            ui.error(`Push failed: ${e}`);
-            process.exit(1);
+            if (e instanceof CapabilityError)
+                throw e;
+            // The failure travels as `cause`; its text (a remote body, a URL) never reaches the message.
+            throw new CapabilityError('The storage push failed.', 'INTERNAL', {
+                reason: 'storage-sync-push-failed',
+                cause: CaughtFailureSchema.parse(e)
+            });
         }
     }
 };