vibe-coding-master 0.7.15 → 0.7.16

package/README.md

@@ -254,11 +254,17 @@ DevContainer, make the second endpoint reachable from the container. In the VCM
 The key is stored in global VCM state (`~/.vcm/settings.json`) with owner-only
 permissions and is never returned by the settings API. It is used for CCR
 checks, model discovery, and the GPT-only `apiKeyHelper`. GPT sessions receive a
-child-only `--settings` override; VCM removes inherited Anthropic token
-variables only from those child processes. VCM removes CCR-owned takeover
-entries from global Claude settings, so native Claude selections keep their
-normal launch and account authentication. If CCR is disabled, unreachable,
-rejects the key, or does not expose
+child-only `--settings` override and use the isolated Claude configuration root
+`~/.vcm/claude/ccr`. VCM never edits `~/.claude/settings.json`. Native Claude
+sessions keep their normal configuration and account authentication; VCM only
+removes inherited environment variables that clearly point at the local CCR
+gateway from the native child process. Configure CCR without enabling its
+global Claude Code or Claude App takeover if those clients should remain on
+Anthropic.
+
+Resume keeps the provider recorded by the existing Session. Use Restart when
+switching between a native Claude model and `GPT-5.6 Sol (CCR)`. If CCR is
+disabled, unreachable, rejects the key, or does not expose
 `Codex API/gpt-5.6-sol`, VCM blocks the new Start, Resume, or Restart and does
 not fall back to another model.
 
@@ -324,7 +330,9 @@ Conversation translation is controlled from the sidebar `Translation` section.
 
 VCM uses a task-scoped Translator role and Claude transcript JSONL files, not
 raw terminal text. Translation memory and completed file translations remain
-project-level durable data.
+project-level durable data. When translation is enabled and the active task's
+Harness is initialized, the backend automatically starts a fresh Translator for
+the task or resumes its saved Session.
 
 Common controls:
 
@@ -428,9 +436,10 @@ Use it to:
 - merge task harness commits back to the connected repository branch when
   appropriate
 
-Harness Engineer is task-scoped and runs from the active task worktree. A new
-task receives its own Harness Engineer session. Durable memory is versioned with
-the project harness files.
+Harness Engineer is task-scoped and runs from the active task worktree. The
+backend automatically starts a fresh Harness Engineer for each active task or
+resumes its saved Session. Durable memory is versioned with the project harness
+files.
 
 ### Auto Memory
 

package/dist/backend/runtime/session-registry.js

