@codesys/mcp-toolkit 2.7.0 → 2.8.0

package/CHANGELOG.md

@@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.8.0] - 2026-11-14
+
+### Added
+- `breakpoint_on_change`: a data breakpoint that halts the simulation right
+  after a variable is written, optionally only when a condition holds.
+- `watch`: a watch list of expressions, read together, with what changed since
+  the previous read, or sampled several times with min, max and changes.
+- `debug_status` shows the call stack while halted (for example
+  `PLC_PRG.fbCount <- PLC_PRG`).
+- Checked in the SP22 simulation: the call stack, step into, over and out, a
+  data breakpoint with and without a condition, and the watch list.
+- SFC with branches: `create_graphical` takes `sfc.chart`, with alternative
+  and parallel branches and jumps; `read_objects` describes a branched SFC as
+  such a chart, so it can be edited and sent back. Checked in the SP22
+  simulation (both paths of an alternative, a parallel branch).
+- CFC: `create_graphical` takes `cfc` (the same description as `fbd`), and
+  `read_objects` reads CFC bodies as that description. Checked in the SP22
+  simulation with operators, a function and a TON.
+- `compare_sources`: the open project compared with an `export_sources` folder
+  or another `.project` file, with a line diff per changed object.
+
+### Fixed
+- `debug_continue` no longer fails when the simulation is already running.
+
 ## [2.7.0] - 2026-11-14
 
 ### Added

package/README.md

@@ -121,10 +121,10 @@ operation. [The reference](docs/reference.md) describes each one.
 | **Change tracking** | `checkpoint` `get_changes` `revert_object` |
 | **Simulation** | `codesys_sim_start` `codesys_sim_stop` `codesys_sim_status` `codesys_sim_control` `codesys_sim_cycle` `codesys_sim_read` `codesys_sim_write` `codesys_sim_force` `codesys_sim_unforce` `codesys_sim_test` |
 | **Trace** | `trace_setup` `trace_record` |
-| **Debug** | `breakpoint_set` `breakpoint_clear` `debug_status` `debug_step` `debug_continue` |
+| **Debug** | `breakpoint_set` `breakpoint_on_change` `breakpoint_clear` `debug_status` `debug_step` `debug_continue` `watch` |
 | **HMI screens** | `hmi_save_screen` `hmi_template` `hmi_screenshot` `hmi_export_codesys` `hmi_list` `hmi_delete_screen` `open_hmi` `hmi_save_symbol` `hmi_symbols` `hmi_delete_symbol` `hmi_translate` |
 | **Alarms** | `alarm_list` `alarm_status` `alarm_acknowledge` |
-| **Handover** | `project_report` `export_sources` `create_recipes` |
+| **Handover** | `project_report` `export_sources` `compare_sources` `create_recipes` |
 | **Helpers** | `batch` `wait` `help` `open_workspace` `show_in_codesys` |
 
 `batch` runs up to 50 actions in one call, which is much faster than separate
@@ -139,12 +139,12 @@ They are **experimental**: checked on CODESYS V3.5 SP21 and SP22 as noted in
 the [changelog](CHANGELOG.md). On another version they may report that the
 feature isn't available, or not work.
 
-Claude writes Structured Text, and creates ladder (LD), FBD and SFC programs
-and function blocks with `create_graphical` from a simple description of rungs,
-networks or steps; CODESYS draws them. Reading an LD, FBD or SFC POU gives the
+Claude writes Structured Text, and creates ladder (LD), FBD, CFC and SFC
+programs and function blocks with `create_graphical` from a simple description
+of rungs, networks or steps; CODESYS draws them. SFC charts can have alternative
+and parallel branches and jumps. Reading an LD, FBD, CFC or SFC POU gives the
 same description, so Claude can change existing graphical code too: it edits the
-description and sends it back with `replace: true`. CFC isn't supported, and
-stays read-only as PLCopenXML.
+description and sends it back with `replace: true`.
 
 ## Live panel
 
@@ -289,6 +289,9 @@ project tree, ladder/FBD/SFC bodies as PLCopenXML, a `project.txt` with tasks,
 libraries, devices and alarms, and the HMI screens. A `.project` file is
 binary; this folder is what makes a change reviewable as a diff. Exporting
 again rewrites only what changed and removes the files of deleted objects.
