@hasna/loops 0.4.27 → 0.4.28

package/dist/sdk/index.js

@@ -1569,6 +1569,7 @@ var DEFAULT_RECOVERY_BATCH_LIMIT = 100;
 var DEFAULT_RECOVERY_SCAN_MULTIPLIER = 5;
 var LIVE_EXPIRED_RUN_GRACE_MS = 60000;
 var SCHEMA_USER_VERSION = 8;
+var BREAKING_SCHEMA_FLOOR = 7;
 var TERMINAL_RUN_STATUSES = ["succeeded", "failed", "timed_out", "abandoned", "skipped"];
 var PRUNE_BATCH_SIZE = 400;
 var GENERATED_ROUTE_TEMPLATE_IDS = new Set(["todos-task-worker-verifier", "task-lifecycle", "event-worker-verifier"]);
@@ -1711,6 +1712,7 @@ function rowToWorkflowWorkItem(row) {
     priority: row.priority,
     status: row.status,
     attempts: row.attempts,
+    gateDeaths: row.gate_deaths ?? 0,
     nextAttemptAt: row.next_attempt_at ?? undefined,
     leaseExpiresAt: row.lease_expires_at ?? undefined,
     workflowId: row.workflow_id ?? undefined,
@@ -1860,6 +1862,23 @@ function workItemStatusForLoopRun(status, attempt, maxAttempts) {
   }
   return;
 }
+var WORK_ITEM_TEMPFAIL_EXIT_CODE = 75;
+var GATE_STEP_IDS = new Set(["triage", "planner", "plan"]);
+var GATE_DEATH_MAX_DURATION_MS = 60000;
+var GATE_DEATH_CEILING = 20;
+function classifyNonProductiveStepFailure(steps) {
+  const failing = [...steps].reverse().find((step) => step.status === "failed" || step.status === "timed_out");
+  if (!failing)
+    return;
+  if (failing.exitCode === WORK_ITEM_TEMPFAIL_EXIT_CODE)
+    return "tempfail";
+  if (typeof failing.error === "string" && failing.error.includes("worktree preparation failed"))
+    return "gate-death";
+  const fast = failing.durationMs === undefined || failing.durationMs < GATE_DEATH_MAX_DURATION_MS;
+  if (GATE_STEP_IDS.has(failing.stepId) && fast)
+    return "gate-death";
+  return;
+}
 function scrubbedOrNull(value) {
   return value == null ? null : scrubSecrets(value);
 }
@@ -1960,11 +1979,21 @@ class Store {
         id TEXT PRIMARY KEY,
         applied_at TEXT NOT NULL
       );
