diff --git a/src/resources/extensions/sf/auto-runtime-state.js b/src/resources/extensions/sf/auto-runtime-state.js
deleted file mode 100644
index 6283129ac..000000000
--- a/src/resources/extensions/sf/auto-runtime-state.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// SF autonomous mode runtime state
-import { AutoSession } from "./auto/session.js";
-import {
-	isDeterministicPolicyError,
-	isQueuedUserMessageSkip,
-	isToolInvocationError,
-	markToolEnd as markTrackedToolEnd,
-	markToolStart as markTrackedToolStart,
-} from "./auto-tool-tracking.js";
-export const autoSession = new AutoSession();
-export function getAutoRuntimeSnapshot() {
-	return {
-		active: autoSession.active,
-		paused: autoSession.paused,
-		currentUnit: autoSession.currentUnit
-			? { ...autoSession.currentUnit }
-			: null,
-		basePath: autoSession.basePath,
-	};
-}
-export function isAutoActive() {
-	return autoSession.active;
-}
-export function isAutoPaused() {
-	return autoSession.paused;
-}
-export function markToolStart(toolCallId, toolName) {
-	markTrackedToolStart(toolCallId, autoSession.active, toolName);
-}
-export function markToolEnd(toolCallId) {
-	markTrackedToolEnd(toolCallId);
-}
-export function recordToolInvocationError(toolName, errorMsg) {
-	if (!autoSession.active) return;
-	if (
-		isToolInvocationError(errorMsg) ||
-		isQueuedUserMessageSkip(errorMsg) ||
-		isDeterministicPolicyError(errorMsg)
-	) {
-		autoSession.lastToolInvocationError = `${toolName}: ${errorMsg}`;
-	}
-}
diff --git a/src/resources/extensions/sf/worktree-session-state.js b/src/resources/extensions/sf/worktree-session-state.js
deleted file mode 100644
index 789b62d87..000000000
--- a/src/resources/extensions/sf/worktree-session-state.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// SF worktree session state
-let originalCwd = null;
-export function getWorktreeOriginalCwd() {
-	return originalCwd;
-}
-export function setWorktreeOriginalCwd(cwd) {
-	originalCwd = cwd;
-}
-export function clearWorktreeOriginalCwd() {
-	originalCwd = null;
-}
-export function ensureWorktreeOriginalCwdFromPath(cwd = process.cwd()) {
-	if (originalCwd) return originalCwd;
-	const marker = `${/\\/.test(cwd) ? "\\" : "/"}.sf${/\\/.test(cwd) ? "\\" : "/"}worktrees${/\\/.test(cwd) ? "\\" : "/"}`;
-	const markerIdx = cwd.indexOf(marker);
-	if (markerIdx !== -1) {
-		originalCwd = cwd.slice(0, markerIdx);
-	}
-	return originalCwd;
-}
-export function getActiveWorktreeName() {
-	if (!originalCwd) return null;
-	const cwd = process.cwd();
-	const wtDir =
-		`${originalCwd.replace(/[\\/]+$/, "")}/.sf/worktrees`.replaceAll("\\", "/");
-	const normalizedCwd = cwd.replaceAll("\\", "/");
-	if (!normalizedCwd.startsWith(`${wtDir}/`)) return null;
-	const rel = normalizedCwd.slice(wtDir.length + 1);
-	const name = rel.split("/")[0];
-	return name || null;
-}