+`compare_sources` compares the open project with such a folder or with another
+`.project` file: the objects only in one of them, and a line diff of each
+changed one.
 
 ## Other clients and models
 

package/README.zh-CN.md

@@ -226,7 +226,8 @@ V3.5 SP21 的仿真中验证。可视化需要 CODESYS 库存储库中有 `Float
 `export_sources` 把项目导出为纯文本以便用 git 管理：每个 POU、方法、属性、动作、DUT、GVL 和接口一个
 `.st` 文件，按项目树的结构放在文件夹中；梯形图、FBD 和 SFC 以 PLCopenXML 保存；`project.txt` 包含任务、
 库、设备和报警；以及 HMI 画面。`.project` 文件是二进制的，这个文件夹让每次改动都能以差异的形式审阅。
-再次导出时只重写有变化的文件，并删除已删除对象的文件。
+再次导出时只重写有变化的文件，并删除已删除对象的文件。`compare_sources` 将当前打开的项目与这样的文件夹或另一个
+`.project` 文件进行比较：列出只存在于其中一方的对象，并给出每个有变化对象的逐行差异。
 
 ## 可用操作
 
@@ -245,9 +246,9 @@ V3.5 SP21 的仿真中验证。可视化需要 CODESYS 库存储库中有 `Float
 | **改动跟踪** | `checkpoint` `get_changes` `revert_object` |
 | **仿真** | `codesys_sim_start` `codesys_sim_stop` `codesys_sim_status` `codesys_sim_control` `codesys_sim_cycle` `codesys_sim_read` `codesys_sim_write` `codesys_sim_force` `codesys_sim_unforce` `codesys_sim_test` |
 | **跟踪（Trace）** | `trace_setup` `trace_record` |
-| **调试** | `breakpoint_set` `breakpoint_clear` `debug_status` `debug_step` `debug_continue` |
+| **调试** | `breakpoint_set` `breakpoint_on_change` `breakpoint_clear` `debug_status` `debug_step` `debug_continue` `watch` |
 | **报警** | `alarm_list` `alarm_status` `alarm_acknowledge` |
-| **交接** | `project_report` `export_sources` `create_recipes` |
+| **交接** | `project_report` `export_sources` `compare_sources` `create_recipes` |
 | **HMI 画面** | `hmi_save_screen` `hmi_template` `hmi_screenshot` `hmi_export_codesys` `hmi_list` `hmi_delete_screen` `open_hmi` `hmi_save_symbol` `hmi_symbols` `hmi_delete_symbol` `hmi_translate` |
 | **辅助** | `batch` `wait` `help` `open_workspace` `show_in_codesys` |
 
