@caddis/cli 0.4.15 → 0.4.18

package/bundles/antigravity-plugin/caddis_statusline.py

@@ -38,8 +38,22 @@ import shutil
 import subprocess
 import sys
 import time
+import datetime
+import traceback
 from pathlib import Path
 
+_DEBUG_LOG = Path.home() / ".caddis" / "statusline_debug.log"
+def _debug_log(msg: str):
+    if not os.environ.get("CADDIS_STATUSLINE_DEBUG"):
+        return
+    try:
+        with open(_DEBUG_LOG, "a", encoding="utf-8") as f:
+            f.write(f"[{datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')}] [PID {os.getpid()}] {msg}\n")
+    except Exception:
+        pass
+
+_debug_log(f"INVOKE: argv={sys.argv} cwd={os.getcwd()}")
+
 # --------------------------------------------------------------------------------------
 # Config
 # --------------------------------------------------------------------------------------
@@ -186,17 +200,30 @@ def term_width() -> int:
 # Host facts the payload does not carry
 # --------------------------------------------------------------------------------------
 
+_GIT_CACHE_FILE = Path.home() / ".caddis" / ".git_status_cache.json"
+
+
 def git_facts(cwd: str) -> dict:
     """One `git status --porcelain=v2 --branch` call -> branch, staged/unstaged/untracked,
-    ahead/behind. The v2 format gives all of it in a single invocation, which is why the
-    old bash line dropped its two-calls-plus-grep-plus-awk approach."""
+    ahead/behind. Uses a 2-second cache file per cwd to eliminate git process thrashing on rapid
+    status updates."""
     out = {"branch": "", "staged": 0, "unstaged": 0, "untracked": 0, "ahead": 0, "behind": 0}
     if not cwd or not os.path.isdir(cwd):
         return out
+
+    now = time.time()
+    try:
+        if _GIT_CACHE_FILE.exists():
+            cached = json.loads(_GIT_CACHE_FILE.read_text(encoding="utf-8"))
+            if cached.get("cwd") == cwd and (now - cached.get("time", 0)) < 2.0:
+                return cached.get("facts", out)
+    except Exception:
+        pass
+
     try:
         proc = subprocess.run(
             ["git", "-C", cwd, "--no-optional-locks", "status", "--porcelain=v2", "--branch"],
-            stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, timeout=1.0,
+            stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, timeout=0.8,
         )
         text = proc.stdout.decode("utf-8", "replace")
     except Exception:
@@ -223,6 +250,12 @@ def git_facts(cwd: str) -> dict:
             out["unstaged"] += 1
         elif line.startswith("? "):
             out["untracked"] += 1
+
+    try:
+        _GIT_CACHE_FILE.write_text(json.dumps({"cwd": cwd, "time": now, "facts": out}), encoding="utf-8")
+    except Exception:
+        pass
+
     return out
 
 
@@ -722,7 +755,19 @@ def wire_host(host: str, settings_path: Path, command: str, dry_run: bool) -> in
     if host == "agy":
         entry["enabled"] = True  # agy ignores a statusLine block without this
 
-    if data.get("statusLine") == entry:
+    changed = False
+    if data.get("statusLine") != entry:
+        data["statusLine"] = entry
+        changed = True
+
+    if host == "agy":
+        title_cmd = command.replace("--profile agy", "--title")
+        title_entry = {"type": "command", "command": title_cmd, "enabled": True}
+        if data.get("title") != title_entry:
+            data["title"] = title_entry
+            changed = True
+
+    if not changed:
         print("  ok %-6s already wired" % host)
         return 0
 
@@ -730,7 +775,6 @@ def wire_host(host: str, settings_path: Path, command: str, dry_run: bool) -> in
         if settings_path.exists():
             backup = settings_path.with_suffix(settings_path.suffix + ".bak-caddis-statusline")
             shutil.copyfile(str(settings_path), str(backup))
-        data["statusLine"] = entry
         settings_path.write_text(json.dumps(data, indent=2) + "\n", encoding="utf-8")
     print("  ok %-6s wired -> %s" % (host, settings_path))
     return 0
@@ -761,6 +805,12 @@ def check() -> int:
         else:
             print("  !! %-6s points elsewhere: %s" % (host, cmd))
             bad += 1
+        if host == "agy":
+            t_entry = data.get("title")
+            if isinstance(t_entry, dict) and "statusline.py" in str(t_entry.get("command", "")) and "--title" in str(t_entry.get("command", "")):
+                print("  ok agy-title %s" % t_entry.get("command"))
+            else:
+                print("  -- agy-title not wired to statusline.py (run --install to wire)")
     return bad
 
 
@@ -815,6 +865,7 @@ def main(argv=None) -> int:
     parser.add_argument("--sample", action="store_true", help="render a fake payload (preview / test)")
     parser.add_argument("--dry-run", action="store_true", help="with --install: print, write nothing")
     parser.add_argument("--no-color", action="store_true", help="render without ANSI colour")
+    parser.add_argument("--title", action="store_true", help="render terminal title (agy)")
     args = parser.parse_args(argv)
 
     # The line is Unicode. On Windows the default cp1252 stdout raises on ◆/⎇/█.
@@ -827,6 +878,21 @@ def main(argv=None) -> int:
     except Exception:
         pass
 
+    if args.title:
+        cwd = os.getcwd()
+        repo = os.path.basename(cwd) or cwd
+        facts = git_facts(cwd)
+        branch = facts.get("branch", "")
+        if branch:
+            print(f"agy: {repo} [{branch}]")
+        else:
+            print(f"agy: {repo}")
+        try:
+            sys.stdout.flush()
+        except Exception:
+            pass
+        return 0
+
     if args.install:
         hosts = ["claude", "agy"] if args.host == "both" else [args.host]
         return 1 if install(hosts, args.dry_run) else 0
@@ -838,31 +904,39 @@ def main(argv=None) -> int:
     if args.no_color:
         cfg["color"] = False
 
+    t0 = time.time()
     if args.sample:
         data = SAMPLES[args.profile]
     else:
         try:
             raw = sys.stdin.read()
-        except Exception:
+        except Exception as e:
+            _debug_log(f"stdin.read exception: {e}")
             raw = ""
+        _debug_log(f"stdin read: {len(raw)} bytes in {time.time()-t0:.3f}s")
         start = raw.find("{")  # strip a UTF-8 BOM or any leading noise
         try:
             data = json.loads(raw[start:]) if start >= 0 else {}
-        except Exception:
+        except Exception as e:
+            _debug_log(f"json.loads exception: {e}")
             data = {}
         if not isinstance(data, dict):
             data = {}
 
     try:
         line = RENDERERS[args.profile](data, cfg)
-    except Exception:
+        _debug_log(f"Rendered in {time.time()-t0:.3f}s")
+    except Exception as e:
+        _debug_log(f"Renderer exception: {traceback.format_exc()}")
         # A status line must never break the host. Degrade to the directory name.
         line = os.path.basename(os.getcwd())
 
     try:
         print(line)
         sys.stdout.flush()
-    except (BrokenPipeError, OSError):
+        _debug_log(f"Printed and flushed in {time.time()-t0:.3f}s")
+    except (BrokenPipeError, OSError) as e:
+        _debug_log(f"BrokenPipeError on flush: {e}")
         # Parent process cancelled or closed stdout pipe (e.g. agy runner on user prompt/state switch).
         # Redirecting to devnull prevents Windows Python from throwing unhandled TextIOWrapper errors on exit.
         try:
@@ -871,7 +945,8 @@ def main(argv=None) -> int:
         except Exception:
             pass
         return 0
-    except Exception:
+    except Exception as e:
+        _debug_log(f"Flush exception: {e}")
         return 0
 
     return 0
@@ -880,10 +955,12 @@ def main(argv=None) -> int:
 if __name__ == "__main__":
     try:
         code = main()
-    except BaseException:
+    except BaseException as e:
+        _debug_log(f"Unhandled exception in main: {traceback.format_exc()}")
         code = 0
     try:
         sys.stdout.flush()
-    except Exception:
-        pass
-    sys.exit(code)
+    except Exception as e:
+        _debug_log(f"Final flush exception: {e}")
+    _debug_log(f"EXIT with code {code}")
+    os._exit(code)

package/bundles/antigravity-plugin/plugin.json

@@ -1,5 +1,5 @@
 {
   "name": "caddis",
-  "version": "1.3.108",
+  "version": "1.3.110",
   "description": "caddis — agent-agnostic dev harness as an Antigravity (agy) plugin: TDD skills + commands, single-sourced with the Claude Code plugin."
 }

package/bundles/antigravity-plugin/scripts/caddis_statusline.py

@@ -38,8 +38,22 @@ import shutil
 import subprocess
 import sys
 import time
+import datetime
+import traceback
 from pathlib import Path
 
+_DEBUG_LOG = Path.home() / ".caddis" / "statusline_debug.log"
+def _debug_log(msg: str):
+    if not os.environ.get("CADDIS_STATUSLINE_DEBUG"):
+        return
+    try:
+        with open(_DEBUG_LOG, "a", encoding="utf-8") as f:
+            f.write(f"[{datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')}] [PID {os.getpid()}] {msg}\n")
+    except Exception:
+        pass
+
+_debug_log(f"INVOKE: argv={sys.argv} cwd={os.getcwd()}")
+
 # --------------------------------------------------------------------------------------
 # Config
 # --------------------------------------------------------------------------------------
@@ -186,17 +200,30 @@ def term_width() -> int:
 # Host facts the payload does not carry
 # --------------------------------------------------------------------------------------
 
+_GIT_CACHE_FILE = Path.home() / ".caddis" / ".git_status_cache.json"
+
+
 def git_facts(cwd: str) -> dict:
     """One `git status --porcelain=v2 --branch` call -> branch, staged/unstaged/untracked,
