@mmerterden/multi-agent-pipeline 20.23.0 → 20.23.1

package/CHANGELOG.md

@@ -16,6 +16,15 @@ Internal file-layout changes that don't affect the slash-command surface are sti
 
 ## [Unreleased]
 
+## [20.23.1] - 2026-10-13
+
+### Fixed
+
+- `/multi-agent:analysis-jira` finds a site's sub-task types on Jira Data Center 9, which answers only the per-project `createmeta/{project}/issuetypes`; sub-tasks were created under the generic `Sub-task` name there. `issueTree.subtaskIssueType` may now map each role to the site's type (`{"develop": "Development Task", "test": "Test Task"}`, `"*"` for any other role), a site with several sub-task types and no setting is named in the run's output, and the preview shows the type each role gets.
+- The code graph reads Swift imports behind an attribute (`@testable import`, `@_exported import`, `@preconcurrency import`, `@_spi(...) import`).
+- Python type parameters (`class Box[T](Base):`) keep their bases, and a TypeScript base built by a call (`extends mixin(Base)`) adds no edge to the function.
+- A diff hunk that only inserts or only deletes lines is given to the declaration spanning both lines around it, at any context size; at `-U0` it was given to the line before it.
+
 ## [20.23.0] - 2026-10-13
 
 ### Added

package/docs/facts.json