@@ -259,8 +260,8 @@ V3.5 SP21 的仿真中验证。可视化需要 CODESYS 库存储库中有 `Float
 验证（见[更新日志](CHANGELOG.md)），在其他版本上可能提示功能不可用，或无法正常工作。
 
 Claude 编写结构化文本，并可用 `create_graphical` 根据梯级、网络或步骤的简单描述创建梯形图（LD）、
-FBD 和 SFC 程序及功能块，由 CODESYS 绘制。读取 LD、FBD 或 SFC POU 时会得到同样的描述，因此 Claude
-也能修改已有的图形化代码：修改描述后用 `replace: true` 发回即可。不支持 CFC，CFC 仍以 PLCopenXML 只读显示。
+FBD、CFC 和 SFC 程序及功能块，由 CODESYS 绘制。SFC 可以包含选择分支、并行分支和跳转。读取 LD、FBD、CFC
+或 SFC POU 时会得到同样的描述，因此 Claude 也能修改已有的图形化代码：修改描述后用 `replace: true` 发回即可。
 
 ## 安全
 

package/dist/codesys/compare.d.ts

@@ -0,0 +1,17 @@
+/** An export_sources folder as relative path -> text (the files its manifest lists, or every text file). */
+export declare function readSourceDir(dir: string): Map<string, string>;
+export interface Comparison {
+    added: string[];
+    removed: string[];
+    changed: {
+        file: string;
+        plus: number;
+        minus: number;
+        diff: string[];
+    }[];
+    same: number;
+}
+/** What `to` has that `from` hasn't, the other way round, and the changed files with their diffs. */
+export declare function compareSources(from: Map<string, string>, to: Map<string, string>, only?: string): Comparison;
+/** The comparison as text; diffs stop after maxLines lines in all. */
+export declare function describeComparison(c: Comparison, fromName: string, toName: string, maxLines?: number): string;

package/dist/codesys/compare.js

@@ -0,0 +1,105 @@
+/**
+ * Comparing two projects as the text files export_sources writes: what was
+ * added, removed and changed, with a line diff per changed file. Pure, apart
+ * from reading an export folder.
+ */
+import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
+import { join, relative } from "node:path";
+import { countDiff, formatDiff, lineDiff } from "./diff.js";
+const MANIFEST = ".codesys-export.json";
+const TEXT = /\.(st|xml|txt|json)$/i;
+/** An export_sources folder as relative path -> text (the files its manifest lists, or every text file). */
+export function readSourceDir(dir) {
+    if (!existsSync(dir) || !statSync(dir).isDirectory())
+        throw new Error(`${dir} isn't a folder. Give a folder export_sources wrote, or a .project file.`);
+    const out = new Map();
+    const manifest = join(dir, MANIFEST);
+    let listed;
+    if (existsSync(manifest)) {
+        try {
+            listed = JSON.parse(readFileSync(manifest, "utf8")).files;
+        }
+        catch {
+            listed = undefined;
+        }
+    }
+    const norm = (s) => s.replace(/\r\n/g, "\n");
+    if (listed) {
+        for (const f of listed)
+            if (!f.includes("..") && existsSync(join(dir, f)))
+                out.set(f, norm(readFileSync(join(dir, f), "utf8")));
+        return out;
+    }
+    const walk = (d) => {
+        for (const e of readdirSync(d, { withFileTypes: true })) {
+            const p = join(d, e.name);
+            if (e.isDirectory()) {
+                if (!e.name.startsWith("."))
+                    walk(p);
+            }
+            else if (TEXT.test(e.name) && e.name !== MANIFEST)
+                out.set(relative(dir, p).replace(/\\/g, "/"), norm(readFileSync(p, "utf8")));
+        }
+    };
+    walk(dir);
+    return out;
+}
+/** What `to` has that `from` hasn't, the other way round, and the changed files with their diffs. */
+export function compareSources(from, to, only) {
+    const want = (only ?? "").toLowerCase().replace(/^\/+|\/+$/g, "");
+    const keep = (f) => {
+        const l = f.toLowerCase();
+        return !want || l === want || l.startsWith(`${want}.`) || l.startsWith(`${want}/`);
+    };
+    const out = { added: [], removed: [], changed: [], same: 0 };
+    for (const [f, text] of to) {
+        if (!keep(f))
+            continue;
+        const before = from.get(f);
+        if (before === undefined)
+            out.added.push(f);
+        else if (before.trimEnd() === text.trimEnd())
+            out.same++;
+        else {
+            const ops = lineDiff(before.trimEnd(), text.trimEnd());
+            out.changed.push({ file: f, ...countDiff(ops), diff: formatDiff(ops) });
+        }
+    }
+    for (const f of from.keys())
+        if (keep(f) && !to.has(f))
+            out.removed.push(f);
+    out.added.sort();
+    out.removed.sort();
+    out.changed.sort((a, b) => a.file.localeCompare(b.file));
+    return out;
+}
+/** The comparison as text; diffs stop after maxLines lines in all. */
+export function describeComparison(c, fromName, toName, maxLines = 400) {
+    const object = (f) => (/\.xml$/i.test(f) ? `${f.slice(0, -4)} (graphical body)` : f.replace(/\.st$/i, ""));
+    if (!c.added.length && !c.removed.length && !c.changed.length)
+        return `No differences between ${fromName} and ${toName} (${c.same} file(s) compared).`;
+    const lines = [
+        `${fromName} -> ${toName}: ${c.changed.length} changed, ${c.added.length} added, ${c.removed.length} removed, ${c.same} the same.`,
+    ];
+    if (c.added.length)
+        lines.push("", `Only in ${toName}:`, ...c.added.map((f) => `  + ${object(f)}`));
+    if (c.removed.length)
+        lines.push("", `Only in ${fromName}:`, ...c.removed.map((f) => `  - ${object(f)}`));
+    if (c.changed.length) {
+        lines.push("", "Changed:", ...c.changed.map((x) => `  ~ ${object(x.file)} (+${x.plus} -${x.minus})`));
+        let budget = maxLines;
+        for (const x of c.changed) {
+            if (budget <= 0) {
+                lines.push("", `(More diffs left out: pass path to see one object, or a larger max_lines.)`);
+                break;
+            }
+            const shown = x.diff.slice(0, budget);
+            lines.push("", `=== ${object(x.file)} ===`, ...shown);
+            if (shown.length < x.diff.length)
+                lines.push(`  ... (${x.diff.length - shown.length} more lines: pass path to see this object, or a larger max_lines)`);
+            budget -= shown.length;
+        }
+    }
+    return lines.join("\n");
+}
+//# sourceMappingURL=compare.js.map