-    ahead/behind. The v2 format gives all of it in a single invocation, which is why the
-    old bash line dropped its two-calls-plus-grep-plus-awk approach."""
+    ahead/behind. Uses a 2-second cache file per cwd to eliminate git process thrashing on rapid
+    status updates."""
     out = {"branch": "", "staged": 0, "unstaged": 0, "untracked": 0, "ahead": 0, "behind": 0}
     if not cwd or not os.path.isdir(cwd):
         return out
+
+    now = time.time()
+    try:
+        if _GIT_CACHE_FILE.exists():
+            cached = json.loads(_GIT_CACHE_FILE.read_text(encoding="utf-8"))
+            if cached.get("cwd") == cwd and (now - cached.get("time", 0)) < 2.0:
+                return cached.get("facts", out)
+    except Exception:
+        pass
+
     try:
         proc = subprocess.run(
             ["git", "-C", cwd, "--no-optional-locks", "status", "--porcelain=v2", "--branch"],
-            stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, timeout=1.0,
+            stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, timeout=0.8,
         )
         text = proc.stdout.decode("utf-8", "replace")
     except Exception:
@@ -223,6 +250,12 @@ def git_facts(cwd: str) -> dict:
             out["unstaged"] += 1
         elif line.startswith("? "):
             out["untracked"] += 1
