← Commit history

Merge PR #43: dock: stop shadowing kicad and fusion dock.json with a dead CLI (dock-unbreak-kicad-fusion -> master) merge

John Lauer ·a3dd20e6d8 ·2mo ago ·parents 5bd70c7, 370036a

Showing changes introduced by the merge (against its first parent).

1 file changed +17−45
dock/apps.json+17−45
@@ -9,7 +9,13 @@     "from each entry's launch block; the authoring contract for app publishers",     "is the public hd-dock skill (ships with HD) and the Dock section of the",     "adom/hydrogen-desktop wiki page. To request listing: open an issue on the",-    "adom/hydrogen-desktop wiki page."+    "adom/hydrogen-desktop wiki page.",+    "OMIT the launch block for any app that publishes its own dock.json: an",+    "inline launch here ALWAYS wins, so pinning one freezes that app's launch",+    "at whatever this file said and silently shadows the manifest its authors",+    "maintain. That is exactly how kicad and fusion ended up still calling the",+    "adom-desktop CLI months after it was renamed to adom-bridge-cli. Pin a",+    "launch here only as a deliberate override, and say why."   ],   "poll_seconds": 21600,   "manual_refresh_cooldown_seconds": 60,@@ -18,43 +24,13 @@       "id": "kicad",       "wiki_repo": "adom/kicad-bridge",       "featured": true,-      "order": 10,-      "webview": {-        "title": "KiCad Bridge"-      },-      "launch": {-        "mode": "container_command",-        "steps": [-          {-            "label": "Starting the KiCad bridge",-            "run": "adom-desktop bridge start kicad --print-url",-            "await": "url",-            "timeout_seconds": 60-          }-        ],-        "on_ready": "navigate_placeholder"-      }+      "order": 10     },     {       "id": "fusion",       "wiki_repo": "adom/fusion-bridge",       "featured": true,-      "order": 20,-      "webview": {-        "title": "Fusion 360 Bridge"-      },-      "launch": {-        "mode": "container_command",-        "steps": [-          {-            "label": "Starting the Fusion bridge",-            "run": "adom-desktop bridge start fusion --print-url",-            "await": "url",-            "timeout_seconds": 60-          }-        ],-        "on_ready": "navigate_placeholder"-      }+      "order": 20     },     {       "id": "chip-fetcher",@@ -87,20 +63,16 @@       "id": "pup",       "wiki_repo": "adom/pup-bridge",       "order": 50,+      "_comment": [+        "No launch block on purpose. The old one called adom-desktop, which no",+        "longer exists, so this card failed on every click. pup publishes no",+        "dock.json yet, so with no launch the card opens its wiki page, which",+        "is a better landing than a guaranteed error. Tracked as an issue on",+        "adom/pup-bridge asking for a dock.json per adom/hydrogen-dock-sdk;",+        "when that lands, this entry picks it up with no edit here."+      ],       "webview": {         "title": "Pup"-      },-      "launch": {-        "mode": "container_command",-        "steps": [-          {-            "label": "Starting the pup bridge",-            "run": "adom-desktop bridge start pup --print-url",-            "await": "url",-            "timeout_seconds": 60-          }-        ],-        "on_ready": "navigate_placeholder"       }     },     {