diff --git a/docs/contributing/architecture/remote-connectors.md b/docs/contributing/architecture/remote-connectors.md
index 4eb1780b0f..a8dbd3144a 100644
--- a/docs/contributing/architecture/remote-connectors.md
+++ b/docs/contributing/architecture/remote-connectors.md
@@ -8,16 +8,15 @@ calls to JSON-RPC on the socket.
 
 ## URLs and session keys
 
-`wss://<worker-origin>/@<username>/connectors/<kind>/<instanceId>`
+`wss://<worker-origin>/@<username>/connectors/<instanceId>`
 
-Session key = JSON tuple `[userId, kind, instanceId]` where `kind` is lowercase
-after trim.
+Session key = JSON tuple `[userId, instanceId]` where `instanceId` is the
+user-chosen connector name, lowercase after trim.
 
 The Worker sets header **`X-Kody-Connector-Session-Key`** on requests forwarded
 into the Durable Object. The connector’s **`connector.hello`** must declare a
-**`connectorKind`** and **`connectorId`** (instance id) that match the session
-key implied by the WebSocket URL; otherwise the session closes with a mismatch
-error.
+**`connectorId`** (instance id) that matches the session key implied by the
+WebSocket URL; otherwise the session closes with a mismatch error.
 
 ## WebSocket message protocol
 
@@ -31,8 +30,9 @@ All messages are **JSON objects** with a **`type`** field.
      (`^[a-z0-9](?:[a-z0-9-]{0,62}[a-z0-9])?$`, for example `home` or
      `living-room`). Connector names are globally unique per user.
    - **`sharedSecret`:** string — must match an enabled shared secret saved for
-     the connector ref in D1.
-   - **`connectorKind`:** non-empty string. Lowercase values are normalized.
+     the connector in D1.
+   - **`connectorKind`:** ignored by Kody (may still be sent for compatibility
+     with connector-kit clients).
 
 2. **`connector.heartbeat`**
    - **`type`:** `"connector.heartbeat"`
@@ -84,23 +84,22 @@ External connector authors only need the **WebSocket**.
 For capabilities to be synthesized from a connector, the MCP session must list
 that connector:
 
-- **`remoteConnectors`:** optional array of `{ kind, instanceId }`, where
-  `instanceId` is the explicit connector name. When present (including empty),
-  it fully defines the set of remote connectors for that session.
+- **`remoteConnectors`:** optional array of `{ instanceId }`, where `instanceId`
+  is the explicit connector name. When present (including empty), it fully
+  defines the set of remote connectors for that session.
 
 Regular authenticated MCP and chat sessions load this array from the user's
 saved remote connector settings. Operators can manage those settings at
 `/account/remote-connectors`:
 
-- **`kind`** is protocol metadata, and **`instanceId`** is the user-chosen
-  connector name. Names are unique per user across all kinds because they key
-  `kody.remote[name]`.
+- **`instanceId`** is the user-chosen connector name. Names are unique per user
+  and key `kody.remote[name]`.
 - **`enabled`** controls whether the saved shared secret can authenticate
-  `connector.hello` for that ref.
-- **`attached`** controls whether the ref is included in normal Kody MCP/chat
-  caller context.
+  `connector.hello` for that connector.
+- **`attached`** controls whether the connector is included in normal Kody
+  MCP/chat caller context.
 - **`sharedSecret`** is encrypted in D1 and authenticates only the user-scoped
-  connector URL for the saved ref.
+  connector URL for the saved name.
 
 Source: `packages/shared/src/chat.ts`,
 `packages/shared/src/remote-connectors.ts`, and
@@ -121,15 +120,15 @@ Source: `packages/shared/src/chat.ts`,
 ## Connector checklist
 
 1. **Outbound WebSocket** to your connector URL:
-   `wss://<worker-origin>/@<username>/connectors/<kind>/<connectorName>`.
-2. **Hello first** with matching **`connectorKind`** + **`connectorId`** and a
-   **valid `sharedSecret`** for that `kind:instanceId` pair.
+   `wss://<worker-origin>/@<username>/connectors/<connectorName>`.
+2. **Hello first** with matching **`connectorId`** and a **valid
+   `sharedSecret`** for that connector name.
 3. Implement **`tools/list`** and **`tools/call`** on the socket via
    **`connector.jsonrpc`** envelopes.
 4. **Heartbeats** if the service stays connected for a long time.
-5. **Operator config:** save the connector ref and shared secret from
-   `/account/remote-connectors`; enabled + attached refs are loaded into normal
-   Kody sessions so the registry merges your domain.
+5. **Operator config:** save the connector and shared secret from
+   `/account/remote-connectors`; enabled + attached connectors are loaded into
+   normal Kody sessions so the registry merges your domain.
 
 ## Reference implementation
 
diff --git a/packages/shared/src/chat.ts b/packages/shared/src/chat.ts
index 54754f79ec..e52bd130dc 100644
--- a/packages/shared/src/chat.ts
+++ b/packages/shared/src/chat.ts
@@ -9,17 +9,6 @@ import {
 	type InferOutput,
 } from 'remix/data-schema'
 
