diff --git a/packages/worker/src/app/permissions-server.node.test.ts b/packages/worker/src/app/permissions-server.node.test.ts
index d592430bd8..8e9f605ed6 100644
--- a/packages/worker/src/app/permissions-server.node.test.ts
+++ b/packages/worker/src/app/permissions-server.node.test.ts
@@ -11,10 +11,13 @@ import {
 import {
 	requireUserWithPermission,
 	requireUserWithRole,
+} from '#app/permissions-server.ts'
+import {
+	type PermissionString,
+	type RoleName,
 	userHasPermission,
 	userHasRole,
-} from '#app/permissions-server.ts'
-import { type PermissionString, type RoleName } from '#universal/permissions.ts'
+} from '#universal/permissions.ts'
 import { testStableUserIdFromEmail } from '#worker/test-support/stable-user-id.ts'
 
 const testCookieSecret = 'test-cookie-secret-0123456789abcdef0123456789'
diff --git a/packages/worker/src/app/permissions-server.ts b/packages/worker/src/app/permissions-server.ts
index cc3ac396db..2d33b51b62 100644
--- a/packages/worker/src/app/permissions-server.ts
+++ b/packages/worker/src/app/permissions-server.ts
@@ -17,7 +17,6 @@ export {
 	removeAdminRolePreservingLastAdmin,
 	removeUserRole,
 } from '#worker/identity/permissions-db.ts'