@@ -2,6 +2,13 @@ export function createSessionRegistry() {
     const sessions = new Map();
     return {
         upsert(session) {
+            for (const [sessionId, candidate] of sessions) {
+                if (sessionId !== session.id
+                    && candidate.taskSlug === session.taskSlug
+                    && candidate.role === session.role) {
+                    sessions.delete(sessionId);
+                }
+            }
             sessions.set(session.id, session);
         },
         get(sessionId) {

package/dist/backend/server.js

@@ -5,7 +5,6 @@ import fastifyStatic from "@fastify/static";
 import { createArtifactService } from "./services/artifact-service.js";
 import { createClaudeAdapter } from "./adapters/claude-adapter.js";
 import { createCcrGatewayAdapter } from "./adapters/ccr-gateway-adapter.js";
-import { createClaudeSettingsAdapter } from "./adapters/claude-settings-adapter.js";
 import { createCommandRunner } from "./adapters/command-runner.js";
 import { createCommandDispatcher } from "./services/command-dispatcher.js";
 import { createClaudeHookService } from "./services/claude-hook-service.js";
@@ -209,11 +208,9 @@ export function createDefaultServerDeps(options = {}) {
     const git = createGitAdapter(runner);
     const claude = createClaudeAdapter(runner);
     const appSettings = createAppSettingsService({ fs });
-    const claudeSettings = createClaudeSettingsAdapter({ fs });
     const ccrIntegration = createCcrIntegrationService({
         settings: appSettings,
-        gateway: createCcrGatewayAdapter(),
-        restoreNativeClaudeSettings: () => claudeSettings.restoreNativeSettings()
+        gateway: createCcrGatewayAdapter()
     });
     const runtime = createNodePtyTerminalRuntime({ fs });
     const registry = createSessionRegistry();

package/dist/backend/services/ccr-integration-service.js

@@ -1,11 +1,15 @@
 import { CCR_GATEWAY_BASE_URL, CCR_GPT_MODEL_ID, createSessionModelOptions, isCcrSessionModel } from "../../shared/types/session.js";
+import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { VcmError } from "../errors.js";
+import { resolveVcmDataDir } from "../vcm-data-dir.js";
 const DEFAULT_CACHE_TTL_MS = 10_000;
 const DEFAULT_API_KEY_HELPER_PATH = fileURLToPath(new URL("../../../scripts/ccr-api-key-helper.mjs", import.meta.url));
 export function createCcrIntegrationService(deps) {
     const now = deps.now ?? (() => new Date());
     const cacheTtlMs = deps.cacheTtlMs ?? DEFAULT_CACHE_TTL_MS;
+    const baseEnv = deps.baseEnv ?? process.env;
+    const configDir = deps.configDir ?? path.join(resolveVcmDataDir(baseEnv), "claude", "ccr");
     let cachedProbe;
     let inFlight;
     async function probe(force = false) {
@@ -67,9 +71,6 @@ export function createCcrIntegrationService(deps) {
     return {
         async initialize() {
             const settings = await deps.settings.getCcrIntegrationSettings();
-            if (settings.apiKey) {
-                await deps.restoreNativeClaudeSettings?.();
-            }
             if (settings.enabled) {
                 await probe(true);
             }
@@ -102,9 +103,6 @@ export function createCcrIntegrationService(deps) {
                 enabled: nextEnabled,
                 apiKey: nextApiKey
             });
-            if (nextApiKey) {
-                await deps.restoreNativeClaudeSettings?.();
-            }
             if (clearApiKey || !nextEnabled) {
                 cachedProbe = undefined;
                 return buildStatus();
@@ -130,7 +128,7 @@ export function createCcrIntegrationService(deps) {
         },
         async getLaunchEnvironment(model) {
             if (!isCcrSessionModel(model)) {
-                return {};
+                return buildNativeLaunchEnvironment(baseEnv);
             }
             const settings = await deps.settings.getCcrIntegrationSettings();
             if (!settings.enabled) {
@@ -164,15 +162,12 @@ export function createCcrIntegrationService(deps) {
                 CODEXL_CLAUDE_CODE_MODEL: CCR_GPT_MODEL_ID,
                 ANTHROPIC_SMALL_FAST_MODEL: CCR_GPT_MODEL_ID,
                 CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY: "1",
+                CLAUDE_CONFIG_DIR: configDir,
                 NO_PROXY: noProxy,
                 no_proxy: noProxy
             };
         },
         async getLaunchSettingsOverride(model) {
-            const settings = await deps.settings.getCcrIntegrationSettings();
-            if (settings.apiKey) {
-                await deps.restoreNativeClaudeSettings?.();
-            }
             if (!isCcrSessionModel(model)) {
                 return undefined;
             }
@@ -182,6 +177,70 @@ export function createCcrIntegrationService(deps) {
         }
     };
 }
+const CCR_BASE_URL_KEYS = [
+    "ANTHROPIC_BASE_URL",
+    "ANTHROPIC_API_BASE_URL",
+    "CLAUDE_AGENT_API_BASE_URL"
+];
+const CCR_MODEL_KEYS = [
+    "ANTHROPIC_MODEL",
+    "ANTHROPIC_SMALL_FAST_MODEL"
+];
+const CCR_ONLY_ENV_KEYS = [
+    "CCR_CLAUDE_CODE_MODEL",
+    "CODEXL_CLAUDE_CODE_MODEL",
+    "CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY"
+];
+export function buildNativeLaunchEnvironment(baseEnv) {
+    const environment = {};
+    let inheritedCcrTakeover = false;
+    if (baseEnv.CLAUDE_CONFIG_DIR?.trim()) {
+        environment.CLAUDE_CONFIG_DIR = baseEnv.CLAUDE_CONFIG_DIR.trim();
+    }
+    for (const key of CCR_BASE_URL_KEYS) {
+        if (isCcrGatewayUrl(baseEnv[key])) {
+            environment[key] = undefined;
+            inheritedCcrTakeover = true;
+        }
+    }
+    for (const key of CCR_MODEL_KEYS) {
+        if (isCcrModelName(baseEnv[key])) {
+            environment[key] = undefined;
+            inheritedCcrTakeover = true;
+        }
+    }
+    for (const key of CCR_ONLY_ENV_KEYS) {
+        if (baseEnv[key] !== undefined) {
+            environment[key] = undefined;
+            inheritedCcrTakeover = true;
+        }
+    }
+    if (inheritedCcrTakeover) {
+        environment.ANTHROPIC_AUTH_TOKEN = undefined;
+        environment.ANTHROPIC_API_KEY = undefined;
+    }
+    return environment;
+}
+function isCcrGatewayUrl(value) {
+    if (!value) {
+        return false;
+    }
+    try {
+        const url = new URL(value);
+        return url.port === "3456"
+            && ["127.0.0.1", "localhost", "host.docker.internal"].includes(url.hostname);
+    }
+    catch {
+        return false;
+    }
+}
+function isCcrModelName(value) {
+    if (!value) {
+        return false;
+    }
+    return value === CCR_GPT_MODEL_ID
+        || value.startsWith("anthropic/claude-ccr-h");
+}
 function createStatus(input) {
     const reason = input.error
         ?? (input.enabled ? "CCR GPT-5.6 Sol is unavailable." : "Enable CCR GPT models in Settings.");

package/dist/backend/services/claude-transcript-service.js

@@ -208,14 +208,14 @@ export function resolveExistingClaudeTranscriptPath(session) {
     if (sessionPath) {
         return sessionPath;
     }
-    const cwdPath = existingFile(claudeTranscriptPath(session.cwd, session.claudeSessionId));
+    const cwdPath = existingFile(claudeTranscriptPath(session.cwd, session.claudeSessionId, session.claudeConfigDir));
     if (cwdPath) {
         return cwdPath;
     }
-    return findClaudeTranscriptPathBySessionId(session.claudeSessionId);
+    return findClaudeTranscriptPathBySessionId(session.claudeSessionId, session.claudeConfigDir);
 }
-export function findClaudeTranscriptPathBySessionId(claudeSessionId) {
-    const root = claudeProjectsRoot();
+export function findClaudeTranscriptPathBySessionId(claudeSessionId, configDir) {
+    const root = claudeProjectsRoot(configDir);
     let projectDirs;
     try {
         projectDirs = readdirSync(root, { withFileTypes: true });
@@ -253,17 +253,17 @@ function existingFile(candidate) {
         return undefined;
     }
 }
-export function claudeProjectsRoot() {
-    return join(homedir(), ".claude", "projects");
+export function claudeProjectsRoot(configDir) {
+    return join(configDir ?? join(homedir(), ".claude"), "projects");
 }
 export function projectHash(projectDir) {
     return projectDir.replace(/[\/\s]+/g, "-");
 }
-export function projectsTranscriptDir(projectDir) {
-    return join(claudeProjectsRoot(), projectHash(projectDir));
+export function projectsTranscriptDir(projectDir, configDir) {
+    return join(claudeProjectsRoot(configDir), projectHash(projectDir));
 }
-export function claudeTranscriptPath(projectDir, claudeSessionId) {
-    return join(projectsTranscriptDir(projectDir), `${claudeSessionId}.jsonl`);
+export function claudeTranscriptPath(projectDir, claudeSessionId, configDir) {
+    return join(projectsTranscriptDir(projectDir, configDir), `${claudeSessionId}.jsonl`);
 }
 export function parseAssistantContent(line) {
     let obj;

package/dist/backend/services/runtime-coordinator-service.js

@@ -34,6 +34,40 @@ export function createRuntimeCoordinatorService(deps) {
             }
         }
     }
+    function reconcileProject(repoRoot, input = {}) {
+        return withRepoLock(repoRoot, async () => {
+            const [activeTask, gatewayStatus] = await Promise.all([
+                resolveActiveTask(repoRoot, input.taskSlug),
+                deps.gatewayService.getStatus().catch(() => null)
+            ]);
+            const preferences = await deps.appSettings.getPreferences();
+            if (!activeTask) {
+                return { activeTask: null, gatewayStatus };
+            }
+            const taskRepoRoot = getTaskRuntimeRepoRoot(activeTask);
+            const stateRoot = await deps.getStateRoot(repoRoot);
+            await deps.turnReconciler.reconcileTask(repoRoot, activeTask, stateRoot);
+            const harnessInitialized = await deps.harnessService.getHarnessStatus(taskRepoRoot)
+                .then((status) => status.initialized)
+                .catch(() => false);
+            await Promise.all([
+                reconcileHarnessEngineer(repoRoot, activeTask),
+                reconcileTranslator(repoRoot, activeTask, preferences.translationEnabled && harnessInitialized)
+            ]);
+            if (preferences.translationEnabled && harnessInitialized) {
+                await startConversationTranslationListeners(repoRoot, activeTask);
+            }
+            else {
+                await deps.translationService.stopTask(taskRepoRoot, activeTask.taskSlug).catch(() => undefined);
+            }
+            await reconcileAutoMemory(repoRoot, activeTask, preferences.autoTaskHarnessReviewEnabled ? "auto" : undefined);
+            const memoryReadiness = await getTaskRetrospectiveMemoryReadiness(repoRoot, activeTask);
+            if ((preferences.autoTaskHarnessReviewEnabled || memoryReadiness.trigger) && memoryReadiness.ready) {
+                await maybeStartTaskHarnessRetrospective(repoRoot, activeTask, memoryReadiness.trigger ?? "auto");
+            }
+            return { activeTask, gatewayStatus };
+        });
+    }
     return {
         start() {
             if (reconcileTimer !== undefined) {
@@ -51,53 +85,14 @@ export function createRuntimeCoordinatorService(deps) {
             clearTimer(reconcileTimer);
             reconcileTimer = undefined;
         },
-        reconcileProject(repoRoot, input = {}) {
-            return withRepoLock(repoRoot, async () => {
-                const [activeTask, gatewayStatus] = await Promise.all([
-                    resolveActiveTask(repoRoot, input.taskSlug),
-                    deps.gatewayService.getStatus().catch(() => null)
-                ]);
-                const preferences = await deps.appSettings.getPreferences();
-                if (!activeTask) {
-                    return { activeTask: null, gatewayStatus };
-                }
-                const taskRepoRoot = getTaskRuntimeRepoRoot(activeTask);
-                const stateRoot = await deps.getStateRoot(repoRoot);
-                await deps.turnReconciler.reconcileTask(repoRoot, activeTask, stateRoot);
-                const harnessInitialized = await deps.harnessService.getHarnessStatus(taskRepoRoot)
-                    .then((status) => status.initialized)
-                    .catch(() => false);
-                await Promise.all([
-                    reconcileHarnessEngineer(repoRoot, activeTask),
-                    reconcileTranslator(repoRoot, activeTask, preferences.translationEnabled && harnessInitialized)
-                ]);
-                if (preferences.translationEnabled && harnessInitialized) {
-                    await startConversationTranslationListeners(repoRoot, activeTask);
-                }
-                else {
-                    await deps.translationService.stopTask(taskRepoRoot, activeTask.taskSlug).catch(() => undefined);
-                }
-                await reconcileAutoMemory(repoRoot, activeTask, preferences.autoTaskHarnessReviewEnabled ? "auto" : undefined);
-                const memoryReadiness = await getTaskRetrospectiveMemoryReadiness(repoRoot, activeTask);
-                if ((preferences.autoTaskHarnessReviewEnabled || memoryReadiness.trigger) && memoryReadiness.ready) {
-                    await maybeStartTaskHarnessRetrospective(repoRoot, activeTask, memoryReadiness.trigger ?? "auto");
-                }
-                return { activeTask, gatewayStatus };
-            });
-        }
+        reconcileProject
     };
     async function reconcileCurrentProject() {
         const project = await deps.projectService.getCurrentProject();
         if (!project) {
             return;
         }
-        await withRepoLock(project.repoRoot, async () => {
-            const activeTask = await resolveActiveTask(project.repoRoot);
-            if (activeTask) {
-                await deps.turnReconciler.reconcileTask(project.repoRoot, activeTask, await deps.getStateRoot(project.repoRoot));
-            }
-            return { activeTask, gatewayStatus: null };
-        });
+        await reconcileProject(project.repoRoot);
     }
     async function resolveActiveTask(repoRoot, requestedTaskSlug) {
         const tasks = await deps.taskService.listTasks(repoRoot);
@@ -136,7 +131,7 @@ export function createRuntimeCoordinatorService(deps) {
         });
     }
     function shouldAutoEnsureTaskToolSession(session) {
-        return Boolean(session && (session.status === "running" || session.claudeSessionId));
+        return !session || session.status === "running" || Boolean(session.claudeSessionId);
     }
     async function ensureTaskToolRoleSession(repoRoot, taskSlug, role, input) {
         const existing = await deps.sessionService.getRoleSession(repoRoot, taskSlug, role);

package/dist/backend/services/session-service.js

@@ -55,6 +55,9 @@ export function createSessionService(deps) {
         const permissionMode = normalizeClaudePermissionMode(input.permissionMode ?? persisted?.permissionMode);
         const model = normalizeClaudeModel(input.model ?? persisted?.model);
         const effort = normalizeClaudeEffort(input.effort ?? persisted?.effort);
+        if (launchMode === "resume" && persisted) {
+            assertResumeProviderCompatible(persisted, model);
+        }
         const [modelEnvironment, modelSettingsOverride] = await Promise.all([
             getModelLaunchEnvironment(model),
             getModelLaunchSettingsOverride(model)
@@ -74,7 +77,7 @@ export function createSessionService(deps) {
         const transcriptPath = launchMode === "resume" && persisted?.transcriptPath
             ? persisted.transcriptPath
             : resumeClaudeSessionId
-                ? claudeTranscriptPath(taskRepoRoot, resumeClaudeSessionId)
+                ? claudeTranscriptPath(taskRepoRoot, resumeClaudeSessionId, persisted?.claudeConfigDir)
                 : undefined;
         const startCommand = {
             ...deps.claude.buildRoleStartCommand(role, config.claudeCommand, permissionMode, resumeClaudeSessionId, launchMode === "resume", model, effort, modelSettingsOverride),
@@ -113,6 +116,7 @@ export function createSessionService(deps) {
             model,
             effort,
             cwd: startCommand.cwd,
+            claudeConfigDir: readClaudeConfigDir(modelEnvironment),
             terminalBackend: "node-pty",
             pid: runtimeSession.pid,
             roleCommandPath: isDispatchableRole(role)
@@ -163,6 +167,9 @@ export function createSessionService(deps) {
         const permissionMode = normalizeClaudePermissionMode(input.permissionMode ?? persisted?.permissionMode);
         const model = normalizeClaudeModel(input.model ?? persisted?.model);
         const effort = normalizeClaudeEffort(input.effort ?? persisted?.effort ?? "medium");
+        if (launchMode === "resume" && persisted) {
+            assertResumeProviderCompatible(persisted, model);
+        }
         const [modelEnvironment, modelSettingsOverride] = await Promise.all([
             getModelLaunchEnvironment(model),
             getModelLaunchSettingsOverride(model)
@@ -194,7 +201,7 @@ export function createSessionService(deps) {
         const sessionCwd = launchMode === "resume" ? persisted?.cwd ?? launchCwd : launchCwd;
         const claudeSessionId = resumeClaudeSessionId ?? "";
         const transcriptPath = resumeClaudeSessionId
-            ? claudeTranscriptPath(repoRoot, resumeClaudeSessionId)
+            ? claudeTranscriptPath(repoRoot, resumeClaudeSessionId, persisted?.claudeConfigDir)
             : undefined;
         const startCommand = {
             ...deps.claude.buildRoleStartCommand(TRANSLATOR_ROLE, config.claudeCommand, permissionMode, resumeClaudeSessionId, launchMode === "resume", model, effort, modelSettingsOverride),
@@ -236,6 +243,7 @@ export function createSessionService(deps) {
             model,
             effort,
             cwd: sessionCwd,
+            claudeConfigDir: readClaudeConfigDir(modelEnvironment),
             terminalBackend: "node-pty",
             pid: runtimeSession.pid,
             startedAt: runtimeSession.startedAt,
@@ -276,6 +284,9 @@ export function createSessionService(deps) {
         const permissionMode = normalizeClaudePermissionMode(input.permissionMode ?? persisted?.permissionMode);
         const model = normalizeClaudeModel(input.model ?? persisted?.model);
         const effort = normalizeClaudeEffort(input.effort ?? persisted?.effort ?? "medium");
+        if (launchMode === "resume" && persisted) {
+            assertResumeProviderCompatible(persisted, model);
+        }
         const [modelEnvironment, modelSettingsOverride] = await Promise.all([
             getModelLaunchEnvironment(model),
             getModelLaunchSettingsOverride(model)
@@ -303,7 +314,7 @@ export function createSessionService(deps) {
         const sessionCwd = launchMode === "resume" ? persisted?.cwd ?? launchCwd : launchCwd;
         const claudeSessionId = resumeClaudeSessionId ?? "";
         const transcriptPath = resumeClaudeSessionId
-            ? claudeTranscriptPath(repoRoot, resumeClaudeSessionId)
+            ? claudeTranscriptPath(repoRoot, resumeClaudeSessionId, persisted?.claudeConfigDir)
             : undefined;
         const startCommand = {
             ...deps.claude.buildRoleStartCommand(HARNESS_ENGINEER_ROLE, config.claudeCommand, permissionMode, resumeClaudeSessionId, launchMode === "resume", model, effort, modelSettingsOverride),
@@ -345,6 +356,7 @@ export function createSessionService(deps) {
             model,
             effort,
             cwd: sessionCwd,
+            claudeConfigDir: readClaudeConfigDir(modelEnvironment),
             terminalBackend: "node-pty",
             pid: runtimeSession.pid,
             startedAt: runtimeSession.startedAt,
@@ -489,6 +501,7 @@ export function createSessionService(deps) {
         const permissionMode = normalizeClaudePermissionMode(session.permissionMode);
         const model = normalizeClaudeModel(session.model);
         const effort = normalizeClaudeEffort(session.effort);
+        assertResumeProviderCompatible(session, model);
         const [modelEnvironment, modelSettingsOverride] = await Promise.all([
             getModelLaunchEnvironment(model),
             getModelLaunchSettingsOverride(model)
@@ -546,13 +559,14 @@ export function createSessionService(deps) {
             permissionMode,
             model,
             effort,
+            claudeConfigDir: readClaudeConfigDir(modelEnvironment),
             pid: runtimeSession.pid,
             startedAt: runtimeSession.startedAt,
             updatedAt: timestamp,
             lastOutputAt: runtimeSession.lastOutputAt,
             exitCode: runtimeSession.exitCode,
             transcriptPath: session.claudeSessionId
-                ? claudeTranscriptPath(repoRoot, session.claudeSessionId)
+                ? claudeTranscriptPath(repoRoot, session.claudeSessionId, session.claudeConfigDir)
                 : session.transcriptPath
         };
         deps.registry.upsert(normalizeProjectScopedRecordForPersistence(resumed));
@@ -560,16 +574,16 @@ export function createSessionService(deps) {
         return migrateRunningProjectToolSessionCwd(repoRoot, resumed, targetCwd);
     }
     async function getModelLaunchEnvironment(model) {
-        if (!isCcrSessionModel(model)) {
-            return {};
-        }
         if (!deps.ccrIntegration) {
-            throw new VcmError({
-                code: "CCR_UNAVAILABLE",
-                message: "CCR integration is not available in this VCM runtime.",
-                statusCode: 409,
-                hint: "Enable and configure CCR GPT models before starting this session."
-            });
+            if (isCcrSessionModel(model)) {
+                throw new VcmError({
+                    code: "CCR_UNAVAILABLE",
+                    message: "CCR integration is not available in this VCM runtime.",
+                    statusCode: 409,
+                    hint: "Enable and configure CCR GPT models before starting this session."
+                });
+            }
+            return {};
         }
         return deps.ccrIntegration.getLaunchEnvironment(model);
     }
@@ -1490,6 +1504,28 @@ function normalizeClaudeEffort(value) {
     }
     return "default";
 }
+function assertResumeProviderCompatible(session, requestedModel) {
+    const persistedModel = normalizeClaudeModel(session.model);
+    if (isCcrSessionModel(persistedModel) !== isCcrSessionModel(requestedModel)) {
+        throw new VcmError({
+            code: "SESSION_PROVIDER_SWITCH_REQUIRES_RESTART",
+            message: `Cannot resume ${session.role} with a different model provider.`,
+            statusCode: 409,
+            hint: "Use Restart to switch between native Claude and CCR models."
+        });
+    }
+    if (isCcrSessionModel(requestedModel) && !session.claudeConfigDir) {
+        throw new VcmError({
+            code: "CCR_SESSION_CONFIG_MISSING",
+            message: `${session.role} was created before isolated CCR session storage was enabled.`,
+            statusCode: 409,
+            hint: "Restart this role once to create an isolated CCR session."
+        });
+    }
+}
+function readClaudeConfigDir(environment) {
+    return environment.CLAUDE_CONFIG_DIR?.trim() || undefined;
+}
 function formatClaudeCdCommand(targetCwd) {
     // Claude Code's `/cd` slash command takes the literal remainder of the line as
     // the path, so the target must NOT be wrapped in quotes (quotes are taken as part

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibe-coding-master",
-  "version": "0.7.15",
+  "version": "0.7.16",
   "description": "Local GUI session cockpit for Claude Code role sessions.",
   "type": "module",
   "files": [

package/dist/backend/adapters/claude-settings-adapter.js

@@ -1,79 +0,0 @@
-import { homedir } from "node:os";
-import path from "node:path";
-const CCR_ENV_KEYS = [
-    "CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY",
-    "ANTHROPIC_BASE_URL",
-    "ANTHROPIC_API_BASE_URL",
-    "CLAUDE_AGENT_API_BASE_URL",
-    "ANTHROPIC_MODEL",
-    "CCR_CLAUDE_CODE_MODEL",
-    "CODEXL_CLAUDE_CODE_MODEL",
-    "ANTHROPIC_SMALL_FAST_MODEL"
-];
-export function createClaudeSettingsAdapter(deps) {
-    const settingsPath = deps.settingsPath ?? resolveClaudeSettingsPath(deps.env ?? process.env);
-    return {
-        async restoreNativeSettings() {
-            if (!(await deps.fs.pathExists(settingsPath))) {
-                return false;
-            }
-            const current = await deps.fs.readJson(settingsPath);
-            const restored = restoreNativeClaudeSettings(current);
-            if (!restored.changed) {
-                return false;
-            }
-            await deps.fs.writeJsonAtomic(settingsPath, restored.settings);
-            return true;
-        }
-    };
-}
-export function restoreNativeClaudeSettings(value) {
-    const settings = isObject(value) ? structuredClone(value) : {};
-    const helperIsCcr = typeof settings.apiKeyHelper === "string"
-        && settings.apiKeyHelper.includes(".claude-code-router");
-    const env = isObject(settings.env) ? settings.env : undefined;
-    const envUsesCcr = env
-        ? ["ANTHROPIC_BASE_URL", "ANTHROPIC_API_BASE_URL", "CLAUDE_AGENT_API_BASE_URL"]
-            .some((key) => isCcrGatewayUrl(env[key]))
-        : false;
-    if (!helperIsCcr && !envUsesCcr) {
-        return { changed: false, settings };
-    }
-    let changed = false;
-    if (helperIsCcr) {
-        delete settings.apiKeyHelper;
-        changed = true;
-    }
-    if (env) {
-        for (const key of CCR_ENV_KEYS) {
-            if (key in env) {
-                delete env[key];
-                changed = true;
-            }
-        }
-        if (Object.keys(env).length === 0) {
-            delete settings.env;
-        }
-    }
-    return { changed, settings };
-}
-function resolveClaudeSettingsPath(env) {
-    const configDir = env.CLAUDE_CONFIG_DIR?.trim();
-    return path.join(configDir ? path.resolve(configDir) : path.join(homedir(), ".claude"), "settings.json");
-}
-function isCcrGatewayUrl(value) {
-    if (typeof value !== "string") {
-        return false;
-    }
-    try {
-        const url = new URL(value);
-        return url.port === "3456"
-            && ["127.0.0.1", "localhost", "host.docker.internal"].includes(url.hostname);
-    }
-    catch {
-        return false;
-    }
-}
-function isObject(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}