package/dist/codesys/compare.js.map

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

package/dist/codesys/debug.d.ts

@@ -2,4 +2,6 @@ import type { ActionResult, RegisterAction } from "../actions.js";
 import type { AppContext } from "../tools.js";
 /** Implementation line (1-based) -> CODESYS position, for every statement. */
 export declare function lineMap(impl: string, positions: number[]): Map<number, number>;
+/** Bytes of an elementary value as the simulation reads it ('REAL#52', 'TRUE', 'T#1s'). */
+export declare function dataSize(value: string | undefined): number | undefined;
 export declare function registerDebugActions(reg: RegisterAction, ctx: AppContext, run: (fn: () => Promise<string>) => Promise<ActionResult>): void;

package/dist/codesys/debug.js

@@ -26,6 +26,25 @@ export function lineMap(impl, positions) {
     }
     return out;
 }
+const SIZES = {
+    BOOL: 1, BYTE: 1, SINT: 1, USINT: 1,
+    WORD: 2, INT: 2, UINT: 2,
+    DWORD: 4, DINT: 4, UDINT: 4, REAL: 4, TIME: 4, TOD: 4, TIME_OF_DAY: 4, DATE: 4, DT: 4, DATE_AND_TIME: 4,
+    LWORD: 8, LINT: 8, ULINT: 8, LREAL: 8, LTIME: 8,
+};
+/** Bytes of an elementary value as the simulation reads it ('REAL#52', 'TRUE', 'T#1s'). */
+export function dataSize(value) {
+    if (value === undefined)
+        return undefined;
+    const v = value.trim();
+    if (/^(TRUE|FALSE)$/i.test(v))
+        return 1;
+    const m = /^([A-Z_]+)#/i.exec(v);
+    if (!m)
+        return undefined;
+    const t = m[1].toUpperCase();
+    return SIZES[t] ?? (t === "T" ? 4 : t === "LT" ? 8 : t === "D" ? 4 : undefined);
+}
 export function registerDebugActions(reg, ctx, run) {
     const b = ctx.bridge;
     const needSim = () => {
@@ -36,14 +55,89 @@ export function registerDebugActions(reg, ctx, run) {
         if (!/halt/i.test(s.state))
             return `Simulation: ${s.state}.`;
         const at = s.at;
+        const stack = (s.call_stack ?? []).filter((e) => e.pou || e.instance);
+        const stackText = stack.length > 1 ? `\nCall stack (innermost first): ${stack.map((e) => e.instance || e.pou).join(" <- ")}` : "";
         if (!at?.path)
-            return `Simulation: ${s.state} (position unknown).`;
+            return `Simulation: ${s.state} (position unknown).${stackText}`;
         const map = lineMap(at.implementation ?? "", at.positions ?? []);
         const line = [...map].find(([, p]) => p === at.position)?.[0];
         const code = line ? (at.implementation ?? "").split(/\r?\n/)[line - 1]?.trim() : undefined;
         const end = low(at.position) === 0xffffffff ? " at its end (RETURN)" : "";
-        return `Halted in ${at.path}${line ? ` at line ${line}: ${code}` : end} (instance ${at.instance}). Read values with codesys_sim_read, then debug_step or debug_continue.`;
+        return `Halted in ${at.path}${line ? ` at line ${line}: ${code}` : end} (instance ${at.instance}). Read values with codesys_sim_read, then debug_step or debug_continue.${stackText}`;
     };
+    reg("breakpoint_on_change", {
+        description: "A data breakpoint in the running simulation: halt right after a statement writes a variable (optionally only when a condition holds, e.g. 'PLC_PRG.nCount > 10'; CODESYS checks the condition on every write, which slows the simulation down). debug_status then shows where it halted and the call stack. Elementary variables only (1-8 bytes).",
+        inputSchema: z.object({
+            variable: z.string().describe("e.g. 'PLC_PRG.rSetpoint'"),
+            condition: z.string().optional(),
+            size: z.number().int().min(1).max(8).optional().describe("Bytes to watch; found from the variable's type when left out"),
+        }),
+    }, async ({ variable, condition, size }) => run(async () => {
+        needSim();
+        let bytes = size;
+        if (!bytes) {
+            const r = await b.call("sim.read", { names: [variable] }, { timeoutMs: 10_000 });
+            if (r.errors?.[variable])
+                throw new Error(`${variable}: ${r.errors[variable]}`);
+            bytes = dataSize(r.values?.[variable]);
+            if (!bytes)
+                throw new Error(`Can't tell the size of ${variable} (${r.values?.[variable]}): a data breakpoint watches 1-8 bytes of an elementary variable. Give size, or pick a variable of an elementary type.`);
+        }
+        const r = await b.call("debug.set_data", { expression: variable, size: bytes, ...(condition ? { condition } : {}) });
+        if (r.enabled === false)
+            throw new Error(`CODESYS created the data breakpoint on ${variable} but didn't enable it: this target may not support data breakpoints.`);
+        return `Data breakpoint on ${variable}${condition ? ` when ${condition}` : ""}: the simulation halts right after the statement that writes it (debug_status shows where). breakpoint_clear removes it.`;
+    }));
+    // A watch list the model keeps: one read of every expression, with what changed since the last read.
+    const watched = [];
+    let last = {};
+    reg("watch", {
+        description: "A watch list in the running simulation: add or remove expressions, then read them all at once; each read marks what changed since the previous one. samples > 1 reads several times (every ms) and reports min, max and changes per expression, e.g. to see a value move over a second.",
+        inputSchema: z.object({
+            add: z.array(z.string()).optional(),
+            remove: z.array(z.string()).optional(),
+            clear: z.boolean().optional(),
+            samples: z.number().int().min(1).max(50).default(1),
+            every: z.number().int().min(20).max(5000).default(200).describe("ms between samples"),
+        }),
+    }, async ({ add, remove, clear, samples, every }) => run(async () => {
+        if (clear)
+            watched.splice(0), (last = {});
+        for (const a of add ?? [])
+            if (!watched.includes(a))
+                watched.push(a);
+        for (const r of remove ?? []) {
+            const i = watched.indexOf(r);
+            if (i >= 0)
+                watched.splice(i, 1);
+        }
+        if (!watched.length)
+            return "The watch list is empty: add expressions, e.g. {add: ['PLC_PRG.nCount']}.";
+        needSim();
+        const reads = [];
+        let errors = {};
+        for (let k = 0; k < samples; k++) {
+            if (k)
+                await new Promise((r) => setTimeout(r, every));
+            const r = await b.call("sim.read", { names: watched }, { timeoutMs: 10_000 });
+            reads.push(r.values ?? {});
+            errors = r.errors ?? {};
+        }
+        const now = reads[reads.length - 1];
+        const lines = watched.map((w) => {
+            if (errors[w])
+                return `  ${w}: ${errors[w]}`;
+            const series = reads.map((r) => r[w]);
+            const changed = last[w] !== undefined && last[w] !== now[w] ? `  (was ${last[w]})` : "";
+            if (samples === 1)
+                return `  ${w} = ${now[w]}${changed}`;
+            const nums = series.map((v) => Number(String(v).replace(/^[A-Z_]+#/i, ""))).filter((n) => Number.isFinite(n));
+            const changes = series.filter((v, i) => i && v !== series[i - 1]).length;
+            return `  ${w} = ${now[w]}  [${nums.length === samples ? `min ${Math.min(...nums)}, max ${Math.max(...nums)}, ` : ""}${changes} change(s) in ${samples} reads]${changed}`;
+        });
+        last = { ...now };
+        return [`Watch (${watched.length}):`, ...lines].join("\n");
+    }));
     reg("breakpoint_set", {
         description: "Set a breakpoint in the running simulation at a line of a POU's implementation. The simulation halts there; debug_status shows where, codesys_sim_read reads values, debug_step steps, debug_continue goes on. For a function block give the instance, e.g. 'PLC_PRG.fbPump'.",
         inputSchema: z.object({

package/dist/codesys/debug.js.map

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

package/dist/codesys/graphical-read.d.ts

@@ -7,10 +7,11 @@
  * LD: every coil's power flow is followed back to the rail: contacts in series
  * become {and}, parallel paths {or}. FBD: each output variable (or output
  * written straight on a block) is followed back through blocks to the inputs.
- * SFC: steps, their actions and the transition to the next step. What has no
- * place in the description (function boxes in LD, SFC branches) is reported.
+ * SFC: steps, their actions and the transition to the next step; with branches,
+ * the chart (alternative and parallel paths, jumps). What has no place in the
+ * description (function boxes in LD) is reported.
  */
-import type { Fbd, Logic } from "./graphical.js";
+import type { Fbd, Logic, SfcElement } from "./graphical.js";
 interface El {
     name: string;
     attrs: Record<string, string>;
@@ -32,7 +33,7 @@ export type GraphicalDescription = {
     };
     notes: string[];
 } | {
-    kind: "fbd";
+    kind: "fbd" | "cfc";
     spec: {
         networks: {
             expr: Fbd;
@@ -55,6 +56,8 @@ export type GraphicalDescription = {
             next: string;
             when: string;
         }[];
+    } | {
+        chart: SfcElement[];
     };
     notes: string[];
 };

package/dist/codesys/graphical-read.js

@@ -50,8 +50,42 @@ export function describeGraphical(xml) {
     const sfc = kid(body, "SFC");
     if (sfc)
         return readSfc(sfc, pou);
+    const cfc = find(body, "CFC");
+    if (cfc)
+        return { ...readFbd(cfcAsFbd(cfc)), kind: "cfc" };
     return undefined;
 }
+/**
+ * CODESYS's CFC as the FBD the reader knows: every line runs through an unnamed
+ * connector, so a connection to a connector becomes the connector's own
+ * connection (an input variable's or a function's output has no parameter in
+ * FBD terms), and the elements are taken in execution order.
+ */
+function cfcAsFbd(cfc) {
+    const byId = new Map(cfc.children.filter((c) => c.attrs.localId !== undefined).map((c) => [c.attrs.localId, c]));
+    const through = (conn) => {
+        const seen = new Set();
+        let c = conn;
+        for (;;) {
+            const target = byId.get(c.attrs.refLocalId);
+            if (target?.name !== "connector" || seen.has(target.attrs.localId))
+                break;
+            seen.add(target.attrs.localId);
+            const next = kids(kid(target, "connectionPointIn"), "connection")[0];
+            if (!next)
+                return { ...c, attrs: { refLocalId: "missing" } };
+            c = next;
+        }
+        const src = byId.get(c.attrs.refLocalId);
+        const plain = src?.name === "inVariable" || (src?.name === "block" && !src.attrs.instanceName);
+        const { formalParameter, ...rest } = c.attrs;
+        return { ...c, attrs: plain || !formalParameter ? rest : { ...rest, formalParameter } };
+    };
+    const rewire = (e) => (e.name === "connection" ? through(e) : { ...e, children: e.children.map(rewire) });
+    const order = (e) => (e.attrs.executionOrderId === undefined ? -1 : Number(e.attrs.executionOrderId));
+    const children = cfc.children.filter((c) => c.name !== "connector").map(rewire);
+    return { ...cfc, name: "FBD", children: children.sort((a, b) => order(a) - order(b)) };
+}
 function readLadder(ld) {
     const notes = new Set();
     const byId = new Map(ld.children.filter((c) => c.attrs.localId !== undefined).map((c) => [c.attrs.localId, c]));
@@ -180,9 +214,8 @@ function readSfc(sfc, pou) {
     const notes = new Set();
     const byId = new Map(sfc.children.filter((c) => c.attrs.localId !== undefined).map((c) => [c.attrs.localId, c]));
     const bodies = new Map(kids(kid(pou, "actions"), "action").map((a) => [a.attrs.name, allText(find(a, "xhtml") ?? find(a, "ST")).trim()]));
-    for (const e of sfc.children)
-        if (/Divergence|Convergence/.test(e.name))
-            notes.add(`${e.name} (a branch): the description holds one sequence; read_objects shows the XML`);
+    if (sfc.children.some((e) => /Divergence/.test(e.name)))
+        return readSfcChart(sfc, byId, bodies);
     const after = (ref) => sfc.children.filter((c) => inputsOf(c).some((i) => i.ref === ref));
     const steps = sfc.children
         .filter((c) => c.name === "step")
@@ -211,4 +244,71 @@ function readSfc(sfc, pou) {
     });
     return { kind: "sfc", spec: { steps }, notes: [...notes] };
 }
+/** An SFC with branches, as create_graphical's chart: walked from the initial step along the connections. */
+function readSfcChart(sfc, byId, bodies) {
+    const notes = new Set();
+    // Every connectionPointIn counts: a convergence has one per path.
+    const ins = (e) => kids(e, "connectionPointIn").flatMap((p) => kids(p, "connection").map((c) => c.attrs.refLocalId));
+    const after = (id) => sfc.children.filter((c) => c.name !== "actionBlock" && c.name !== "inVariable" && ins(c).includes(id));
+    const actionsOf = (id) => sfc.children
+        .filter((c) => c.name === "actionBlock" && ins(c).includes(id))
+        .flatMap((b) => kids(b, "action").map((a) => {
+        const name = kid(a, "reference")?.attrs.name ?? "";
+        return { name, qualifier: (a.attrs.qualifier ?? "N"), st: bodies.get(name) ?? allText(find(a, "xhtml")).trim() };
+    }));
+    const condition = (tr) => {
+        const cond = kid(tr, "condition");
+        const src = inputsOf(cond)[0];
+        return src ? allText(kid(byId.get(src.ref), "expression")).trim() : allText(find(cond ?? tr, "xhtml")).trim() || (kid(cond, "reference")?.attrs.name ?? "");
+    };
+    const seen = new Set();
+    /** The sequence from node on, and the convergence it ends at (the end of a branch path). */
+    const walk = (start) => {
+        const seq = [];
+        let node = start;
+        while (node) {
+            const id = node.attrs.localId;
+            if (/Convergence$/.test(node.name))
+                return { seq, conv: node };
+            if (seen.has(id)) {
+                notes.add("a connection loops back without a jump");
+                return { seq };
+            }
+            seen.add(id);
+            if (node.name === "step") {
+                const acts = actionsOf(id);
+                seq.push({ step: node.attrs.name, ...(node.attrs.initialStep === "true" ? { initial: true } : {}), ...(acts.length ? { actions: acts } : {}) });
+                node = after(id)[0];
+            }
+            else if (node.name === "transition") {
+                seq.push({ when: condition(node) });
+                node = after(id)[0];
+            }
+            else if (node.name === "jumpStep") {
+                seq.push({ jump: node.attrs.targetName });
+                const conv = after(id).find((c) => /Convergence$/.test(c.name));
+                return conv ? { seq, conv } : { seq };
+            }
+            else if (/Divergence$/.test(node.name)) {
+                const paths = after(id).map(walk);
+                const conv = paths.find((p) => p.conv)?.conv;
+                seq.push(node.name === "selectionDivergence" ? { alternative: paths.map((p) => p.seq) } : { parallel: paths.map((p) => p.seq) });
+                if (!conv)
+                    return { seq };
+                // Past the convergence (a path that ended in a jump leads nowhere further).
+                const allJump = node.name === "selectionDivergence" && paths.every((p) => p.seq.length && "jump" in p.seq[p.seq.length - 1]);
+                node = allJump ? undefined : after(conv.attrs.localId)[0];
+            }
+            else {
+                notes.add(`${node.name} elements aren't part of the description; read_objects shows the XML`);
+                return { seq };
+            }
+        }
+        return { seq };
+    };
+    const steps = sfc.children.filter((c) => c.name === "step");
+    const first = steps.find((s) => s.attrs.initialStep === "true") ?? steps.find((s) => !ins(s).length) ?? steps[0];
+    const chart = walk(first).seq;
+    return { kind: "sfc", spec: { chart }, notes: [...notes] };
+}
 //# sourceMappingURL=graphical-read.js.map