diff --git a/src/features/chat/panel/runtime-status-projection.ts b/src/features/chat/panel/runtime-status-projection.ts
index e4b886f8..54f1efc2 100644
--- a/src/features/chat/panel/runtime-status-projection.ts
+++ b/src/features/chat/panel/runtime-status-projection.ts
@@ -1,15 +1,15 @@
-import { appServerDiagnosticSections } from "../application/connection/diagnostic-sections";
-import { toolInventoryDiagnosticSections } from "../application/connection/tool-inventory-diagnostic-sections";
 import { runtimeSnapshotForChatState } from "../application/runtime/snapshot";
 import type { ChatState } from "../application/state/root-reducer";
 import type { MessageStreamNoticeSection } from "../domain/message-stream/items";
 import { collaborationModeLabel as formatCollaborationModeLabel } from "../domain/runtime/labels";
 import type { RuntimeSnapshot } from "../domain/runtime/snapshot";
+import { appServerDiagnosticSections } from "../presentation/runtime/diagnostic-sections";
 import {
   effortStatusLines as buildEffortStatusLines,
   modelStatusLines as buildModelStatusLines,
   statusSummaryLines as buildStatusSummaryLines,
 } from "../presentation/runtime/status";
+import { toolInventoryDiagnosticSections } from "../presentation/runtime/tool-inventory-diagnostic-sections";
 
 export interface ChatPanelRuntimeProjection {
   connectionDiagnosticDetails: () => MessageStreamNoticeSection[];
diff --git a/src/features/chat/panel/surface/toolbar-projection.tsx b/src/features/chat/panel/surface/toolbar-projection.tsx
index e216421d..c8c1fddf 100644
--- a/src/features/chat/panel/surface/toolbar-projection.tsx
+++ b/src/features/chat/panel/surface/toolbar-projection.tsx
@@ -4,10 +4,10 @@ import { h } from "preact";
 import { CLIENT_VERSION } from "../../../../constants";
 import type { Thread } from "../../../../domain/threads/model";
 import { threadRowCoreProjection } from "../../../threads/list/row-projection";
-import { appServerDiagnosticSections } from "../../application/connection/diagnostic-sections";
-import { toolInventoryDiagnosticSections } from "../../application/connection/tool-inventory-diagnostic-sections";
 import type { RuntimeSnapshot } from "../../domain/runtime/snapshot";
+import { appServerDiagnosticSections } from "../../presentation/runtime/diagnostic-sections";
 import { rateLimitSummary } from "../../presentation/runtime/status";
+import { toolInventoryDiagnosticSections } from "../../presentation/runtime/tool-inventory-diagnostic-sections";
 import { Toolbar, type ToolbarActions, type ToolbarThreadRow, type ToolbarViewModel } from "../../ui/toolbar";
 import type { ChatPanelToolbarReadModel } from "../shell-read-model";
 
diff --git a/src/features/chat/application/connection/diagnostic-sections.ts b/src/features/chat/presentation/runtime/diagnostic-sections.ts
similarity index 100%
rename from src/features/chat/application/connection/diagnostic-sections.ts
rename to src/features/chat/presentation/runtime/diagnostic-sections.ts
diff --git a/src/features/chat/application/connection/tool-inventory-diagnostic-sections.ts b/src/features/chat/presentation/runtime/tool-inventory-diagnostic-sections.ts
similarity index 100%
rename from src/features/chat/application/connection/tool-inventory-diagnostic-sections.ts
rename to src/features/chat/presentation/runtime/tool-inventory-diagnostic-sections.ts
diff --git a/tests/features/chat/app-server/actions/actions.test.ts b/tests/features/chat/app-server/actions/actions.test.ts
index 442187df..e21ce561 100644
--- a/tests/features/chat/app-server/actions/actions.test.ts
+++ b/tests/features/chat/app-server/actions/actions.test.ts
@@ -22,9 +22,9 @@ import type { SharedServerMetadata } from "../../../../../src/domain/server/meta
 import { createChatServerDiagnosticsActions } from "../../../../../src/features/chat/app-server/actions/diagnostics";
 import { createChatServerMetadataActions } from "../../../../../src/features/chat/app-server/actions/metadata";
 import { createChatServerThreadActions } from "../../../../../src/features/chat/app-server/actions/threads";
-import { toolInventoryDiagnosticSections } from "../../../../../src/features/chat/application/connection/tool-inventory-diagnostic-sections";
 import { runtimeSnapshotForChatState } from "../../../../../src/features/chat/application/runtime/snapshot";
 import { createChatStateStore } from "../../../../../src/features/chat/application/state/store";
+import { toolInventoryDiagnosticSections } from "../../../../../src/features/chat/presentation/runtime/tool-inventory-diagnostic-sections";
 import { chatStateFixture, chatStateWith } from "../../support/state";
 
 type ThreadStartResponse = ClientResponseByMethod["thread/start"];
diff --git a/tests/features/chat/application/connection/diagnostic-sections.test.ts b/tests/features/chat/presentation/runtime/diagnostic-sections.test.ts
similarity index 98%
rename from tests/features/chat/application/connection/diagnostic-sections.test.ts
rename to tests/features/chat/presentation/runtime/diagnostic-sections.test.ts
index 8f2c9c12..80471510 100644
--- a/tests/features/chat/application/connection/diagnostic-sections.test.ts
+++ b/tests/features/chat/presentation/runtime/diagnostic-sections.test.ts
@@ -9,8 +9,8 @@ import {
   upsertMcpServerStatusDiagnostics,
 } from "../../../../../src/domain/server/diagnostics";
 import type { ToolInventorySnapshot } from "../../../../../src/domain/server/tool-inventory";
-import { appServerDiagnosticSections } from "../../../../../src/features/chat/application/connection/diagnostic-sections";
-import { toolInventoryDiagnosticSections } from "../../../../../src/features/chat/application/connection/tool-inventory-diagnostic-sections";
+import { appServerDiagnosticSections } from "../../../../../src/features/chat/presentation/runtime/diagnostic-sections";
+import { toolInventoryDiagnosticSections } from "../../../../../src/features/chat/presentation/runtime/tool-inventory-diagnostic-sections";
 
 function diagnosticsWithToolInventory(inventory: ToolInventorySnapshot) {
   let diagnostics = createServerDiagnostics();