diff --git a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
index 94298ca320a0..fe429813c76a 100644
--- a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
+++ b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts
@@ -661,10 +661,6 @@ export class AgentManagerProvider implements Disposable {
       void this.importer.branches()
       return null
     }
-    if (m.type === "agentManager.requestExternalWorktrees") {
-      void this.importer.external()
-      return null
-    }
     if (m.type === "agentManager.importFromBranch") {
       void this.importer.branch(m.branch)
       return null
@@ -673,14 +669,6 @@ export class AgentManagerProvider implements Disposable {
       void this.importer.pr(m.url)
       return null
     }
-    if (m.type === "agentManager.importExternalWorktree") {
-      void this.importer.path(m.path, m.branch)
-      return null
-    }
-    if (m.type === "agentManager.importAllExternalWorktrees") {
-      void this.importer.all()
-      return null
-    }
   }
 
   private onDiffMessage(m: AgentManagerInMessage): Record<string, unknown> | null | undefined {
@@ -868,7 +856,7 @@ export class AgentManagerProvider implements Disposable {
     }
   }
 
-  /** Send worktreeSetup.ready + sessionMeta + pushState after worktree creation. */
+  /** Send worktreeSetup.ready + pushState after worktree creation. */
   private notifyWorktreeReady(sessionId: string, result: CreateWorktreeResult, worktreeId?: string): void {
     this.pushState()
     this.postToWebview({
@@ -879,14 +867,6 @@ export class AgentManagerProvider implements Disposable {
       branch: result.branch,
       worktreeId,
     })
-    this.postToWebview({
-      type: "agentManager.sessionMeta",
-      sessionId,
-      mode: "worktree",
-      branch: result.branch,
-      path: result.path,
-      parentBranch: result.parentBranch,
-    })
   }
 
   private async waitForStateReady(context: string): Promise<void> {
@@ -907,8 +887,6 @@ export class AgentManagerProvider implements Disposable {
       case "agentManager.requestBranches":
       case "agentManager.importFromBranch":
       case "agentManager.importFromPR":
-      case "agentManager.importExternalWorktree":
-      case "agentManager.importAllExternalWorktrees":
       case "agentManager.setTabOrder":
       case "agentManager.setWorktreeOrder":
       case "agentManager.setSessionsCollapsed":
diff --git a/packages/kilo-vscode/src/agent-manager/SessionTerminalManager.ts b/packages/kilo-vscode/src/agent-manager/SessionTerminalManager.ts
index efc8b54f4293..6120ba6a1cbe 100644
--- a/packages/kilo-vscode/src/agent-manager/SessionTerminalManager.ts
+++ b/packages/kilo-vscode/src/agent-manager/SessionTerminalManager.ts
@@ -174,18 +174,6 @@ export class SessionTerminalManager {
     return true
   }
 
-  /**
-   * Check if a session has an active terminal.
-   */
-  hasTerminal(sessionId: string): boolean {
-    const entry = this.terminals.get(sessionId)
-    return entry !== undefined && entry.terminal.exitStatus === undefined
-  }
-
-  hasActiveTerminal(): boolean {
-    return this.host.activeTerminal() !== undefined
-  }
-
   activeSession(): string | undefined {
     const active = this.host.activeTerminal()
     if (!active) return undefined
diff --git a/packages/kilo-vscode/src/agent-manager/SetupScriptService.ts b/packages/kilo-vscode/src/agent-manager/SetupScriptService.ts
index f579d0779c07..16fb48d93f62 100644
--- a/packages/kilo-vscode/src/agent-manager/SetupScriptService.ts
+++ b/packages/kilo-vscode/src/agent-manager/SetupScriptService.ts
@@ -66,18 +66,6 @@ export class SetupScriptService {
     return this.resolveScript(platform) !== undefined
   }
 
-  /** Read the setup script content. Returns null if not found or read fails. */
-  async getScript(platform: NodeJS.Platform = process.platform): Promise<string | null> {
-    const script = this.resolveScript(platform)
-    if (!script) return null
-    try {
-      return await fs.promises.readFile(script.path, "utf-8")
-    } catch (error) {
-      this.log(`Failed to read setup script: ${error}`)
-      return null
-    }
-  }
-
   /** Create a default setup script with helpful comments for the current platform. */
   async createDefaultScript(platform: NodeJS.Platform = process.platform): Promise<void> {
     if (!fs.existsSync(this.dir)) {
diff --git a/packages/kilo-vscode/src/agent-manager/WorktreeManager.ts b/packages/kilo-vscode/src/agent-manager/WorktreeManager.ts
index 96b3bcceb3e3..32f2fb1b9f91 100644
--- a/packages/kilo-vscode/src/agent-manager/WorktreeManager.ts
+++ b/packages/kilo-vscode/src/agent-manager/WorktreeManager.ts
@@ -67,11 +67,6 @@ export interface CreateWorktreeResult {
   startPointWarning?: string
 }
 
-export interface ExternalWorktreeItem {
-  path: string
-  branch: string
-}
-
 /**
  * Backward compat: split a possibly-prefixed branch like "origin/main" into
  * `{ branch: "main", remote: "origin" }`. If no slash is found, returns bare branch.
@@ -815,7 +810,7 @@ export class WorktreeManager {
 
     // 4. Derived fallback
     if (allowFallback) {
-      const fallbacks = await this.derivedFallbackBranches(branch)
+      const fallbacks = await this.derivedFallbackBranches()
       for (const fallback of fallbacks) {
         if (fallback === branch) continue // already tried
         try {
@@ -863,7 +858,7 @@ export class WorktreeManager {
     }
   }
 
-  async derivedFallbackBranches(requested: string): Promise<string[]> {
+  async derivedFallbackBranches(): Promise<string[]> {
     const defaults = []
     try {
       defaults.push(await this.defaultBranch())
@@ -1015,22 +1010,6 @@ export class WorktreeManager {
     }
   }
 
-  async listExternalWorktrees(managedPaths: Set<string>): Promise<ExternalWorktreeItem[]> {
-    try {
-      const raw = await this.git.raw(["worktree", "list", "--porcelain"])
-      const normalizedRoot = normalizePath(this.root)
-      const normalizedManaged = new Set([...managedPaths].map(normalizePath))
-      return parseWorktreeList(raw)
-        .filter(
-          (e) => !e.bare && normalizePath(e.path) !== normalizedRoot && !normalizedManaged.has(normalizePath(e.path)),
-        )
-        .map((e) => ({ path: e.path, branch: e.branch }))
-    } catch (error) {
-      this.log(`Failed to list external worktrees: ${error}`)
-      return []
-    }
-  }
-
   async createFromPR(url: string): Promise<CreateWorktreeResult> {
     return this.withGitLock(() => this.createFromPRImpl(url))
   }
diff --git a/packages/kilo-vscode/src/agent-manager/__tests__/AgentManagerProvider.spec.ts b/packages/kilo-vscode/src/agent-manager/__tests__/AgentManagerProvider.spec.ts
index 05352e380a7f..045a108fafce 100644
--- a/packages/kilo-vscode/src/agent-manager/__tests__/AgentManagerProvider.spec.ts
+++ b/packages/kilo-vscode/src/agent-manager/__tests__/AgentManagerProvider.spec.ts
@@ -77,7 +77,6 @@ function createMockHost(): Host {
     openFolder: vi.fn(),
     createOutput: () => ({ appendLine: vi.fn(), dispose: vi.fn() }) as OutputHandle,
     extensionKeybindings: () => [],
-    serverPort: () => undefined,
     capture: vi.fn(),
     dispose: vi.fn(),
   }
diff --git a/packages/kilo-vscode/src/agent-manager/host.ts b/packages/kilo-vscode/src/agent-manager/host.ts
index 193d77cfcbd5..ed8b1f2f633e 100644
--- a/packages/kilo-vscode/src/agent-manager/host.ts
+++ b/packages/kilo-vscode/src/agent-manager/host.ts
@@ -125,9 +125,6 @@ export interface Host {
   /** Read extension keybinding metadata. */
   extensionKeybindings(): Array<{ command: string; key?: string; mac?: string }>
 
-  /** Get the CLI server port (for webview CSP). */
-  serverPort(): number | undefined
-
   /** Copy text to the system clipboard. */
   copyToClipboard(text: string): void
 
diff --git a/packages/kilo-vscode/src/agent-manager/types.ts b/packages/kilo-vscode/src/agent-manager/types.ts
index 63ade03fc947..7d7076516f08 100644
--- a/packages/kilo-vscode/src/agent-manager/types.ts
+++ b/packages/kilo-vscode/src/agent-manager/types.ts
@@ -13,7 +13,6 @@ import type { Worktree, ManagedSession, Section } from "./WorktreeStateManager"
 import type { WorktreeStats, LocalStats } from "./GitStatsPoller"
 import type { ApplyConflict } from "./GitOps"
 import type { BranchListItem, WorktreeSetupErrorCode } from "./git-import"
-import type { ExternalWorktreeItem } from "./WorktreeManager"
 import type { RunStatus } from "./run/manager"
 import type { TerminalFont } from "./terminal-font"
 
@@ -23,8 +22,6 @@ export type { TerminalFont }
 // Shared payload types
 // ---------------------------------------------------------------------------
 
-type SessionMode = "worktree" | "local"
-
 export type ApplyDiffStatus = "checking" | "applying" | "success" | "conflict" | "error"
 
 export type WorktreeDiffEntry = SnapshotFileDiff & {
@@ -114,15 +111,6 @@ interface WorktreeSetupMessage {
   errorCode?: WorktreeSetupErrorCode
 }
 
-interface SessionMetaMessage {
-  type: "agentManager.sessionMeta"
-  sessionId: string
-  mode: SessionMode
-  branch?: string
-  path?: string
-  parentBranch?: string
-}
-
 interface StateMessage {
   type: "agentManager.state"
   worktrees: Worktree[]
@@ -228,11 +216,6 @@ interface BranchesMessage {
   defaultBranch: string
 }
 
-interface ExternalWorktreesMessage {
-  type: "agentManager.externalWorktrees"
-  worktrees: ExternalWorktreeItem[]
-}
-
 interface ImportResultMessage {
   type: "agentManager.importResult"
   success: boolean
@@ -307,7 +290,6 @@ export type AgentManagerOutMessage =
   | WorktreeStatsMessage
   | LocalStatsMessage
   | WorktreeSetupMessage
-  | SessionMetaMessage
   | StateMessage
   | ErrorOutMessage
   | SessionAddedMessage
@@ -317,7 +299,6 @@ export type AgentManagerOutMessage =
   | SetSessionModelMessage
   | SendInitialMessage
   | BranchesMessage
-  | ExternalWorktreesMessage
   | ImportResultMessage
   | KeybindingsMessage
   | RepoInfoMessage
@@ -500,10 +481,6 @@ interface SetDefaultBaseBranchIn {
   branch?: string
 }
 
-interface RequestExternalWorktreesIn {
-  type: "agentManager.requestExternalWorktrees"
-}
-
 interface ImportFromBranchIn {
   type: "agentManager.importFromBranch"
   branch: string
@@ -514,16 +491,6 @@ interface ImportFromPRIn {
   url: string
 }
 
-interface ImportExternalWorktreeIn {
-  type: "agentManager.importExternalWorktree"
-  path: string
-  branch: string
-}
-
-interface ImportAllExternalWorktreesIn {
-  type: "agentManager.importAllExternalWorktrees"
-}
-
 interface RequestWorktreeDiffIn {
   type: "agentManager.requestWorktreeDiff"
   sessionId: string
@@ -807,11 +774,8 @@ export type AgentManagerInMessage =
   | SetReviewDiffStyleIn
   | SetReviewMarkdownRenderIn
   | SetDefaultBaseBranchIn
-  | RequestExternalWorktreesIn
   | ImportFromBranchIn
   | ImportFromPRIn
-  | ImportExternalWorktreeIn
-  | ImportAllExternalWorktreesIn
   | RequestWorktreeDiffIn
   | RequestWorktreeDiffFileIn
   | ApplyWorktreeDiffIn
diff --git a/packages/kilo-vscode/src/agent-manager/vscode-host.ts b/packages/kilo-vscode/src/agent-manager/vscode-host.ts
index 69dd31a858ee..fc5dfd010786 100644
--- a/packages/kilo-vscode/src/agent-manager/vscode-host.ts
+++ b/packages/kilo-vscode/src/agent-manager/vscode-host.ts
@@ -6,7 +6,7 @@
  */
 
 import * as vscode from "vscode"
-import type { Host, PanelContext, OutputHandle, SessionProvider, Disposable } from "./host"
+import type { Host, PanelContext, OutputHandle, SessionProvider } from "./host"
 import type { KiloConnectionService } from "../services/cli-backend"
 import { KiloProvider } from "../KiloProvider"
 import { PLATFORM, SNAPSHOT_INITIALIZATION } from "./constants"
@@ -216,10 +216,6 @@ export class VscodeHost implements Host {
     return ext?.packageJSON?.contributes?.keybindings ?? []
   }
 
-  serverPort(): number | undefined {
-    return this.connectionService.getServerInfo()?.port
-  }
-
   copyToClipboard(text: string): void {
     void vscode.env.clipboard.writeText(text)
   }
diff --git a/packages/kilo-vscode/src/agent-manager/worktree-importer.ts b/packages/kilo-vscode/src/agent-manager/worktree-importer.ts
index cfa3d1ab96ce..d840f67eb55f 100644
--- a/packages/kilo-vscode/src/agent-manager/worktree-importer.ts
+++ b/packages/kilo-vscode/src/agent-manager/worktree-importer.ts
@@ -2,9 +2,7 @@ import type { Session } from "@kilocode/sdk/v2/client"
 import type { AgentManagerOutMessage } from "./types"
 import type { WorktreeManager, CreateWorktreeResult } from "./WorktreeManager"
 import type { WorktreeStateManager } from "./WorktreeStateManager"
-import { classifyWorktreeError, normalizePath } from "./git-import"
-
-type Worktree = ReturnType<WorktreeStateManager["addWorktree"]>
+import { classifyWorktreeError } from "./git-import"
 
 export interface WorktreeImporterHost {
   manager(): WorktreeManager | undefined
@@ -57,24 +55,6 @@ export class WorktreeImporter {
     }
   }
 
-  async external(): Promise<void> {
-    const manager = this.host.manager()
-    const state = this.host.state()
-    if (!manager || !state) {
-      this.host.post({ type: "agentManager.externalWorktrees", worktrees: [] })
-      return
-    }
-
-    try {
-      const paths = new Set(state.getWorktrees().map((worktree) => worktree.path))
-      const worktrees = await manager.listExternalWorktrees(paths)
-      this.host.post({ type: "agentManager.externalWorktrees", worktrees })
-    } catch (error) {
-      this.host.log(`Failed to list external worktrees: ${error}`)
-      this.host.post({ type: "agentManager.externalWorktrees", worktrees: [] })
-    }
-  }
-
   async branch(branch: string): Promise<void> {
     const manager = this.host.manager()
     const state = this.host.state()
@@ -189,136 +169,6 @@ export class WorktreeImporter {
     }
   }
 
-  async path(path: string, branch: string): Promise<void> {
-    const state = this.host.state()
-    const manager = this.host.manager()
-    if (!state || !manager) {
-      this.host.post({ type: "agentManager.importResult", success: false, message: "State not initialized" })
-      return
-    }
-    if (this.busy()) return
-
-    this.importing = true
-    let worktree: Worktree | undefined
-    try {
-      const paths = new Set(state.getWorktrees().map((worktree) => worktree.path))
-      const externals = await manager.listExternalWorktrees(paths)
-      if (!externals.some((worktree) => normalizePath(worktree.path) === normalizePath(path))) {
-        this.host.post({
-          type: "agentManager.importResult",
-          success: false,
-          message: "Path is not a valid worktree for this repository",
-        })
-        return
-      }
-
-      const base = await manager.resolveBaseBranch()
-      worktree = state.addWorktree({ branch, path, parentBranch: base.branch, remote: base.remote, branchOwned: false })
-      this.host.push()
-
-      const session = await this.host.session(path, branch, worktree.id)
-      if (!session) {
-        state.removeWorktree(worktree.id)
-        this.host.push()
-        this.host.post({ type: "agentManager.importResult", success: false, message: "Failed to create session" })
-        return
-      }
-
-      state.addSession(session.id, worktree.id)
-      this.host.register(session.id, path)
-      this.host.push()
-      this.host.post({
-        type: "agentManager.worktreeSetup",
-        status: "ready",
-        message: "Worktree imported",
-        sessionId: session.id,
-        branch,
-        worktreeId: worktree.id,
-      })
-      this.host.post({
-        type: "agentManager.sessionMeta",
-        sessionId: session.id,
-        mode: "worktree",
-        branch,
-        path,
-        parentBranch: base.branch,
-      })
-      this.host.post({ type: "agentManager.importResult", success: true, message: `Imported ${branch}` })
-      this.host.log(`Imported external worktree ${path} (${branch})`)
-    } catch (error) {
-      if (worktree) {
-        state.removeWorktree(worktree.id)
-        this.host.push()
-      }
-      const message = error instanceof Error ? error.message : String(error)
-      this.host.post({ type: "agentManager.importResult", success: false, message })
-    } finally {
-      this.importing = false
-    }
-  }
-
-  async all(): Promise<void> {
-    if (this.busy()) return
-
-    const manager = this.host.manager()
-    const state = this.host.state()
-    if (!manager || !state) {
-      this.host.post({ type: "agentManager.importResult", success: false, message: "Not a git repository" })
-      return
-    }
-    this.importing = true
-
-    try {
-      const paths = new Set(state.getWorktrees().map((worktree) => worktree.path))
-      const externals = await manager.listExternalWorktrees(paths)
-      if (externals.length === 0) {
-        this.host.post({
-          type: "agentManager.importResult",
-          success: true,
-          message: "No external worktrees to import",
-        })
-        return
-      }
-
-      const imported: string[] = []
-      const base = await manager.resolveBaseBranch()
-      for (const external of externals) {
-        try {
-          const worktree = state.addWorktree({
-            branch: external.branch,
-            path: external.path,
-            parentBranch: base.branch,
-            remote: base.remote,
-            branchOwned: false,
-          })
-          const session = await this.host.session(external.path, external.branch, worktree.id)
-          if (session) {
-            state.addSession(session.id, worktree.id)
-            this.host.register(session.id, external.path)
-            imported.push(worktree.id)
-            continue
-          }
-          state.removeWorktree(worktree.id)
-        } catch (error) {
-          this.host.log(`Failed to import external worktree ${external.path}: ${error}`)
-        }
-      }
-
-      this.host.push()
-      this.host.post({
-        type: "agentManager.importResult",
-        success: true,
-        message: `Imported ${imported.length} worktree${imported.length !== 1 ? "s" : ""}`,
-      })
-      this.host.log(`Imported ${imported.length}/${externals.length} external worktrees`)
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error)
-      this.host.post({ type: "agentManager.importResult", success: false, message })
-    } finally {
-      this.importing = false
-    }
-  }
-
   private busy(): boolean {
     if (!this.importing) return false
     this.host.post({
diff --git a/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts
index bee29f59a9ea..8609d7aaaa57 100644
--- a/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts
+++ b/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts
@@ -186,8 +186,6 @@ describe("Agent Manager Provider Messages", () => {
       "agentManager.forgetSession",
       "agentManager.importFromBranch",
       "agentManager.importFromPR",
-      "agentManager.importExternalWorktree",
-      "agentManager.importAllExternalWorktrees",
       "agentManager.createSection",
       "agentManager.moveToSection",
     ]
@@ -435,7 +433,6 @@ describe("Agent Manager Provider — onMessage routing", () => {
     const text = body("onSessionMessage")
     const show = text.indexOf("this.terminalManager.prepareContext(m.sessionID)")
     expect(show).toBeGreaterThan(-1)
-    expect(text).not.toContain("!this.terminalManager.hasActiveTerminal()")
     expect(text).toContain('type: "terminalContextError"')
   })
 
@@ -544,8 +541,6 @@ describe("Agent Manager Provider — onMessage routing", () => {
     const pushIdx = text.indexOf("this.pushState()")
     const readyIdx = text.indexOf("agentManager.worktreeSetup")
     expect(pushIdx, "pushState must come before worktreeSetup").toBeLessThan(readyIdx)
-    // Must also send sessionMeta so the webview knows the branch/path
-    expect(text).toContain("agentManager.sessionMeta")
   })
 
   // -- agentManager.requestState in non-git workspace -------------------------
@@ -583,7 +578,6 @@ describe("Agent Manager Provider — onMessage routing", () => {
     const providerText = body("onImportMessage")
     expect(text).toContain("class WorktreeImporter")
     expect(text).toContain("createFromPR")
-    expect(text).toContain("listExternalWorktrees")
     expect(text).toContain("createWorktree")
     expect(providerText).toContain("this.importer")
   })
diff --git a/packages/kilo-vscode/tests/unit/session-terminal-manager.test.ts b/packages/kilo-vscode/tests/unit/session-terminal-manager.test.ts
index da340afc0b94..4e763196bfa7 100644
--- a/packages/kilo-vscode/tests/unit/session-terminal-manager.test.ts
+++ b/packages/kilo-vscode/tests/unit/session-terminal-manager.test.ts
@@ -130,11 +130,6 @@ describe("SessionTerminalManager structure", () => {
     expect(text).toContain("panel command registration skipped")
   })
 
-  it("exposes active terminal state for terminal context routing", () => {
-    const text = body("hasActiveTerminal")
-    expect(text).toContain("this.host.activeTerminal()")
-  })
-
   it("resolves the session that owns the active managed terminal", () => {
     const text = body("activeSession")
     expect(text).toContain("this.host.activeTerminal()")
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
index 92da93f7721a..c9dcc6aa6e1b 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx
@@ -13,7 +13,6 @@ import {
   type JSX,
 } from "solid-js"
 import type {
-  ExtensionMessage,
   AgentManagerRepoInfoMessage,
   AgentManagerWorktreeSetupMessage,
   AgentManagerStateMessage,
@@ -70,7 +69,6 @@ import { Button } from "@kilocode/kilo-ui/button"
 import { IconButton } from "@kilocode/kilo-ui/icon-button"
 import { Spinner } from "@kilocode/kilo-ui/spinner"
 import { Tooltip, TooltipKeybind } from "@kilocode/kilo-ui/tooltip"
-import { Popover } from "@kilocode/kilo-ui/popover"
 import { VSCodeProvider, useVSCode } from "../src/context/vscode"
 import { ServerProvider } from "../src/context/server"
 import { ProviderProvider } from "../src/context/provider"
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/agent-manager.ts b/packages/kilo-vscode/webview-ui/src/types/messages/agent-manager.ts
index 298d9eba88b6..e48532a511b8 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/agent-manager.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/agent-manager.ts
@@ -117,12 +117,6 @@ export interface BranchInfo {
   isCheckedOut?: boolean
 }
 
-// Agent Manager Import tab: external worktrees (extension → webview)
-export interface ExternalWorktreeInfo {
-  path: string
-  branch: string
-}
-
 export type DiffImageError = "too-large" | "unreadable"
 
 export interface DiffImageSide {
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts b/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts
index 0faed279b9ff..cbc9eb776613 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts
@@ -1,7 +1,6 @@
 import type { ProviderAuthAuthorization, ProviderAuthMethod } from "@kilocode/sdk/v2/client"
 import type { DiffSourceCapabilities, DiffSourceDescriptor } from "../../../../src/diff/sources/types"
 import type { PartBatch, PartRemove, PartUpdate } from "../../../../src/shared/stream-messages"
-import type { SessionMode } from "../../context/worktree-mode"
 import type { MarketplaceItem, MarketplaceInstalledMetadata, MarketplaceRelevanceMetadata } from "../marketplace"
 import type { ConnectionState, ServerInfo, SessionStatus } from "./connection"
 import type { FileAttachment, Part } from "./parts"
@@ -27,7 +26,6 @@ import type {
   AgentManagerApplyWorktreeDiffStatus,
   BranchInfo,
   ContinueInWorktreeStatus,
-  ExternalWorktreeInfo,
   LocalGitStats,
   ManagedSessionState,
   PRStatus,
@@ -632,16 +630,6 @@ export interface NotificationsLoadedMessage {
   dismissedIds: string[]
 }
 
-// Agent Manager worktree session metadata
-export interface AgentManagerSessionMetaMessage {
-  type: "agentManager.sessionMeta"
-  sessionId: string
-  mode: SessionMode
-  branch?: string
-  path?: string
-  parentBranch?: string
-}
-
 // Agent Manager repo info (current branch of the main workspace)
 export interface AgentManagerRepoInfoMessage {
   type: "agentManager.repoInfo"
@@ -819,11 +807,6 @@ export interface AgentManagerBranchesMessage {
   defaultBranch: string
 }
 
-export interface AgentManagerExternalWorktreesMessage {
-  type: "agentManager.externalWorktrees"
-  worktrees: ExternalWorktreeInfo[]
-}
-
 // Agent Manager Import tab: result feedback (extension → webview)
 export interface AgentManagerImportResultMessage {
   type: "agentManager.importResult"
@@ -1198,7 +1181,6 @@ export type ExtensionMessage =
   | WorkStyleAppliedMessage
   | WorkStyleApplyFailedMessage
   | NotificationsLoadedMessage
-  | AgentManagerSessionMetaMessage
   | AgentManagerRepoInfoMessage
   | AgentManagerWorktreeSetupMessage
   | AgentManagerSessionAddedMessage
@@ -1226,7 +1208,6 @@ export type ExtensionMessage =
   | OpenCloudSessionMessage
   | SelectKiloModelMessage
   | AgentManagerBranchesMessage
-  | AgentManagerExternalWorktreesMessage
   | AgentManagerImportResultMessage
   | WorkspaceDirectoryChangedMessage
   | AgentManagerWorktreeDiffMessage
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts b/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts
index 2852e699e677..6a6b8c62e83c 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts
@@ -804,10 +804,6 @@ export interface RequestBranchesMessage {
   type: "agentManager.requestBranches"
 }
 
-export interface RequestExternalWorktreesMessage {
-  type: "agentManager.requestExternalWorktrees"
-}
-
 export interface ImportFromBranchRequest {
   type: "agentManager.importFromBranch"
   branch: string
@@ -818,16 +814,6 @@ export interface ImportFromPRRequest {
   url: string
 }
 
-export interface ImportExternalWorktreeRequest {
-  type: "agentManager.importExternalWorktree"
-  path: string
-  branch: string
-}
-
-export interface ImportAllExternalWorktreesRequest {
-  type: "agentManager.importAllExternalWorktrees"
-}
-
 // Agent Manager: Request one-shot diff fetch (webview → extension)
 export interface RequestWorktreeDiffMessage {
   type: "agentManager.requestWorktreeDiff"
@@ -1362,11 +1348,8 @@ export type WebviewMessage =
   | RequestCloudSessionDataMessage
   | ImportAndSendMessage
   | RequestBranchesMessage
-  | RequestExternalWorktreesMessage
   | ImportFromBranchRequest
   | ImportFromPRRequest
-  | ImportExternalWorktreeRequest
-  | ImportAllExternalWorktreesRequest
   | RequestWorktreeDiffMessage
   | RequestWorktreeDiffFileMessage
   | StartDiffWatchMessage