From cc2f7a40abff83eb40df5ef31ea9856aea3c7067 Mon Sep 17 00:00:00 2001
From: aaron <aaron.j.trowbridge@gmail.com>
Date: Sat, 22 Aug 2026 17:38:46 -0400
Subject: [PATCH] =?UTF-8?q?fix:=20un-red=20main=20=E2=80=94=20drop=20dead?=
 =?UTF-8?q?=20import,=20re-pin=20app-bundle=20manifest=20(#504)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two failures inherited by the #306 merge commit, both predating it:

- fast/typecheck: the catalog removal left an unused import in the
  extension entrypoint — removed.
- app-bundle-gate: the devtools toggle fix (#489) was hand-copied into
  the committed overlay without re-pinning the manifest, so the overlay
  no longer matched what the pinned fork tag extracts. Fixed the
  designed way: fork release branch release/v1.18.10-amicode.15 =
  the .14 pin + cherry-pick of the fork's #223 devtools fix (the exact
  two hand-copied files), extractor re-run against it. Overlay content
  unchanged (manifest-only diff); the fork's later uncoordinated work
  (solver banner, workspace engine, settings permissions) is
  deliberately NOT pulled into this sync.

Closes #504.
---
 packages/app-bundle/manifest.json   | 10 +++++-----
 packages/extension/src/extension.ts |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/app-bundle/manifest.json b/packages/app-bundle/manifest.json
index 0e34ce76..d4262f43 100644
--- a/packages/app-bundle/manifest.json
+++ b/packages/app-bundle/manifest.json
@@ -2,11 +2,11 @@
   "schema": 4,
   "slices": "b (complete app-graph delta)",
   "scope": "complete fork-vs-base delta of packages/{app,ui,session-ui,schema,core,sdk}",
-  "fork_tag": "v1.18.10-amicode.14",
-  "fork_sha": "1fe58157f78ce62515baaee69a9c1461eed42282",
+  "fork_tag": "v1.18.10-amicode.15",
+  "fork_sha": "b460cf8be8dbdaf0f3b6531e50a6edb5f80e6831",
   "upstream_base": "v1.18.12",
   "upstream_base_sha": "0dd6950d1b06958fbcdcadf0ad56258257ab7fdb",
-  "extracted_at": "2026-08-21T08:01:10.830Z",
+  "extracted_at": "2026-08-22T21:37:25.141Z",
   "per_package": {
     "packages/app": {
       "A": 94,
@@ -715,7 +715,7 @@
     "packages/app/src/components/settings-dialog.tsx": "da3bc01dad4ece4214c14083ae4e7dea87ef64ef9829b315b867fdafccdb6916",
     "packages/app/src/components/settings-v2/data-storage-controller.ts": "fa5d143cc101f3a3b9d5ad445edddc981e0d02783021d52dbfed6c8d8bf62498",
     "packages/app/src/components/settings-v2/data-storage.tsx": "a56b423b32c952c4379688d88d13a9f43b163a4169b9393f8c35b18a763a1180",
-    "packages/app/src/components/settings-v2/developer-tools-controller.ts": "bfe2d97b034fb97802123c5d03de8a1feff495ae09557b5619e2f1df1d9a68f6",
+    "packages/app/src/components/settings-v2/developer-tools-controller.ts": "dca45b8ca7fa5f7790ebd67dd1502d729e15887deeda5a86fd9df0f959464f98",
     "packages/app/src/components/settings-v2/developer-tools.tsx": "96ccc0e2ba8ee40eeeaea4933ad176a4029a1b972364e070f0cb027d8fb0a1db",
     "packages/app/src/components/settings-v2/dialog-settings-v2.tsx": "253c32f1309aa5a474075f8fe5d3ad2f40946b772903e07d38a6560f9c4e634c",
     "packages/app/src/components/settings-v2/general.tsx": "e20b03b6f6bb6fc6418bc60ce6dc5af2a02fedc1da76b4ab6a861a2267b909ef",
@@ -758,7 +758,7 @@
     "packages/app/src/context/server-sdk.tsx": "c147f740ffaa2feb87364a70f535c5bd20893a7f54b82f66374a21407d066b91",
     "packages/app/src/context/server-session.ts": "009fcdb6cd374c0f2cac53d37952afaa611f65371b43ff84f3654cffa8c56b18",
     "packages/app/src/context/server.tsx": "08e978e4b4b3094221a2a0b92e069f39cbedb6d6cf95935881e21cde52265ee2",
-    "packages/app/src/context/settings.tsx": "84911434b26eb3254cd399f0ab39396e22fc7cbd502d3d5007cb7eab773007e3",
+    "packages/app/src/context/settings.tsx": "1187bcab92b8e6f622f7522aaed185e144d1b174b91487935ad542703cbed3e5",
     "packages/app/src/context/split.tsx": "891aeb290b369b327a63ce548dcaab1daca08e41fab430648787be7f84e53ec0",
     "packages/app/src/context/tabs.tsx": "6ca4ae0d85d5456cdda6f9aaec7e6aab0ca8aef0296b61f8bae7ee51da150a0a",
     "packages/app/src/context/vault-panel.ts": "f91cb5fb49a9f0d46bd2a1b131f9a218b30147e2ad3617d2a2dc4f1e14599a53",
diff --git a/packages/extension/src/extension.ts b/packages/extension/src/extension.ts
index 43c2bb6d..6fd5a4a2 100644
--- a/packages/extension/src/extension.ts
+++ b/packages/extension/src/extension.ts
@@ -68,7 +68,6 @@ import {
   REPORT_BUG_COMMAND,
 } from "./bug_report";
 import * as os from "node:os";
-import { readTomlSafe } from "./run_dir_reader";
 import { parse as parseYaml } from "yaml";
 import { loadGraph } from "./calibration_graph";
 import { parseStateJson } from "./device_registry";