+
+    try:
+        _GIT_CACHE_FILE.write_text(json.dumps({"cwd": cwd, "time": now, "facts": out}), encoding="utf-8")
+    except Exception:
+        pass
+
     return out
 
 
@@ -722,7 +755,19 @@ def wire_host(host: str, settings_path: Path, command: str, dry_run: bool) -> in
     if host == "agy":
         entry["enabled"] = True  # agy ignores a statusLine block without this
 
-    if data.get("statusLine") == entry:
+    changed = False
+    if data.get("statusLine") != entry:
+        data["statusLine"] = entry
+        changed = True
+
+    if host == "agy":
+        title_cmd = command.replace("--profile agy", "--title")
+        title_entry = {"type": "command", "command": title_cmd, "enabled": True}
+        if data.get("title") != title_entry:
+            data["title"] = title_entry
+            changed = True
+
+    if not changed:
         print("  ok %-6s already wired" % host)
         return 0
 
@@ -730,7 +775,6 @@ def wire_host(host: str, settings_path: Path, command: str, dry_run: bool) -> in
         if settings_path.exists():
             backup = settings_path.with_suffix(settings_path.suffix + ".bak-caddis-statusline")
             shutil.copyfile(str(settings_path), str(backup))
-        data["statusLine"] = entry
         settings_path.write_text(json.dumps(data, indent=2) + "\n", encoding="utf-8")
     print("  ok %-6s wired -> %s" % (host, settings_path))
     return 0