@@ -1,7 +1,7 @@
 {
   "$comment": "Generated by pipeline/scripts/gen-facts.mjs. Do not hand-edit: the site reads this, and a number edited here instead of at its source is the drift this file removes.",
   "generatedAt": "2026-10-13",
-  "version": "20.23.0",
+  "version": "20.23.1",
   "phaseSchema": 2,
   "phases": [
     {

package/manifest.json

@@ -1,12 +1,12 @@
 {
   "name": "@mmerterden/multi-agent-pipeline",
-  "version": "20.23.0",
-  "commit": "a64fcccc1e81e70293ec18d96f00b1bfc861dbe0",
-  "generatedAt": "2026-10-13T11:40:10.540Z",
+  "version": "20.23.1",
+  "commit": "202735c51f3f1ba48c52d2faff53b4ebca2ce0e9",
+  "generatedAt": "2026-10-13T12:42:14.108Z",
   "algorithm": "sha256",
   "fileCount": 1367,
   "files": {
-    "CHANGELOG.md": "49fd9096d6707758216930437150dcf42cdd5d38ff33019a2bdfef97311782af",
+    "CHANGELOG.md": "4989a15706727f4056d2f6008d9fb214369b3d9d9437dfcad867e79bedfcd798",
     "LICENSE": "8d8c51aaf1e1538b180c69965fa038db71be86798cc3e26a143bebfefe16a43e",
     "README.md": "4cb9fee0aed62bd1467bdc09954e011612b0de6e7895d663f297bc8778e00b2e",
     "README.tr.md": "f30edbc26e51e311077fbb5b64234e70285db92340e6dadc259cfd673f104326",
@@ -34,7 +34,7 @@
     "docs/best-practices.md": "f8b75b0d38b5896a6a852bb30a1edddeb24dab8b5b7b1d9313290e1241c72024",
     "docs/ecosystem.md": "328a56a9f48514bca380d311a8e62246d85ccb18668f873047a883596153395f",
     "docs/engineering.md": "550528cd47c7d2c921729c68d0782a00ac8e77a4bdfec479f6749f9c3235d188",
-    "docs/facts.json": "64736478061d3d3af245acd7bc6695e3d96a31910da64622f597bc5831b1ba51",
+    "docs/facts.json": "0f668242196f9e4ad1fe68871118a8e28da6a9d2598228b2074f1b6760facdcc",
     "docs/features.md": "79a4b5a9722375ea16d7b337148d47bbea2951c8eb7bc8a6e616c9b3ed2c8703",
     "docs/performance.md": "bbf2f3922c25dcba0c1a9e69ef420e3871a729af5b35009a49b48a5d3c5cd151",
     "docs/recovery-guide.md": "59a8f1b66b34cb9ff5507b3d54dac3b9915e184aa044d9c758d18cac818d510e",
@@ -65,7 +65,7 @@
     "install/templates/multi-agent-autopilot-awake.plist.template": "ddd25c76c56fcbb38a89de8e35637372d70ace993d6bc487a88ca9cfb702fe1f",
     "install/templates/multi-agent-autopilot.plist.template": "122c8a61cd927edd99375d6e3da40f1d42bcceed5b6641785c8b28bb930bc77e",
     "install/unattended-profile-legacy.json": "f52e86b998956f09ad306b1735a6c10b58580d7082d8a55665a4c6bb15c3aa1f",
-    "package.json": "bc6e1a7d54eb993ef1db3ded8880bc52748f5a4622145c26d5a0311ffd4ff7e1",
+    "package.json": "9378b09fd1cc14fce2d55dfc9d0e607728bcbcf09aee276058e760702b7d3b82",
     "pipeline/agents/android-architect.md": "11fb74543cb0ebcf9525ca6654fe95d53da7229e0bf4a1149b31fd9005abc453",
     "pipeline/agents/backend-architect.md": "b02a606c301e4714131aed70ae6d16eeb77fbc819a001e2752cff2488d4246de",
     "pipeline/agents/bulk-reader.md": "6597052cd7d205bac2b1c7633f5232fe1a40730664a913b8eb77efd5a786dc25",
@@ -169,7 +169,7 @@
     "pipeline/lib/_jira-auth.sh": "fc468736057f8841d824eb1a4db527442562f8979fea333ebaef5527f4369e9f",
     "pipeline/lib/account-resolver.sh": "f7bef9beba3f839268509361651be0b1e1f319f2f23821f90ba466fdf185a8f6",
     "pipeline/lib/agent-model-sync.mjs": "2e0264ca8d8fef761563db219d588fed9067847043f960f68f055c186c20b668",
-    "pipeline/lib/analysis-jira-write.sh": "d9ad4065d8675db42f3f6248df992842e6f73fa6e5d571dfc5326ba9d37283c6",
+    "pipeline/lib/analysis-jira-write.sh": "d38a7665c91a4b65b219381184357a723a43c3daff8fae0bace6f55605f8e5bf",
     "pipeline/lib/analysis-quality.mjs": "58dec3447178ff05dc0687c256fa5134c909cd485dd22a0932eafc05ba5c9ad8",
     "pipeline/lib/analysis-sections.mjs": "e31ddf128ef7a6d1b9061896fc2d7cb4b5165202d8e03a46a1e0f9ec906ed01d",
     "pipeline/lib/ask-choice.sh": "b77282645cf64d016cdebf43d1ee299874a1411f5c51b6ae3b6c580d1bbfe78a",
@@ -282,7 +282,7 @@
     "pipeline/multi-agent-refs/design-check/figma-mapping.md": "731b7f19ddee2e67ea5d318e95e3a0d6840fa62c4ad682a25315509ac9ddcbc3",
     "pipeline/multi-agent-refs/design-check/init-inventory.md": "62defc5ea804f6c8f059a8d512b023791daac59274c0def28cefd7709a7fe862",
     "pipeline/multi-agent-refs/design-check/mcp-currency-gate.md": "70a96d3135af905989cd1819e6fb37fc44d25df9817b1efcd20121ec6db76d74",
-    "pipeline/multi-agent-refs/features/analysis-jira.md": "5f6932d2d675c4f7812c6d4c44a8de1bd4c6b07d2ff92a05d8747e811d0f22ad",
+    "pipeline/multi-agent-refs/features/analysis-jira.md": "fe95a8a2435c0118f804f6ad17ab312d04ffa2ea7e0eab9e00d84c684039c93b",
     "pipeline/multi-agent-refs/features/analysis-outline.md": "36a917343a7c07ae115aa1e89f825304e5878db931915aefef614d251b167e92",
     "pipeline/multi-agent-refs/features/analysis-sources.md": "12c8035e6aabf8e8a973b7264edc9a943e6758e79dbc53ae3e9b43c7f998000c",
     "pipeline/multi-agent-refs/features/assertion-judge.md": "ee9d1f32a5edfc35bf7f97126fa285eaddad6c1ba99724149bcf414c6e318e00",
@@ -458,7 +458,7 @@
     "pipeline/schemas/plan-todos.schema.json": "f1dcf8df338b29bbc1d874addd3408c0841a5f869c0b6075efd9242e3e8552d6",
     "pipeline/schemas/planning-output.schema.json": "bc6eda32ecd435cf84d846078f9d38347f8f741f8a427cff15913dd6c380d4b8",
     "pipeline/schemas/pr-request.schema.json": "ae75c4856349d62834802b1189af516bb6fb3d36646831b7ff2fa61d938afcd0",
-    "pipeline/schemas/prefs.schema.json": "009d3f1c9b5dfbbcdc5fd38b2edbea12ec8dead9ab116557288db12a8e44cd46",
+    "pipeline/schemas/prefs.schema.json": "57701b646d651f6ec6bb3a688da1ad2c3c11bd63a28cf0174b78b717ad2cae62",
     "pipeline/schemas/repo-profile.schema.json": "1a74ef8330da9a26a5a70955f6f9cbb20eda54a8615efaf86c7993d420a7f04e",
     "pipeline/schemas/repos.schema.json": "a9bf56f25c66201c170912e3389bd73e4a3f61922410f83e31a6c6ba47aee861",
     "pipeline/schemas/research-output.schema.json": "54e3ba1b04fdc20fbaa84333b943a8ab95d1395c7b0e0aedc67929184cb49523",
@@ -496,7 +496,7 @@
     "pipeline/scripts/_code-graph.mjs": "6b1848d78cef2000c11fcaaa6f1faaae89365a86a37642aa458db9ad422a4cc1",
     "pipeline/scripts/_command-contract.mjs": "e97a5c624e0768769da54d4175e9f7655f1de1dcd0832468bc66bf140b0f5a6f",
     "pipeline/scripts/_cost.mjs": "bdf03835af4719b72e4574f2d5ca827e94f9d80e49527a8e9e200a0aa4ecd7a9",
-    "pipeline/scripts/_diff-impact.mjs": "fc61b34d6495ae8576ecccf1cf1e4effac2d025644259f30bfc46fafe5de264a",
+    "pipeline/scripts/_diff-impact.mjs": "cda016ca6071c741a680a3dbc35bb21926465b296defa4fa3677ce550704198a",
     "pipeline/scripts/_fingerprint.mjs": "d8c63b062a3be0e138b6675aa031824fcd96f5517cf0f7b477378913c1db7d73",
     "pipeline/scripts/_notices.mjs": "1f78037b0849ab3cf8a85ca353ed1610c2895250ac21a1d50ac1fb9732be4300",
     "pipeline/scripts/_path-match.mjs": "880b27d90351441b4f3c05e1a87ace62cd1caab3ec7a286663efb2176cb69a69",
@@ -508,14 +508,14 @@
     "pipeline/scripts/_smoke-root.sh": "dad129959a4e37a0cd0f4f6c04f6d66c5a43752b2bf33989db9c002eb106b832",
     "pipeline/scripts/_stack-adapter.mjs": "a754c042d237cd03abf11c6909099a7a3ea798cdd13d49b03787797fd3496cd7",
     "pipeline/scripts/_stack-routing.mjs": "d1f804d457295e5cc8ad7039e8c29431f0e9f52f4396cc54c1305eb82b9b61e9",
-    "pipeline/scripts/_supertypes.mjs": "d31af077ee670dc68c25dca49b332ebefe44f1ccba3d6d5bd1f534c72609084f",
+    "pipeline/scripts/_supertypes.mjs": "7bf4bf8fca087ad93a19316fd24bfaae19d05f8a0907edda4c17946fcaf375d8",
     "pipeline/scripts/agent-guard.py": "ba8f0c08a80d953d339ea69492efb1fbe8db5d364c2bcb2094a9839cf6dcc081",
     "pipeline/scripts/agent-guard.sh": "5b57cea687754533c673b66a9dd2281ca06d12ef86bdc0d03fa285fc9e7debf8",
     "pipeline/scripts/aggregate-metrics.mjs": "c324e349993fb154a885263cf6665af0ff656e9c987b455a263dad8b96cca667",
     "pipeline/scripts/analysis-conform-coverage.mjs": "2b7de99855d1901b1b7803f47d4bb5f75ed5df1b5f4840d55bfc3537e3f65afe",
     "pipeline/scripts/analysis-sources.mjs": "53d843b0504a6cadd7d4a047331ebc34a2868304fcf791617ad0a215396e35a6",
     "pipeline/scripts/analysis-story-body.mjs": "309cf9f1a9859228d073aff6e7b4a9322bc960d4fe1a21a10ce58521a0c1b641",
-    "pipeline/scripts/analysis-story-tree.mjs": "6c14d66b9718e0b68a7020058cbaeaf2f38f0ea3b1ee72ffa11a0878d8e38f44",
+    "pipeline/scripts/analysis-story-tree.mjs": "5fb7b5978391b1a090db26dae982bb9763177736c2457180a941946d40eb4224",
     "pipeline/scripts/analysis-tickets-writeback.mjs": "8c1f117ac5c6516385e3458462de6bde28c81768853c2d9524118d0155befe8b",
     "pipeline/scripts/anonymize-findings.mjs": "5d7e042793790c1b924d4d952b4f79b7e5f1dd0a3fe936f1ee16a4fa2ba820dd",
     "pipeline/scripts/answer-question.mjs": "b948df9d063f623a7ccd9cc65903c4388018b6b968228f77eb2e229223a61b1c",
@@ -545,7 +545,7 @@
     "pipeline/scripts/classify-plan-safety.mjs": "d25f21da21dd4ee1ea507fb0df89301715071121b1bd96aca9ef140a4eee896b",
     "pipeline/scripts/code-graph-rules/android.json": "6ba2cc0d496f5c6cc40cca9931e0903da3a64596d939fe2e86367615ec6241c2",
     "pipeline/scripts/code-graph-rules/go.json": "7d794157675c0d4c71d7ba3d6e538de0e20de6711c652d55844eac11b10e0bdf",
-    "pipeline/scripts/code-graph-rules/ios.json": "097cb95842ddbe4ed66c2fee3f87ce3be319eaee79533ee46ba917978ddcd8cd",
+    "pipeline/scripts/code-graph-rules/ios.json": "b2c8acc464158b29c669050e7f13cf1f3445fcc2e8b8fb5c5da80feea78f9d2d",
     "pipeline/scripts/code-graph-rules/node.json": "062d7337519f5a743da6953d2748e95560729715502a665d19025108ceba4845",
     "pipeline/scripts/code-graph-rules/python.json": "91394dc31a9392e8d02cf46797bf39551fbe483aa2e6b34145cd33aa2460eca9",
     "pipeline/scripts/commands.mjs": "5b20a7d01aa0f205f2605fcfcbdb197bdfeafbdfc1e5164b5ee083ac6ff39cc2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mmerterden/multi-agent-pipeline",
-  "version": "20.23.0",
+  "version": "20.23.1",
   "description": "6-phase AI development pipeline with full orchestration on Claude Code, Copilot CLI and Codex CLI. Analysis, planning, TDD, CLI-aware parallel review with consensus surfacing + Fable triage, default-FAIL evidence gates, secret + intent guards, per-phase cost ledger, persistent learnings memory, wiki generation, commit automation. Token-preserving uninstall.",
   "type": "module",
   "main": "index.js",

package/pipeline/lib/analysis-jira-write.sh

@@ -239,6 +239,25 @@ if [ -n "${EPIC:-}" ]; then
   fi
 fi
 
+# Discover rather than assume: the types this site marks subtask:true, under
+# whatever names it gave them. Jira Data Center 9 answers only the per-project
+# createmeta; older sites answer only the classic one. Read once per run.
+SITE_SUBTASK_TYPES=""
+SITE_SUBTASK_READ=0
+site_subtask_types() {
+  SITE_SUBTASK_READ=1
+  SITE_SUBTASK_TYPES="$(jira_api GET "/rest/api/2/issue/createmeta/${PROJECT}/issuetypes?maxResults=100" 2>/dev/null \
+    | jq -r '.values[]? | select(.subtask == true) | .name' 2>/dev/null || echo "")"
+  [ -n "$SITE_SUBTASK_TYPES" ] || SITE_SUBTASK_TYPES="$(jira_api GET \
+    "/rest/api/2/issue/createmeta?projectKeys=${PROJECT}&expand=projects.issuetypes" 2>/dev/null \
+    | jq -r '.projects[]?.issuetypes[]? | select(.subtask == true) | .name' 2>/dev/null || echo "")"
+  local n
+  n="$(printf '%s' "$SITE_SUBTASK_TYPES" | grep -c . || true)"
+  if [ "${n:-0}" -gt 1 ]; then
+    echo "  note      ${PROJECT} has ${n} sub-task types ($(printf '%s' "$SITE_SUBTASK_TYPES" | paste -sd, - | sed 's/,/, /g')); using the first. Set issueTree.subtaskIssueType to a name, or to a {role: type} map, to choose." >&2
+  fi
+}
+
 RC=0
 NODES="$(jq -c '.nodes[]' "$PLAN")"
 while IFS= read -r node; do
@@ -272,12 +291,13 @@ while IFS= read -r node; do
     [ -n "$sub" ] || continue
     t_label="$(printf '%s' "$sub" | jq -r '.label')"
     t_role="$(printf '%s' "$sub" | jq -r '.role')"
-    t_type="$(jq -r '.prefsUsed.subtaskIssueType // empty' "$PLAN")"
+    # A name, or a map from role to name ("*" for any other role).
+    t_type="$(jq -r --arg r "$t_role" '.prefsUsed.subtaskIssueType
+      | if type == "object" then (.[$r] // .["*"] // empty)
+        elif type == "string" then . else empty end' "$PLAN")"
     if [ -z "$t_type" ] && [ "$DRY" -eq 0 ]; then
-      # Discover rather than assume: whichever type this site marks subtask:true,
-      # under whatever name the site gave it.
-      t_type="$(jira_api GET "/rest/api/2/issue/createmeta?projectKeys=${PROJECT}&expand=projects.issuetypes" \
-        | jq -r '[.projects[]?.issuetypes[]? | select(.subtask==true) | .name] | first // empty' 2>/dev/null || echo "")"
+      [ "$SITE_SUBTASK_READ" -eq 1 ] || site_subtask_types
+      t_type="$(printf '%s\n' "$SITE_SUBTASK_TYPES" | head -n 1)"
     fi
     [ -n "$t_type" ] || t_type="Sub-task"
     t_desc="$(printf '%s' "$sub" | jq -r '.description // empty')"

package/pipeline/multi-agent-refs/features/analysis-jira.md

@@ -173,9 +173,15 @@ are values the site fills in:
 - `epicLinkFieldId`, when set, is the site's own field id; otherwise it is
   discovered
 - `subtaskIssueType: null` means discover it - `createmeta` returns whichever
-  type carries `subtask: true`, under whatever name the site gave it. Same rule
-  as `features/jira-context.md`: the type travels as it comes from Jira and is
+  type carries `subtask: true`, under whatever name the site gave it (the
+  per-project `createmeta/{project}/issuetypes` first, which is all Jira Data
+  Center 9 answers, then the classic form). Same rule as
+  `features/jira-context.md`: the type travels as it comes from Jira and is
   never a matching criterion in code
+- a site with several sub-task types (Analysis Task, Development Task, Test
+  Task) names them per role: `subtaskIssueType` as a map from a `subtaskRoles`
+  entry to the type, `"*"` for any other role. Without one the first discovered
+  type is used and the run prints the types it found
 
 The preview prints every field beside the pref key it came from, so a wrong
 setting is visible before the writes rather than in Jira afterwards.

package/pipeline/schemas/prefs.schema.json

@@ -2202,9 +2202,10 @@
               "default": "Story"
             },
             "subtaskIssueType": {
-              "type": ["string", "null"],
+              "type": ["string", "null", "object"],
+              "additionalProperties": { "type": "string" },
               "default": null,
-              "description": "Null means discover from createmeta rather than assume a name."
+              "description": "The sub-task type name, or a map from a subtaskRoles entry to this site's type name (\"*\" for any other role), e.g. {\"develop\": \"Development Task\", \"test\": \"Test Task\"}. Null means discover from createmeta (the per-project endpoint, else the classic one) rather than assume a name; when the site has several sub-task types the first is used and the run says so."
             },
             "subtaskRoles": {
               "type": "array",

package/pipeline/scripts/_diff-impact.mjs

@@ -38,7 +38,7 @@ function addLine(set, line) {
   set.add(Math.max(1, line));
 }
 
-function toRanges(lines) {
+function toRanges(lines, gaps = new Set()) {
   const sorted = [...lines].sort((a, b) => a - b);
   const out = [];
   for (const l of sorted) {
@@ -46,21 +46,28 @@ function toRanges(lines) {
     if (last && l === last.end + 1) last.end = l;
     else if (!last || l > last.end) out.push({ start: l, end: l });
   }
-  return out;
+  // A gap is a point between two lines where lines went in (or, on the new
+  // side, came out): `{start: before, end: before + 1, gap: true}`.
+  for (const before of gaps)
+    if (!sorted.includes(before) && !sorted.includes(before + 1))
+      out.push({ start: before, end: before + 1, gap: true });
+  return out.sort((a, b) => a.start - b.start);
 }
 
 /**
  * Every file of a unified diff with the lines it touched on each side.
  *
- * New side: an added line counts as itself, and a deletion as the line now
- * standing where the removed lines were. Old side: a removed line counts as
- * itself, and an insertion as the old line standing where it went in. Either way a hunk that
- * only adds or only removes still lands inside the declaration it changed.
+ * New side: an added line counts as itself, and a pure deletion as the gap
+ * between the two new lines it fell between. Old side: a removed line counts as
+ * itself, and a pure insertion as the gap between the two old lines it went in
+ * between. A gap belongs to the innermost declaration spanning both of its
+ * lines, so a hunk that only adds or only removes lands inside the declaration
+ * it changed, whatever the context size.
  * Hunks are counted from their headers, so concatenated `diff -u` output with
  * no `diff --git` lines parses too, CRLF included, at any context size.
  *
  * @param {string} diffText - unified diff
- * @returns {Array<{oldPath: string|null, newPath: string|null, oldRanges: Array<{start: number, end: number}>, newRanges: Array<{start: number, end: number}>}>}
+ * @returns {Array<{oldPath: string|null, newPath: string|null, oldRanges: Array<{start: number, end: number, gap?: boolean}>, newRanges: Array<{start: number, end: number, gap?: boolean}>}>}
  */
 export function parseDiffFiles(diffText) {
   const files = [];
@@ -70,23 +77,36 @@ export function parseDiffFiles(diffText) {
   let newLine = 0;
   let oldLeft = 0;
   let newLeft = 0;
+  // One run of -/+ lines. Its removed lines stand for it on the old side and
+  // its added lines on the new side; a run with nothing on one side is a gap
+  // there, between the lines either side of it.
+  let run = null;
+  const endRun = () => {
+    if (run && !run.removed) cur.oldGaps.add(run.oldBefore);
+    if (run && !run.added) cur.newGaps.add(run.newBefore);
+    run = null;
+  };
   for (const line of String(diffText).split("\n")) {
     const raw = line.endsWith("\r") ? line.slice(0, -1) : line;
     if (oldLeft > 0 || newLeft > 0) {
-      if (raw.startsWith("+")) {
-        addLine(cur.newLines, newLine);
-        addLine(cur.oldLines, oldLine);
-        newLine++;
-        newLeft--;
-        continue;
-      }
-      if (raw.startsWith("-")) {
-        addLine(cur.oldLines, oldLine);
-        addLine(cur.newLines, newLine);
-        oldLine++;
-        oldLeft--;
+      if (raw.startsWith("+") || raw.startsWith("-")) {
+        run = run || { oldBefore: oldLine - 1, newBefore: newLine - 1, removed: 0, added: 0 };
+        if (raw.startsWith("+")) {
+          addLine(cur.newLines, newLine);
+          run.added++;
+          newLine++;
+          newLeft--;
+        } else {
+          addLine(cur.oldLines, oldLine);
+          run.removed++;
+          oldLine++;
+          oldLeft--;
+        }
+        if (oldLeft <= 0 && newLeft <= 0) endRun();
         continue;
       }
+      if (raw.startsWith("\\")) continue;
+      endRun();
       if (raw.startsWith(" ") || raw === "") {
         oldLine++;
         newLine++;
@@ -94,7 +114,6 @@ export function parseDiffFiles(diffText) {
         newLeft--;
         continue;
       }
-      if (raw.startsWith("\\")) continue;
       oldLeft = 0;
       newLeft = 0;
     }
@@ -112,6 +131,8 @@ export function parseDiffFiles(diffText) {
         newPath: sidePath(raw.slice(4), "b/"),
         oldLines: new Set(),
         newLines: new Set(),
+        oldGaps: new Set(),
+        newGaps: new Set(),
       };
       files.push(cur);
       pendingOld = undefined;
@@ -121,12 +142,14 @@ export function parseDiffFiles(diffText) {
     if (hunk && cur) {
       const oldCount = hunk[2] === undefined ? 1 : Number(hunk[2]);
       const newCount = hunk[4] === undefined ? 1 : Number(hunk[4]);
-      oldLine = Number(hunk[1]);
-      newLine = Number(hunk[3]);
+      // An empty side names the line BEFORE the change; any other side names
+      // the change's first line.
+      oldLine = Number(hunk[1]) + (oldCount === 0 ? 1 : 0);
+      newLine = Number(hunk[3]) + (newCount === 0 ? 1 : 0);
       oldLeft = oldCount;
       newLeft = newCount;
-      if (newCount === 0) addLine(cur.newLines, newLine);
-      if (oldCount === 0) addLine(cur.oldLines, oldLine);
+      if (oldCount === 0) cur.oldGaps.add(oldLine - 1);
+      if (newCount === 0) cur.newGaps.add(newLine - 1);
     }
   }
   return files
@@ -134,8 +157,8 @@ export function parseDiffFiles(diffText) {
     .map((f) => ({
       oldPath: f.oldPath,
       newPath: f.newPath,
-      oldRanges: toRanges(f.oldLines),
-      newRanges: toRanges(f.newLines),
+      oldRanges: toRanges(f.oldLines, f.oldGaps),
+      newRanges: toRanges(f.newLines, f.newGaps),
     }));
 }
 
@@ -202,8 +225,13 @@ export function changedSymbols(graph, ranges) {
       continue;
     }
     for (const r of list) {
+      // A gap belongs to a declaration only when the lines on both sides do.
       const containing = spanned
-        .filter((s) => (s.startLine ?? s.line) <= r.end && s.endLine >= r.start)
+        .filter((s) =>
+          r.gap
+            ? (s.startLine ?? s.line) <= r.start && s.endLine >= r.end
+            : (s.startLine ?? s.line) <= r.end && s.endLine >= r.start,
+        )
         .sort((a, b) => b.line - a.line);
       if (!containing.length) {
         seeds.set(fileNode.id, fileNode);

package/pipeline/scripts/_supertypes.mjs

@@ -6,7 +6,7 @@
  * protocols or interfaces. Three syntaxes cover the stacks the graph indexes:
  *
  *   colon    Swift and Kotlin: `Name<T>(ctor): A, B<X>() where ...  {`
- *   parens   Python: `Name(A, B, metaclass=M):`
+ *   parens   Python: `Name(A, B, metaclass=M):`, `Name[T](A):`
  *   extends  TypeScript / JavaScript: `Name<T> extends A implements B, C {`
  *
  * Only names that start with a letter or underscore are kept, qualified names
@@ -20,6 +20,7 @@
  */
 
 const HEADER_MAX = 4000;
+const CALL_RE = /^\s*[A-Za-z_$][\w$.]*\s*(?:<[^()]*>)?\s*\(/;
 const OPEN = { "(": ")", "<": ">", "[": "]" };
 const CLOSE = new Set([")", ">", "]"]);
 
@@ -99,10 +100,14 @@ function names(list) {
 export function supertypesAt(body, start, syntax) {
   const header = headerText(body, start, syntax);
   if (syntax === "parens") {
-    const m = /^\s*\(/.exec(header);
+    let k = 0;
+    while (k < header.length && /\s/.test(header[k])) k++;
+    // PEP 695 type parameters come before the bases: `class Box[T](Base):`.
+    const rest = header.slice(skipGroup(header, k, "["));
+    const m = /^\s*\(/.exec(rest);
     if (!m) return [];
-    const end = skipGroup(header, m[0].length - 1, "(");
-    return names(header.slice(m[0].length, end - 1));
+    const end = skipGroup(rest, m[0].length - 1, "(");
+    return names(rest.slice(m[0].length, end - 1));
   }
   if (syntax === "extends") {
     let k = 0;
@@ -111,8 +116,16 @@ export function supertypesAt(body, start, syntax) {
     const out = [];
     const ext = /\bextends\s+([\s\S]*?)(?=\bimplements\b|$)/.exec(rest);
     const imp = /\bimplements\s+([\s\S]*)$/.exec(rest);
+    // A base built by a call (`extends mixin(Base)`) is the call's result,
+    // which names no type the graph can point at.
     for (const part of [ext?.[1], imp?.[1]])
-      if (part) for (const n of names(part)) if (!out.includes(n)) out.push(n);
+      if (part)
+        for (const n of names(
+          splitTop(part)
+            .filter((p) => !CALL_RE.test(p))
+            .join(","),
+        ))
+          if (!out.includes(n)) out.push(n);
     return out;
   }
   let i = 0;

package/pipeline/scripts/analysis-story-tree.mjs

@@ -153,7 +153,7 @@ export function identityLabel(prefix, docId, sourceIds) {
  *   issueTree.projectKey         where the tree is created
  *   issueTree.epicIssueType      the type name for an epic on this site
  *   issueTree.storyIssueType     the type name for a story
- *   issueTree.subtaskIssueType   null = discover from createmeta
+ *   issueTree.subtaskIssueType   a name, a {role: name} map, or null = discover
  *   issueTree.subtaskRoles       how a story is split; ships empty on purpose
  *   issueTree.channelComponents  channel -> this site's component name
  *   issueTree.channelTeams       channel -> this site's team name
@@ -195,6 +195,17 @@ function readPrefs() {
   }
 }
 
+/**
+ * The sub-task type a role is created as, from issueTree.subtaskIssueType: a
+ * name for every role, or a {role: name} map with "*" for any other role. Null
+ * means the writer discovers it from the site.
+ */
+export function subtaskTypeFor(setting, role) {
+  if (typeof setting === "string" && setting) return setting;
+  if (setting && typeof setting === "object") return setting[role] ?? setting["*"] ?? null;
+  return null;
+}
+
 /** Every open placeholder that makes a document unfit to become work. */
 export function openItems(text) {
   const found = [];
@@ -557,7 +568,10 @@ async function main() {
       for (const line of s.description.split("\n")) process.stdout.write(`        ${line}\n`);
     }
     for (const t of s.subtasks) {
-      process.stdout.write(`      subtask  ${t.role}  [${t.label}]\n`);
+      const type = subtaskTypeFor(result.prefsUsed.subtaskIssueType, t.role);
+      process.stdout.write(
+        `      subtask  ${t.role}  type ${type ?? "discovered from createmeta"}  [${t.label}]\n`,
+      );
     }
     for (const c of s.clones || []) {
       process.stdout.write(

package/pipeline/scripts/code-graph-rules/ios.json

@@ -47,7 +47,7 @@
   "importPatterns": [
     {
       "id": "import",
-      "regex": "^\\s*import\\s+(?:class|struct|enum|protocol|func|var|let|typealias)\\s+([A-Za-z_][A-Za-z0-9_]*)|^\\s*import\\s+([A-Za-z_][A-Za-z0-9_]*)"
+      "regex": "^\\s*(?:@[A-Za-z_]\\w*(?:\\([^)\\n]*\\))?\\s+)*import\\s+(?:class|struct|enum|protocol|func|var|let|typealias)\\s+([A-Za-z_][A-Za-z0-9_]*)|^\\s*(?:@[A-Za-z_]\\w*(?:\\([^)\\n]*\\))?\\s+)*import\\s+([A-Za-z_][A-Za-z0-9_]*)"
     }
   ],
   "referenceKinds": ["class", "struct", "enum", "protocol", "actor", "typealias"],