-export { userHasPermission, userHasRole } from '#universal/permissions.ts'
 
 function unauthorizedResponse(request: Request) {
 	if (wantsJson(request)) {
diff --git a/packages/worker/src/dr/exporter.node.test.ts b/packages/worker/src/dr/exporter.node.test.ts
index 4dd6f2e840..744b0e7e65 100644
--- a/packages/worker/src/dr/exporter.node.test.ts
+++ b/packages/worker/src/dr/exporter.node.test.ts
@@ -21,14 +21,16 @@ import {
 	drExportMaxStorageDumpBufferBytes,
 	__testOnlyCreateInitialProgress,
 	__testOnlyParseProgress,
-	listPlatformStorageInventory,
 	runDrExportTick,
 	runDrExportWatchdogTick,
 	shouldRunDrExportCatchUpCron,
 	shouldRunDrExportCron,
 	shouldRunDrExportWatchdogCron,
 } from '#worker/dr/exporter.ts'
-import { listPlatformOwnerInventory } from '#worker/dr/exporter-inventory.ts'
+import {
+	listPlatformOwnerInventory,
+	listPlatformStorageInventory,
+} from '#worker/dr/exporter-inventory.ts'
 import { encodeStorageIdentity } from '#worker/dr/storage-identity.ts'
 import {
 	DrBackupPreconditionFailedError,
diff --git a/packages/worker/src/dr/exporter.ts b/packages/worker/src/dr/exporter.ts
index e53f214158..2567b3f546 100644
--- a/packages/worker/src/dr/exporter.ts
+++ b/packages/worker/src/dr/exporter.ts
@@ -66,7 +66,6 @@ import {
 	shouldRunDrExportCron,
 } from '#worker/dr/exporter-schedule.ts'
 
-export { listPlatformStorageInventory } from '#worker/dr/exporter-inventory.ts'
 export {
 	drExportCatchUpLookbackDays,
 	isDrExportConfigured,
diff --git a/packages/worker/src/email/outbound.ts b/packages/worker/src/email/outbound.ts
index 102daca3e1..287966fb2b 100644
--- a/packages/worker/src/email/outbound.ts
+++ b/packages/worker/src/email/outbound.ts
@@ -39,10 +39,8 @@ import {
 	recordEmailReportingEvent,
 	type EmailReportingEnv,
 } from './reporting-events.ts'
-import {
-	emailAttachmentBlobKey,
-	ensurePlatformSenderIdentity,
-} from './service.ts'
+import { emailAttachmentBlobKey } from './blob-keys.ts'
+import { ensurePlatformSenderIdentity } from './repo.ts'
 import { type EmailMessageRecord, type EmailProcessingStatus } from './types.ts'
 
 type SendEmailEnv = Pick<
diff --git a/packages/worker/src/email/service.ts b/packages/worker/src/email/service.ts
index 93080549c2..3f5a833b70 100644
--- a/packages/worker/src/email/service.ts
+++ b/packages/worker/src/email/service.ts
@@ -2,7 +2,6 @@ import { bytesToBase64 } from '@kody-internal/shared/base64.ts'
 import { isoTimestampDayKey } from '@kody-internal/shared/date-keys.ts'
 import PostalMime from 'postal-mime'
 import {
-	EmailRawMimeStorageError,
 	putEmailRawMime,
 	RetryableInboundStorageError,
 } from './email-raw-mime-store.ts'
@@ -35,10 +34,7 @@ import {
 	type ParsedInboundEmail,
 } from './types.ts'
 
-export { EmailRawMimeStorageError, RetryableInboundStorageError }
-
-export { emailAttachmentBlobKey, emailRawMimeKey } from './blob-keys.ts'
-export { ensurePlatformSenderIdentity } from './repo.ts'
+export { RetryableInboundStorageError }
 
 function nowIso() {
 	return new Date().toISOString()
diff --git a/packages/worker/src/mcp/executor.node.test.ts b/packages/worker/src/mcp/executor.node.test.ts
index fa31c8ac35..024a8e16c7 100644
--- a/packages/worker/src/mcp/executor.node.test.ts
+++ b/packages/worker/src/mcp/executor.node.test.ts
@@ -7,12 +7,12 @@ import {
 	createMissingSecretMessage,
 	createPackageSecretAccessDeniedBatchMessage,
 } from '#mcp/secrets/errors.ts'
+import { createKodyProviderProxySource } from '#mcp/kody-provider-proxy-source.ts'
 import { EntitlementLimitError } from '#worker/entitlements/errors.ts'
 import { createUnboundRuntimeHelperMessage } from '#worker/package-runtime/unbound-runtime-helpers.ts'
 import { createStorageEstimateReadError } from '#worker/storage-estimate-error.ts'
 import {
 	createKodyRemoteProxy,
-	createKodyProviderProxySource,
 	createExecuteExecutor,
 	createExecutorModuleSource,
 	createExecutorSandboxTimeoutMessage,
diff --git a/packages/worker/src/mcp/executor.ts b/packages/worker/src/mcp/executor.ts
index ee469ad241..6931d6d845 100644
--- a/packages/worker/src/mcp/executor.ts
+++ b/packages/worker/src/mcp/executor.ts
@@ -52,8 +52,6 @@ import {
 } from '#worker/sentry-options.ts'
 import { parseStorageEstimateReadErrorMessage } from '#worker/storage-estimate-error.ts'
 
-export { createKodyProviderProxySource } from '#mcp/kody-provider-proxy-source.ts'
-
 type WorkerLoopbackExports = Exclude<typeof workerExports, undefined>
 
 export const defaultExecutionResponseLimitBytes = 102_400
diff --git a/packages/worker/src/mcp/run-kody-registry.node.test.ts b/packages/worker/src/mcp/run-kody-registry.node.test.ts
index 92e0353a3c..630f6795eb 100644
--- a/packages/worker/src/mcp/run-kody-registry.node.test.ts
+++ b/packages/worker/src/mcp/run-kody-registry.node.test.ts
@@ -23,6 +23,7 @@ import {
 	runModuleWithRegistry,
 } from './run-kody-registry.ts'
 import * as mcpExecutor from '#mcp/executor.ts'
+import { createKodyProviderProxySource } from '#mcp/kody-provider-proxy-source.ts'
 import { type KodyResolvedProvider } from '#mcp/kody-remote-types.ts'
 import { PackageSecretMountError } from '#mcp/secrets/package-access.ts'
 import * as packageAccess from '#mcp/secrets/package-access.ts'
@@ -1444,7 +1445,7 @@ test('remote connector calls round-trip through sanitized ToolDispatcher names',
 	const dispatchers = mcpExecutor.createToolDispatchers([provider], {
 		active: true,
 	})
-	const source = mcpExecutor.createKodyProviderProxySource({
+	const source = createKodyProviderProxySource({
 		providerName: provider.name,
 		remoteConnectors,
 	})
diff --git a/packages/worker/src/mcp/tools/search-descriptors.ts b/packages/worker/src/mcp/tools/search-descriptors.ts
index 202d91697f..d2388dba26 100644
--- a/packages/worker/src/mcp/tools/search-descriptors.ts
+++ b/packages/worker/src/mcp/tools/search-descriptors.ts
@@ -17,9 +17,6 @@ import {
 	extractSearchTokens,
 } from './understand-search-query.ts'
 
-export { buildIntegrationSearchDocument } from './search-entity-plugins/integration.ts'
-export { flattenReferencedTypeFields } from './search-entity-plugins/package.ts'
-
 function buildPackageRelationTokens(
 	match: Extract<SearchMatch, { type: 'package' }>,
 ) {
diff --git a/packages/worker/src/package-runtime/module-graph.ts b/packages/worker/src/package-runtime/module-graph.ts
index dc0cd16bef..01e9c27226 100644
--- a/packages/worker/src/package-runtime/module-graph.ts
+++ b/packages/worker/src/package-runtime/module-graph.ts
@@ -6,7 +6,6 @@ export {
 	parsePackageRuntimeModulePathPackageId,
 	refreshKodyRuntimeModules,
 } from './runtime-source-modules.ts'
-export { createPublishedBundleArtifact } from './module-graph-artifacts.ts'
 export {
 	buildKodyAppBundle,
 	buildKodyImportableModuleBundle,
diff --git a/packages/worker/src/remote-connector/connector-session-key.node.test.ts b/packages/worker/src/remote-connector/connector-session-key.node.test.ts
index f91cfd6993..b87aca0c9d 100644
--- a/packages/worker/src/remote-connector/connector-session-key.node.test.ts
+++ b/packages/worker/src/remote-connector/connector-session-key.node.test.ts
@@ -1,7 +1,7 @@
 import { expect, test } from 'vitest'
+import { userScopedConnectorIngressPath } from '@kody-internal/shared/remote-connectors.ts'
 import {
 	parseUserScopedConnectorRoutePath,
-	userScopedConnectorIngressPath,
 	userScopedConnectorSessionKey,
 } from './connector-session-key.ts'
 
diff --git a/packages/worker/src/remote-connector/connector-session-key.ts b/packages/worker/src/remote-connector/connector-session-key.ts
index 41267528e3..de765919c0 100644
--- a/packages/worker/src/remote-connector/connector-session-key.ts
+++ b/packages/worker/src/remote-connector/connector-session-key.ts
@@ -4,8 +4,6 @@ import {
 } from '@kody-internal/shared/remote-connectors.ts'
 import { durableObjectNameFromParts } from '#worker/user-scoped-durable-object-name.ts'
 
-export { userScopedConnectorIngressPath } from '@kody-internal/shared/remote-connectors.ts'
-
 export type UserScopedConnectorRouteMatch = {
 	username: string
 	instanceId: string
diff --git a/packages/worker/src/run-records/service.ts b/packages/worker/src/run-records/service.ts
index 3f00f0e2d1..b783ed10e3 100644
--- a/packages/worker/src/run-records/service.ts
+++ b/packages/worker/src/run-records/service.ts
@@ -1180,7 +1180,6 @@ export type {
 	ActivationMilestoneRecord,
 	PackageRunSuccessRecord,
 } from './package-activation-state.ts'
-export { countsTowardPackageActivation } from './package-activation-state.ts'
 export type {
 	JobRunObservabilityRecord,
 	JobRunObservabilityStatus,