-const remoteConnectorKindFieldSchema = createSchema<unknown, string>(
-	(value, context) => {
-		if (typeof value !== 'string') return fail('Expected string', context.path)
-		const trimmed = value.trim().toLowerCase()
-		if (!trimmed) {
-			return fail('remote connector kind must not be empty', context.path)
-		}
-		return { value: trimmed }
-	},
-)
-
 const remoteConnectorInstanceIdFieldSchema = createSchema<unknown, string>(
 	(value, context) => {
 		if (typeof value !== 'string') return fail('Expected string', context.path)
@@ -59,7 +48,6 @@ export const mcpRepoContextSchema = object({
 })
 
 const remoteConnectorRefSchema = object({
-	kind: remoteConnectorKindFieldSchema,
 	instanceId: remoteConnectorInstanceIdFieldSchema,
 })
 
diff --git a/packages/shared/src/remote-connectors.ts b/packages/shared/src/remote-connectors.ts
index e66aaf4a23..7e9ecef107 100644
--- a/packages/shared/src/remote-connectors.ts
+++ b/packages/shared/src/remote-connectors.ts
@@ -5,17 +5,12 @@ import { buildUsernamePathPrefix } from './public-urls.ts'
 type McpCallerContext = InferOutput<typeof mcpCallerContextSchema>
 
 export type RemoteConnectorRef = {
-	kind: string
 	instanceId: string
 }
 
 export const remoteConnectorNamePattern =
 	/^[a-z0-9](?:[a-z0-9-]{0,62}[a-z0-9])?$/
 
-export function normalizeRemoteConnectorKind(kind: string): string {
-	return kind.trim().toLowerCase()
-}
-
 export function normalizeRemoteConnectorInstanceId(instanceId: string): string {
 	return instanceId.trim().toLowerCase()
 }
@@ -28,20 +23,17 @@ export function isValidRemoteConnectorName(instanceId: string): boolean {
 
 export function userScopedConnectorIngressPath(input: {
 	username: string
-	kind: string
 	instanceId: string
 }) {
-	const kind = encodeURIComponent(normalizeRemoteConnectorKind(input.kind))
 	const instanceId = encodeURIComponent(
 		normalizeRemoteConnectorInstanceId(input.instanceId),
 	)
-	return `${buildUsernamePathPrefix(input.username)}/connectors/${kind}/${instanceId}`
+	return `${buildUsernamePathPrefix(input.username)}/connectors/${instanceId}`
 }
 
 export function userScopedConnectorWebSocketUrl(input: {
 	origin: string
 	username: string
-	kind: string
 	instanceId: string
 }) {
 	const origin = input.origin.trim().replace(/\/+$/, '')
@@ -53,8 +45,7 @@ export function normalizeRemoteConnectorRefs(
 ): Array<RemoteConnectorRef> {
 	return (context.remoteConnectors ?? [])
 		.map((ref) => ({
-			kind: normalizeRemoteConnectorKind(ref.kind),
 			instanceId: normalizeRemoteConnectorInstanceId(ref.instanceId),
 		}))
-		.filter((ref) => ref.kind.length > 0 && ref.instanceId.length > 0)
+		.filter((ref) => ref.instanceId.length > 0)
 }
diff --git a/packages/worker/client/routes/account-remote-connectors.tsx b/packages/worker/client/routes/account-remote-connectors.tsx
index bbbdc7cc82..b5dc55d051 100644
--- a/packages/worker/client/routes/account-remote-connectors.tsx
+++ b/packages/worker/client/routes/account-remote-connectors.tsx
@@ -38,7 +38,6 @@ import { userScopedConnectorWebSocketUrl } from '@kody-internal/shared/remote-co
 
 type RemoteConnectorListItem = {
 	id: string
-	kind: string
 	instanceId: string
 	connectorUrl: string
 	enabled: boolean
@@ -60,7 +59,6 @@ type AccountRemoteConnectorsPayload = {
 
 type EditorState = {
 	id: string | null
-	kind: string
 	instanceId: string
 	enabled: boolean
 	attached: boolean
@@ -100,7 +98,6 @@ export async function accountRemoteConnectorsRouteLoader(
 function createEmptyEditorState(): EditorState {
 	return {
 		id: null,
-		kind: '',
 		instanceId: '',
 		enabled: true,
 		attached: true,
@@ -114,7 +111,6 @@ function createEditorStateFromConnector(
 ): EditorState {
 	return {
 		id: connector.id,
-		kind: connector.kind,
 		instanceId: connector.instanceId,
 		enabled: connector.enabled,
 		attached: connector.attached,
@@ -128,9 +124,9 @@ function formatTimestamp(value: string) {
 }
 
 function connectorLabel(
-	connector: Pick<RemoteConnectorListItem, 'kind' | 'instanceId'>,
+	connector: Pick<RemoteConnectorListItem, 'instanceId'>,
 ) {
-	return `${connector.kind}:${connector.instanceId}`
+	return connector.instanceId
 }
 
 function bytesToBase64Url(bytes: Uint8Array) {
@@ -409,7 +405,6 @@ export function AccountRemoteConnectorsRoute(handle: Handle) {
 		const enabled = formData.get('enabled') === 'on'
 		return {
 			...editorState,
-			kind: String(formData.get('kind') ?? '').trim(),
 			instanceId: String(formData.get('instanceId') ?? '').trim(),
 			sharedSecret: String(formData.get('sharedSecret') ?? ''),
 			enabled,
@@ -423,11 +418,6 @@ export function AccountRemoteConnectorsRoute(handle: Handle) {
 		if (saveState !== 'idle') return
 		const nextEditorState = form ? readEditorStateFromForm(form) : editorState
 		editorState = nextEditorState
-		if (!nextEditorState.kind.trim()) {
-			message = 'Connector kind is required.'
-			handle.update()
-			return
-		}
 		if (!nextEditorState.instanceId.trim()) {
 			message = 'Connector name is required.'
 			handle.update()
@@ -456,7 +446,6 @@ export function AccountRemoteConnectorsRoute(handle: Handle) {
 				body: JSON.stringify({
 					action: 'save',
 					id: nextEditorState.id,
-					kind: nextEditorState.kind,
 					instanceId: nextEditorState.instanceId,
 					enabled: nextEditorState.enabled,
 					attached: nextEditorState.attached,
@@ -565,11 +554,10 @@ export function AccountRemoteConnectorsRoute(handle: Handle) {
 
 	function getEditorConnectorUrl() {
 		if (!username || !connectorUrlOrigin) return null
-		if (!editorState.kind.trim() || !editorState.instanceId.trim()) return null
+		if (!editorState.instanceId.trim()) return null
 		return userScopedConnectorWebSocketUrl({
 			origin: connectorUrlOrigin,
 			username,
-			kind: editorState.kind,
 			instanceId: editorState.instanceId,
 		})
 	}
@@ -609,10 +597,9 @@ export function AccountRemoteConnectorsRoute(handle: Handle) {
 		}
 		const isMutating = saveState !== 'idle'
 		const isEditing = Boolean(editorState.id)
-		const selectedLabel =
-			editorState.kind && editorState.instanceId
-				? `${editorState.kind}:${editorState.instanceId}`
-				: 'New remote connector'
+		const selectedLabel = editorState.instanceId
+			? editorState.instanceId
+			: 'New remote connector'
 		const connectorUrl = getEditorConnectorUrl()
 
 		return (
@@ -747,27 +734,6 @@ export function AccountRemoteConnectorsRoute(handle: Handle) {
 								</p>
 							</div>
 
-							<label mix={css(fieldCss)}>
-								<span mix={css(fieldLabelCss)}>Kind</span>
-								<input
-									name="kind"
-									type="text"
-									value={editorState.kind}
-									placeholder="lights"
-									disabled={isMutating}
-									required
-									mix={[
-										on('input', (event) => {
-											editorState = {
-												...editorState,
-												kind: event.currentTarget.value,
-											}
-											handle.update()
-										}),
-										css(inputCss),
-									]}
-								/>
-							</label>
 							<label mix={css(fieldCss)}>
 								<span mix={css(fieldLabelCss)}>Connector name</span>
 								<input
@@ -820,8 +786,7 @@ export function AccountRemoteConnectorsRoute(handle: Handle) {
 									</div>
 								) : (
 									<p mix={css(descriptionCss)}>
-										Enter a kind and connector name to build the connector
-										WebSocket URL.
+										Enter a connector name to build the connector WebSocket URL.
 									</p>
 								)}
 								<p mix={css(descriptionCss)}>
diff --git a/packages/worker/migrations/0050-drop-remote-connector-kind.sql b/packages/worker/migrations/0050-drop-remote-connector-kind.sql
new file mode 100644
index 0000000000..06963d3342
--- /dev/null
+++ b/packages/worker/migrations/0050-drop-remote-connector-kind.sql
@@ -0,0 +1,47 @@
+DROP INDEX IF EXISTS idx_remote_connector_settings_ref_enabled;
+
+CREATE TABLE remote_connector_settings_new (
+	id TEXT PRIMARY KEY NOT NULL,
+	user_id TEXT NOT NULL,
+	instance_id TEXT NOT NULL,
+	enabled INTEGER NOT NULL DEFAULT 1 CHECK (enabled IN (0, 1)),
+	attached INTEGER NOT NULL DEFAULT 1 CHECK (attached IN (0, 1)),
+	encrypted_shared_secret TEXT,
+	created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
+	updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
+	UNIQUE(user_id, instance_id)
+);
+
+INSERT INTO remote_connector_settings_new (
+	id,
+	user_id,
+	instance_id,
+	enabled,
+	attached,
+	encrypted_shared_secret,
+	created_at,
+	updated_at
+)
+SELECT
+	r.id,
+	r.user_id,
+	LOWER(r.instance_id),
+	r.enabled,
+	r.attached,
+	r.encrypted_shared_secret,
+	r.created_at,
+	r.updated_at
+FROM remote_connector_settings AS r
+INNER JOIN (
+	SELECT user_id, LOWER(instance_id) AS normalized_instance_id, MIN(rowid) AS min_rowid
+	FROM remote_connector_settings
+	GROUP BY user_id, LOWER(instance_id)
+) AS winners
+	ON r.rowid = winners.min_rowid;
+
+DROP TABLE remote_connector_settings;
+
+ALTER TABLE remote_connector_settings_new RENAME TO remote_connector_settings;
+
+CREATE INDEX IF NOT EXISTS idx_remote_connector_settings_ref_enabled
+	ON remote_connector_settings(instance_id, enabled);
diff --git a/packages/worker/src/app/account-deletion.node.test.ts b/packages/worker/src/app/account-deletion.node.test.ts
index c3d714109b..7c6fd302b4 100644
--- a/packages/worker/src/app/account-deletion.node.test.ts
+++ b/packages/worker/src/app/account-deletion.node.test.ts
@@ -94,12 +94,11 @@ function createTestDb(initial: RowMap): {
 							}
 							if (
 								lower ===
-								'select kind, instance_id from remote_connector_settings where user_id = ?'
+								'select instance_id from remote_connector_settings where user_id = ?'
 							) {
 								results = (rows.remote_connector_settings ?? [])
 									.filter((row) => row['user_id'] === userId)
 									.map((row) => ({
-										kind: row['kind'],
 										instance_id: row['instance_id'],
 									}))
 								return { results: results as Array<T>, meta: { changes: 0 } }
@@ -445,8 +444,8 @@ test('deleteUserAccount cascades user-scoped rows for the requested user', async
 		value_buckets: [{ id: 'vb-1', user_id: userAaa }],
 		value_entries: [{ bucket_id: 'vb-1', name: 'v', user_id: 'unused' }],
 		remote_connector_settings: [
-			{ id: 'rc-1', user_id: userAaa, kind: 'home', instance_id: 'home' },
-			{ id: 'rc-2', user_id: userBbb, kind: 'home', instance_id: 'other' },
+			{ id: 'rc-1', user_id: userAaa, instance_id: 'home' },
+			{ id: 'rc-2', user_id: userBbb, instance_id: 'other' },
 		],
 		saved_packages: [
 			{
@@ -636,7 +635,7 @@ test('deleteUserAccount cascades user-scoped rows for the requested user', async
 		},
 	])
 	expect(rows.remote_connector_settings).toEqual([
-		{ id: 'rc-2', user_id: userBbb, kind: 'home', instance_id: 'other' },
+		{ id: 'rc-2', user_id: userBbb, instance_id: 'other' },
 	])
 	expect(rows.published_bundle_artifacts).toEqual([
 		{ id: 'pba-2', user_id: userBbb, kv_key: 'bundle-artifact:v1:src-2' },
@@ -716,7 +715,7 @@ test('deleteUserAccount cascades user-scoped rows for the requested user', async
 	})
 	expect(purgeRemoteConnectorMock).toHaveBeenCalledWith({
 		userId: userAaa,
-		kind: 'home',
+
 		instanceId: 'home',
 	})
 	expect(doFetchMock).toHaveBeenCalledTimes(3)
diff --git a/packages/worker/src/app/account-deletion.ts b/packages/worker/src/app/account-deletion.ts
index d03a8da792..336b18f376 100644
--- a/packages/worker/src/app/account-deletion.ts
+++ b/packages/worker/src/app/account-deletion.ts
@@ -75,7 +75,6 @@ type UserRepoSessionSnapshot = {
 }
 
 type UserRemoteConnectorSnapshot = {
-	kind: string
 	instanceId: string
 }
 
@@ -225,14 +224,13 @@ async function listUserRepoSessions(env: Env, userId: string) {
 
 async function listUserRemoteConnectors(env: Env, userId: string) {
 	const rows = await env.APP_DB.prepare(
-		`SELECT kind, instance_id
+		`SELECT instance_id
 		FROM remote_connector_settings
 		WHERE user_id = ?`,
 	)
 		.bind(userId)
-		.all<{ kind: string; instance_id: string }>()
+		.all<{ instance_id: string }>()
 	return (rows.results ?? []).map((row) => ({
-		kind: row.kind,
 		instanceId: row.instance_id,
 	}))
 }
@@ -515,7 +513,6 @@ async function purgeRemoteConnectorSessions(input: {
 	for (const connector of input.connectors) {
 		const sessionKey = userScopedConnectorSessionKey({
 			userId: input.userId,
-			kind: connector.kind,
 			instanceId: connector.instanceId,
 		})
 		try {
@@ -524,20 +521,18 @@ async function purgeRemoteConnectorSessions(input: {
 			) as unknown as {
 				rpcPurgeUserSession: (payload: {
 					userId: string
-					kind: string
 					instanceId: string
 				}) => Promise<{ ok: true }>
 			}
 			await stub.rpcPurgeUserSession({
 				userId: input.userId,
-				kind: connector.kind,
 				instanceId: connector.instanceId,
 			})
 			purged += 1
 		} catch (error) {
 			const message = error instanceof Error ? error.message : String(error)
 			input.warnings.push(
-				`Remote connector session purge failed for ${connector.kind}/${connector.instanceId}: ${message}`,
+				`Remote connector session purge failed for ${connector.instanceId}: ${message}`,
 			)
 		}
 	}
diff --git a/packages/worker/src/app/account-export.node.test.ts b/packages/worker/src/app/account-export.node.test.ts
index ad1adffc9c..df501c54a1 100644
--- a/packages/worker/src/app/account-export.node.test.ts
+++ b/packages/worker/src/app/account-export.node.test.ts
@@ -175,7 +175,6 @@ test('createAccountExport redacts secrets and credential-equivalent hashes', asy
 		INSERT INTO remote_connector_settings (
 			id,
 			user_id,
-			kind,
 			instance_id,
 			encrypted_shared_secret,
 			created_at,
@@ -185,7 +184,6 @@ test('createAccountExport redacts secrets and credential-equivalent hashes', asy
 			'connector-a',
 			'user-aaa',
 			'home',
-			'home',
 			'encrypted-connector-secret',
 			'2026-07-05',
 			'2026-07-05'
@@ -245,7 +243,6 @@ test('createAccountExport redacts secrets and credential-equivalent hashes', asy
 	expect(accountExport.d1.remote_connector_settings.rows[0]).toEqual(
 		expect.objectContaining({
 			id: 'connector-a',
-			kind: 'home',
 			instance_id: 'home',
 		}),
 	)
diff --git a/packages/worker/src/app/account-export.ts b/packages/worker/src/app/account-export.ts
index 517baffc66..63cc34ddbf 100644
--- a/packages/worker/src/app/account-export.ts
+++ b/packages/worker/src/app/account-export.ts
@@ -82,7 +82,6 @@ type UserSavedPackageSnapshot = {
 }
 
 type UserRemoteConnectorSnapshot = {
-	kind: string
 	instanceId: string
 }
 
@@ -160,7 +159,6 @@ export type AccountExportArtifactRepo = {
 type AccountExportDurableObjects = {
 	jobManager: unknown | null
 	remoteConnectorSessions: Array<{
-		kind: string
 		instanceId: string
 		export: RemoteConnectorSessionExport | null
 	}>
@@ -524,15 +522,14 @@ async function listUserSavedPackages(env: Env, userId: string) {
 }
 
 async function listUserRemoteConnectors(env: Env, userId: string) {
-	const rows = await selectRows<{ kind: string; instance_id: string }>(
+	const rows = await selectRows<{ instance_id: string }>(
 		env,
-		`SELECT kind, instance_id
+		`SELECT instance_id
 		FROM remote_connector_settings
 		WHERE user_id = ?`,
 		[userId],
 	)
 	return rows.map((row) => ({
-		kind: row.kind,
 		instanceId: row.instance_id,
 	}))
 }
@@ -879,7 +876,6 @@ async function exportRemoteConnectorSessions(input: {
 	for (const connector of input.connectors) {
 		const sessionKey = userScopedConnectorSessionKey({
 			userId: input.userId,
-			kind: connector.kind,
 			instanceId: connector.instanceId,
 		})
 		try {
@@ -888,25 +884,21 @@ async function exportRemoteConnectorSessions(input: {
 			) as unknown as {
 				rpcExportUserSession: (payload: {
 					userId: string
-					kind: string
 					instanceId: string
 				}) => Promise<RemoteConnectorSessionExport>
 			}
 			sessions.push({
-				kind: connector.kind,
 				instanceId: connector.instanceId,
 				export: await stub.rpcExportUserSession({
 					userId: input.userId,
-					kind: connector.kind,
 					instanceId: connector.instanceId,
 				}),
 			})
 		} catch (error) {
 			input.warnings.push(
-				`Remote connector session export failed for ${connector.kind}/${connector.instanceId}: ${getErrorMessage(error)}`,
+				`Remote connector session export failed for ${connector.instanceId}: ${getErrorMessage(error)}`,
 			)
 			sessions.push({
-				kind: connector.kind,
 				instanceId: connector.instanceId,
 				export: null,
 			})
diff --git a/packages/worker/src/app/account-remote-connectors-data.ts b/packages/worker/src/app/account-remote-connectors-data.ts
index 1d1d4a3751..0b5b1645b6 100644
--- a/packages/worker/src/app/account-remote-connectors-data.ts
+++ b/packages/worker/src/app/account-remote-connectors-data.ts
@@ -33,7 +33,6 @@ export async function loadAccountRemoteConnectorsData(input: {
 			connectorUrl: userScopedConnectorWebSocketUrl({
 				origin: connectorUrlOrigin,
 				username: input.user.username,
-				kind: connector.kind,
 				instanceId: connector.instanceId,
 			}),
 		})),
diff --git a/packages/worker/src/app/handlers/account-remote-connectors.node.test.ts b/packages/worker/src/app/handlers/account-remote-connectors.node.test.ts
index 3eef746453..3ea18f5365 100644
--- a/packages/worker/src/app/handlers/account-remote-connectors.node.test.ts
+++ b/packages/worker/src/app/handlers/account-remote-connectors.node.test.ts
@@ -19,7 +19,6 @@ const mockModule = vi.hoisted(() => ({
 	listRemoteConnectorSettingsWithSharedSecrets: vi.fn(async () => [
 		{
 			id: 'connector-1',
-			kind: 'lights',
 			instanceId: 'home',
 			enabled: true,
 			attached: true,
@@ -31,7 +30,6 @@ const mockModule = vi.hoisted(() => ({
 	]),
 	saveRemoteConnectorSetting: vi.fn(async () => ({
 		id: 'connector-1',
-		kind: 'lights',
 		instanceId: 'home',
 		enabled: true,
 		attached: true,
@@ -97,9 +95,8 @@ test('remote connector settings API lists connectors and saves submitted secrets
 		connectors: [
 			{
 				id: 'connector-1',
-				kind: 'lights',
 				instanceId: 'home',
-				connectorUrl: 'wss://example.com/@test-user/connectors/lights/home',
+				connectorUrl: 'wss://example.com/@test-user/connectors/home',
 				enabled: true,
 				attached: true,
 				hasSharedSecret: true,
@@ -116,7 +113,6 @@ test('remote connector settings API lists connectors and saves submitted secrets
 			headers: { 'Content-Type': 'application/json' },
 			body: JSON.stringify({
 				action: 'save',
-				kind: 'roku',
 				instanceId: 'living-room',
 				enabled: true,
 				attached: true,
@@ -130,7 +126,6 @@ test('remote connector settings API lists connectors and saves submitted secrets
 	expect(mockModule.saveRemoteConnectorSetting).toHaveBeenCalledWith(
 		expect.objectContaining({
 			userId: 'stable-user-1',
-			kind: 'roku',
 			instanceId: 'living-room',
 			sharedSecret: 'roku-secret',
 		}),
@@ -144,9 +139,8 @@ test('remote connector settings API lists connectors and saves submitted secrets
 		connectors: [
 			{
 				id: 'connector-1',
-				kind: 'lights',
 				instanceId: 'home',
-				connectorUrl: 'wss://example.com/@test-user/connectors/lights/home',
+				connectorUrl: 'wss://example.com/@test-user/connectors/home',
 				enabled: true,
 				attached: true,
 				hasSharedSecret: true,
diff --git a/packages/worker/src/app/handlers/account-remote-connectors.ts b/packages/worker/src/app/handlers/account-remote-connectors.ts
index 018473243f..5452f85abd 100644
--- a/packages/worker/src/app/handlers/account-remote-connectors.ts
+++ b/packages/worker/src/app/handlers/account-remote-connectors.ts
@@ -120,7 +120,6 @@ async function handleSaveAction(input: {
 		env: input.env,
 		userId: input.user.mcpUser.userId,
 		id: readOptionalString(input.body, 'id'),
-		kind: readString(input.body, 'kind'),
 		instanceId: readString(input.body, 'instanceId'),
 		enabled: readBoolean(input.body, 'enabled', true),
 		attached: readBoolean(input.body, 'attached', true),
diff --git a/packages/worker/src/app/loader-data.ts b/packages/worker/src/app/loader-data.ts
index 233c76711f..232ba782f2 100644
--- a/packages/worker/src/app/loader-data.ts
+++ b/packages/worker/src/app/loader-data.ts
@@ -233,7 +233,6 @@ export type AccountIntegrationsLoaderData = {
 
 export type AccountRemoteConnectorListItem = {
 	id: string
-	kind: string
 	instanceId: string
 	connectorUrl: string
 	enabled: boolean
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index f465a8336d..b8ee20363a 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -128,7 +128,6 @@ async function handleUserScopedConnectorRequest(request: Request, env: Env) {
 	}
 	const sessionKey = userScopedConnectorSessionKey({
 		userId: routeUser.mcpUserId,
-		kind: userScopedConnectorRoute.kind,
 		instanceId: userScopedConnectorRoute.instanceId,
 	})
 	const stub = env.REMOTE_CONNECTOR_SESSION.get(
diff --git a/packages/worker/src/mcp-auth.workers.test.ts b/packages/worker/src/mcp-auth.workers.test.ts
index 692ddecac2..b4dab5045c 100644
--- a/packages/worker/src/mcp-auth.workers.test.ts
+++ b/packages/worker/src/mcp-auth.workers.test.ts
@@ -201,7 +201,6 @@ test('mcp request enforces token audience and forwards caller props', async () =
 						{
 							id: 'connector-1',
 							user_id: 'user',
-							kind: 'lights',
 							instance_id: 'home',
 							enabled: 1,
 							attached: 1,
@@ -231,7 +230,7 @@ test('mcp request enforces token audience and forwards caller props', async () =
 	})
 	expect(withConnectorResponse.status).toBe(200)
 	expect(receivedProps).toMatchObject({
-		remoteConnectors: [{ kind: 'lights', instanceId: 'home' }],
+		remoteConnectors: [{ instanceId: 'home' }],
 	})
 
 	const appDbUnavailable = {
diff --git a/packages/worker/src/mcp/capabilities/meta/meta-list-capabilities.node.test.ts b/packages/worker/src/mcp/capabilities/meta/meta-list-capabilities.node.test.ts
index 42c55f30c7..be723647a3 100644
--- a/packages/worker/src/mcp/capabilities/meta/meta-list-capabilities.node.test.ts
+++ b/packages/worker/src/mcp/capabilities/meta/meta-list-capabilities.node.test.ts
@@ -101,7 +101,7 @@ test('meta_list_capabilities lists runtime remote tools and filters by domain',
 					email: 'user-1@example.com',
 					displayName: 'user-1',
 				},
-				remoteConnectors: [{ kind: 'roku', instanceId: 'roku' }],
+				remoteConnectors: [{ instanceId: 'roku' }],
 			}),
 		},
 	)
@@ -125,7 +125,6 @@ test('meta_list_capabilities lists runtime remote tools and filters by domain',
 		domain: 'remote:roku',
 		source: 'remote-connector',
 		remoteConnector: {
-			kind: 'roku',
 			instanceId: 'roku',
 			connectorId: 'roku',
 			connectorName: 'roku',
@@ -197,7 +196,7 @@ test('meta_list_capabilities lists runtime remote tools and filters by domain',
 					email: 'user-1@example.com',
 					displayName: 'user-1',
 				},
-				remoteConnectors: [{ kind: 'roku', instanceId: 'roku' }],
+				remoteConnectors: [{ instanceId: 'roku' }],
 			}),
 		},
 	)
diff --git a/packages/worker/src/mcp/capabilities/meta/meta-list-capabilities.ts b/packages/worker/src/mcp/capabilities/meta/meta-list-capabilities.ts
index 65504235ac..cac1fb6758 100644
--- a/packages/worker/src/mcp/capabilities/meta/meta-list-capabilities.ts
+++ b/packages/worker/src/mcp/capabilities/meta/meta-list-capabilities.ts
@@ -14,7 +14,6 @@ const capabilitySummarySchema = z.object({
 	source: z.enum(['builtin', 'remote-connector']),
 	remoteConnector: z
 		.object({
-			kind: z.string(),
 			instanceId: z.string(),
 			connectorId: z.string(),
 			connectorName: z.string(),
diff --git a/packages/worker/src/mcp/capabilities/meta/meta-list-remote-connector-status.ts b/packages/worker/src/mcp/capabilities/meta/meta-list-remote-connector-status.ts
index d8acc5cf32..286a9f8f15 100644
--- a/packages/worker/src/mcp/capabilities/meta/meta-list-remote-connector-status.ts
+++ b/packages/worker/src/mcp/capabilities/meta/meta-list-remote-connector-status.ts
@@ -6,8 +6,7 @@ import { getRemoteConnectorStatus } from '#worker/remote-connector/status.ts'
 import { normalizeRemoteConnectorRefs } from '@kody-internal/shared/remote-connectors.ts'
 
 const connectorStatusSchema = z.object({
-	connector_kind: z.string(),
-	connector_instance_id: z.string(),
+	connector_id: z.string(),
 	status: z.enum(['connected', 'disconnected', 'unavailable', 'error']),
 	connected: z.boolean(),
 	connected_at: z.string().nullable(),
@@ -26,7 +25,7 @@ export const metaListRemoteConnectorStatusCapability = defineDomainCapability(
 	{
 		name: 'meta_list_remote_connector_status',
 		description:
-			'Report connection status for each remote connector attached to this session (kind + instance id). Use when search results miss remote capabilities or a remote capability fails.',
+			'Report connection status for each remote connector attached to this session. Use when search results miss remote capabilities or a remote capability fails.',
 		keywords: [
 			'remote',
 			'connector',
@@ -54,8 +53,7 @@ export const metaListRemoteConnectorStatusCapability = defineDomainCapability(
 						ref,
 					})
 					return {
-						connector_kind: s.connectorKind,
-						connector_instance_id: s.connectorId ?? ref.instanceId,
+						connector_id: s.connectorId ?? ref.instanceId,
 						status: s.state,
 						connected: s.connected,
 						connected_at: s.connectedAt,
diff --git a/packages/worker/src/mcp/capabilities/meta/search.ts b/packages/worker/src/mcp/capabilities/meta/search.ts
index 4eab59ac6f..f1511f87cd 100644
--- a/packages/worker/src/mcp/capabilities/meta/search.ts
+++ b/packages/worker/src/mcp/capabilities/meta/search.ts
@@ -20,7 +20,6 @@ const defaultSearchLimit = 15
 const maxSearchLimit = 100
 
 const remoteConnectorStatusSchema = z.object({
-	connectorKind: z.string(),
 	connectorId: z.string(),
 	state: z.string(),
 	connected: z.boolean(),
@@ -51,14 +50,12 @@ function normalizeLimit(limit: number | undefined) {
 }
 
 function serializeRemoteConnectorStatus(status: {
-	connectorKind: string
 	connectorId?: string | null
 	state: string
 	connected: boolean
 	toolCount: number
 }) {
 	return {
-		connectorKind: status.connectorKind,
 		connectorId: status.connectorId ?? 'unknown',
 		state: status.state,
 		connected: status.connected,
diff --git a/packages/worker/src/mcp/capabilities/registry.ts b/packages/worker/src/mcp/capabilities/registry.ts
index 3f18e31e71..cb64134fb5 100644
--- a/packages/worker/src/mcp/capabilities/registry.ts
+++ b/packages/worker/src/mcp/capabilities/registry.ts
@@ -52,7 +52,7 @@ function createCapabilityRegistryCacheKey(input: {
 	const connectorParts = input.refs
 		.map((ref, index) => {
 			const snapshot = input.snapshots[index] ?? null
-			const refKey = `${ref.kind.trim().toLowerCase()}:${ref.instanceId.trim()}`
+			const refKey = ref.instanceId.trim()
 			if (!snapshot) {
 				return `${refKey}:disconnected`
 			}
@@ -115,7 +115,6 @@ export async function getCapabilityRegistryForContext(input: {
 			getCachedRemoteConnectorSnapshot({
 				env: input.env,
 				userId,
-				kind: ref.kind,
 				instanceId: ref.instanceId,
 			}),
 		),
diff --git a/packages/worker/src/mcp/capabilities/remote-connector/index.ts b/packages/worker/src/mcp/capabilities/remote-connector/index.ts
index 0fa17ebe34..24977038c3 100644
--- a/packages/worker/src/mcp/capabilities/remote-connector/index.ts
+++ b/packages/worker/src/mcp/capabilities/remote-connector/index.ts
@@ -18,7 +18,6 @@ import { type RemoteConnectorSnapshot } from '#worker/remote-connector/types.ts'
 
 type RemoteToolCapabilityBinding = {
 	capabilityName: string
-	kind: string
 	instanceId: string
 	mcpToolName: string
 }
@@ -34,10 +33,8 @@ function buildKeywords(
 	ref: RemoteConnectorRef,
 	extraRoots: ReadonlyArray<string>,
 ) {
-	const kind = (snapshot.connectorKind ?? ref.kind).trim().toLowerCase()
 	const words = [
 		...extraRoots,
-		kind,
 		'connector',
 		'remote',
 		tool.name,
@@ -73,7 +70,6 @@ function createCapabilityFromTool(input: {
 	const cleanToolName = remoteConnectorToolName(tool.name)
 	const binding: RemoteToolCapabilityBinding = {
 		capabilityName,
-		kind: (snapshot.connectorKind ?? ref.kind).trim().toLowerCase(),
 		instanceId: ref.instanceId,
 		mcpToolName: tool.name,
 	}
@@ -84,7 +80,7 @@ function createCapabilityFromTool(input: {
 		description:
 			tool.description?.trim() ||
 			tool.title?.trim() ||
-			`Remote connector action (${ref.kind}) for ${tool.name}.`,
+			`Remote connector action for ${tool.name}.`,
 		keywords: buildKeywords(snapshot, tool, ref, domainKeywordRoots),
 		readOnly: Boolean(
 			(tool.annotations as Record<string, unknown> | undefined)?.[
@@ -103,7 +99,6 @@ function createCapabilityFromTool(input: {
 		),
 		source: 'remote-connector',
 		remoteConnector: {
-			kind: binding.kind,
 			instanceId: binding.instanceId,
 			connectorId: snapshot.connectorId,
 			connectorName,
@@ -116,13 +111,12 @@ function createCapabilityFromTool(input: {
 			const userId = ctx.callerContext.user?.userId
 			if (!userId) {
 				throw new Error(
-					`Remote capability "${binding.kind}:${binding.instanceId}:${tool.name}" requires an authenticated user.`,
+					`Remote capability "${binding.instanceId}:${tool.name}" requires an authenticated user.`,
 				)
 			}
 			const client = createRemoteConnectorMcpClient({
 				env: ctx.env,
 				userId,
-				kind: binding.kind,
 				instanceId: binding.instanceId,
 			})
 			let result: Awaited<ReturnType<typeof client.callTool>>
@@ -133,7 +127,6 @@ function createCapabilityFromTool(input: {
 					env: ctx.env,
 					userId,
 					ref: {
-						kind: binding.kind,
 						instanceId: binding.instanceId,
 					},
 				})
@@ -143,7 +136,7 @@ function createCapabilityFromTool(input: {
 				const message =
 					error instanceof Error ? error.message : 'Unknown connector error.'
 				throw new Error(
-					`Remote capability "${binding.kind}:${binding.instanceId}:${tool.name}" failed: ${message}`,
+					`Remote capability "${binding.instanceId}:${tool.name}" failed: ${message}`,
 				)
 			}
 			if (
@@ -174,18 +167,15 @@ export async function synthesizeRemoteToolDomain(input: {
 			: await createRemoteConnectorMcpClient({
 					env: input.env,
 					userId: input.userId,
-					kind: input.ref.kind,
 					instanceId: input.ref.instanceId,
 				}).getSnapshot()
 	const ref = input.ref
 	if (!snapshot || snapshot.tools.length === 0) return null
 
 	const domainId = remoteConnectorDomainId(ref)
-	const k = ref.kind.trim().toLowerCase()
 	const domainIdForCapabilities: CapabilityDomain = domainId
 
 	const domainKeywordRoots = [
-		k,
 		snapshot.description ?? '',
 		'integration',
 		'connector',
@@ -193,7 +183,7 @@ export async function synthesizeRemoteToolDomain(input: {
 
 	const domainDescription =
 		snapshot.description?.trim() ||
-		`Capabilities discovered from the connected "${ref.kind}" remote connector ("${ref.instanceId}").`
+		`Capabilities discovered from the connected remote connector "${ref.instanceId}".`
 
 	const capabilities: Array<Capability> = []
 	const bindings: Record<string, RemoteToolCapabilityBinding> = {}
diff --git a/packages/worker/src/mcp/capabilities/types.ts b/packages/worker/src/mcp/capabilities/types.ts
index 6d92c30cb6..b9840b9e4a 100644
--- a/packages/worker/src/mcp/capabilities/types.ts
+++ b/packages/worker/src/mcp/capabilities/types.ts
@@ -21,7 +21,6 @@ export type CapabilitySchemaDefinition = CapabilityJsonSchema | ZodType
 export type CapabilitySource = 'builtin' | 'remote-connector'
 
 export type CapabilityRemoteConnectorMetadata = {
-	kind: string
 	instanceId: string
 	connectorId: string
 	connectorName: string
diff --git a/packages/worker/src/mcp/executor.node.test.ts b/packages/worker/src/mcp/executor.node.test.ts
index 616574412b..acd744a18d 100644
--- a/packages/worker/src/mcp/executor.node.test.ts
+++ b/packages/worker/src/mcp/executor.node.test.ts
@@ -95,14 +95,13 @@ test('kody remote proxy dispatches and reports connector/capability errors clear
 		remoteConnectors: [
 			{
 				name: 'home',
-				kind: 'home',
 				instanceId: 'home',
 				status: {
 					state: 'connected',
 					connected: true,
 					toolCount: 1,
-					message: 'The home connector "home" is connected.',
-					unavailableMessage: 'The home connector "home" is connected.',
+					message: 'The connector "home" is connected.',
+					unavailableMessage: 'The connector "home" is connected.',
 				},
 				capabilities: [
 					{
@@ -113,15 +112,14 @@ test('kody remote proxy dispatches and reports connector/capability errors clear
 			},
 			{
 				name: 'lights',
-				kind: 'lights',
 				instanceId: 'home',
 				status: {
 					state: 'disconnected',
 					connected: false,
 					toolCount: 0,
-					message: 'The lights connector "lights" is not connected.',
+					message: 'The connector "home" is not connected.',
 					unavailableMessage:
-						'The lights connector "lights" is not connected. Kody cannot use this connector until it reconnects.',
+						'The connector "home" is not connected. Kody cannot use this connector until it reconnects.',
 				},
 				capabilities: [],
 			},
@@ -148,7 +146,7 @@ test('kody remote proxy dispatches and reports connector/capability errors clear
 		'Unknown remote capability "missing_tool" for connector "home". Available capabilities: "set_pin".',
 	)
 	expect(() => remote['lights']?.set_pin).toThrow(
-		'The lights connector "lights" is not connected. Kody cannot use this connector until it reconnects.',
+		'The connector "home" is not connected. Kody cannot use this connector until it reconnects.',
 	)
 })
 
@@ -159,14 +157,13 @@ test('generated kody provider source wires remote proxy dispatch', async () => {
 		remoteConnectors: [
 			{
 				name: 'home',
-				kind: 'home',
 				instanceId: 'home',
 				status: {
 					state: 'connected',
 					connected: true,
 					toolCount: 1,
-					message: 'The home connector "home" is connected.',
-					unavailableMessage: 'The home connector "home" is connected.',
+					message: 'The connector "home" is connected.',
+					unavailableMessage: 'The connector "home" is connected.',
 				},
 				capabilities: [
 					{
diff --git a/packages/worker/src/mcp/index.ts b/packages/worker/src/mcp/index.ts
index a81696d37a..5822c95479 100644
--- a/packages/worker/src/mcp/index.ts
+++ b/packages/worker/src/mcp/index.ts
@@ -42,14 +42,12 @@ async function loadRemoteConnectorInstructionSummaries(input: {
 			const snapshot = await createRemoteConnectorMcpClient({
 				env: input.env,
 				userId,
-				kind: ref.kind,
 				instanceId: ref.instanceId,
 			}).getSnapshot()
 			if (!snapshot) return null
-			const connectorKind = snapshot.connectorKind.trim().toLowerCase()
 			const connectorId = snapshot.connectorId.trim()
 			return {
-				name: `${connectorKind}/${connectorId}`,
+				name: connectorId,
 				domain: remoteConnectorDomainId(ref),
 				description: snapshot.description ?? null,
 			}
diff --git a/packages/worker/src/mcp/kody-remote-types.ts b/packages/worker/src/mcp/kody-remote-types.ts
index 6d7f82772b..bb85e19529 100644
--- a/packages/worker/src/mcp/kody-remote-types.ts
+++ b/packages/worker/src/mcp/kody-remote-types.ts
@@ -7,7 +7,6 @@ export type KodyRemoteCapabilityMetadata = {
 
 export type KodyRemoteConnectorMetadata = {
 	name: string
-	kind: string
 	instanceId: string
 	status: {
 		state: string
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 bdb66023c4..cc65020d8b 100644
--- a/packages/worker/src/mcp/run-kody-registry.node.test.ts
+++ b/packages/worker/src/mcp/run-kody-registry.node.test.ts
@@ -769,7 +769,7 @@ test('buildKodyFns resolves, denies, and tracks secret-marked capability inputs'
 		createMcpCallerContext({
 			baseUrl: 'https://heykody.dev',
 			user: { userId: 'user-123' },
-			remoteConnectors: [{ kind: 'lighting', instanceId: 'lighting' }],
+			remoteConnectors: [{ instanceId: 'lighting' }],
 		}),
 		{
 			resolveSecretValue: async (secret, capabilityName) =>
@@ -805,7 +805,7 @@ test('buildKodyFns resolves, denies, and tracks secret-marked capability inputs'
 		createMcpCallerContext({
 			baseUrl: 'https://heykody.dev',
 			user: { userId: 'user-123' },
-			remoteConnectors: [{ kind: 'lighting', instanceId: 'lighting' }],
+			remoteConnectors: [{ instanceId: 'lighting' }],
 		}),
 	)
 	try {
diff --git a/packages/worker/src/mcp/run-kody-registry.ts b/packages/worker/src/mcp/run-kody-registry.ts
index 006cba7498..5dcaf1d609 100644
--- a/packages/worker/src/mcp/run-kody-registry.ts
+++ b/packages/worker/src/mcp/run-kody-registry.ts
@@ -569,7 +569,6 @@ async function buildKodyRemoteConnectorMetadata(input: {
 				})
 			: {
 					state: 'unavailable' as const,
-					connectorKind: ref.kind.trim().toLowerCase(),
 					connectorId: ref.instanceId,
 					connected: false,
 					connectedAt: null,
@@ -580,7 +579,6 @@ async function buildKodyRemoteConnectorMetadata(input: {
 				}
 		connectors.set(name, {
 			name,
-			kind: ref.kind.trim().toLowerCase(),
 			instanceId: ref.instanceId,
 			status: {
 				state: status.state,
@@ -601,14 +599,13 @@ async function buildKodyRemoteConnectorMetadata(input: {
 			connectors.get(remote.connectorName) ??
 			({
 				name: remote.connectorName,
-				kind: remote.kind,
 				instanceId: remote.instanceId,
 				status: {
 					state: 'connected',
 					connected: true,
 					toolCount: 0,
-					message: `The ${remote.kind} connector "${remote.instanceId}" is connected.`,
-					unavailableMessage: `The ${remote.kind} connector "${remote.instanceId}" is connected.`,
+					message: `The "${remote.instanceId}" connector is connected.`,
+					unavailableMessage: `The "${remote.instanceId}" connector is connected.`,
 				},
 				capabilities: [],
 			} satisfies KodyRemoteConnectorMetadata)
diff --git a/packages/worker/src/mcp/tools/search-format.node.test.ts b/packages/worker/src/mcp/tools/search-format.node.test.ts
index 6785fae8e1..99fe903eb4 100644
--- a/packages/worker/src/mcp/tools/search-format.node.test.ts
+++ b/packages/worker/src/mcp/tools/search-format.node.test.ts
@@ -359,7 +359,6 @@ test('capability formatting keeps execute contracts for identifier and bracket i
 			destructive: false,
 			source: 'remote-connector',
 			remoteConnector: {
-				kind: 'home',
 				instanceId: 'home',
 				connectorId: 'home',
 				connectorName: 'home',
diff --git a/packages/worker/src/mcp/tools/search-format.ts b/packages/worker/src/mcp/tools/search-format.ts
index 654fc4bf23..09cb48fae4 100644
--- a/packages/worker/src/mcp/tools/search-format.ts
+++ b/packages/worker/src/mcp/tools/search-format.ts
@@ -95,7 +95,6 @@ export type SearchResultStructuredContent = {
 		retrieverWarnings?: Array<string>
 	}
 	remoteConnectorStatuses?: Array<{
-		connectorKind: string
 		connectorId: string
 		state: string
 		connected: boolean
diff --git a/packages/worker/src/mcp/tools/search-handler.node.test.ts b/packages/worker/src/mcp/tools/search-handler.node.test.ts
index af7f3a0ffa..df21e3f27e 100644
--- a/packages/worker/src/mcp/tools/search-handler.node.test.ts
+++ b/packages/worker/src/mcp/tools/search-handler.node.test.ts
@@ -23,11 +23,14 @@ const mockModule = vi.hoisted(() => ({
 	listValues: vi.fn(async () => []),
 	loadRelevantMemoriesForTool: vi.fn(async () => null),
 	getRemoteConnectorStatus: vi.fn(async () => ({
-		connectorKind: 'home',
 		connectorId: 'home',
 		state: 'connected',
 		connected: true,
 		toolCount: 1,
+		message: 'connected',
+		error: null,
+		connectedAt: null,
+		lastSeenAt: null,
 	})),
 }))
 
@@ -80,7 +83,7 @@ async function getSearchRegistration() {
 		getCallerContext: vi.fn(() => ({
 			baseUrl: 'https://example.com',
 			user: null,
-			remoteConnectors: [{ kind: 'lights', instanceId: 'home' }],
+			remoteConnectors: [{ instanceId: 'home' }],
 		})),
 	} as never)
 
diff --git a/packages/worker/src/mcp/tools/search.node.test.ts b/packages/worker/src/mcp/tools/search.node.test.ts
index 9b99e68967..63284b42ba 100644
--- a/packages/worker/src/mcp/tools/search.node.test.ts
+++ b/packages/worker/src/mcp/tools/search.node.test.ts
@@ -809,7 +809,7 @@ test('down remote connector statuses surface only disconnected connectors for si
 			email: 'user-1@example.com',
 			displayName: 'user-1',
 		},
-		remoteConnectors: [{ kind: 'lights', instanceId: 'home' }],
+		remoteConnectors: [{ instanceId: 'home' }],
 	}
 	const disconnected = await loadDownRemoteConnectorStatuses({
 		env: {
@@ -864,7 +864,7 @@ test('down remote connector statuses surface only disconnected connectors for si
 	const anonymous = await loadDownRemoteConnectorStatuses({
 		env: {} as unknown as Env,
 		callerContext: {
-			remoteConnectors: [{ kind: 'lights', instanceId: 'home' }],
+			remoteConnectors: [{ instanceId: 'home' }],
 		},
 	})
 	expect(anonymous).toEqual([])
diff --git a/packages/worker/src/mcp/tools/search.ts b/packages/worker/src/mcp/tools/search.ts
index 15b0f2d686..2ae0f39e13 100644
--- a/packages/worker/src/mcp/tools/search.ts
+++ b/packages/worker/src/mcp/tools/search.ts
@@ -1443,14 +1443,12 @@ function shouldIncludeRemoteConnectorStatus(status: RemoteConnectorStatus) {
 }
 
 function serializeRemoteConnectorStatus(status: RemoteConnectorStatus): {
-	connectorKind: string
 	connectorId: string
 	state: string
 	connected: boolean
 	toolCount: number
 } {
 	return {
-		connectorKind: status.connectorKind,
 		connectorId: status.connectorId ?? 'unknown',
 		state: status.state,
 		connected: status.connected,
@@ -1925,7 +1923,6 @@ export async function registerSearchTool(agent: McpRegistrationAgent) {
 					matches: Array<SearchMatch>
 					offline: boolean
 					remoteConnectorStatuses?: Array<{
-						connectorKind: string
 						connectorId: string
 						state: string
 						connected: boolean
diff --git a/packages/worker/src/package-invocations/http.workers.test.ts b/packages/worker/src/package-invocations/http.workers.test.ts
index 179166dda7..6a02be48c7 100644
--- a/packages/worker/src/package-invocations/http.workers.test.ts
+++ b/packages/worker/src/package-invocations/http.workers.test.ts
@@ -62,7 +62,6 @@ async function createEnv(
 		{
 			id: 'home-default',
 			user_id: tokenUserId,
-			kind: 'home',
 			instance_id: 'home',
 			enabled: 1,
 			attached: 1,
@@ -394,7 +393,7 @@ test('package invocation API validates requests and invokes exports with scoped
 			packageKodyIds: ['discord-gateway'],
 			exportNames: ['./dispatch-message-created'],
 			sources: ['discord-gateway'],
-			remoteConnectors: [{ kind: 'home', instanceId: 'home' }],
+			remoteConnectors: [{ instanceId: 'home' }],
 		},
 		request: {
 			packageIdOrKodyId: 'discord-gateway',
diff --git a/packages/worker/src/package-invocations/service.node.test.ts b/packages/worker/src/package-invocations/service.node.test.ts
index 7329000631..6d646d023b 100644
--- a/packages/worker/src/package-invocations/service.node.test.ts
+++ b/packages/worker/src/package-invocations/service.node.test.ts
@@ -186,7 +186,7 @@ function createToken(
 		packageKodyIds: Array<string>
 		exportNames: Array<string>
 		sources: Array<string>
-		remoteConnectors: Array<{ kind: string; instanceId: string }>
+		remoteConnectors: Array<{ instanceId: string }>
 	}> = {},
 ) {
 	return {
@@ -661,7 +661,7 @@ test('invokePackageExport executes a scoped package export successfully', async
 		env: createEnv(db),
 		baseUrl: 'https://kody.dev',
 		token: createToken({
-			remoteConnectors: [{ kind: 'home', instanceId: 'home' }],
+			remoteConnectors: [{ instanceId: 'home' }],
 		}),
 		request: {
 			packageIdOrKodyId: 'discord-gateway',
@@ -687,7 +687,7 @@ test('invokePackageExport executes a scoped package export successfully', async
 	expect(repoMockModule.runBundledModuleWithRegistry).toHaveBeenCalledWith(
 		expect.anything(),
 		expect.objectContaining({
-			remoteConnectors: [{ kind: 'home', instanceId: 'home' }],
+			remoteConnectors: [{ instanceId: 'home' }],
 		}),
 		expect.anything(),
 		expect.anything(),
diff --git a/packages/worker/src/package-runtime/package-workflows.node.test.ts b/packages/worker/src/package-runtime/package-workflows.node.test.ts
index c69db51c84..4671e8d015 100644
--- a/packages/worker/src/package-runtime/package-workflows.node.test.ts
+++ b/packages/worker/src/package-runtime/package-workflows.node.test.ts
@@ -351,7 +351,7 @@ test('DynamicCallableWorkflowBase executes queued inline code and records comple
 })
 
 test('DynamicCallableWorkflowBase restores attached remote connectors for inline code and package exports', async () => {
-	const remoteConnectors = [{ kind: 'home', instanceId: 'home' }]
+	const remoteConnectors = [{ instanceId: 'home' }]
 	const stepDo = vi.fn(
 		async (_name: string, _config: unknown, callback: () => unknown) =>
 			await callback(),
diff --git a/packages/worker/src/remote-connector/client.ts b/packages/worker/src/remote-connector/client.ts
index 7be24e76ab..d534ef10a0 100644
--- a/packages/worker/src/remote-connector/client.ts
+++ b/packages/worker/src/remote-connector/client.ts
@@ -23,12 +23,10 @@ export type RemoteConnectorMcpClient = {
 function getSessionStub(input: {
 	env: Env
 	userId: string
-	kind: string
 	instanceId: string
 }) {
 	const sessionKey = userScopedConnectorSessionKey({
 		userId: input.userId,
-		kind: input.kind,
 		instanceId: input.instanceId,
 	})
 	return input.env.REMOTE_CONNECTOR_SESSION.get(
@@ -39,7 +37,6 @@ function getSessionStub(input: {
 export function createRemoteConnectorMcpClient(input: {
 	env: Env
 	userId: string
-	kind: string
 	instanceId: string
 }): RemoteConnectorMcpClient {
 	const stub = getSessionStub(input)
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 b2a5e3d488..f91cfd6993 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
@@ -8,66 +8,52 @@ import {
 test('connector session keys and ingress routes round-trip without segment collisions', () => {
 	const userA = userScopedConnectorSessionKey({
 		userId: 'user-aaa',
-		kind: 'lights',
 		instanceId: 'home',
 	})
 	const userB = userScopedConnectorSessionKey({
 		userId: 'user-bbb',
-		kind: 'lights',
 		instanceId: 'home',
 	})
 	expect(userA).not.toBe(userB)
-	expect(userA).toBe('["user-aaa","lights","home"]')
+	expect(userA).toBe('["user-aaa","home"]')
 
 	const collidingA = userScopedConnectorSessionKey({
 		userId: 'user-aaa',
-		kind: 'lights',
 		instanceId: 'a/b',
 	})
 	const collidingB = userScopedConnectorSessionKey({
 		userId: 'user-aaa',
-		kind: 'lights/a',
-		instanceId: 'b',
+		instanceId: 'a',
 	})
 	expect(collidingA).not.toBe(collidingB)
 
 	expect(
 		userScopedConnectorIngressPath({
 			username: 'user-aaa',
-			kind: 'lights',
 			instanceId: 'living-room',
 		}),
-	).toBe('/@user-aaa/connectors/lights/living-room')
+	).toBe('/@user-aaa/connectors/living-room')
 	expect(
 		userScopedConnectorIngressPath({
 			username: 'with space',
-			kind: 'CUSTOM',
 			instanceId: 'a b',
 		}),
-	).toBe('/@with%20space/connectors/custom/a%20b')
+	).toBe('/@with%20space/connectors/a%20b')
 
 	expect(
-		parseUserScopedConnectorRoutePath(
-			'/@user-aaa/connectors/lights/home/snapshot',
-		),
+		parseUserScopedConnectorRoutePath('/@user-aaa/connectors/home/snapshot'),
 	).toEqual({
 		username: 'user-aaa',
-		kind: 'lights',
 		instanceId: 'home',
 		rest: '/snapshot',
 	})
 	expect(
-		parseUserScopedConnectorRoutePath('/@user-bbb/connectors/custom/abc'),
+		parseUserScopedConnectorRoutePath('/@user-bbb/connectors/abc'),
 	).toEqual({
 		username: 'user-bbb',
-		kind: 'custom',
 		instanceId: 'abc',
 		rest: '',
 	})
-	expect(
-		parseUserScopedConnectorRoutePath('/connectors/lights/home'),
-	).toBeNull()
-	expect(
-		parseUserScopedConnectorRoutePath('/@user-aaa/connectors/lights'),
-	).toBeNull()
+	expect(parseUserScopedConnectorRoutePath('/connectors/home')).toBeNull()
+	expect(parseUserScopedConnectorRoutePath('/@user-aaa/connectors')).toBeNull()
 })
diff --git a/packages/worker/src/remote-connector/connector-session-key.ts b/packages/worker/src/remote-connector/connector-session-key.ts
index d2b559c89e..cdfd5e1b33 100644
--- a/packages/worker/src/remote-connector/connector-session-key.ts
+++ b/packages/worker/src/remote-connector/connector-session-key.ts
@@ -1,33 +1,29 @@
 import {
 	isValidRemoteConnectorName,
 	normalizeRemoteConnectorInstanceId,
-	normalizeRemoteConnectorKind,
 } from '@kody-internal/shared/remote-connectors.ts'
 
 export { userScopedConnectorIngressPath } from '@kody-internal/shared/remote-connectors.ts'
 
 export type UserScopedConnectorRouteMatch = {
 	username: string
-	kind: string
 	instanceId: string
 	rest: string
 }
 
 /**
  * Stable Durable Object name for a per-user remote connector WebSocket
- * session. The DO id is keyed on `(userId, kind, instanceId)` so two users
- * cannot share a connector session by registering the same `(kind,
- * instanceId)` pair. Encoded as a JSON tuple so any character (including
- * '/' and ':') in any of the three components round-trips unambiguously.
+ * session. The DO id is keyed on `(userId, instanceId)` so two users
+ * cannot share a connector session by registering the same instance id.
+ * Encoded as a JSON tuple so any character (including '/' and ':') in any
+ * of the components round-trips unambiguously.
  */
 export function userScopedConnectorSessionKey(input: {
 	userId: string
-	kind: string
 	instanceId: string
 }) {
 	return JSON.stringify([
 		input.userId.trim(),
-		normalizeRemoteConnectorKind(input.kind),
 		normalizeRemoteConnectorInstanceId(input.instanceId),
 	])
 }
@@ -44,24 +40,20 @@ export function parseUserScopedConnectorRoutePath(
 		}
 	}
 	if (
-		parts.length >= 4 &&
+		parts.length >= 3 &&
 		parts[0]?.startsWith('@') &&
 		parts[0].length > 1 &&
 		parts[1] === 'connectors' &&
-		parts[2] &&
-		parts[3]
+		parts[2]
 	) {
 		const decodedUsername = decodeSegment(parts[0].slice(1))
-		const decodedKind = decodeSegment(parts[2])
-		const decodedInstanceId = decodeSegment(parts[3])
-		if (!decodedUsername || !decodedKind || !decodedInstanceId) return null
+		const decodedInstanceId = decodeSegment(parts[2])
+		if (!decodedUsername || !decodedInstanceId) return null
 		const username = decodedUsername.trim()
-		const kind = decodedKind.trim().toLowerCase()
 		const instanceId = normalizeRemoteConnectorInstanceId(decodedInstanceId)
-		if (!username || !kind || !isValidRemoteConnectorName(instanceId))
-			return null
-		const rest = parts.length > 4 ? `/${parts.slice(4).join('/')}` : ''
-		return { username, kind, instanceId, rest }
+		if (!username || !isValidRemoteConnectorName(instanceId)) return null
+		const rest = parts.length > 3 ? `/${parts.slice(3).join('/')}` : ''
+		return { username, instanceId, rest }
 	}
 	return null
 }
diff --git a/packages/worker/src/remote-connector/remote-connectors-shared.node.test.ts b/packages/worker/src/remote-connector/remote-connectors-shared.node.test.ts
index 70e630809e..9934ed1acf 100644
--- a/packages/worker/src/remote-connector/remote-connectors-shared.node.test.ts
+++ b/packages/worker/src/remote-connector/remote-connectors-shared.node.test.ts
@@ -4,31 +4,20 @@ import {
 	userScopedConnectorWebSocketUrl,
 } from '@kody-internal/shared/remote-connectors.ts'
 
-test('normalizeRemoteConnectorRefs normalizes connector lists and userScopedConnectorWebSocketUrl builds scoped URLs', () => {
+test('normalizeRemoteConnectorRefs trims and lowercases instance ids', () => {
 	expect(
 		normalizeRemoteConnectorRefs({
-			remoteConnectors: undefined,
+			remoteConnectors: [{ instanceId: '  Home  ' }, { instanceId: 'x' }],
 		}),
-	).toEqual([])
-
-	expect(
-		normalizeRemoteConnectorRefs({
-			remoteConnectors: [
-				{ kind: 'Lights', instanceId: '  a  ' },
-				{ kind: 'custom', instanceId: 'x' },
-			],
-		}),
-	).toEqual([
-		{ kind: 'lights', instanceId: 'a' },
-		{ kind: 'custom', instanceId: 'x' },
-	])
+	).toEqual([{ instanceId: 'home' }, { instanceId: 'x' }])
+})
 
+test('userScopedConnectorWebSocketUrl builds user-scoped connector URLs', () => {
 	expect(
 		userScopedConnectorWebSocketUrl({
-			origin: 'wss://kody.example.com/',
+			origin: 'wss://kody.example.com',
 			username: 'user-aaa',
-			kind: 'Lights',
 			instanceId: 'living room',
 		}),
-	).toBe('wss://kody.example.com/@user-aaa/connectors/lights/living%20room')
+	).toBe('wss://kody.example.com/@user-aaa/connectors/living%20room')
 })
diff --git a/packages/worker/src/remote-connector/remote-domain-id.node.test.ts b/packages/worker/src/remote-connector/remote-domain-id.node.test.ts
index 90445cfe29..648e5774ca 100644
--- a/packages/worker/src/remote-connector/remote-domain-id.node.test.ts
+++ b/packages/worker/src/remote-connector/remote-domain-id.node.test.ts
@@ -7,7 +7,7 @@ import {
 } from './remote-domain-id.ts'
 
 test('remote connector ids keep clean names readable', () => {
-	const ref = { kind: 'home', instanceId: 'home' }
+	const ref = { instanceId: 'home' }
 
 	expect(remoteConnectorDomainId(ref)).toBe('remote:home')
 	expect(remoteConnectorKodyName(ref)).toBe('home')
@@ -18,8 +18,8 @@ test('remote connector ids keep clean names readable', () => {
 })
 
 test('remote connector ids disambiguate names that sanitize to the same slug', () => {
-	const spacedRef = { kind: 'home', instanceId: 'living room' }
-	const underscoredRef = { kind: 'home', instanceId: 'living_room' }
+	const spacedRef = { instanceId: 'living room' }
+	const underscoredRef = { instanceId: 'living_room' }
 	const spacedTool = remoteConnectorToolName('set pin')
 	const underscoredTool = remoteConnectorToolName('set_pin')
 
diff --git a/packages/worker/src/remote-connector/resolve-remote-connector-secret.node.test.ts b/packages/worker/src/remote-connector/resolve-remote-connector-secret.node.test.ts
index e82752962a..724f69c9a1 100644
--- a/packages/worker/src/remote-connector/resolve-remote-connector-secret.node.test.ts
+++ b/packages/worker/src/remote-connector/resolve-remote-connector-secret.node.test.ts
@@ -29,7 +29,6 @@ test('remote connector shared secrets are not read from environment variables',
 		resolveRemoteConnectorSharedSecret({
 			env,
 			userId: 'user-aaa',
-			kind: 'custom',
 			instanceId: 'alpha',
 		}),
 	).resolves.toBeUndefined()
@@ -37,7 +36,6 @@ test('remote connector shared secrets are not read from environment variables',
 		remoteConnectorSharedSecretMatches({
 			env,
 			userId: 'user-aaa',
-			kind: 'custom',
 			instanceId: 'alpha',
 			sharedSecret: 'alpha-secret',
 		}),
@@ -46,7 +44,6 @@ test('remote connector shared secrets are not read from environment variables',
 		hasRemoteConnectorSharedSecret({
 			env,
 			userId: 'user-aaa',
-			kind: 'lights',
 			instanceId: 'home',
 		}),
 	).resolves.toBe(false)
diff --git a/packages/worker/src/remote-connector/resolve-remote-connector-secret.ts b/packages/worker/src/remote-connector/resolve-remote-connector-secret.ts
index e64be681d5..6c95328073 100644
--- a/packages/worker/src/remote-connector/resolve-remote-connector-secret.ts
+++ b/packages/worker/src/remote-connector/resolve-remote-connector-secret.ts
@@ -1,7 +1,4 @@
-import {
-	normalizeRemoteConnectorInstanceId,
-	normalizeRemoteConnectorKind,
-} from '@kody-internal/shared/remote-connectors.ts'
+import { normalizeRemoteConnectorInstanceId } from '@kody-internal/shared/remote-connectors.ts'
 import {
 	hasRemoteConnectorSharedSecretForRef,
 	listRemoteConnectorSharedSecretsForRef,
@@ -43,7 +40,6 @@ function timingSafeStringEquals(left: string, right: string) {
 
 async function listStoredSharedSecrets(input: {
 	userId: string
-	kind: string
 	instanceId: string
 	env: Env
 }) {
@@ -51,13 +47,12 @@ async function listStoredSharedSecrets(input: {
 		return await listRemoteConnectorSharedSecretsForRef({
 			env: input.env,
 			userId: input.userId,
-			kind: input.kind,
 			instanceId: input.instanceId,
 		})
 	} catch (error) {
 		const detail = error instanceof Error ? error.message : String(error)
 		console.error(
-			`[remote-connectors] failed to read persisted shared secrets for ${input.userId} ${normalizeRemoteConnectorKind(input.kind)}:${normalizeRemoteConnectorInstanceId(input.instanceId)}: ${detail}`,
+			`[remote-connectors] failed to read persisted shared secrets for ${input.userId} ${normalizeRemoteConnectorInstanceId(input.instanceId)}: ${detail}`,
 		)
 		return []
 	}
@@ -65,7 +60,6 @@ async function listStoredSharedSecrets(input: {
 
 async function storedSharedSecretExists(input: {
 	userId: string
-	kind: string
 	instanceId: string
 	env: Env
 }) {
@@ -73,13 +67,12 @@ async function storedSharedSecretExists(input: {
 		return await hasRemoteConnectorSharedSecretForRef({
 			env: input.env,
 			userId: input.userId,
-			kind: input.kind,
 			instanceId: input.instanceId,
 		})
 	} catch (error) {
 		const detail = error instanceof Error ? error.message : String(error)
 		console.error(
-			`[remote-connectors] failed to check persisted shared secret for ${input.userId} ${normalizeRemoteConnectorKind(input.kind)}:${normalizeRemoteConnectorInstanceId(input.instanceId)}: ${detail}`,
+			`[remote-connectors] failed to check persisted shared secret for ${input.userId} ${normalizeRemoteConnectorInstanceId(input.instanceId)}: ${detail}`,
 		)
 		return false
 	}
@@ -87,7 +80,6 @@ async function storedSharedSecretExists(input: {
 
 export async function resolveRemoteConnectorSharedSecret(input: {
 	userId: string
-	kind: string
 	instanceId: string
 	env: Env
 }): Promise<string | undefined> {
@@ -97,7 +89,6 @@ export async function resolveRemoteConnectorSharedSecret(input: {
 
 export async function remoteConnectorSharedSecretMatches(input: {
 	userId: string
-	kind: string
 	instanceId: string
 	sharedSecret: string
 	env: Env
@@ -117,7 +108,6 @@ export async function remoteConnectorSharedSecretMatches(input: {
 
 export async function hasRemoteConnectorSharedSecret(input: {
 	userId: string
-	kind: string
 	instanceId: string
 	env: Env
 }): Promise<boolean> {
diff --git a/packages/worker/src/remote-connector/session.node.test.ts b/packages/worker/src/remote-connector/session.node.test.ts
index d4074225d3..98fbf18127 100644
--- a/packages/worker/src/remote-connector/session.node.test.ts
+++ b/packages/worker/src/remote-connector/session.node.test.ts
@@ -27,7 +27,6 @@ const { RemoteConnectorSession } = await import('./session.ts')
 type StoredRemoteConnectorSessionState = {
 	persisted: {
 		connectorId: string | null
-		connectorKind: string | null
 		description?: string | null
 		connectedAt: string | null
 		lastSeenAt: string | null
@@ -100,7 +99,6 @@ test('remote connector session lifecycle across restore, snapshot, heartbeat, cl
 		storedState: {
 			persisted: {
 				connectorId: 'home',
-				connectorKind: 'lights',
 				description: 'Local lighting automation.',
 				connectedAt: '2026-04-26T05:00:00.000Z',
 				lastSeenAt: '2026-04-26T05:01:00.000Z',
@@ -120,13 +118,11 @@ test('remote connector session lifecycle across restore, snapshot, heartbeat, cl
 	await expect(
 		restored.session.rpcExportUserSession({
 			userId: 'user-123',
-			kind: 'lights',
 			instanceId: 'home',
 		}),
 	).resolves.toEqual({
 		persisted: {
 			connectorId: 'home',
-			connectorKind: 'lights',
 			description: 'Local lighting automation.',
 			connectedAt: '2026-04-26T05:00:00.000Z',
 			lastSeenAt: '2026-04-26T05:01:00.000Z',
@@ -139,7 +135,6 @@ test('remote connector session lifecycle across restore, snapshot, heartbeat, cl
 		storedState: {
 			persisted: {
 				connectorId: 'home',
-				connectorKind: 'lights',
 				connectedAt: '2026-04-26T05:00:00.000Z',
 				lastSeenAt: '2026-04-26T05:01:00.000Z',
 			},
@@ -152,7 +147,6 @@ test('remote connector session lifecycle across restore, snapshot, heartbeat, cl
 		storedState: {
 			persisted: {
 				connectorId: 'home',
-				connectorKind: 'lights',
 				connectedAt: '2026-04-26T05:00:00.000Z',
 				lastSeenAt: '2026-04-26T05:01:00.000Z',
 			},
@@ -185,7 +179,6 @@ test('remote connector session lifecycle across restore, snapshot, heartbeat, cl
 		storedState: {
 			persisted: {
 				connectorId: 'home',
-				connectorKind: 'lights',
 				connectedAt: '2026-04-26T05:00:00.000Z',
 				lastSeenAt: '2026-04-26T05:01:00.000Z',
 			},
@@ -214,7 +207,6 @@ test('remote connector session lifecycle across restore, snapshot, heartbeat, cl
 		storedState: {
 			persisted: {
 				connectorId: 'home',
-				connectorKind: 'lights',
 				connectedAt: '2026-04-26T05:00:00.000Z',
 				lastSeenAt: '2026-04-26T05:01:00.000Z',
 			},
@@ -246,7 +238,6 @@ test('remote connector session lifecycle across restore, snapshot, heartbeat, cl
 		storedState: {
 			persisted: {
 				connectorId: 'home',
-				connectorKind: 'lights',
 				connectedAt: '2026-04-26T05:00:00.000Z',
 				lastSeenAt: '2026-04-26T05:01:00.000Z',
 			},
@@ -280,7 +271,6 @@ test('remote connector session lifecycle across restore, snapshot, heartbeat, cl
 		storedState: {
 			persisted: {
 				connectorId: 'home',
-				connectorKind: 'lights',
 				connectedAt: '2026-04-26T05:00:00.000Z',
 				lastSeenAt: '2026-04-26T05:01:00.000Z',
 			},
diff --git a/packages/worker/src/remote-connector/session.ts b/packages/worker/src/remote-connector/session.ts
index cdee6ddf0b..011f0b9f47 100644
--- a/packages/worker/src/remote-connector/session.ts
+++ b/packages/worker/src/remote-connector/session.ts
@@ -1,6 +1,7 @@
 import * as Sentry from '@sentry/cloudflare'
 import { DurableObject } from 'cloudflare:workers'
 import { type JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js'
+import { normalizeRemoteConnectorInstanceId } from '@kody-internal/shared/remote-connectors.ts'
 import { buildSentryOptions } from '#worker/sentry-options.ts'
 import {
 	type RemoteConnectorHelloMessage,
@@ -50,7 +51,6 @@ class RemoteConnectorSessionBase extends DurableObject<Env> {
 	private stateSnapshot: RemoteConnectorSessionState = {
 		persisted: {
 			connectorId: null,
-			connectorKind: null,
 			description: null,
 			connectedAt: null,
 			lastSeenAt: null,
@@ -219,15 +219,14 @@ class RemoteConnectorSessionBase extends DurableObject<Env> {
 	}
 
 	async getSnapshot(): Promise<RemoteConnectorSnapshot | null> {
-		const { connectorId, connectorKind, description, connectedAt, lastSeenAt } =
+		const { connectorId, description, connectedAt, lastSeenAt } =
 			this.stateSnapshot.persisted
 		if (!connectorId || !connectedAt || !lastSeenAt) return null
 		if (this.ctx.getWebSockets(connectorTag).length === 0) {
 			return null
 		}
-		const kind = (connectorKind && connectorKind.trim()) || 'unknown'
 		return {
-			connectorKind: kind,
+			connectorKind: connectorId,
 			connectorId,
 			...(description ? { description } : {}),
 			connectedAt,
@@ -238,7 +237,6 @@ class RemoteConnectorSessionBase extends DurableObject<Env> {
 
 	async rpcExportUserSession(input: {
 		userId: string
-		kind: string
 		instanceId: string
 	}): Promise<RemoteConnectorSessionExport> {
 		const sessionKey = userScopedConnectorSessionKey(input)
@@ -252,11 +250,7 @@ class RemoteConnectorSessionBase extends DurableObject<Env> {
 		}
 	}
 
-	async rpcPurgeUserSession(input: {
-		userId: string
-		kind: string
-		instanceId: string
-	}) {
+	async rpcPurgeUserSession(input: { userId: string; instanceId: string }) {
 		const sessionKey = userScopedConnectorSessionKey(input)
 		if (!sessionKey) {
 			throw new Error('Remote connector session key was invalid.')
@@ -280,9 +274,6 @@ class RemoteConnectorSessionBase extends DurableObject<Env> {
 		const stored =
 			await this.ctx.storage.get<RemoteConnectorSessionState>(stateStorageKey)
 		if (!stored) return
-		if (stored.persisted.connectorKind === undefined) {
-			stored.persisted.connectorKind = null
-		}
 		if (stored.persisted.description === undefined) {
 			stored.persisted.description = null
 		}
@@ -386,8 +377,9 @@ class RemoteConnectorSessionBase extends DurableObject<Env> {
 		ws: WebSocket,
 		message: RemoteConnectorHelloMessage,
 	) {
-		const declaredKind = message.connectorKind.trim().toLowerCase()
-		const canonicalInstanceId = message.connectorId.trim()
+		const canonicalInstanceId = normalizeRemoteConnectorInstanceId(
+			message.connectorId,
+		)
 		const ingressUserId = this.loadIngressUserId(ws)
 		if (!ingressUserId) {
 			this.captureSessionMessage(
@@ -396,7 +388,6 @@ class RemoteConnectorSessionBase extends DurableObject<Env> {
 					level: 'error',
 					extra: {
 						connectorId: canonicalInstanceId,
-						declaredKind,
 					},
 				},
 			)
@@ -404,7 +395,7 @@ class RemoteConnectorSessionBase extends DurableObject<Env> {
 				stringifyRemoteConnectorMessage({
 					type: 'server.error',
 					message:
-						'Connector ingress is missing the owning user id. Reconfigure the connector to use the /@{username}/connectors/{kind}/{instanceId} URL.',
+						'Connector ingress is missing the owning user id. Reconfigure the connector to use the /@{username}/connectors/{instanceId} URL.',
 				}),
 			)
 			ws.close(4002, 'missing-user')
@@ -412,7 +403,6 @@ class RemoteConnectorSessionBase extends DurableObject<Env> {
 		}
 		const expectedSessionKey = userScopedConnectorSessionKey({
 			userId: ingressUserId,
-			kind: declaredKind,
 			instanceId: canonicalInstanceId,
 		})
 		const ingressSessionKey = this.loadIngressSessionKey(ws)
@@ -423,7 +413,6 @@ class RemoteConnectorSessionBase extends DurableObject<Env> {
 					level: 'error',
 					extra: {
 						connectorId: canonicalInstanceId,
-						declaredKind,
 						ingressSessionKeySummary: summarizeSessionKey(ingressSessionKey),
 						expectedSessionKeySummary: summarizeSessionKey(expectedSessionKey),
 						sessionKeyMatch: false,
@@ -442,7 +431,6 @@ class RemoteConnectorSessionBase extends DurableObject<Env> {
 
 		const secretMatches = await remoteConnectorSharedSecretMatches({
 			userId: ingressUserId,
-			kind: declaredKind,
 			instanceId: canonicalInstanceId,
 			sharedSecret: message.sharedSecret,
 			env: this.env,
@@ -450,7 +438,6 @@ class RemoteConnectorSessionBase extends DurableObject<Env> {
 		if (!secretMatches) {
 			const hasExpectedSecret = await hasRemoteConnectorSharedSecret({
 				userId: ingressUserId,
-				kind: declaredKind,
 				instanceId: canonicalInstanceId,
 				env: this.env,
 			})
@@ -460,7 +447,6 @@ class RemoteConnectorSessionBase extends DurableObject<Env> {
 					level: 'error',
 					extra: {
 						connectorId: canonicalInstanceId,
-						declaredKind,
 						hasExpectedSecret,
 					},
 				},
@@ -478,7 +464,6 @@ class RemoteConnectorSessionBase extends DurableObject<Env> {
 		const now = new Date().toISOString()
 		this.stateSnapshot.persisted = {
 			connectorId: canonicalInstanceId,
-			connectorKind: declaredKind,
 			description: message.description?.trim() || null,
 			connectedAt: this.stateSnapshot.persisted.connectedAt ?? now,
 			lastSeenAt: now,
diff --git a/packages/worker/src/remote-connector/settings-repo.ts b/packages/worker/src/remote-connector/settings-repo.ts
index 3d14a05e80..ff9389f1a8 100644
--- a/packages/worker/src/remote-connector/settings-repo.ts
+++ b/packages/worker/src/remote-connector/settings-repo.ts
@@ -6,10 +6,10 @@ export async function listRemoteConnectorSettingRows(input: {
 }): Promise<Array<RemoteConnectorSettingRow>> {
 	const { results } = await input.db
 		.prepare(
-			`SELECT id, user_id, kind, instance_id, enabled, attached, encrypted_shared_secret, created_at, updated_at
+			`SELECT id, user_id, instance_id, enabled, attached, encrypted_shared_secret, created_at, updated_at
 			FROM remote_connector_settings
 			WHERE user_id = ?
-			ORDER BY kind ASC, instance_id ASC`,
+			ORDER BY instance_id ASC`,
 		)
 		.bind(input.userId)
 		.all<Record<string, unknown>>()
@@ -22,10 +22,10 @@ export async function listAttachedRemoteConnectorSettingRows(input: {
 }): Promise<Array<RemoteConnectorSettingRow>> {
 	const { results } = await input.db
 		.prepare(
-			`SELECT id, user_id, kind, instance_id, enabled, attached, encrypted_shared_secret, created_at, updated_at
+			`SELECT id, user_id, instance_id, enabled, attached, encrypted_shared_secret, created_at, updated_at
 			FROM remote_connector_settings
 			WHERE user_id = ? AND enabled = 1 AND attached = 1
-			ORDER BY kind ASC, instance_id ASC`,
+			ORDER BY instance_id ASC`,
 		)
 		.bind(input.userId)
 		.all<Record<string, unknown>>()
@@ -35,18 +35,17 @@ export async function listAttachedRemoteConnectorSettingRows(input: {
 export async function listRemoteConnectorSharedSecretRows(input: {
 	db: D1Database
 	userId: string
-	kind: string
 	instanceId: string
 }): Promise<Array<RemoteConnectorSettingRow>> {
 	const { results } = await input.db
 		.prepare(
-			`SELECT id, user_id, kind, instance_id, enabled, attached, encrypted_shared_secret, created_at, updated_at
+			`SELECT id, user_id, instance_id, enabled, attached, encrypted_shared_secret, created_at, updated_at
 			FROM remote_connector_settings
-			WHERE user_id = ? AND kind = ? AND instance_id = ? AND enabled = 1
+			WHERE user_id = ? AND instance_id = ? AND enabled = 1
 				AND encrypted_shared_secret IS NOT NULL
 			ORDER BY updated_at DESC`,
 		)
-		.bind(input.userId, input.kind, input.instanceId)
+		.bind(input.userId, input.instanceId)
 		.all<Record<string, unknown>>()
 	return (results ?? []).map(mapRemoteConnectorSettingRow)
 }
@@ -58,7 +57,7 @@ export async function getRemoteConnectorSettingRowById(input: {
 }): Promise<RemoteConnectorSettingRow | null> {
 	const row = await input.db
 		.prepare(
-			`SELECT id, user_id, kind, instance_id, enabled, attached, encrypted_shared_secret, created_at, updated_at
+			`SELECT id, user_id, instance_id, enabled, attached, encrypted_shared_secret, created_at, updated_at
 			FROM remote_connector_settings
 			WHERE user_id = ? AND id = ?
 			LIMIT 1`,
@@ -68,20 +67,19 @@ export async function getRemoteConnectorSettingRowById(input: {
 	return row ? mapRemoteConnectorSettingRow(row) : null
 }
 
-export async function getRemoteConnectorSettingRowByRef(input: {
+export async function getRemoteConnectorSettingRowByInstanceId(input: {
 	db: D1Database
 	userId: string
-	kind: string
 	instanceId: string
 }): Promise<RemoteConnectorSettingRow | null> {
 	const row = await input.db
 		.prepare(
-			`SELECT id, user_id, kind, instance_id, enabled, attached, encrypted_shared_secret, created_at, updated_at
+			`SELECT id, user_id, instance_id, enabled, attached, encrypted_shared_secret, created_at, updated_at
 			FROM remote_connector_settings
-			WHERE user_id = ? AND kind = ? AND instance_id = ?
+			WHERE user_id = ? AND instance_id = ?
 			LIMIT 1`,
 		)
-		.bind(input.userId, input.kind, input.instanceId)
+		.bind(input.userId, input.instanceId)
 		.first<Record<string, unknown>>()
 	return row ? mapRemoteConnectorSettingRow(row) : null
 }
@@ -97,9 +95,9 @@ export async function upsertRemoteConnectorSettingRow(input: {
 	await input.db
 		.prepare(
 			`INSERT INTO remote_connector_settings (
-				id, user_id, kind, instance_id, enabled, attached, encrypted_shared_secret, created_at, updated_at
-			) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-			ON CONFLICT(user_id, kind, instance_id)
+				id, user_id, instance_id, enabled, attached, encrypted_shared_secret, created_at, updated_at
+			) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+			ON CONFLICT(user_id, instance_id)
 			DO UPDATE SET
 				enabled = excluded.enabled,
 				attached = excluded.attached,
@@ -109,7 +107,6 @@ export async function upsertRemoteConnectorSettingRow(input: {
 		.bind(
 			input.row.id,
 			input.row.user_id,
-			input.row.kind,
 			input.row.instance_id,
 			input.row.enabled ? 1 : 0,
 			input.row.attached ? 1 : 0,
@@ -130,8 +127,7 @@ export async function updateRemoteConnectorSettingRow(input: {
 	const result = await input.db
 		.prepare(
 			`UPDATE remote_connector_settings
-			SET kind = ?,
-				instance_id = ?,
+			SET instance_id = ?,
 				enabled = ?,
 				attached = ?,
 				encrypted_shared_secret = ?,
@@ -139,7 +135,6 @@ export async function updateRemoteConnectorSettingRow(input: {
 			WHERE user_id = ? AND id = ?`,
 		)
 		.bind(
-			input.row.kind,
 			input.row.instance_id,
 			input.row.enabled ? 1 : 0,
 			input.row.attached ? 1 : 0,
@@ -172,7 +167,6 @@ function mapRemoteConnectorSettingRow(
 	return {
 		id: String(row['id']),
 		user_id: String(row['user_id']),
-		kind: String(row['kind']),
 		instance_id: String(row['instance_id']),
 		enabled: Boolean(Number(row['enabled'])),
 		attached: Boolean(Number(row['attached'])),
diff --git a/packages/worker/src/remote-connector/settings-service.node.test.ts b/packages/worker/src/remote-connector/settings-service.node.test.ts
index 563682b4b1..30ce7d1c16 100644
--- a/packages/worker/src/remote-connector/settings-service.node.test.ts
+++ b/packages/worker/src/remote-connector/settings-service.node.test.ts
@@ -34,15 +34,14 @@ function createRemoteConnectorSettingsTestDb() {
 							if (
 								normalizedQuery.includes('from remote_connector_settings') &&
 								normalizedQuery.includes(
-									'where user_id = ? and kind = ? and instance_id = ?',
+									'where user_id = ? and instance_id = ?',
 								)
 							) {
-								const [userId, kind, instanceId] = params as Array<string>
+								const [userId, instanceId] = params as Array<string>
 								const row =
 									Array.from(rows.values()).find(
 										(candidate) =>
 											candidate.user_id === userId &&
-											candidate.kind === kind &&
 											candidate.instance_id === instanceId,
 									) ?? null
 								return row ? (clone(row) as T) : null
@@ -60,10 +59,8 @@ function createRemoteConnectorSettingsTestDb() {
 										(row) =>
 											row.user_id === userId && row.enabled && row.attached,
 									)
-									.sort(
-										(left, right) =>
-											left.kind.localeCompare(right.kind) ||
-											left.instance_id.localeCompare(right.instance_id),
+									.sort((left, right) =>
+										left.instance_id.localeCompare(right.instance_id),
 									)
 									.map(clone)
 								return { results: results as Array<T>, meta: { changes: 0 } }
@@ -71,15 +68,14 @@ function createRemoteConnectorSettingsTestDb() {
 							if (
 								normalizedQuery.includes('from remote_connector_settings') &&
 								normalizedQuery.includes(
-									'where user_id = ? and kind = ? and instance_id = ? and enabled = 1',
+									'where user_id = ? and instance_id = ? and enabled = 1',
 								)
 							) {
-								const [userId, kind, instanceId] = params as Array<string>
+								const [userId, instanceId] = params as Array<string>
 								const results = Array.from(rows.values())
 									.filter(
 										(row) =>
 											row.user_id === userId &&
-											row.kind === kind &&
 											row.instance_id === instanceId &&
 											row.enabled &&
 											row.encrypted_shared_secret,
@@ -97,10 +93,8 @@ function createRemoteConnectorSettingsTestDb() {
 								const [userId] = params as Array<string>
 								const results = Array.from(rows.values())
 									.filter((row) => row.user_id === userId)
-									.sort(
-										(left, right) =>
-											left.kind.localeCompare(right.kind) ||
-											left.instance_id.localeCompare(right.instance_id),
+									.sort((left, right) =>
+										left.instance_id.localeCompare(right.instance_id),
 									)
 									.map(clone)
 								return { results: results as Array<T>, meta: { changes: 0 } }
@@ -116,7 +110,6 @@ function createRemoteConnectorSettingsTestDb() {
 								const [
 									id,
 									userId,
-									kind,
 									instanceId,
 									enabled,
 									attached,
@@ -127,14 +120,11 @@ function createRemoteConnectorSettingsTestDb() {
 								const existing =
 									Array.from(rows.values()).find(
 										(row) =>
-											row.user_id === userId &&
-											row.kind === kind &&
-											row.instance_id === instanceId,
+											row.user_id === userId && row.instance_id === instanceId,
 									) ?? null
 								rows.set(existing?.id ?? String(id), {
 									id: existing?.id ?? String(id),
 									user_id: String(userId),
-									kind: String(kind),
 									instance_id: String(instanceId),
 									enabled: Boolean(Number(enabled)),
 									attached: Boolean(Number(attached)),
@@ -166,7 +156,6 @@ function createRemoteConnectorSettingsTestDb() {
 								)
 							) {
 								const [
-									kind,
 									instanceId,
 									enabled,
 									attached,
@@ -181,7 +170,6 @@ function createRemoteConnectorSettingsTestDb() {
 								}
 								rows.set(String(id), {
 									...existing,
-									kind: String(kind),
 									instance_id: String(instanceId),
 									enabled: Boolean(Number(enabled)),
 									attached: Boolean(Number(attached)),
@@ -216,7 +204,6 @@ test('remote connector settings are generic and do not echo plaintext secrets',
 	const saved = await saveRemoteConnectorSetting({
 		env,
 		userId: 'user-1',
-		kind: ' Lights ',
 		instanceId: ' home ',
 		enabled: true,
 		attached: true,
@@ -224,7 +211,6 @@ test('remote connector settings are generic and do not echo plaintext secrets',
 	})
 
 	expect(saved).toMatchObject({
-		kind: 'lights',
 		instanceId: 'home',
 		enabled: true,
 		attached: true,
@@ -253,12 +239,11 @@ test('remote connector settings are generic and do not echo plaintext secrets',
 	])
 	await expect(
 		listAttachedRemoteConnectorRefs({ env, userId: 'user-1' }),
-	).resolves.toEqual([{ kind: 'lights', instanceId: 'home' }])
+	).resolves.toEqual([{ instanceId: 'home' }])
 	await expect(
 		remoteConnectorSharedSecretMatches({
 			env,
 			userId: 'user-1',
-			kind: 'lights',
 			instanceId: 'home',
 			sharedSecret: 'lights-secret',
 		}),
@@ -267,7 +252,6 @@ test('remote connector settings are generic and do not echo plaintext secrets',
 		remoteConnectorSharedSecretMatches({
 			env,
 			userId: 'user-1',
-			kind: 'lights',
 			instanceId: 'home',
 			sharedSecret: 'wrong-secret',
 		}),
@@ -277,7 +261,6 @@ test('remote connector settings are generic and do not echo plaintext secrets',
 		env,
 		userId: 'user-1',
 		id: saved.id,
-		kind: 'lights',
 		instanceId: 'home',
 		enabled: true,
 		attached: false,
@@ -291,7 +274,6 @@ test('remote connector settings are generic and do not echo plaintext secrets',
 		remoteConnectorSharedSecretMatches({
 			env,
 			userId: 'user-1',
-			kind: 'lights',
 			instanceId: 'home',
 			sharedSecret: 'lights-secret',
 		}),
@@ -310,7 +292,6 @@ test('renames an existing remote connector setting by id', async () => {
 	const saved = await saveRemoteConnectorSetting({
 		env,
 		userId: 'user-1',
-		kind: 'lights',
 		instanceId: 'home',
 		enabled: true,
 		attached: true,
@@ -321,7 +302,6 @@ test('renames an existing remote connector setting by id', async () => {
 		env,
 		userId: 'user-1',
 		id: saved.id,
-		kind: 'roku',
 		instanceId: 'living-room',
 		enabled: true,
 		attached: true,
@@ -330,18 +310,16 @@ test('renames an existing remote connector setting by id', async () => {
 
 	expect(renamed).toMatchObject({
 		id: saved.id,
-		kind: 'roku',
 		instanceId: 'living-room',
 		hasSharedSecret: true,
 	})
 	await expect(
 		listAttachedRemoteConnectorRefs({ env, userId: 'user-1' }),
-	).resolves.toEqual([{ kind: 'roku', instanceId: 'living-room' }])
+	).resolves.toEqual([{ instanceId: 'living-room' }])
 	await expect(
 		remoteConnectorSharedSecretMatches({
 			env,
 			userId: 'user-1',
-			kind: 'roku',
 			instanceId: 'living-room',
 			sharedSecret: 'lights-secret',
 		}),
@@ -353,7 +331,6 @@ test('disabled connector settings do not authenticate connector hello', async ()
 	await saveRemoteConnectorSetting({
 		env,
 		userId: 'user-1',
-		kind: 'roku',
 		instanceId: 'living-room',
 		enabled: false,
 		attached: true,
@@ -367,7 +344,6 @@ test('disabled connector settings do not authenticate connector hello', async ()
 		remoteConnectorSharedSecretMatches({
 			env,
 			userId: 'user-1',
-			kind: 'roku',
 			instanceId: 'living-room',
 			sharedSecret: 'roku-secret',
 		}),
@@ -380,7 +356,6 @@ test('connector names are explicit, formatted, and globally unique per user', as
 		saveRemoteConnectorSetting({
 			env,
 			userId: 'user-1',
-			kind: 'lights',
 			instanceId: '',
 			enabled: true,
 			attached: true,
@@ -391,7 +366,6 @@ test('connector names are explicit, formatted, and globally unique per user', as
 		saveRemoteConnectorSetting({
 			env,
 			userId: 'user-1',
-			kind: 'lights',
 			instanceId: 'Living Room',
 			enabled: true,
 			attached: true,
@@ -402,7 +376,6 @@ test('connector names are explicit, formatted, and globally unique per user', as
 	await saveRemoteConnectorSetting({
 		env,
 		userId: 'user-1',
-		kind: 'lights',
 		instanceId: 'home',
 		enabled: true,
 		attached: true,
@@ -412,7 +385,6 @@ test('connector names are explicit, formatted, and globally unique per user', as
 		saveRemoteConnectorSetting({
 			env,
 			userId: 'user-1',
-			kind: 'roku',
 			instanceId: 'home',
 			enabled: true,
 			attached: true,
@@ -426,7 +398,6 @@ test('connector hello secrets are scoped to the user_id of the ingress', async (
 	await saveRemoteConnectorSetting({
 		env,
 		userId: 'user-aaa',
-		kind: 'lights',
 		instanceId: 'home',
 		enabled: true,
 		attached: true,
@@ -435,20 +406,16 @@ test('connector hello secrets are scoped to the user_id of the ingress', async (
 	await saveRemoteConnectorSetting({
 		env,
 		userId: 'user-bbb',
-		kind: 'lights',
 		instanceId: 'home',
 		enabled: true,
 		attached: true,
 		sharedSecret: 'bbb-secret',
 	})
 
-	// Each user's secret only authenticates that user's connector even when
-	// (kind, instanceId) collide.
 	await expect(
 		remoteConnectorSharedSecretMatches({
 			env,
 			userId: 'user-aaa',
-			kind: 'lights',
 			instanceId: 'home',
 			sharedSecret: 'aaa-secret',
 		}),
@@ -457,7 +424,6 @@ test('connector hello secrets are scoped to the user_id of the ingress', async (
 		remoteConnectorSharedSecretMatches({
 			env,
 			userId: 'user-aaa',
-			kind: 'lights',
 			instanceId: 'home',
 			sharedSecret: 'bbb-secret',
 		}),
@@ -466,7 +432,6 @@ test('connector hello secrets are scoped to the user_id of the ingress', async (
 		remoteConnectorSharedSecretMatches({
 			env,
 			userId: 'user-bbb',
-			kind: 'lights',
 			instanceId: 'home',
 			sharedSecret: 'bbb-secret',
 		}),
@@ -475,7 +440,6 @@ test('connector hello secrets are scoped to the user_id of the ingress', async (
 		remoteConnectorSharedSecretMatches({
 			env,
 			userId: 'user-bbb',
-			kind: 'lights',
 			instanceId: 'home',
 			sharedSecret: 'aaa-secret',
 		}),
diff --git a/packages/worker/src/remote-connector/settings-service.ts b/packages/worker/src/remote-connector/settings-service.ts
index 417a279aef..dc1fb4ffb6 100644
--- a/packages/worker/src/remote-connector/settings-service.ts
+++ b/packages/worker/src/remote-connector/settings-service.ts
@@ -1,14 +1,12 @@
 import {
 	isValidRemoteConnectorName,
 	normalizeRemoteConnectorInstanceId,
-	normalizeRemoteConnectorKind,
 	type RemoteConnectorRef,
 } from '@kody-internal/shared/remote-connectors.ts'
 import { decryptSecretValue, encryptSecretValue } from '#mcp/secrets/crypto.ts'
 import {
 	deleteRemoteConnectorSettingRow,
 	getRemoteConnectorSettingRowById,
-	getRemoteConnectorSettingRowByRef,
 	listAttachedRemoteConnectorSettingRows,
 	listRemoteConnectorSettingRows,
 	listRemoteConnectorSharedSecretRows,
@@ -27,7 +25,6 @@ export type SaveRemoteConnectorSettingInput = {
 	env: RemoteConnectorSettingsEnv
 	userId: string
 	id?: string | null
-	kind: string
 	instanceId: string
 	enabled: boolean
 	attached: boolean
@@ -39,7 +36,6 @@ function toMetadata(
 ): RemoteConnectorSettingMetadata {
 	return {
 		id: row.id,
-		kind: row.kind,
 		instanceId: row.instance_id,
 		enabled: row.enabled,
 		attached: row.attached,
@@ -87,7 +83,6 @@ export async function listAttachedRemoteConnectorRefs(input: {
 		userId: input.userId,
 	})
 	return rows.map((row) => ({
-		kind: row.kind,
 		instanceId: row.instance_id,
 	}))
 }
@@ -95,11 +90,7 @@ export async function listAttachedRemoteConnectorRefs(input: {
 export async function saveRemoteConnectorSetting(
 	input: SaveRemoteConnectorSettingInput,
 ): Promise<RemoteConnectorSettingMetadata> {
-	const kind = normalizeRemoteConnectorKind(input.kind)
 	const instanceId = normalizeRemoteConnectorInstanceId(input.instanceId)
-	if (!kind) {
-		throw new Error('Connector kind is required.')
-	}
 	if (!instanceId) {
 		throw new Error('Connector name is required.')
 	}
@@ -125,30 +116,11 @@ export async function saveRemoteConnectorSetting(
 				userId: input.userId,
 				id: input.id,
 			})
-		: await getRemoteConnectorSettingRowByRef({
-				db: input.env.APP_DB,
-				userId: input.userId,
-				kind,
-				instanceId,
-			})
+		: null
 	if (input.id && !existing) {
 		throw new Error('Remote connector setting not found.')
 	}
 
-	if (input.id) {
-		const refConflict = await getRemoteConnectorSettingRowByRef({
-			db: input.env.APP_DB,
-			userId: input.userId,
-			kind,
-			instanceId,
-		})
-		if (refConflict && refConflict.id !== existing?.id) {
-			throw new Error(
-				'A remote connector with this kind and name already exists.',
-			)
-		}
-	}
-
 	const sharedSecret = input.sharedSecret?.trim() ?? ''
 	const encryptedSharedSecret = sharedSecret
 		? await encryptSecretValue(input.env, sharedSecret)
@@ -161,7 +133,6 @@ export async function saveRemoteConnectorSetting(
 	const row = {
 		id: existing?.id ?? crypto.randomUUID(),
 		user_id: input.userId,
-		kind,
 		instance_id: instanceId,
 		enabled: input.enabled,
 		attached: input.attached,
@@ -202,17 +173,14 @@ export async function deleteRemoteConnectorSetting(input: {
 export async function listRemoteConnectorSharedSecretsForRef(input: {
 	env: RemoteConnectorSettingsEnv
 	userId: string
-	kind: string
 	instanceId: string
 }): Promise<Array<string>> {
-	const kind = normalizeRemoteConnectorKind(input.kind)
 	const instanceId = normalizeRemoteConnectorInstanceId(input.instanceId)
-	if (!kind || !instanceId) return []
+	if (!instanceId) return []
 
 	const rows = await listRemoteConnectorSharedSecretRows({
 		db: input.env.APP_DB,
 		userId: input.userId,
-		kind,
 		instanceId,
 	})
 	const secrets: Array<string> = []
@@ -228,17 +196,14 @@ export async function listRemoteConnectorSharedSecretsForRef(input: {
 export async function hasRemoteConnectorSharedSecretForRef(input: {
 	env: Pick<Env, 'APP_DB'>
 	userId: string
-	kind: string
 	instanceId: string
 }) {
-	const kind = normalizeRemoteConnectorKind(input.kind)
 	const instanceId = normalizeRemoteConnectorInstanceId(input.instanceId)
-	if (!kind || !instanceId) return false
+	if (!instanceId) return false
 
 	const rows = await listRemoteConnectorSharedSecretRows({
 		db: input.env.APP_DB,
 		userId: input.userId,
-		kind,
 		instanceId,
 	})
 	return rows.length > 0
diff --git a/packages/worker/src/remote-connector/settings-types.ts b/packages/worker/src/remote-connector/settings-types.ts
index 28582c1041..cf3336adfa 100644
--- a/packages/worker/src/remote-connector/settings-types.ts
+++ b/packages/worker/src/remote-connector/settings-types.ts
@@ -1,7 +1,6 @@
 export type RemoteConnectorSettingRow = {
 	id: string
 	user_id: string
-	kind: string
 	instance_id: string
 	enabled: boolean
 	attached: boolean
@@ -12,7 +11,6 @@ export type RemoteConnectorSettingRow = {
 
 export type RemoteConnectorSettingMetadata = {
 	id: string
-	kind: string
 	instanceId: string
 	enabled: boolean
 	attached: boolean
diff --git a/packages/worker/src/remote-connector/snapshot-cache.node.test.ts b/packages/worker/src/remote-connector/snapshot-cache.node.test.ts
index 3f43d4a0ad..e59632360f 100644
--- a/packages/worker/src/remote-connector/snapshot-cache.node.test.ts
+++ b/packages/worker/src/remote-connector/snapshot-cache.node.test.ts
@@ -63,7 +63,6 @@ test('getCachedRemoteConnectorSnapshot reuses DO snapshots within TTL', async ()
 	const request = {
 		env,
 		userId: 'user-1',
-		kind: 'roku',
 		instanceId: 'home',
 	}
 
@@ -91,7 +90,6 @@ test('getCachedRemoteConnectorSnapshot does not retain disconnected snapshots',
 	const request = {
 		env,
 		userId: 'user-1',
-		kind: 'roku',
 		instanceId: 'home',
 	}
 
@@ -120,7 +118,6 @@ test('a failed connector RPC evicts the cached snapshot', async () => {
 	const request = {
 		env,
 		userId: 'user-1',
-		kind: 'roku',
 		instanceId: 'home',
 	}
 	const client = createRemoteConnectorMcpClient(request)
@@ -149,7 +146,6 @@ test('getCachedRemoteConnectorSnapshot does not share entries across users', asy
 	}))
 	const connector = {
 		env,
-		kind: 'roku',
 		instanceId: 'home',
 	}
 
diff --git a/packages/worker/src/remote-connector/snapshot-cache.ts b/packages/worker/src/remote-connector/snapshot-cache.ts
index 6e27197fe0..8f41415be3 100644
--- a/packages/worker/src/remote-connector/snapshot-cache.ts
+++ b/packages/worker/src/remote-connector/snapshot-cache.ts
@@ -16,7 +16,6 @@ let remoteConnectorSnapshotCache = createRemoteConnectorSnapshotCache()
 
 export function createRemoteConnectorSnapshotCacheKey(input: {
 	userId: string
-	kind: string
 	instanceId: string
 }) {
 	return userScopedConnectorSessionKey(input)
@@ -25,7 +24,6 @@ export function createRemoteConnectorSnapshotCacheKey(input: {
 export function getCachedRemoteConnectorSnapshot(input: {
 	env: Env
 	userId: string
-	kind: string
 	instanceId: string
 }): Promise<RemoteConnectorSnapshot | null> {
 	const cacheKey = createRemoteConnectorSnapshotCacheKey(input)
@@ -48,7 +46,6 @@ export function getCachedRemoteConnectorSnapshot(input: {
 
 export function invalidateRemoteConnectorSnapshotCache(input: {
 	userId: string
-	kind: string
 	instanceId: string
 }) {
 	remoteConnectorSnapshotCache.delete(
diff --git a/packages/worker/src/remote-connector/status.ts b/packages/worker/src/remote-connector/status.ts
index 8fabb40237..f858931b45 100644
--- a/packages/worker/src/remote-connector/status.ts
+++ b/packages/worker/src/remote-connector/status.ts
@@ -4,7 +4,6 @@ import { type RemoteConnectorSnapshot } from './types.ts'
 
 export type RemoteConnectorStatus = {
 	state: 'connected' | 'disconnected' | 'unavailable' | 'error'
-	connectorKind: string
 	connectorId: string | null
 	connected: boolean
 	connectedAt: string | null
@@ -14,22 +13,17 @@ export type RemoteConnectorStatus = {
 	error: string | null
 }
 
-function connectorLabel(kind: string, connectorId: string) {
-	const k = kind.trim().toLowerCase()
-	return `${k} connector "${connectorId}"`
+function connectorLabel(connectorId: string) {
+	return `connector "${connectorId}"`
 }
 
 function createConnectedStatus(
 	snapshot: RemoteConnectorSnapshot,
-	kind: string,
 ): RemoteConnectorStatus {
-	const resolvedKind =
-		(snapshot.connectorKind ?? kind).trim().toLowerCase() || 'unknown'
 	const toolCount = snapshot.tools.length
-	const label = connectorLabel(resolvedKind, snapshot.connectorId)
+	const label = connectorLabel(snapshot.connectorId)
 	return {
 		state: 'connected',
-		connectorKind: resolvedKind,
 		connectorId: snapshot.connectorId,
 		connected: true,
 		connectedAt: snapshot.connectedAt,
@@ -46,11 +40,9 @@ function createConnectedStatus(
 function createDisconnectedStatus(
 	ref: RemoteConnectorRef,
 ): RemoteConnectorStatus {
-	const k = ref.kind.trim().toLowerCase()
-	const label = connectorLabel(k, ref.instanceId)
+	const label = connectorLabel(ref.instanceId)
 	return {
 		state: 'disconnected',
-		connectorKind: k,
 		connectorId: ref.instanceId,
 		connected: false,
 		connectedAt: null,
@@ -66,11 +58,9 @@ function createErrorStatus(
 	error: unknown,
 ): RemoteConnectorStatus {
 	const message = error instanceof Error ? error.message : String(error)
-	const k = ref.kind.trim().toLowerCase()
-	const label = connectorLabel(k, ref.instanceId)
+	const label = connectorLabel(ref.instanceId)
 	return {
 		state: 'error',
-		connectorKind: k,
 		connectorId: ref.instanceId,
 		connected: false,
 		connectedAt: null,
@@ -116,14 +106,13 @@ export async function getRemoteConnectorStatus(input: {
 		const client = createRemoteConnectorMcpClient({
 			env: input.env,
 			userId: input.userId,
-			kind: input.ref.kind,
 			instanceId: input.ref.instanceId,
 		})
 		const snapshot = await client.getSnapshot()
 		if (!snapshot) {
 			return createDisconnectedStatus(input.ref)
 		}
-		return createConnectedStatus(snapshot, input.ref.kind)
+		return createConnectedStatus(snapshot)
 	} catch (error) {
 		return createErrorStatus(input.ref, error)
 	}
diff --git a/packages/worker/src/remote-connector/types.ts b/packages/worker/src/remote-connector/types.ts
index 1c62434603..9cbdb35dc2 100644
--- a/packages/worker/src/remote-connector/types.ts
+++ b/packages/worker/src/remote-connector/types.ts
@@ -46,7 +46,6 @@ export type RemoteConnectorClientMessage = KodyToConnectorMessage
 
 export type RemoteConnectorPersistedState = {
 	connectorId: string | null
-	connectorKind: string | null
 	description: string | null
 	connectedAt: string | null
 	lastSeenAt: string | null
diff --git a/packages/worker/src/security/public-route-hardening.workers.test.ts b/packages/worker/src/security/public-route-hardening.workers.test.ts
index 4a1d2cc345..8355bc1ec6 100644
--- a/packages/worker/src/security/public-route-hardening.workers.test.ts
+++ b/packages/worker/src/security/public-route-hardening.workers.test.ts
@@ -31,16 +31,16 @@ test('public route hardening rejects unauthenticated connector access, unknown p
 	).run()
 
 	const unauthorizedConnectorRequests = [
-		createRequest('/@connector-user/connectors/lights/home/snapshot'),
-		createRequest('/@connector-user/connectors/lights/home/rpc/tools-list', {
+		createRequest('/@connector-user/connectors/home/snapshot'),
+		createRequest('/@connector-user/connectors/home/rpc/tools-list', {
 			method: 'POST',
 		}),
-		createRequest('/@connector-user/connectors/lights/home/rpc/tools-call', {
+		createRequest('/@connector-user/connectors/home/rpc/tools-call', {
 			method: 'POST',
 			headers: { 'Content-Type': 'application/json' },
 			body: JSON.stringify({ name: 'test', arguments: {} }),
 		}),
-		createRequest('/@connector-user/connectors/lights/home/rpc/jsonrpc', {
+		createRequest('/@connector-user/connectors/home/rpc/jsonrpc', {
 			method: 'POST',
 			headers: { 'Content-Type': 'application/json' },
 			body: JSON.stringify({
@@ -48,24 +48,18 @@ test('public route hardening rejects unauthenticated connector access, unknown p
 			}),
 		}),
 		createRequest('/@connector-user/connectors'),
-		createRequest('/@connector-user/connectors/home', {
-			headers: { Upgrade: 'websocket' },
-		}),
 	]
 	for (const request of unauthorizedConnectorRequests) {
 		const response = await workerFetch(request)
 		expect(response.status).toBe(404)
-		if (request.url.endsWith('/connectors') || request.url.endsWith('/home')) {
+		if (request.url.endsWith('/connectors')) {
 			await expect(response.text()).resolves.toBe('Not Found')
 		}
 	}
 
-	const websocketRequest = createRequest(
-		'/@connector-user/connectors/lights/home',
-		{
-			headers: { Upgrade: 'websocket' },
-		},
-	)
+	const websocketRequest = createRequest('/@connector-user/connectors/home', {
+		headers: { Upgrade: 'websocket' },
+	})
 	const websocketResponse = await workerFetch(websocketRequest)
 	expect(websocketResponse.status).toBe(101)
 	expect(websocketResponse.webSocket).toBeTruthy()