@@ -761,6 +805,12 @@ def check() -> int:
         else:
             print("  !! %-6s points elsewhere: %s" % (host, cmd))
             bad += 1
+        if host == "agy":
+            t_entry = data.get("title")
+            if isinstance(t_entry, dict) and "statusline.py" in str(t_entry.get("command", "")) and "--title" in str(t_entry.get("command", "")):
+                print("  ok agy-title %s" % t_entry.get("command"))
+            else:
+                print("  -- agy-title not wired to statusline.py (run --install to wire)")
     return bad
 
 
@@ -815,6 +865,7 @@ def main(argv=None) -> int:
     parser.add_argument("--sample", action="store_true", help="render a fake payload (preview / test)")
     parser.add_argument("--dry-run", action="store_true", help="with --install: print, write nothing")
     parser.add_argument("--no-color", action="store_true", help="render without ANSI colour")
+    parser.add_argument("--title", action="store_true", help="render terminal title (agy)")
     args = parser.parse_args(argv)
 
     # The line is Unicode. On Windows the default cp1252 stdout raises on ◆/⎇/█.
@@ -827,6 +878,21 @@ def main(argv=None) -> int:
     except Exception:
         pass
 
+    if args.title:
+        cwd = os.getcwd()
+        repo = os.path.basename(cwd) or cwd
+        facts = git_facts(cwd)
+        branch = facts.get("branch", "")
+        if branch:
+            print(f"agy: {repo} [{branch}]")
+        else:
+            print(f"agy: {repo}")
+        try:
+            sys.stdout.flush()
+        except Exception:
+            pass
+        return 0
+
     if args.install:
         hosts = ["claude", "agy"] if args.host == "both" else [args.host]
         return 1 if install(hosts, args.dry_run) else 0
@@ -838,31 +904,39 @@ def main(argv=None) -> int:
     if args.no_color:
         cfg["color"] = False
 
+    t0 = time.time()
     if args.sample:
         data = SAMPLES[args.profile]
     else:
         try:
             raw = sys.stdin.read()
-        except Exception:
+        except Exception as e:
+            _debug_log(f"stdin.read exception: {e}")
             raw = ""
+        _debug_log(f"stdin read: {len(raw)} bytes in {time.time()-t0:.3f}s")
         start = raw.find("{")  # strip a UTF-8 BOM or any leading noise
         try:
             data = json.loads(raw[start:]) if start >= 0 else {}
-        except Exception:
+        except Exception as e:
+            _debug_log(f"json.loads exception: {e}")
             data = {}
         if not isinstance(data, dict):
             data = {}
 
     try:
         line = RENDERERS[args.profile](data, cfg)
-    except Exception:
+        _debug_log(f"Rendered in {time.time()-t0:.3f}s")
+    except Exception as e:
+        _debug_log(f"Renderer exception: {traceback.format_exc()}")
         # A status line must never break the host. Degrade to the directory name.
         line = os.path.basename(os.getcwd())
 
     try:
         print(line)
         sys.stdout.flush()
-    except (BrokenPipeError, OSError):
+        _debug_log(f"Printed and flushed in {time.time()-t0:.3f}s")
+    except (BrokenPipeError, OSError) as e:
+        _debug_log(f"BrokenPipeError on flush: {e}")
         # Parent process cancelled or closed stdout pipe (e.g. agy runner on user prompt/state switch).
         # Redirecting to devnull prevents Windows Python from throwing unhandled TextIOWrapper errors on exit.
         try:
@@ -871,7 +945,8 @@ def main(argv=None) -> int:
         except Exception:
             pass
         return 0
-    except Exception:
+    except Exception as e:
+        _debug_log(f"Flush exception: {e}")
         return 0
 
     return 0
@@ -880,10 +955,12 @@ def main(argv=None) -> int:
 if __name__ == "__main__":
     try:
         code = main()
-    except BaseException:
+    except BaseException as e:
+        _debug_log(f"Unhandled exception in main: {traceback.format_exc()}")
         code = 0
     try:
         sys.stdout.flush()
-    except Exception:
-        pass
-    sys.exit(code)
+    except Exception as e:
+        _debug_log(f"Final flush exception: {e}")
+    _debug_log(f"EXIT with code {code}")
+    os._exit(code)

package/bundles/antigravity-plugin/skills/confluence-hla/SKILL.md

@@ -89,6 +89,12 @@ When authoring an HLA, strictly adhere to the following 7-section structure:
    [Note: 7.2 References is kept in working Markdown but STRICTLY OMITTED from Confluence HTML]
 ```
 
+### Key Section Authoring Guidelines:
+- **Section 3.1 Operational Process Flow:** Document the flow using clean, continuous numbered text steps (`1. **Step Name:** ...`). Completely omit ASCII, unicode, or plain-text drawing boxes, which break formatting in Confluence. The accompanying sequence diagram in 3.2 provides the visual workflow.
+- **Section 3.2 End-to-End Sequence Diagram:** Autonumber all interactions. Apply corporate palette classes (`clientStyle`, `serverStyle`, `appStyle`, `dataStyle`, `extStyle`). Wrap all participant names, notes, and message labels under 45 characters using `<br/>`.
+- **Section 4.1 Solution Design and Architecture:** The standardized title is `4.1 Solution Design and Architecture` (do NOT use "System Topology and Network Boundaries"). Provides the compact component topology and network boundary diagram.
+- **Tables:** All tables must be authored cleanly and converted into `<table class="wrapped">` with wrapped headers (`<th><p>Header</p></th>`) and wrapped table cells (`<td><p>Value</p></td>`).
+
 ---
 
 ## 3. High-Level Database and Data Processing Pipeline Discovery
@@ -272,7 +278,7 @@ Never use default bright or garish PlantUML colors. Use muted corporate Material
      - **Stage 2 (Middle):** Language Model Synthesis Engine (`LLMEngine`), receiving 90-degree orthogonal connections from each track's summary node (`NSum -right-> LLMEngine`, etc.).
      - **Stage 3 (Right):** Action Recommendation & Justification (`RecOutput`), receiving a horizontal connection from `LLMEngine`.
 
-4. **Component-to-Component Connections in System Topology:**
+4. **Component-to-Component Connections in Solution Design & Architecture:**
    - Connect internal component nodes directly (e.g., `Worker -down-> SQL`, `Worker -down-> Apigee`, `Worker -right-> LLM`).
    - Do NOT connect package boundaries (e.g., `HostLayer -down-> MidLayer`), which inflates diagram bounding boxes and distorts routing.
    - Use `skinparam nodesep 60` and `skinparam ranksep 50` for comfortable whitespace.
@@ -337,7 +343,7 @@ Inspect the target codebase across five dimensions:
 - Write using the 7-section canonical structure in Simplified Technical English.
 - Author PlantUML (or Mermaid) diagram blocks for:
   1. Sequence diagram
-  2. System topology diagram
+  2. Solution Design and Architecture diagram (compact topology)
   3. Multi-track summarization pipeline
   4. End-to-end database and processing pipeline (Section 4.5)
 - Document the Screener Feedback Service and RLHF loop (Section 4.6).

package/bundles/antigravity-plugin/skills/confluence-hla/scripts/convert_hla_to_confluence.py

@@ -180,7 +180,13 @@ def _parse_mermaid_flowchart(code: str) -> Optional[str]:
 
     subgraph_start_re = re.compile(r'^\s*subgraph\s+([A-Za-z0-9_]+)(?:\["([^"]+)"\]|\[([^\]]+)\])?', re.IGNORECASE)
     direction_re = re.compile(r'^\s*direction\s+(LR|RL|TB|TD)', re.IGNORECASE)
-    node_def_re = re.compile(r'([A-Za-z0-9_]+)\["([^"]+)"\](?::::([A-Za-z0-9_]+))?|([A-Za-z0-9_]+)\[([^\]]+)\](?::::([A-Za-z0-9_]+))?')
+    node_def_re = re.compile(
+        r'([A-Za-z0-9_]+)(?:'
+        r'\["([^"]+)"\]|\[([^\]]+)\]|'
+        r'\{"([^"]+)"\}|\{([^\}]+)\}|'
+        r'\("([^"]+)"\)|\(([^\)]+)\)'
+        r')(?::::([A-Za-z0-9_]+))?'
+    )
 
     has_flowchart = False
     for line in lines:
@@ -222,9 +228,9 @@ def _parse_mermaid_flowchart(code: str) -> Optional[str]:
 
         # 1. Extract node definitions
         for match in node_def_re.finditer(stripped):
-            n_id = match.group(1) or match.group(4)
-            n_lbl = match.group(2) or match.group(5)
-            n_cls = match.group(3) or match.group(6) or ""
+            n_id = match.group(1)
+            n_lbl = next(g for g in match.groups()[1:7] if g is not None)
+            n_cls = match.group(8) or ""
             node_info = {"id": n_id, "label": n_lbl, "class": n_cls}
             if sg_stack:
                 sg_stack[-1]["nodes"][n_id] = node_info
@@ -233,7 +239,7 @@ def _parse_mermaid_flowchart(code: str) -> Optional[str]:
 
         # 2. Clean line for edge extraction
         def repl_node(m):
-            return m.group(1) or m.group(4)
+            return m.group(1)
         clean_edge_line = node_def_re.sub(repl_node, stripped)
 
         # 3. Extract edges

package/bundles/codex/.codex/skills/docs/confluence-hla/SKILL.md

@@ -89,6 +89,12 @@ When authoring an HLA, strictly adhere to the following 7-section structure:
    [Note: 7.2 References is kept in working Markdown but STRICTLY OMITTED from Confluence HTML]
 ```
 
