@@ -132,7 +132,7 @@ node $AGENT labels mode comment --state er.json
 - `nudge <id> <dx> <dy>`: shift a node by delta.
 - `swap <idA> <idB>`: exchange two entity positions.
 
-Use exact ids from `describe`; run `describe --full` when targeting attributes. Each command runs one `arrange` pass afterward. Use `--raw` to skip settling and automatic avoidance. Coordinates are unbounded; exports fit the view to the graph.
+Use exact ids from `describe`; run `describe --full` when targeting attributes. Entity edits keep owned attributes attached and re-anchor related relationship diamonds. Automatic avoidance runs by default; use `--raw` to skip it. Coordinates are unbounded; exports fit the view to the graph.
 
 ## rotate `<degrees>`
 
 
@@ -180,10 +180,10 @@ Usage: node sql2er-agent.mjs <command> [args] [--flags]   (state in ./sql2er-sta
   layout <optimal|arrange>  Re-run a layout. optimal = planar skeleton seed + constrained stress
                            (rooms for attribute rings; the recommended default);
                            arrange = settle current positions.
-  move <id> <x> <y>        Place a node. Entity attributes and diamonds follow. Then settles
-                           with one arrange pass unless --raw.
-  nudge <id> <dx> <dy>     Shift a node by a delta. --raw to skip the settle pass.
-  swap <idA> <idB>         Exchange two entities' positions. --raw to skip settle.
+  move <id> <x> <y>        Place a node. Entity attributes and diamonds follow. Then auto-avoids
+                           unless --raw.
+  nudge <id> <dx> <dy>     Shift a node by a delta. --raw to skip automatic avoidance.
+  swap <idA> <idB>         Exchange two entities' positions. --raw to skip automatic avoidance.
   rotate <degrees>         Rotate the whole diagram about its centre (shapes stay upright).
   attrs <auto|compact|moderate>  Re-place attribute ellipses. compact = tightest
                            non-overlapping pack; moderate = uniform even ring. Persists.
 
@@ -3,10 +3,10 @@
  * mutates it via the REAL app layout/styling functions, and returns the new model.
  *
  * Scope is deliberately agent-shaped: no scroll-zoom, no history, no continuous
- * force loop (an agent adjusts once, not by dragging). The "settle after an edit"
- * step is a single arrangeLayout pass — arrangeLayout refines the *current* coords
- * with deadband springs, so it preserves the agent's coarse intent while fixing
- * attributes / diamonds / overlaps.
+ * force loop (an agent adjusts once, not by dragging). Direct edits preserve the
+ * user's coarse intent: entity-owned attributes translate with the entity, related
+ * diamonds are re-anchored between entities, and the optional post step is only
+ * automatic overlap avoidance.
  */
 import { parseSQLTables } from "@app/parser/sql";
 import { parseDBML } from "@app/parser/dbml";
@@ -812,14 +812,6 @@ export function setAttrMode(state: State, mode: AttrMode): State {
   return next;
 }
 
-function settle(state: State) {
-  state.settings = normalizeSettings(state.settings);
-  const graph = styleAndSize(state.nodes, state.edges, state.settings);
-  arrangeLayout(graph);
-  applyAttrMode(state);
-  applyAutoAvoid(state);
-}
-
 export function setAutoAvoid(state: State, enabled: boolean): State {
   state.settings = normalizeSettings({ ...state.settings, autoAvoid: enabled });
   if (enabled) applyAutoAvoid(state);
@@ -833,7 +825,7 @@ export function move(state: State, arg: string, x: number, y: number, raw: boole
   const dy = y - (typeof node.y === "number" ? node.y : 0);
   translateCluster(state, node, dx, dy);
   if (node.nodeType === "entity") syncMovedEntities(state, [node.id], startPositions);
-  if (!raw) settle(state);
+  if (!raw) applyAutoAvoid(state);
   return { state: { ...state }, resolved: [{ id: node.id, label: String(node.label) }] };
 }
 
@@ -842,7 +834,7 @@ export function nudge(state: State, arg: string, dx: number, dy: number, raw: bo
   const startPositions = captureNodePositions(state.nodes);
   translateCluster(state, node, dx, dy);
   if (node.nodeType === "entity") syncMovedEntities(state, [node.id], startPositions);
-  if (!raw) settle(state);
+  if (!raw) applyAutoAvoid(state);
   return { state: { ...state }, resolved: [{ id: node.id, label: String(node.label) }] };
 }
 
@@ -866,7 +858,7 @@ export function swap(state: State, argA: string, argB: string, raw: boolean): Ed
   translateCluster(state, a, bx - ax, by - ay);
   translateCluster(state, b, ax - bx, ay - by);
   syncMovedEntities(state, [a.id, b.id], startPositions);
-  if (!raw) settle(state);
+  if (!raw) applyAutoAvoid(state);
   return {
     state: { ...state },
     resolved: [
 
@@ -5994,13 +5994,6 @@ function setAttrMode(state, mode) {
   applyAutoAvoid(next);
   return next;
 }
-function settle(state) {
-  state.settings = normalizeSettings(state.settings);
-  const graph = styleAndSize(state.nodes, state.edges, state.settings);
-  arrangeLayout(graph);
-  applyAttrMode(state);
-  applyAutoAvoid(state);
-}
 function setAutoAvoid(state, enabled) {
   state.settings = normalizeSettings({ ...state.settings, autoAvoid: enabled });
   if (enabled) applyAutoAvoid(state);
@@ -6013,15 +6006,15 @@ function move(state, arg, x, y, raw) {
   const dy = y - (typeof node.y === "number" ? node.y : 0);
   translateCluster(state, node, dx, dy);
   if (node.nodeType === "entity") syncMovedEntities(state, [node.id], startPositions);
-  if (!raw) settle(state);
+  if (!raw) applyAutoAvoid(state);
   return { state: { ...state }, resolved: [{ id: node.id, label: String(node.label) }] };
 }
 function nudge(state, arg, dx, dy, raw) {
   const node = resolveNodeById(state, arg);
   const startPositions = captureNodePositions(state.nodes);
   translateCluster(state, node, dx, dy);
   if (node.nodeType === "entity") syncMovedEntities(state, [node.id], startPositions);
-  if (!raw) settle(state);
+  if (!raw) applyAutoAvoid(state);
   return { state: { ...state }, resolved: [{ id: node.id, label: String(node.label) }] };
 }
 function swap(state, argA, argB, raw) {
@@ -6044,7 +6037,7 @@ function swap(state, argA, argB, raw) {
   translateCluster(state, a, bx - ax, by - ay);
   translateCluster(state, b, ax - bx, ay - by);
   syncMovedEntities(state, [a.id, b.id], startPositions);
-  if (!raw) settle(state);
+  if (!raw) applyAutoAvoid(state);
   return {
     state: { ...state },
     resolved: [
@@ -8108,10 +8101,10 @@ Usage: node sql2er-agent.mjs <command> [args] [--flags]   (state in ./sql2er-sta
   layout <optimal|arrange>  Re-run a layout. optimal = planar skeleton seed + constrained stress
                            (rooms for attribute rings; the recommended default);
                            arrange = settle current positions.
-  move <id> <x> <y>        Place a node. Entity attributes and diamonds follow. Then settles
-                           with one arrange pass unless --raw.
-  nudge <id> <dx> <dy>     Shift a node by a delta. --raw to skip the settle pass.
-  swap <idA> <idB>         Exchange two entities' positions. --raw to skip settle.
+  move <id> <x> <y>        Place a node. Entity attributes and diamonds follow. Then auto-avoids
+                           unless --raw.
+  nudge <id> <dx> <dy>     Shift a node by a delta. --raw to skip automatic avoidance.
+  swap <idA> <idB>         Exchange two entities' positions. --raw to skip automatic avoidance.
   rotate <degrees>         Rotate the whole diagram about its centre (shapes stay upright).
   attrs <auto|compact|moderate>  Re-place attribute ellipses. compact = tightest
                            non-overlapping pack; moderate = uniform even ring. Persists.
 
@@ -345,6 +345,78 @@ function makeAttributeConnectorCrossingState(): AgentState {
   };
 }
 
+function makeEntityEditFollowState(): AgentState {
+  return {
+    version: 1,
+    input: "manual",
+    format: "sql",
+    settings: {
+      colored: true,
+      comment: false,
+      hideAttrs: false,
+      fontScale: 1,
+      attrMode: "moderate",
+      autoAvoid: true,
+    },
+    nodes: [
+      { id: "entity-a", type: "entity", label: "a", nodeType: "entity", x: 100, y: 100 },
+      { id: "entity-b", type: "entity", label: "b", nodeType: "entity", x: 360, y: 140 },
+      {
+        id: "attr-a-name",
+        type: "attribute",
+        label: "name",
+        nodeType: "attribute",
+        parentEntity: "entity-a",
+        x: 140,
+        y: 172,
+      },
+      {
+        id: "attr-b-name",
+        type: "attribute",
+        label: "name",
+        nodeType: "attribute",
+        parentEntity: "entity-b",
+        x: 360,
+        y: 20,
+      },
+      {
+        id: "rel-a-b",
+        type: "relationship",
+        label: "a_b",
+        nodeType: "relationship",
+        x: 230,
+        y: 120,
+      },
+    ],
+    edges: [
+      {
+        id: "edge-a-name",
+        source: "entity-a",
+        target: "attr-a-name",
+        edgeType: "entity-attribute",
+      },
+      {
+        id: "edge-b-name",
+        source: "entity-b",
+        target: "attr-b-name",
+        edgeType: "entity-attribute",
+      },
+      {
+        id: "edge-a-rel",
+        source: "entity-a",
+        target: "rel-a-b",
+        edgeType: "entity-relationship",
+      },
+      {
+        id: "edge-rel-b",
+        source: "rel-a-b",
+        target: "entity-b",
+        edgeType: "relationship-entity",
+      },
+    ],
+  };
+}
+
 function makeAttributeDetailState(): AgentState {
   return {
     version: 1,
@@ -1459,6 +1531,67 @@ describe("sql2er agent CLI entity edits", () => {
     }
   });
 
+  it("keeps entity attributes attached and relationship diamonds synced without settling default move and nudge edits", () => {
+    const cases = [
+      {
+        command: ["move", "entity-a", "180", "210"],
+        expectedEntity: { x: 180, y: 210 },
+      },
+      {
+        command: ["nudge", "entity-a", "80", "110"],
+        expectedEntity: { x: 180, y: 210 },
+      },
+    ];
+
+    for (const testCase of cases) {
+      const dir = mkdtempSync(resolve(tmpdir(), "sql2er-agent-"));
+      try {
+        const state = resolve(dir, "er.json");
+        writeFileSync(state, JSON.stringify(makeEntityEditFollowState()));
+
+        const edited = runAgent([...testCase.command, "--state", state]);
+
+        expect(edited.status).toBe(0);
+        const next = readState(state);
+        expect(nodePosition(next, "entity-a")).toEqual(testCase.expectedEntity);
+        expect(nodePosition(next, "entity-b")).toEqual({ x: 360, y: 140 });
+        expect(nodePosition(next, "attr-a-name")).toEqual({ x: 220, y: 282 });
+        expect(nodePosition(next, "attr-b-name")).toEqual({ x: 360, y: 20 });
+        expectPointOnSegment(
+          nodePosition(next, "rel-a-b"),
+          nodePosition(next, "entity-a"),
+          nodePosition(next, "entity-b"),
+        );
+      } finally {
+        rmSync(dir, { recursive: true, force: true });
+      }
+    }
+  });
+
+  it("keeps entity attributes attached and relationship diamonds synced without settling default swaps", () => {
+    const dir = mkdtempSync(resolve(tmpdir(), "sql2er-agent-"));
+    try {
+      const state = resolve(dir, "er.json");
+      writeFileSync(state, JSON.stringify(makeEntityEditFollowState()));
+
+      const swapped = runAgent(["swap", "entity-a", "entity-b", "--state", state]);
+
+      expect(swapped.status).toBe(0);
+      const next = readState(state);
+      expect(nodePosition(next, "entity-a")).toEqual({ x: 360, y: 140 });
+      expect(nodePosition(next, "entity-b")).toEqual({ x: 100, y: 100 });
+      expect(nodePosition(next, "attr-a-name")).toEqual({ x: 400, y: 212 });
+      expect(nodePosition(next, "attr-b-name")).toEqual({ x: 100, y: -20 });
+      expectPointOnSegment(
+        nodePosition(next, "rel-a-b"),
+        nodePosition(next, "entity-a"),
+        nodePosition(next, "entity-b"),
+      );
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
   it("warns and leaves positions unchanged when swapping an attribute id", () => {
     const dir = mkdtempSync(resolve(tmpdir(), "sql2er-agent-"));
     try {