@hoanghainh/komagu 2.3.0 → 2.5.0

package/CHANGELOG.md

@@ -2,6 +2,42 @@
 
 All notable changes to `@hoanghainh/komagu` (published as `komainu-guard` up to v1.7.0) are documented here. From v1.2.2 on, entries are generated by [release-please](https://github.com/googleapis/release-please) from [Conventional Commits](https://www.conventionalcommits.org/). Earlier entries are copied from the [GitHub Releases](https://github.com/hoanghainh1188/komainu/releases).
 
+## [2.5.0](https://github.com/hoanghainh1188/komagu/compare/v2.4.0...v2.5.0) (2026-11-10)
+
+
+### Features
+
+* **docker:** move the published image to an Alpine base ([#363](https://github.com/hoanghainh1188/komagu/issues/363)) ([fb45135](https://github.com/hoanghainh1188/komagu/commit/fb451356e4fdd8b3d16a785f121fd7a9ed702231))
+* **pilot:** add leak check, exclude list, deletion record and pilot data guard ([#370](https://github.com/hoanghainh1188/komagu/issues/370)) ([b0eaef9](https://github.com/hoanghainh1188/komagu/commit/b0eaef9b779816bcfe000633fea5bc5f18fcafc5))
+* **test:** verify cross-user authorization on session-based Java legacy apps ([#371](https://github.com/hoanghainh1188/komagu/issues/371)) ([2aff6eb](https://github.com/hoanghainh1188/komagu/commit/2aff6eb59adc0043d59cfe5d2a30bd0f084c33e3))
+
+
+### Bug Fixes
+
+* **assess/lsa:** close Tier 1 gaps found on real Java legacy apps ([#369](https://github.com/hoanghainh1188/komagu/issues/369)) ([41177c7](https://github.com/hoanghainh1188/komagu/commit/41177c74673bcdbf89a7f5c6b4863b50850ea199))
+* **examples:** upgrade plugin-react so the portal frontend builds on vite 8 ([#362](https://github.com/hoanghainh1188/komagu/issues/362)) ([9485fce](https://github.com/hoanghainh1188/komagu/commit/9485fcebb475ebf4d6c22b3e1d48a3ccd729b3d6))
+* **pilot:** pin the runbook to v2.4.0 and add the Apache-2.0 LICENSE ([#357](https://github.com/hoanghainh1188/komagu/issues/357)) ([79e9e71](https://github.com/hoanghainh1188/komagu/commit/79e9e715fdab86581d378a6205e90dc39d2eb2a8))
+* **pilot:** rehearse the runbook on a running Struts legacy app and fix what broke ([#375](https://github.com/hoanghainh1188/komagu/issues/375)) ([62d8f8d](https://github.com/hoanghainh1188/komagu/commit/62d8f8d5678320ddf43a264889ab148bd97006ef))
+* **remediate/authz:** stop emitting unusable patches on Java legacy code ([#373](https://github.com/hoanghainh1188/komagu/issues/373)) ([4ae9c29](https://github.com/hoanghainh1188/komagu/commit/4ae9c293d1ffab8153e10c46d7af21cc1b123a15))
+* **security:** harden images and Terraform flagged by code scanning ([#359](https://github.com/hoanghainh1188/komagu/issues/359)) ([4658417](https://github.com/hoanghainh1188/komagu/commit/46584174efe86e6b49231302b0f51c5217a657bf))
+
+
+### Documentation
+
+* mark pilot ROI claims as internal and add CONTRIBUTING.md ([#366](https://github.com/hoanghainh1188/komagu/issues/366)) ([63c223c](https://github.com/hoanghainh1188/komagu/commit/63c223c976c46d60f789dafdeaff169b9cd6b974))
+
+## [2.4.0](https://github.com/hoanghainh1188/komagu/compare/v2.3.0...v2.4.0) (2026-11-03)
+
+
+### Features
+
+* **pilot:** prepare the AMS pilot on a Java legacy system and redact secrets sent to the model ([#352](https://github.com/hoanghainh1188/komagu/issues/352)) ([fb02b3c](https://github.com/hoanghainh1188/komagu/commit/fb02b3cbdf70e3d6e5ee7c73c7e308f03c2ff7f3))
+
+
+### Documentation
+
+* **delivery:** remove Komainu leftovers and file:/// links from pilot deliverables ([#353](https://github.com/hoanghainh1188/komagu/issues/353)) ([f61d1df](https://github.com/hoanghainh1188/komagu/commit/f61d1dff03469986970d0a6d640a37fd2f7b947f))
+
 ## [2.3.0](https://github.com/hoanghainh1188/komagu/compare/v2.2.1...v2.3.0) (2026-11-01)
 
 

package/LICENSE

@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

package/README.md

@@ -231,3 +231,4 @@ komagu/
 
 - **The Two-Person Rule:** Komagu enforces strict governance ([`governance/usage-policy.md`](governance/usage-policy.md)) where automated audits/patches (Person A) must be validated by a human architect/engineer (Person B) prior to production deployment.
 - **100% Open Source Architecture ([ADR-0008](docs/adr/0008-transition-to-fully-open-source.md)):** Komagu is fully open source under the **Apache License 2.0**. The assessment kit, WAF edge shields, AST auto-fix generators, and CI cross-user testing engines are completely open and auditable by the global engineering community.
+- **Contributing:** See [`CONTRIBUTING.md`](CONTRIBUTING.md) for issues, branches, pull requests, tests, and Apache-2.0 contribution terms.

package/assess/lsa/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## Unreleased
+
+AMS pilot readiness (#350).
+
+- **Secret redaction (`scripts/redaction.py`, re-exported by `lsa_common`):** besides quoted `password`-like values, it now masks:
+  - unquoted config values (`.properties`, YAML, `.env`) and dotted keys inside comments (`<%-- db.password=x --%>`);
+  - JSON and PHP keys, plus `pass`, `pw`, `passphrase` and `credential` key names such as Tomcat `keystorePass`;
+  - Java legacy forms: `setPassword("x")`, `getConnection(url, user, "x")`, `PasswordAuthentication`, Spring XML `<property name=… value=…>`, and `web.xml` `<param-name>` / `<param-value>`, including when split across lines;
+  - credentials in connection strings and URIs (`;password=`, `?pwd=`, `password={…}`, `scheme://user:pass@host`, `jdbc:oracle:thin:user/pass@host`);
+  - `Basic` / `Bearer` values and AWS, GitHub, `sk-` and Google API tokens;
+  - private key blocks.
+
+  Lines longer than 4,000 characters are dropped whole, which keeps the regexes linear on minified files. The headless runner applies `redact_lines()` to every code excerpt it sends to the model (`operate/ai/context.py`).
+- **`detect_stack.py`:** JPA's `@Entity` and Spring Data's `getRepository` no longer report "TypeORM (Node/TS)" on Java code.
+
 ## 0.3.1 — 2026-10-30
 
 SARIF replay properties (#289).

package/assess/lsa/scripts/detect_stack.py

@@ -12,7 +12,10 @@ import sys
 from pathlib import Path
 
 sys.path.insert(0, str(Path(__file__).resolve().parent))
-from lsa_common import KIT_VERSION, iter_source_files, load_config, read_text, write_json  # noqa: E402
+from lsa_common import KIT_VERSION, blank_java_comments, iter_source_files, load_config, read_text, write_json  # noqa: E402
+
+# org.hibernate.validator is the Bean Validation implementation: it says nothing about the persistence layer
+HIBERNATE_ORM = r"org\.hibernate\.(?!validator\b)"
 
 # (stack id, language, knowledge file, list of (kind, pattern))
 #   kind = "name"  -> regex on relative path
@@ -35,7 +38,7 @@ RULES = [
     ("java-jaxrs", "java", "java.md", [("text", r"javax\.ws\.rs\.|jakarta\.ws\.rs\.")]),
     ("java-mybatis", "java", "java.md", [("text", r"<mapper\s+namespace=|org\.apache\.ibatis")]),
     ("java-ibatis", "java", "java.md", [("text", r"<sqlMap\b|com\.ibatis\.")]),
-    ("java-hibernate", "java", "java.md", [("text", r"org\.hibernate\.|\.hbm\.xml|createQuery\s*\(")]),
+    ("java-hibernate", "java", "java.md", [("text", HIBERNATE_ORM + r"|\.hbm\.xml|createQuery\s*\(")]),
     ("dotnet-webforms", "csharp/vbnet", "dotnet.md", [("ext", {".aspx", ".ascx"})]),
     ("dotnet-handlers", "csharp/vbnet", "dotnet.md", [("ext", {".ashx"})]),
     ("dotnet-asmx-wcf", "csharp/vbnet", "dotnet.md", [("ext", {".asmx", ".svc"})]),
@@ -73,8 +76,8 @@ DATA_ACCESS = [
     ("JDBC", r"java\.sql\.|DriverManager\.getConnection"),
     ("Spring JdbcTemplate", r"JdbcTemplate"),
     ("MyBatis/iBATIS", r"<mapper\s+namespace=|<sqlMap\b"),
-    ("Hibernate/JPA", r"org\.hibernate\.|javax\.persistence\."),
-    ("ADO.NET", r"SqlCommand|OleDbCommand|OdbcCommand|OracleCommand"),
+    ("Hibernate/JPA", HIBERNATE_ORM + r"|javax\.persistence\.|jakarta\.persistence\."),
+    ("ADO.NET", r"\b(?:SqlCommand|OleDbCommand|OdbcCommand|OracleCommand)\b"),
     ("Entity Framework / LINQ to SQL", r"DbContext|DataContext|System\.Data\.Entity"),
     ("Classic ADO", r"ADODB\.(Connection|Recordset|Command)"),
     ("Perl DBI", r"DBI->connect"),
@@ -86,7 +89,8 @@ DATA_ACCESS = [
     ("database/sql (Go)", r"sql\.Open|db\.Query|db\.Exec"),
     ("SQLAlchemy (Python)", r"sqlalchemy\.|create_engine|SessionLocal"),
     ("Prisma (Node/TS)", r"PrismaClient|@prisma/client"),
-    ("TypeORM (Node/TS)", r"typeorm|@Entity|getRepository"),
+    # Not bare @Entity / getRepository: JPA and Spring Data use the same names
+    ("TypeORM (Node/TS)", r"['\"]typeorm['\"]|\bTypeORM\b"),
     ("Drizzle ORM (Node/TS)", r"drizzle-orm"),
     ("postgres.js (Node/TS)", r"from\s+['\"]postgres['\"]|require\(\s*['\"]postgres['\"]\s*\)"),
 ]
@@ -97,6 +101,7 @@ DB_HINTS = [
     ("MongoDB", r"(?i)mongo"), ("SQLite", r"(?i)sqlite"),
 ]
 
+DOTNET_TEXT_EXTS = {".cs", ".vb", ".aspx", ".asax", ".config"}
 TEXT_SAMPLE_EXTS = {".sql", ".php", ".inc", ".java", ".jsp", ".xml", ".cs", ".vb", ".aspx", ".asax", ".config", ".asp",
                     ".pl", ".pm", ".cgi", ".cfm", ".cfc", ".js", ".mjs", ".ts", ".tsx", ".jsx", ".py", ".rb", ".kt", ".kts",
                     ".rs", ".go", ".toml", ".mod"}
@@ -128,9 +133,13 @@ def detect(target: Path, config: dict) -> dict:
     for path, rel in files:
         if path.suffix.lower() not in TEXT_SAMPLE_EXTS:
             continue
+        ext = path.suffix.lower()
         text = read_text(path, enc)
+        rule_text = blank_java_comments(text) if ext == ".java" else text
         for sid, rx in text_rules:
-            if seen_text[sid] < 3 and rx.search(text):
+            if sid.startswith("dotnet-") and ext not in DOTNET_TEXT_EXTS:
+                continue
+            if seen_text[sid] < 3 and rx.search(rule_text):
                 seen_text[sid] += 1
                 evidence[sid].append(f"pattern /{rx.pattern[:40]}/ in {rel}")
         for n, rx in da_rules:

package/assess/lsa/scripts/find_injection.py

@@ -37,6 +37,11 @@ STRONG_SQL = re.compile(
     r"(?i)(\bselect\b[\s\S]*?\bfrom\b|\bselect\s+[\w*]|\binsert\s+into\b|\bupdate\s+[\w\[\].`\"]+\s+set\b|\bupdate\s+[\w\[\].`\"]+\s*$"
     r"|\bdelete\s+from\b|\bwhere\b\s*[\w(`\[]|\border\s+by\b|\bgroup\s+by\b|\bvalues\s*\(|\bexec(ute)?\s+\w|\bunion\s+select\b"
     r"|\bfrom\s+[\w\[\].`\"]+\s+(where|order|group|inner|left|join)\b|\bhaving\b)")
+# Java only: an HTML opening tag is markup, and a literal ending in WHERE is SQL/JPQL about to take a concatenated clause
+HTML_OPEN_TAG = re.compile(r"</?[a-zA-Z][\w:-]*\b")
+JAVA_TRAILING_WHERE = re.compile(r"(?i)\bwhere\s*\"$")
+# JPQL positional parameter: the appended value is the numeric index of a bind mark, as in " = ?").append(size)
+JAVA_POSITIONAL_APPEND = re.compile(r"\?\"\s*\)\s*\.\s*append\s*\(\s*(?:size|index|idx|i|n|pos|position|count|\w*[Ii]ndex)\s*\)\s*;?\s*$")
 WEAK_SQL = re.compile(r"(?i)\b(and|or|like|in|not|between|set|where|order\s+by|limit|offset|values|join|on)\b|=\s*['\"]?$|[(,=<>]\s*'?$")
 SQL_IDENT = re.compile(r"(?i)\b(order\s+by|group\s+by|asc|desc|limit)\b")
 
@@ -132,6 +137,20 @@ def raw_fragment_arg_is_constant(arg: str) -> bool:
     return False
 
 
+def is_sql_literal(text: str, lang: str) -> bool:
+    if lang == "java":
+        return bool(STRONG_SQL.search(HTML_OPEN_TAG.sub("", text)) or JAVA_TRAILING_WHERE.search(text))
+    return bool(STRONG_SQL.search(text))
+
+
+def java_continuation_is_dynamic(line: str, lit: re.Pattern) -> bool:
+    """True when a continuation line of a multi-line SQL statement joins a non-constant operand."""
+    if concat_kind(line, "java", lit) == "dynamic":
+        return True
+    leading = re.match(r"\s*\+\s*([A-Za-z_][\w.]*)", strip_literals(line, lit))
+    return bool(leading and not CONST_OPERAND.match(leading.group(1)))
+
+
 def strip_literals(line: str, lit: re.Pattern) -> str:
     return lit.sub('""', line)
 
@@ -249,7 +268,7 @@ class Finder:
             if com and com.search(line):
                 continue
             lits = untagged(line, literals(line, lit), lang)
-            if not any(STRONG_SQL.search(m.group(0)) for m in lits):
+            if not any(is_sql_literal(m.group(0), lang) for m in lits):
                 continue
             if assign_rx:
                 m = assign_rx.search(line)
@@ -259,6 +278,7 @@ class Finder:
             if am:
                 sqlvars.setdefault(am.group(1), i)
         heredoc_end = None
+        open_sql = False
         # pass 2 — flag dynamic building
         for i, line in enumerate(lines, 1):
             if com and com.search(line):
@@ -283,7 +303,12 @@ class Finder:
                         self.add(lang, rel, i, lines, "heredoc-interpolation", "string_interpolation", "sql", None, file_has_input)
                     continue
             lits = untagged(line, literals(line, lit), lang)
-            sql_lits = [m for m in lits if STRONG_SQL.search(m.group(0))]
+            sql_lits = [m for m in lits if is_sql_literal(m.group(0), lang)]
+            continuing = False
+            if lang == "java":
+                code = strip_literals(line, lit)
+                continuing = open_sql
+                open_sql = (bool(sql_lits) or open_sql) and not re.search(r"[;{}]", code)
             target_var = None
             if assign_rx:
                 am = assign_rx.search(line)
@@ -294,6 +319,8 @@ class Finder:
                 target_var = ap.group(1)
             is_sqlish = bool(sql_lits) or target_var is not None
             if not is_sqlish:
+                if continuing and java_continuation_is_dynamic(line, lit):
+                    self.add(lang, rel, i, lines, "sql-concat", "string_concatenation", "sql", None, file_has_input)
                 continue
             # interpolation inside a SQL literal (or SQL-variable literal)
             cand_lits = sql_lits or (lits if target_var else [])
@@ -317,6 +344,10 @@ class Finder:
                 self.suppressed.append({"file": rel, "line": i, "reason": "concatenation with constant-looking operands only",
                                         "snippet": redact(snippet(lines, i))})
                 continue
+            if lang == "java" and JAVA_POSITIONAL_APPEND.search(line):
+                self.suppressed.append({"file": rel, "line": i, "reason": "appended value is a positional bind index",
+                                        "snippet": redact(snippet(lines, i))})
+                continue
             if target_var and re.search(r"\.\s*(append|Append|AppendLine|concat)\s*\(\s*(?![\"'@\s])", line):
                 self.add(lang, rel, i, lines, "sql-append", "string_concatenation", "sql", target_var, file_has_input)
                 continue
@@ -350,6 +381,8 @@ class Finder:
     def scan_xml(self, rel: str, text: str) -> None:
         if not re.search(r"<mapper\b|<sqlMap\b|<!DOCTYPE\s+(mapper|sqlMap)", text):
             return
+        if re.search(r"<#(?:if|list|assign|macro|include)\b", text):
+            return  # FreeMarker code-generator template: ${...} is the template language, not MyBatis
         lines = text.splitlines()
         in_stmt = False
         for i, line in enumerate(lines, 1):