+### Key Section Authoring Guidelines:
+- **Section 3.1 Operational Process Flow:** Document the flow using clean, continuous numbered text steps (`1. **Step Name:** ...`). Completely omit ASCII, unicode, or plain-text drawing boxes, which break formatting in Confluence. The accompanying sequence diagram in 3.2 provides the visual workflow.
+- **Section 3.2 End-to-End Sequence Diagram:** Autonumber all interactions. Apply corporate palette classes (`clientStyle`, `serverStyle`, `appStyle`, `dataStyle`, `extStyle`). Wrap all participant names, notes, and message labels under 45 characters using `<br/>`.
+- **Section 4.1 Solution Design and Architecture:** The standardized title is `4.1 Solution Design and Architecture` (do NOT use "System Topology and Network Boundaries"). Provides the compact component topology and network boundary diagram.
+- **Tables:** All tables must be authored cleanly and converted into `<table class="wrapped">` with wrapped headers (`<th><p>Header</p></th>`) and wrapped table cells (`<td><p>Value</p></td>`).
+
 ---
 
 ## 3. High-Level Database and Data Processing Pipeline Discovery
@@ -272,7 +278,7 @@ Never use default bright or garish PlantUML colors. Use muted corporate Material
      - **Stage 2 (Middle):** Language Model Synthesis Engine (`LLMEngine`), receiving 90-degree orthogonal connections from each track's summary node (`NSum -right-> LLMEngine`, etc.).
      - **Stage 3 (Right):** Action Recommendation & Justification (`RecOutput`), receiving a horizontal connection from `LLMEngine`.
 