+      CREATE TABLE IF NOT EXISTS schema_compat (
+        id INTEGER PRIMARY KEY CHECK (id = 1),
+        min_compatible_user_version INTEGER NOT NULL
+      );
     `);
     const versionRow = this.db.query("PRAGMA user_version").get();
     const userVersion = versionRow?.user_version ?? 0;
     if (userVersion > SCHEMA_USER_VERSION) {
-      throw new Error(`loops database schema version ${userVersion} is newer than this binary supports (${SCHEMA_USER_VERSION}); upgrade open-loops before opening this database`);
+      const floorRow = this.db.query("SELECT min_compatible_user_version FROM schema_compat WHERE id = 1").get();
+      if (!floorRow) {
+        throw new Error(`loops database schema version ${userVersion} is newer than this binary supports (${SCHEMA_USER_VERSION}) and carries no compatibility floor; upgrade open-loops before opening this database`);
+      }
+      if (SCHEMA_USER_VERSION < floorRow.min_compatible_user_version) {
+        throw new Error(`loops database schema version ${userVersion} requires a binary with schema support >= ${floorRow.min_compatible_user_version} (this binary supports ${SCHEMA_USER_VERSION}); upgrade open-loops before opening this database`);
+      }
     }
     const applied = new Set(this.db.query("SELECT id FROM schema_migrations").all().map((row) => row.id));
     for (const migration of this.migrations()) {
@@ -1975,8 +2004,10 @@ class Store {
         this.db.query("INSERT OR IGNORE INTO schema_migrations (id, applied_at) VALUES (?, ?)").run(migration.id, nowIso());
       }
     }
-    if (userVersion !== SCHEMA_USER_VERSION)
+    if (userVersion < SCHEMA_USER_VERSION)
       this.db.exec(`PRAGMA user_version = ${SCHEMA_USER_VERSION}`);
+    this.db.query(`INSERT INTO schema_compat (id, min_compatible_user_version) VALUES (1, ?)
+         ON CONFLICT(id) DO UPDATE SET min_compatible_user_version = MAX(min_compatible_user_version, excluded.min_compatible_user_version)`).run(BREAKING_SCHEMA_FLOOR);
   }
   migrations() {
     return [
@@ -2043,6 +2074,12 @@ class Store {
           this.addColumnIfMissing("workflow_work_items", "machine_id", "TEXT");
           this.db.exec("CREATE INDEX IF NOT EXISTS idx_workflow_work_items_machine ON workflow_work_items(machine_id, status)");
         }
+      },
+      {
+        id: "0011_work_item_gate_deaths",
+        apply: () => {
+          this.addColumnIfMissing("workflow_work_items", "gate_deaths", "INTEGER NOT NULL DEFAULT 0");
+        }
       }
     ];
   }
@@ -3173,7 +3210,7 @@ class Store {
   }
   upsertWorkflowWorkItem(input) {
     const now = nowIso();
-    const id = genId();
+    const id = input.id ?? genId();
     const status = input.status ?? "queued";
     this.db.query(`INSERT INTO workflow_work_items (id, route_key, idempotency_key, invocation_id, source_type, source_ref,
           subject_ref, project_key, project_group, machine_id, route_scope, priority, status, attempts, next_attempt_at, lease_expires_at,
@@ -3301,6 +3338,7 @@ class Store {
     const placeholders = requeueableStatuses.map(() => "?").join(",");
     const res = this.db.query(`UPDATE workflow_work_items
          SET status='queued', workflow_id=NULL, loop_id=NULL, workflow_run_id=NULL,
+          ${patch.resetAttempts ? "attempts=0, gate_deaths=0," : ""}
           next_attempt_at=NULL, lease_expires_at=NULL, last_reason=?, updated_at=?
          WHERE id=? AND status IN (${placeholders})`).run(reason, now, id, ...requeueableStatuses);
     const item = this.getWorkflowWorkItem(id);
@@ -3310,6 +3348,46 @@ class Store {
       throw new Error(`workflow work item was not requeued: ${id} status=${item.status}`);
     return item;
   }
+  deadLetterWorkflowWorkItem(id, patch = {}) {
+    const now = nowIso();
+    const reason = patch.reason?.trim() || "redispatch cap reached; dead-lettered";
+    this.db.query(`UPDATE workflow_work_items
+         SET status='dead_letter', next_attempt_at=NULL, lease_expires_at=NULL, last_reason=?, updated_at=?
+         WHERE id=? AND status IN ('succeeded','failed','cancelled')`).run(reason, now, id);
+    const item = this.getWorkflowWorkItem(id);
+    if (!item)
+      throw new Error(`workflow work item not found after dead-letter: ${id}`);
+    return item;
+  }
+  demoteNonProductiveWorkItems(workflowRunId, finishedAt) {
+    const kind = classifyNonProductiveStepFailure(this.listWorkflowStepRuns(workflowRunId));
+    if (!kind) {
+      this.db.query("UPDATE workflow_work_items SET gate_deaths=0, updated_at=? WHERE workflow_run_id=? AND status='failed' AND gate_deaths > 0").run(finishedAt, workflowRunId);
+      return;
+    }
+    if (kind === "tempfail") {
+      this.db.query(`UPDATE workflow_work_items
+           SET status='queued', attempts=CASE WHEN attempts > 0 THEN attempts - 1 ELSE 0 END,
+            gate_deaths=0,
+            workflow_id=NULL, loop_id=NULL, workflow_run_id=NULL,
+            next_attempt_at=NULL, lease_expires_at=NULL,
+            last_reason='worker exited 75 (tempfail): requeued for retry; attempt refunded (does not count toward redispatch cap)',
+            updated_at=?
+           WHERE workflow_run_id=? AND status='failed'`).run(finishedAt, workflowRunId);
+      return;
+    }
+    this.db.query(`UPDATE workflow_work_items
+         SET attempts=CASE WHEN attempts > 0 THEN attempts - 1 ELSE 0 END,
+          gate_deaths=gate_deaths + 1,
+          status=CASE WHEN gate_deaths + 1 >= ${GATE_DEATH_CEILING} THEN 'dead_letter' ELSE status END,
+          last_reason=CASE
+            WHEN gate_deaths + 1 >= ${GATE_DEATH_CEILING}
+              THEN 'gate-death ceiling reached (' || (gate_deaths + 1) || '/${GATE_DEATH_CEILING} consecutive runs died at worktree prep / triage / planner without reaching the worker): dead-lettered \u2014 the infrastructure fault needs an operator; ''loops routes requeue'' resets and retries'
+            ELSE 'gate death before real work (worktree prep / triage / planner): attempt refunded (does not count toward redispatch cap); consecutive gate deaths: ' || (gate_deaths + 1) || '/${GATE_DEATH_CEILING}'
+          END,
+          updated_at=?
+         WHERE workflow_run_id=? AND status='failed'`).run(finishedAt, workflowRunId);
+  }
   admitWorkflowWorkItem(id, patch) {
     const now = nowIso();
     const res = this.db.query(`UPDATE workflow_work_items
@@ -4021,6 +4099,8 @@ class Store {
       if (changed) {
         const itemStatus = status === "succeeded" ? "succeeded" : status === "cancelled" ? "cancelled" : "failed";
         this.setWorkflowWorkItemsForWorkflowRun(workflowRunId, itemStatus, error, finishedAt);
+        if (itemStatus === "failed")
+          this.demoteNonProductiveWorkItems(workflowRunId, finishedAt);
         this.maybeArchiveTerminalGeneratedRouteWorkflow(workflowRunId, finishedAt);
       }
       this.db.exec("COMMIT");
@@ -4970,7 +5050,7 @@ class Store {
 // package.json
 var package_default = {
   name: "@hasna/loops",
-  version: "0.4.27",
+  version: "0.4.28",
   description: "Persistent local loop and workflow runner for deterministic commands and headless AI coding agents",
   type: "module",
   main: "dist/index.js",
@@ -5080,6 +5160,7 @@ var package_default = {
     bun: ">=1.0.0"
   },
   dependencies: {
+    "@hasna/contracts": "^0.5.1",
     "@hasna/events": "^0.1.9",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@openrouter/ai-sdk-provider": "2.9.1",
@@ -5089,8 +5170,7 @@ var package_default = {
     zod: "4.4.3"
   },
   optionalDependencies: {
-    "@hasna/machines": "0.0.49",
-    "@hasna/contracts": "^0.4.2"
+    "@hasna/machines": "0.0.49"
   },
   devDependencies: {
     "@types/bun": "latest",
@@ -6136,11 +6216,30 @@ function remoteWorktreePrepareLines(worktree) {
     '  git -C "$repo" rev-parse --is-inside-work-tree >/dev/null 2>&1 || { echo "worktree repoRoot is not a git repository: $repo" >&2; return 1; }',
     '  mkdir -p "$(dirname "$path")" || return 1',
     "  # Preparation chatter goes to stderr so run stdout stays the agent's.",
-    '  if git -C "$repo" show-ref --verify --quiet "refs/heads/$branch"; then',
-    '    git -C "$repo" worktree add "$path" "$branch" 1>&2 || return 1',
-    "  else",
-    '    git -C "$repo" worktree add -b "$branch" "$path" HEAD 1>&2 || return 1',
+    "  __openloops_worktree_add() {",
+    '    if git -C "$repo" show-ref --verify --quiet "refs/heads/$branch"; then',
+    '      git -C "$repo" worktree add "$path" "$branch"',
+    "    else",
+    '      git -C "$repo" worktree add -b "$branch" "$path" HEAD',
+    "    fi",
+    "  }",
+    "  local __ol_add_out",
+    '  if __ol_add_out="$(__openloops_worktree_add 2>&1)"; then',
+    '    if [ -n "$__ol_add_out" ]; then printf "%s\\n" "$__ol_add_out" >&2; fi',
+    "    return 0",
     "  fi",
+    '  printf "%s\\n" "$__ol_add_out" >&2',
+    "  # Self-heal git's own remedy for a stale 'missing but already registered",
+    "  # worktree': prune the dead registration (metadata-only; the directory is",
+    "  # already gone) and retry the add exactly once, then fail honestly.",
+    '  case "$__ol_add_out" in',
+    '    *"missing but already registered worktree"*)',
+    '      git -C "$repo" worktree prune 1>&2 || true',
+    "      __openloops_worktree_add 1>&2 || return 1",
+    "      return 0",
+    "      ;;",
+    "  esac",
+    "  return 1",
     "}"
   ];
 }
@@ -6280,6 +6379,9 @@ async function preflightNativeAuthProfile(spec, env) {
 function spawnDetail(result) {
   return (result.stderr || result.stdout || result.error || "").toString().trim();
 }
+function isStaleWorktreeRegistration(detail) {
+  return typeof detail === "string" && /missing but already registered worktree/i.test(detail);
+}
 function resolvedDirEquals(left, right) {
   try {
     return realpathSync(left) === realpathSync(right);
@@ -6381,7 +6483,12 @@ async function ensureLocalWorktree(worktree, env) {
     return { error: `could not create worktree parent directory: ${error instanceof Error ? error.message : String(error)}` };
   }
   const hasBranch = await git(["-C", repoRoot, "show-ref", "--verify", "--quiet", `refs/heads/${branch}`]);
-  const add = hasBranch.status === 0 ? await git(["-C", repoRoot, "worktree", "add", path, branch]) : await git(["-C", repoRoot, "worktree", "add", "-b", branch, path, "HEAD"]);
+  const runAdd = () => hasBranch.status === 0 ? git(["-C", repoRoot, "worktree", "add", path, branch]) : git(["-C", repoRoot, "worktree", "add", "-b", branch, path, "HEAD"]);
+  let add = await runAdd();
+  if ((add.error || (add.status ?? 1) !== 0) && isStaleWorktreeRegistration(spawnDetail(add))) {
+    await git(["-C", repoRoot, "worktree", "prune"]);
+    add = await runAdd();
+  }
   if (add.error || (add.status ?? 1) !== 0) {
     const detail = spawnDetail(add);
     return { error: `git worktree add failed for ${path}${detail ? `: ${detail}` : ""}` };
@@ -7649,6 +7756,7 @@ function runDoctor(store) {
 import { createHash as createHash4 } from "crypto";
 import { hostname as hostname3 } from "os";
 var LOOPS_MIGRATION_SCHEMA = "open-loops.migration/v1";
+var LOOPS_SELF_HOSTED_PUSH_MANIFEST_SCHEMA = "open-loops.self-hosted-push-manifest/v1";
 function canonicalize(value) {
   if (Array.isArray(value))
     return value.map((entry) => canonicalize(entry));
@@ -7809,6 +7917,20 @@ function compareResource(current, incoming, opts) {
     currentHash
   };
 }
+function remoteRepresentationRow(current, incoming, opts) {
+  const incomingHash = migrationHash(incoming);
+  if (!current)
+    return { resource: opts.resource, id: opts.id, name: opts.name, action: "insert", incomingHash };
+  return {
+    resource: opts.resource,
+    id: opts.id,
+    name: opts.name,
+    action: "skip",
+    reason: "remote id is represented; self-hosted list payload is public/redacted, so exact byte comparison is reserved for import apply",
+    incomingHash,
+    currentHash: migrationHash(current)
+  };
+}
 function buildImportMigrationPlan(store, bundle, opts = {}) {
   assertMigrationBundleIntegrity(bundle);
   const includeRuns = opts.includeRuns ?? true;
@@ -8000,39 +8122,184 @@ async function requestJson(fetchImpl, config, path, init = {}) {
     }
   });
   const payload = await response.json().catch(() => ({}));
-  if (!response.ok)
-    throw new Error(typeof payload.error === "string" ? payload.error : `loops-api request failed: ${response.status}`);
+  if (!response.ok) {
+    throw Object.assign(new Error(typeof payload.error === "string" ? payload.error : `loops-api request failed: ${response.status}`), { status: response.status, payload });
+  }
   return payload;
 }
+async function fetchPagedRows(fetchImpl, config, path, key, opts) {
+  const rows = [];
+  const limit = 1000;
+  for (let offset = 0;; offset += limit) {
+    try {
+      const separator = path.includes("?") ? "&" : "?";
+      const payload = await requestJson(fetchImpl, config, `${path}${separator}limit=${limit}&offset=${offset}`);
+      const page = Array.isArray(payload[key]) ? payload[key] : [];
+      rows.push(...page);
+      if (page.length < limit)
+        break;
+    } catch (error) {
+      if (error.status === 404) {
+        opts.unsupported.push(path);
+        opts.warnings.push(`self-hosted control plane does not expose ${path}; exact ${key} comparison is unavailable`);
+        break;
+      }
+      throw error;
+    }
+  }
+  return rows;
+}
+async function fetchOptionalCount(fetchImpl, config, path, opts) {
+  try {
+    const payload = await requestJson(fetchImpl, config, path);
+    return typeof payload.count === "number" ? payload.count : undefined;
+  } catch (error) {
+    if (error.status === 404) {
+      opts.unsupported.push(path);
+      opts.warnings.push(`self-hosted control plane does not expose ${path}; count comparison is unavailable`);
+      return;
+    }
+    throw error;
+  }
+}
 async function fetchRemotePreview(opts) {
   const config = resolveApiConfig(opts);
   const warnings = [];
+  const unsupported = [];
   if (!config.apiUrl) {
     warnings.push("LOOPS_API_URL or HASNA_LOOPS_API_URL is required to inspect a self-hosted control plane");
-    return { loops: [], runs: [], warnings };
+    return { workflows: [], loops: [], runs: [], counts: {}, unsupported, warnings };
   }
   if (!isLocalApiUrl(config.apiUrl) && !config.token) {
     warnings.push("non-local self-hosted APIs require LOOPS_API_TOKEN or HASNA_LOOPS_API_TOKEN");
-    return { loops: [], runs: [], warnings };
+    return { workflows: [], loops: [], runs: [], counts: {}, unsupported, warnings };
   }
   const fetchImpl = opts.fetchImpl ?? fetch;
-  const loopsPayload = await requestJson(fetchImpl, { apiUrl: config.apiUrl, token: config.token }, "/v1/loops?includeArchived=true&limit=1000");
-  const runsPayload = opts.includeRuns === false ? { runs: [] } : await requestJson(fetchImpl, { apiUrl: config.apiUrl, token: config.token }, "/v1/runs?limit=1000");
+  const api = { apiUrl: config.apiUrl, token: config.token };
+  const requestOpts = { unsupported, warnings };
+  const workflows = await fetchPagedRows(fetchImpl, api, "/v1/workflows", "workflows", requestOpts);
+  const loops = await fetchPagedRows(fetchImpl, api, "/v1/loops?includeArchived=true", "loops", requestOpts);
+  const runs = opts.includeRuns === false ? [] : await fetchPagedRows(fetchImpl, api, "/v1/runs?showOutput=true", "runs", requestOpts);
   return {
-    loops: Array.isArray(loopsPayload.loops) ? loopsPayload.loops : [],
-    runs: Array.isArray(runsPayload.runs) ? runsPayload.runs : [],
+    workflows,
+    loops,
+    runs,
+    counts: {
+      workflows: await fetchOptionalCount(fetchImpl, api, "/v1/workflows/count", requestOpts),
+      loops: await fetchOptionalCount(fetchImpl, api, "/v1/loops/count?includeArchived=true", requestOpts),
+      runs: opts.includeRuns === false ? undefined : await fetchOptionalCount(fetchImpl, api, "/v1/runs/count", requestOpts)
+    },
+    unsupported,
     warnings
   };
 }
+function disabledWorkflowForSelfHostedImport(workflow) {
+  return { ...workflow, status: "archived" };
+}
+function pausedLoopForSelfHostedImport(loop) {
+  return {
+    ...loop,
+    status: "paused",
+    nextRunAt: undefined,
+    retryScheduledFor: undefined
+  };
+}
+function selfHostedDefinitionBundle(bundle) {
+  const body = {
+    ...bundle,
+    data: {
+      workflows: bundle.data.workflows.map(disabledWorkflowForSelfHostedImport),
+      loops: bundle.data.loops.map(pausedLoopForSelfHostedImport),
+      runs: bundle.data.runs
+    }
+  };
+  const { hash: _hash, ...hashBody } = body;
+  return { ...body, hash: migrationHash(hashBody) };
+}
+function typedRows(rows) {
+  return rows.filter((row) => Boolean(row && typeof row === "object" && typeof row.id === "string"));
+}
+function rowsById(rows) {
+  return new Map(rows.map((row) => [row.id, row]));
+}
+function rowsByName(rows) {
+  return new Map(rows.filter((row) => typeof row.name === "string").map((row) => [String(row.name), row]));
+}
+function rowIds(rows, resource, action) {
+  return rows.filter((row) => row.resource === resource && row.action === action).map((row) => row.id);
+}
+function existingRowIds(rows, resource) {
+  return rows.filter((row) => row.resource === resource && (row.action === "skip" || row.action === "update")).map((row) => row.id);
+}
+function buildSelfHostedManifest(args) {
+  return {
+    schema: LOOPS_SELF_HOSTED_PUSH_MANIFEST_SCHEMA,
+    generatedAt: new Date().toISOString(),
+    apiUrl: args.apiUrl,
+    dryRun: args.dryRun,
+    replace: args.replace,
+    includeRuns: args.includeRuns,
+    safety: {
+      forcedLoopStatus: "paused",
+      clearedLoopRunPointers: true,
+      forcedWorkflowStatus: "archived",
+      resumesLoops: false
+    },
+    counts: {
+      source: args.bundle.counts,
+      remoteBefore: args.remote.counts,
+      remoteAfter: args.remoteAfter,
+      plan: args.plan.summary,
+      applied: args.applied,
+      skipped: args.skipped,
+      requests: args.requests
+    },
+    missingIds: {
+      workflows: rowIds(args.plan.rows, "workflow", "insert"),
+      loops: rowIds(args.plan.rows, "loop", "insert"),
+      runs: rowIds(args.plan.rows, "run", "insert")
+    },
+    existingIds: {
+      workflows: existingRowIds(args.plan.rows, "workflow"),
+      loops: existingRowIds(args.plan.rows, "loop"),
+      runs: existingRowIds(args.plan.rows, "run")
+    },
+    unsafe: {
+      blocked: args.plan.rows.filter((row) => row.action === "blocked"),
+      conflicts: args.plan.rows.filter((row) => row.action === "conflict"),
+      unsupported: args.remote.unsupported,
+      warnings: args.plan.warnings
+    },
+    rollback: {
+      notes: [
+        "self-hosted push imports through id-preserving upserts; no local loops are resumed or mutated",
+        "imported loops are forced to paused with nextRunAt/retryScheduledFor cleared before upload",
+        "imported workflows are forced to archived before upload",
+        "rollback is manual: archive or delete imported ids from the self-hosted control plane after reviewing this manifest"
+      ],
+      commands: [
+        "loops self-hosted push --dry-run --no-runs --manifest-file <post-rollback-check.json>"
+      ]
+    }
+  };
+}
 async function buildSelfHostedMigrationPlan(store, opts) {
-  const bundle = exportLoopsMigrationBundle(store, { includeRuns: opts.includeRuns ?? true });
+  const bundle = selfHostedDefinitionBundle(exportLoopsMigrationBundle(store, { includeRuns: opts.includeRuns ?? true }));
   const remote = await fetchRemotePreview(opts);
   const rows = [...bundle.blockers.map((row) => ({ ...row, action: "blocked" }))];
   const warnings = [
     ...bundle.warnings,
     ...remote.warnings,
-    "self-hosted remote apply is preview-only until the control plane exposes id-preserving workflow/loop/run import endpoints"
+    "self-hosted push forces imported loops to paused and imported workflows to archived until activation is explicitly approved"
   ];
+  const config = resolveApiConfig(opts);
+  const apiUrl = config.apiUrl;
+  if (!apiUrl) {
+    pushBlocker(rows, "remote", "self-hosted-api-url", "LOOPS_API_URL or HASNA_LOOPS_API_URL is required to compare a self-hosted control plane");
+  } else if (!isLocalApiUrl(apiUrl) && !config.token) {
+    pushBlocker(rows, "remote", "self-hosted-api-token", "non-local self-hosted APIs require LOOPS_API_TOKEN or HASNA_LOOPS_API_TOKEN");
+  }
+  const replace = opts.replace ?? false;
   if (opts.operation === "self-hosted-pull") {
     for (const entry of remote.loops) {
       const value = entry && typeof entry === "object" ? entry : {};
@@ -8062,58 +8329,107 @@ async function buildSelfHostedMigrationPlan(store, opts) {
       schema: LOOPS_MIGRATION_SCHEMA,
       operation: opts.operation,
       dryRun: true,
-      replace: false,
+      replace,
       importable: false,
       rows,
       warnings
     });
-    return { ...plan2, importable: false };
+    return {
+      ...plan2,
+      importable: false,
+      manifest: buildSelfHostedManifest({
+        apiUrl,
+        dryRun: true,
+        replace,
+        includeRuns: opts.includeRuns ?? true,
+        bundle,
+        remote,
+        plan: plan2
+      })
+    };
   }
-  const remoteLoopsByName = new Map(remote.loops.map((entry) => entry && typeof entry === "object" ? entry : undefined).filter((entry) => typeof entry?.name === "string").map((entry) => [String(entry.name), entry]));
+  const remoteWorkflows = typedRows(remote.workflows);
+  const remoteLoops = typedRows(remote.loops);
+  const remoteRuns = typedRows(remote.runs);
+  const remoteWorkflowsById = rowsById(remoteWorkflows);
+  const remoteLoopsById = rowsById(remoteLoops);
+  const remoteRunsById = rowsById(remoteRuns);
+  const remoteLoopsByName = rowsByName(remoteLoops);
   for (const workflow of bundle.data.workflows) {
-    rows.push({
+    if (remote.unsupported.some((entry) => entry.startsWith("/v1/workflows"))) {
+      rows.push({
+        resource: "workflow",
+        id: workflow.id,
+        name: workflow.name,
+        action: "blocked",
+        reason: "self-hosted API does not expose workflow list/count endpoints for safe comparison",
+        incomingHash: migrationHash(workflow)
+      });
+      continue;
+    }
+    rows.push(remoteRepresentationRow(remoteWorkflowsById.get(workflow.id), workflow, {
       resource: "workflow",
       id: workflow.id,
-      name: workflow.name,
-      action: "blocked",
-      reason: "self-hosted API does not expose id-preserving workflow import/list endpoints yet",
-      incomingHash: migrationHash(workflow)
-    });
+      name: workflow.name
+    }));
   }
   for (const loop of bundle.data.loops) {
-    const remoteLoop = remoteLoopsByName.get(loop.name);
-    rows.push({
-      resource: "loop",
-      id: loop.id,
-      name: loop.name,
-      action: "blocked",
-      reason: remoteLoop ? `remote loop name exists (${String(remoteLoop.id ?? "unknown id")}); exact id-preserving comparison is not available` : "normal self-hosted loop create would generate a new id; waiting for id-preserving import endpoint",
-      incomingHash: migrationHash(loop),
-      currentHash: remoteLoop ? migrationHash(remoteLoop) : undefined
-    });
+    const remoteLoop = remoteLoopsById.get(loop.id);
+    if (!remoteLoop) {
+      const nameCollision = remoteLoopsByName.get(loop.name);
+      if (nameCollision && nameCollision.id !== loop.id) {
+        rows.push({
+          resource: "loop",
+          id: loop.id,
+          name: loop.name,
+          action: "insert",
+          reason: `remote loop name exists under different id ${String(nameCollision.id ?? "unknown id")}; id-preserving import will add the missing source id paused`,
+          incomingHash: migrationHash(loop),
+          currentHash: migrationHash(nameCollision)
+        });
+        continue;
+      }
+    }
+    rows.push(remoteRepresentationRow(remoteLoop, loop, { resource: "loop", id: loop.id, name: loop.name }));
   }
   if (opts.includeRuns ?? true) {
     for (const run of bundle.data.runs) {
-      rows.push({
-        resource: "run",
-        id: run.id,
-        name: run.loopName,
-        action: "blocked",
-        reason: "self-hosted API does not expose run-history import endpoints; remote runners should create new run rows",
-        incomingHash: migrationHash(run)
-      });
+      if (run.status === "running") {
+        rows.push({
+          resource: "run",
+          id: run.id,
+          name: run.loopName,
+          action: "blocked",
+          reason: "running rows carry volatile lease/process ownership and are skipped by self-hosted import",
+          incomingHash: migrationHash(run)
+        });
+        continue;
+      }
+      rows.push(remoteRepresentationRow(remoteRunsById.get(run.id), run, { resource: "run", id: run.id, name: run.loopName }));
     }
   }
-  const plan = finalizePlan({
+  let plan = finalizePlan({
     schema: LOOPS_MIGRATION_SCHEMA,
     operation: opts.operation,
     dryRun: true,
-    replace: false,
-    importable: false,
+    replace,
+    importable: bundle.importable && rows.every((row) => row.action !== "blocked" && row.action !== "conflict"),
     rows,
     warnings
   });
-  return { ...plan, importable: false };
+  plan = { ...plan, importable: plan.summary.blocked === 0 && plan.summary.conflict === 0 };
+  return {
+    ...plan,
+    manifest: buildSelfHostedManifest({
+      apiUrl,
+      dryRun: true,
+      replace,
+      includeRuns: opts.includeRuns ?? true,
+      bundle,
+      remote,
+      plan
+    })
+  };
 }
 async function postImportBatch(fetchImpl, config, payload) {
   const body = await requestJson(fetchImpl, config, "/v1/import", { method: "POST", body: JSON.stringify(payload) });
@@ -8134,23 +8450,29 @@ async function applySelfHostedPush(store, opts) {
   const fetchImpl = opts.fetchImpl ?? fetch;
   const includeRuns = opts.includeRuns ?? true;
   const replace = opts.replace ?? false;
+  const plan = await buildSelfHostedMigrationPlan(store, { ...opts, operation: "self-hosted-push", includeRuns, replace });
+  if (plan.summary.blocked > 0 || plan.summary.conflict > 0 || !plan.importable) {
+    throw new ValidationError(`self-hosted push is not safe to apply: blocked=${plan.summary.blocked} conflict=${plan.summary.conflict}`);
+  }
   const batchRows = Math.max(1, opts.batchRows ?? 200);
   const runBatchBytes = Math.max(64 * 1024, opts.runBatchBytes ?? 4 * 1024 * 1024);
   const applied = { workflows: 0, loops: 0, runs: 0 };
   const skipped = { runningRuns: 0, orphanRuns: 0 };
   let requests = 0;
   const base = store.exportMigrationRows({ includeRuns: false });
+  const workflows = base.workflows.map(disabledWorkflowForSelfHostedImport);
+  const loops = base.loops.map(pausedLoopForSelfHostedImport);
   const loopIds = new Set(base.loops.map((loop) => loop.id));
-  for (let i = 0;i < base.workflows.length; i += batchRows) {
-    const batch = base.workflows.slice(i, i + batchRows);
-    const result = await postImportBatch(fetchImpl, config, { workflows: batch, replace });
+  for (let i = 0;i < workflows.length; i += batchRows) {
+    const batch = workflows.slice(i, i + batchRows);
+    const result = await postImportBatch(fetchImpl, config, { workflows: batch, replace, preserveWorkflowActivation: false, preserveLoopScheduling: false });
     applied.workflows += result.imported.workflows;
     requests += 1;
     opts.onProgress?.({ phase: "workflows", sent: applied.workflows, requests });
   }
-  for (let i = 0;i < base.loops.length; i += batchRows) {
-    const batch = base.loops.slice(i, i + batchRows);
-    const result = await postImportBatch(fetchImpl, config, { loops: batch, replace });
+  for (let i = 0;i < loops.length; i += batchRows) {
+    const batch = loops.slice(i, i + batchRows);
+    const result = await postImportBatch(fetchImpl, config, { loops: batch, replace, preserveLoopScheduling: false });
     applied.loops += result.imported.loops;
     requests += 1;
     opts.onProgress?.({ phase: "loops", sent: applied.loops, requests });
@@ -8162,7 +8484,7 @@ async function applySelfHostedPush(store, opts) {
     const flush = async () => {
       if (pending.length === 0)
         return;
-      const result = await postImportBatch(fetchImpl, config, { runs: pending, replace });
+      const result = await postImportBatch(fetchImpl, config, { runs: pending, replace, preserveLoopScheduling: false });
       applied.runs += result.imported.runs;
       skipped.runningRuns += result.skippedRunning;
       requests += 1;
@@ -8192,7 +8514,36 @@ async function applySelfHostedPush(store, opts) {
     }
     await flush();
   }
-  return { ok: true, apiUrl: config.apiUrl, applied, skipped, requests };
+  const remoteAfter = await fetchRemotePreview({ ...opts, operation: "self-hosted-push", includeRuns: false });
+  const bundle = selfHostedDefinitionBundle(exportLoopsMigrationBundle(store, { includeRuns }));
+  const remoteBefore = plan.manifest ? {
+    workflows: [],
+    loops: [],
+    runs: [],
+    counts: plan.manifest.counts.remoteBefore,
+    unsupported: plan.manifest.unsafe.unsupported,
+    warnings: []
+  } : await fetchRemotePreview({ ...opts, operation: "self-hosted-push", includeRuns });
+  return {
+    ok: true,
+    apiUrl: config.apiUrl,
+    applied,
+    skipped,
+    requests,
+    manifest: buildSelfHostedManifest({
+      apiUrl: config.apiUrl,
+      dryRun: false,
+      replace,
+      includeRuns,
+      bundle,
+      remote: remoteBefore,
+      plan,
+      applied,
+      skipped,
+      requests,
+      remoteAfter: remoteAfter.counts
+    })
+  };
 }
 async function registerSelfHostedRunner(opts) {
   const config = resolveApiConfig(opts);