-4. **Component-to-Component Connections in System Topology:**
+4. **Component-to-Component Connections in Solution Design & Architecture:**
    - Connect internal component nodes directly (e.g., `Worker -down-> SQL`, `Worker -down-> Apigee`, `Worker -right-> LLM`).
    - Do NOT connect package boundaries (e.g., `HostLayer -down-> MidLayer`), which inflates diagram bounding boxes and distorts routing.
    - Use `skinparam nodesep 60` and `skinparam ranksep 50` for comfortable whitespace.
@@ -337,7 +343,7 @@ Inspect the target codebase across five dimensions:
 - Write using the 7-section canonical structure in Simplified Technical English.
 - Author PlantUML (or Mermaid) diagram blocks for:
   1. Sequence diagram
-  2. System topology diagram
+  2. Solution Design and Architecture diagram (compact topology)
   3. Multi-track summarization pipeline
   4. End-to-end database and processing pipeline (Section 4.5)
 - Document the Screener Feedback Service and RLHF loop (Section 4.6).

package/bundles/codex/.codex/skills/docs/confluence-hla/scripts/convert_hla_to_confluence.py

@@ -180,7 +180,13 @@ def _parse_mermaid_flowchart(code: str) -> Optional[str]:
 
     subgraph_start_re = re.compile(r'^\s*subgraph\s+([A-Za-z0-9_]+)(?:\["([^"]+)"\]|\[([^\]]+)\])?', re.IGNORECASE)
     direction_re = re.compile(r'^\s*direction\s+(LR|RL|TB|TD)', re.IGNORECASE)
-    node_def_re = re.compile(r'([A-Za-z0-9_]+)\["([^"]+)"\](?::::([A-Za-z0-9_]+))?|([A-Za-z0-9_]+)\[([^\]]+)\](?::::([A-Za-z0-9_]+))?')
+    node_def_re = re.compile(
+        r'([A-Za-z0-9_]+)(?:'
+        r'\["([^"]+)"\]|\[([^\]]+)\]|'
+        r'\{"([^"]+)"\}|\{([^\}]+)\}|'
+        r'\("([^"]+)"\)|\(([^\)]+)\)'
+        r')(?::::([A-Za-z0-9_]+))?'
+    )
 
     has_flowchart = False
     for line in lines:
@@ -222,9 +228,9 @@ def _parse_mermaid_flowchart(code: str) -> Optional[str]:
 
         # 1. Extract node definitions
         for match in node_def_re.finditer(stripped):
-            n_id = match.group(1) or match.group(4)
-            n_lbl = match.group(2) or match.group(5)
-            n_cls = match.group(3) or match.group(6) or ""
+            n_id = match.group(1)
+            n_lbl = next(g for g in match.groups()[1:7] if g is not None)
+            n_cls = match.group(8) or ""
             node_info = {"id": n_id, "label": n_lbl, "class": n_cls}
             if sg_stack:
                 sg_stack[-1]["nodes"][n_id] = node_info
@@ -233,7 +239,7 @@ def _parse_mermaid_flowchart(code: str) -> Optional[str]:
 
         # 2. Clean line for edge extraction
         def repl_node(m):
-            return m.group(1) or m.group(4)
+            return m.group(1)
         clean_edge_line = node_def_re.sub(repl_node, stripped)
 
         # 3. Extract edges

package/bundles/manifest.json

@@ -1,7 +1,7 @@
 {
-  "poolVersion": "1.3.108",
+  "poolVersion": "1.3.110",
   "bundles": {
-    "antigravity-plugin": "1.3.108",
+    "antigravity-plugin": "1.3.110",
     "antigravity-plugin-extras": "1.3.29",
     "codex": "unknown"
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caddis/cli",
-  "version": "0.4.15",
+  "version": "0.4.18",
   "description": "Install, update and diagnose the caddis dev harness across every coding agent you use (Claude Code, agy/Antigravity, and more).",
   "keywords": [
     "caddis",