larkin 0.4.28 → 0.5.0

package/dist/platform/config.cjs

@@ -53,6 +53,8 @@ exports.resolveAgentGlobalMentionPolicy = resolveAgentGlobalMentionPolicy;
 exports.runtimeConfigSignature = runtimeConfigSignature;
 exports.configApplyState = configApplyState;
 exports.markConfigApplied = markConfigApplied;
+exports.withConfigMutationLock = withConfigMutationLock;
+exports.withConfigMutationLockAsync = withConfigMutationLockAsync;
 exports.mutateConfig = mutateConfig;
 exports.rollbackConfig = rollbackConfig;
 exports.commitSetupConfig = commitSetupConfig;
@@ -64,10 +66,8 @@ const path = __importStar(require("node:path"));
 const root_layout_js_1 = require("./root-layout.cjs");
 const secure_metadata_js_1 = require("./secure-metadata.cjs");
 const runtime_model_catalog_js_1 = require("../runtime/runtime-model-catalog.cjs");
-const pi_provider_config_js_1 = require("../runtime/pi-provider-config.cjs");
 const user_runtime_js_1 = require("../runtime/user-runtime.cjs");
 const process_inspect_cjs_1 = __importDefault(require("./process-inspect.cjs"));
-const pi_profile_migration_js_1 = require("../runtime/pi-profile-migration.cjs");
 var user_runtime_js_2 = require("../runtime/user-runtime.cjs");
 Object.defineProperty(exports, "RUNTIME_OPTIONS", { enumerable: true, get: function () { return user_runtime_js_2.RUNTIME_OPTIONS; } });
 Object.defineProperty(exports, "fromUserRuntime", { enumerable: true, get: function () { return user_runtime_js_2.fromUserRuntime; } });
@@ -79,7 +79,8 @@ Object.defineProperty(exports, "toUserRuntime", { enumerable: true, get: functio
 const TOP_FIELDS_V3 = new Set(["version", "serverId", "activeAgent", "agents"]);
 const TOP_FIELDS_V4 = new Set(["version", "serverId", "mentionPolicy", "activeAgent", "agents"]);
 const AGENT_FIELDS_V3 = new Set(["runtime", "model", "effort", "noMentionChats", "createdAt"]);
-const AGENT_FIELDS_V4 = new Set(["runtime", "model", "piDistribution", "effort", "mentionPolicy", "chatMentionPolicies", "createdAt"]);
+const AGENT_FIELDS_V4 = new Set(["runtime", "model", "effort", "mentionPolicy", "chatMentionPolicies", "createdAt"]);
+const LEGACY_AGENT_FIELDS = new Set(["piDistribution", "runtimeOption"]);
 const APP_ID = /^cli_[A-Za-z0-9]+$/;
 const CHAT_ID = /^oc_[A-Za-z0-9_-]+$/;
 const PI_EFFORTS = new Set(["off", "minimal", "low", "medium", "high", "xhigh", "max"]);
@@ -157,31 +158,51 @@ function runtimeSupportsEffort(runtime, effort) {
         : runtime === "codex" ? CODEX_EFFORTS.has(effort)
             : runtime === "claude" ? CLAUDE_EFFORTS.has(effort) : false;
 }
+function takeLegacyAgentFields(agent) {
+    const cleaned = {};
+    for (const [field, value] of Object.entries(agent)) {
+        if (!LEGACY_AGENT_FIELDS.has(field))
+            cleaned[field] = value;
+    }
+    return cleaned;
+}
+function isLegacyBuiltinAgentRecord(agent) {
+    if (!isPlainObject(agent))
+        return false;
+    return agent.piDistribution === "builtin" || agent.runtime === "builtin-pi" || agent.runtimeOption === "builtin-pi";
+}
+function canonicalizeLegacyStoredAgent(key, agent) {
+    const cleaned = takeLegacyAgentFields(agent);
+    if (cleaned.runtime === "builtin-pi" || isLegacyBuiltinAgentRecord(agent))
+        cleaned.runtime = "pi";
+    if (typeof cleaned.runtime !== "string" || !cleaned.runtime)
+        throw new Error(`Agent ${key}.runtime 必须是非空字符串`);
+    return cleaned;
+}
 function validateStoredAgent(key, agent, version) {
     if (!APP_ID.test(key))
         throw new Error(`Agent key 必须是安全的飞书 App ID（cli_ + ASCII 字母数字）：${key}`);
     if (!isPlainObject(agent))
         throw new Error(`Agent ${key} 必须是普通 object`);
-    assertAllowedFields(agent, version === 3 ? AGENT_FIELDS_V3 : AGENT_FIELDS_V4, `Agent ${key}`);
-    if (typeof agent.runtime !== "string" || !agent.runtime)
+    const canonical = canonicalizeLegacyStoredAgent(key, agent);
+    assertAllowedFields(canonical, version === 3 ? AGENT_FIELDS_V3 : AGENT_FIELDS_V4, `Agent ${key}`);
+    if (typeof canonical.runtime !== "string" || !canonical.runtime)
         throw new Error(`Agent ${key}.runtime 必须是非空字符串`);
-    if (!(0, user_runtime_js_1.isAdapterRuntime)(agent.runtime))
-        throw new Error(`Agent ${key}.runtime 未知：${agent.runtime}`);
-    if (typeof agent.model !== "string" || !agent.model)
+    if (!(0, user_runtime_js_1.isAdapterRuntime)(canonical.runtime))
+        throw new Error(`Agent ${key}.runtime 未知：${canonical.runtime}`);
+    if (typeof canonical.model !== "string" || !canonical.model)
         throw new Error(`Agent ${key}.model 必须是非空字符串`);
-    assertModel(agent.runtime, agent.model);
-    if (Object.hasOwn(agent, "piDistribution")) {
-        if (agent.runtime !== "pi" || (agent.piDistribution !== "external" && agent.piDistribution !== "builtin")) {
-            throw new Error(`Agent ${key}.piDistribution 只允许 Pi runtime 使用 external/builtin`);
-        }
-    }
+    assertModel(canonical.runtime, canonical.model);
+    Object.assign(agent, canonical);
+    for (const field of LEGACY_AGENT_FIELDS)
+        delete agent[field];
     if (Object.hasOwn(agent, "effort") && (typeof agent.effort !== "string" || !agent.effort))
         throw new Error(`Agent ${key}.effort 必须是非空字符串`);
     if (agent.model === "default" && Object.hasOwn(agent, "effort"))
         throw new Error(`Agent ${key}.model=default 时不能保存 effort`);
     if (typeof agent.effort === "string") {
-        if (!runtimeSupportsEffort(agent.runtime, agent.effort))
-            throw new Error(`Agent ${key}.effort=${agent.effort} 不在 ${agent.runtime} 安全档位中`);
+        if (!runtimeSupportsEffort(canonical.runtime, agent.effort))
+            throw new Error(`Agent ${key}.effort=${agent.effort} 不在 ${canonical.runtime} 安全档位中`);
     }
     if (version === 3 && Object.hasOwn(agent, "noMentionChats")) {
         if (!Array.isArray(agent.noMentionChats) || agent.noMentionChats.some((chat) => typeof chat !== "string" || !CHAT_ID.test(chat))) {
@@ -216,7 +237,6 @@ function hydratedStoredAgent(key, agent, version) {
     return {
         runtime: agent.runtime,
         model: agent.model,
-        ...(agent.piDistribution === "external" || agent.piDistribution === "builtin" ? { piDistribution: agent.piDistribution } : {}),
         ...(typeof agent.effort === "string" ? { effort: agent.effort } : {}),
         ...(version === 4 && (agent.mentionPolicy === "require" || agent.mentionPolicy === "free") ? { mentionPolicy: agent.mentionPolicy } : {}),
         ...(Object.keys(chatMentionPolicies).length ? { chatMentionPolicies, noMentionChats: Object.entries(chatMentionPolicies).filter(([, policy]) => policy === "free").map(([chatId]) => chatId) } : {}),
@@ -228,7 +248,6 @@ function hydrateAgent(key, agent, configDir) {
     return {
         name: key, agentId: key, feishuAppId: key, feishuProfile: key,
         runtime: agent.runtime, model: agent.model,
-        ...(agent.piDistribution ? { piDistribution: agent.piDistribution } : {}),
         workspaceDir: layout.workspaceDir(key), stateDir: layout.agentStateDir(key),
         larkConfigDir: path.join(layout.agentStateDir(key), "lark-cli-config"),
         ...(agent.effort ? { effort: agent.effort } : {}),
@@ -349,9 +368,137 @@ function readConfigFile(file, root = path.dirname(file)) {
         throw error;
     }
 }
+function collectLegacyBuiltinAgentIds(raw) {
+    if (!isPlainObject(raw) || !isPlainObject(raw.agents))
+        return [];
+    return Object.entries(raw.agents).filter(([, agent]) => isLegacyBuiltinAgentRecord(agent)).map(([agentId]) => agentId);
+}
+function ownedPiProviderDirectory(configDir, agentId) {
+    if (!APP_ID.test(agentId))
+        throw new Error(`Pi Agent ID 格式无效：${agentId}`);
+    return path.join(path.resolve(configDir), "providers", "pi", agentId);
+}
+function userPiHome(env) {
+    const home = typeof env.HOME === "string" && env.HOME.trim() ? env.HOME : os.homedir();
+    return path.resolve(home, ".pi");
+}
+function isInsideOrEqual(candidate, root) {
+    const relative = path.relative(root, candidate);
+    return relative === "" || (!relative.startsWith(`..${path.sep}`) && relative !== ".." && !path.isAbsolute(relative));
+}
+function pathExists(target) {
+    try {
+        fs.lstatSync(target);
+        return true;
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return false;
+        throw error;
+    }
+}
+function shouldSkipOwnedPiDeletion(configDir, expected, env) {
+    let userPi;
+    try {
+        userPi = fs.realpathSync(userPiHome(env));
+    }
+    catch {
+        userPi = path.resolve(userPiHome(env));
+    }
+    let configRoot;
+    try {
+        configRoot = fs.realpathSync(path.resolve(configDir));
+    }
+    catch {
+        configRoot = path.resolve(configDir);
+    }
+    let resolvedExpected;
+    try {
+        resolvedExpected = fs.realpathSync(path.resolve(expected));
+    }
+    catch {
+        resolvedExpected = path.resolve(expected);
+    }
+    if (isInsideOrEqual(configRoot, userPi))
+        return "config root is inside the user ~/.pi directory";
+    if (isInsideOrEqual(resolvedExpected, userPi))
+        return "owned Pi directory is inside the user ~/.pi directory";
+    return null;
+}
+function deleteOwnedPiProviderDirectory(configDir, agentId, env = process.env) {
+    const expected = ownedPiProviderDirectory(configDir, agentId);
+    const skip = shouldSkipOwnedPiDeletion(configDir, expected, env);
+    if (skip) {
+        process.stderr.write(`[larkin] skipped leftover builtin Pi directory for ${agentId}: ${skip}\n`);
+        return;
+    }
+    const parent = path.dirname(expected);
+    if (!pathExists(parent) || !pathExists(expected))
+        return;
+    assertNoSymlinkAncestors(expected);
+    const rootReal = fs.realpathSync(path.resolve(configDir));
+    const parentReal = fs.realpathSync(parent);
+    const relative = path.relative(rootReal, parentReal);
+    if (relative.startsWith(`..${path.sep}`) || relative === ".." || path.isAbsolute(relative)) {
+        throw new Error("owned Pi provider directory escaped the config root");
+    }
+    if (path.basename(parent) !== "pi" || path.basename(path.dirname(parent)) !== "providers") {
+        throw new Error("owned Pi provider directory is not providers/pi/<agentId>");
+    }
+    const stat = fs.lstatSync(expected);
+    if (stat.isSymbolicLink())
+        throw new Error("owned Pi provider directory is a symlink");
+    if (!stat.isDirectory())
+        throw new Error("owned Pi provider directory must be a directory");
+    fs.rmSync(expected, { recursive: true, force: false });
+}
+function rewriteLegacyBuiltinAgents(raw) {
+    if (!isPlainObject(raw) || !isPlainObject(raw.agents))
+        return raw;
+    const legacyIds = new Set(collectLegacyBuiltinAgentIds(raw));
+    if (legacyIds.size === 0)
+        return raw;
+    const agents = {};
+    for (const [agentId, agent] of Object.entries(raw.agents)) {
+        if (!legacyIds.has(agentId) || !isPlainObject(agent)) {
+            agents[agentId] = agent;
+            continue;
+        }
+        const next = takeLegacyAgentFields(agent);
+        if (next.runtime === "builtin-pi" || isLegacyBuiltinAgentRecord(agent))
+            next.runtime = "pi";
+        agents[agentId] = next;
+    }
+    return { ...raw, agents };
+}
+function persistLegacyBuiltinMigration(layout, opts, env) {
+    const current = readConfigFile(layout.configFile, layout.root);
+    const migratedIds = collectLegacyBuiltinAgentIds(current.raw);
+    if (migratedIds.length === 0)
+        return current;
+    const rewritten = rewriteLegacyBuiltinAgents(current.raw);
+    const config = normalizeConfig(structuredClone(rewritten), layout.root, opts);
+    const bytes = atomicWriteConfig(layout.configFile, rewritten);
+    for (const agentId of migratedIds) {
+        const agent = config.agents[agentId];
+        const model = typeof agent?.model === "string" ? agent.model : "unknown";
+        process.stderr.write(`[larkin] migrated Agent ${agentId} from builtin-pi to pi (model=${model})\n`);
+        try {
+            deleteOwnedPiProviderDirectory(layout.root, agentId, env);
+        }
+        catch (error) {
+            const reason = error instanceof Error ? error.message : String(error);
+            process.stderr.write(`[larkin] failed to delete leftover builtin Pi directory for ${agentId}: ${reason}\n`);
+        }
+    }
+    return { raw: rewritten, bytes };
+}
 function loadConfig(env = process.env, opts = {}) {
     const layout = root_layout_js_1.TargetRootLayout.fromConfigDir(resolveConfigDir(env));
-    const { raw, bytes } = readConfigFile(layout.configFile, layout.root);
+    const initial = readConfigFile(layout.configFile, layout.root);
+    const { raw, bytes } = collectLegacyBuiltinAgentIds(initial.raw).length
+        ? withConfigLock(layout, () => persistLegacyBuiltinMigration(layout, opts, env))
+        : initial;
     return { configDir: layout.configDir, file: layout.configFile, revision: revision(bytes), config: normalizeConfig(raw, layout.root, opts) };
 }
 function selectAgent(config, env = process.env) {
@@ -372,8 +519,6 @@ function toStored(config) {
     const out = { version: 4, serverId: config.serverId, mentionPolicy: config.mentionPolicy, activeAgent: config.activeAgent, agents: {} };
     for (const [key, agent] of Object.entries(config.agents || {})) {
         const stored = { runtime: agent.runtime, model: agent.model };
-        if (agent.piDistribution)
-            stored.piDistribution = agent.piDistribution;
         if (typeof agent.effort === "string" && agent.effort)
             stored.effort = agent.effort;
         if (agent.mentionPolicy)
@@ -415,7 +560,8 @@ function agentSignature(config, agentId) {
         throw new Error(`Agent 不存在：${agentId}`);
     const chats = Object.fromEntries(Object.entries(agent.chatMentionPolicies || {}).sort(([left], [right]) => left.localeCompare(right)));
     return revision(JSON.stringify({
-        runtime: agent.runtime, model: agent.model, piDistribution: agent.piDistribution ?? null, effort: agent.effort ?? null,
+        schema: 2,
+        runtime: agent.runtime, model: agent.model, effort: agent.effort ?? null,
         globalMentionPolicy: config.mentionPolicy, agentMentionPolicy: agent.mentionPolicy ?? null, chatMentionPolicies: chats,
     }));
 }
@@ -452,12 +598,6 @@ function writeApplyFile(configDir, value) {
     atomicWriteConfig(applyStateFile(configDir), value);
 }
 function rollbackJournalFile(root) { return path.join(root, CONFIG_ROLLBACK_JOURNAL_FILE); }
-function migrationJournalFile(root) { return path.join(root, ".pi-profile-migration-journal.json"); }
-function assertMigrationTarget(root, agentId, migration) {
-    if (migration.agentId !== agentId || path.resolve(migration.targetDir) !== path.join(path.resolve(root), "providers", "pi", agentId)) {
-        throw new Error("Pi profile migration target is invalid");
-    }
-}
 function restoreTargetApplyState(root, targetAgentId, beforeRevision, before) {
     const current = readApplyFile(root);
     const agents = { ...current.agents };
@@ -496,15 +636,9 @@ function recoverRollbackJournal(root) {
     const beforeRaw = JSON.parse(beforeBytes.toString("utf8"));
     normalizeConfig(beforeRaw, root);
     validateApplyState(journal.beforeApplyState);
-    if (journal.migration !== undefined) {
-        (0, pi_profile_migration_js_1.validatePiProfileMigrationState)(journal.migration);
-        assertMigrationTarget(root, journal.targetAgentId, journal.migration);
-    }
     const current = readConfigFile(path.join(root, "config.json"), root);
     const currentRevision = revision(current.bytes);
     if (currentRevision === journal.expectedAfterRevision) {
-        if (journal.migration)
-            (0, pi_profile_migration_js_1.rollbackPiProfileMigration)(journal.migration);
         atomicWriteBytes(path.join(root, "config.json"), beforeBytes);
         restoreTargetApplyState(root, journal.targetAgentId, journal.beforeRevision, journal.beforeApplyState);
     }
@@ -519,47 +653,6 @@ function recoverRollbackJournal(root) {
     fs.unlinkSync(file);
     (0, secure_metadata_js_1.fsyncDirectoryOf)(file);
 }
-function recoverMigrationJournal(root) {
-    const file = migrationJournalFile(root);
-    const bytes = readPrivateFile(file, root, PROFILE_MIGRATION_ROLLBACK_LIMIT_BYTES, "Pi profile migration journal");
-    if (bytes === null)
-        return;
-    let journal;
-    try {
-        journal = JSON.parse(bytes.toString("utf8"));
-    }
-    catch {
-        throw new Error("Pi profile migration journal is invalid");
-    }
-    if (journal.version !== 1 || journal.phase !== "forward" || typeof journal.targetAgentId !== "string"
-        || typeof journal.beforeRevision !== "string" || typeof journal.expectedAfterRevision !== "string" || !journal.migration) {
-        throw new Error("Pi profile migration journal is invalid");
-    }
-    (0, pi_profile_migration_js_1.validatePiProfileMigrationState)(journal.migration);
-    assertMigrationTarget(root, journal.targetAgentId, journal.migration);
-    const current = readConfigFile(path.join(root, "config.json"), root);
-    const currentRevision = revision(current.bytes);
-    if (currentRevision === journal.beforeRevision) {
-        // Forward import did not publish config. The migration helper restores only
-        // files still matching its expected post-import hashes.
-        try {
-            (0, pi_profile_migration_js_1.rollbackPiProfileMigration)(journal.migration);
-        }
-        catch (error) {
-            throw new Error(`Pi profile migration recovery refused: ${error instanceof Error ? error.message : String(error)}`);
-        }
-    }
-    else if (currentRevision === journal.expectedAfterRevision) {
-        // Config won the race; verify the provider target before finalizing.
-        const migration = journal.migration;
-        (0, pi_profile_migration_js_1.assertPiProfileMigrationAfterState)(migration);
-    }
-    else
-        throw new Error("Pi profile migration journal conflicts with the current configuration");
-    (0, pi_profile_migration_js_1.releasePiProfileMigrationLock)(journal.migration);
-    fs.unlinkSync(file);
-    (0, secure_metadata_js_1.fsyncDirectoryOf)(file);
-}
 function configApplyState(env, config) {
     let state;
     try {
@@ -636,32 +729,13 @@ function applyMutation(config, mutation) {
         agent.noMentionChats = Object.entries(policies).filter(([, value]) => value === "free").map(([chatId]) => chatId);
         return { scope: "chat", agentId: mutation.agentId, runtimeChange: false, affectedAgentIds: [mutation.agentId] };
     }
-    if (mutation.kind === "set-agent-pi-distribution") {
-        if (agent.runtime !== "pi")
-            throw new Error(`Agent ${mutation.agentId} 不是 Pi runtime`);
-        if (mutation.distribution !== "builtin" && mutation.distribution !== "external")
-            throw new Error("Pi distribution 只允许 builtin/external");
-        agent.piDistribution = mutation.distribution;
-    }
-    else if (mutation.kind === "set-agent-runtime") {
+    if (mutation.kind === "set-agent-runtime") {
         if (!(0, user_runtime_js_1.isUserRuntime)(mutation.runtime))
             throw new Error(`未知 runtime：${mutation.runtime}`);
         const stored = (0, user_runtime_js_1.fromUserRuntime)(mutation.runtime);
-        if (stored.piDistribution === "builtin") {
-            try {
-                (0, pi_provider_config_js_1.assertBuiltinPiAgentDirectory)((0, pi_provider_config_js_1.piAgentDirectory)(config.configDir, mutation.agentId));
-            }
-            catch (error) {
-                throw new Error(`无法切换到 builtin-pi：${error instanceof Error ? error.message : String(error)}。请先运行 larkin setup 并为该 Agent 选择 builtin-pi 完成 provider 配置`);
-            }
-        }
         assertModel(stored.runtime, mutation.model || "default");
         agent.runtime = stored.runtime;
         agent.model = mutation.model || "default";
-        if (stored.piDistribution)
-            agent.piDistribution = stored.piDistribution;
-        else
-            delete agent.piDistribution;
         delete agent.effort;
     }
     else if (mutation.kind === "set-agent-model") {
@@ -815,7 +889,7 @@ function assertConfigRoot(root) {
     if (typeof process.getuid === "function" && stat.uid !== process.getuid())
         throw new Error("config root owner is unsafe");
 }
-function withConfigLock(layout, action) {
+function acquireConfigLock(layout) {
     assertNoSymlinkAncestors(layout.root);
     fs.mkdirSync(layout.root, { recursive: true, mode: 0o700 });
     const rootStat = fs.lstatSync(layout.root);
@@ -854,20 +928,41 @@ function withConfigLock(layout, action) {
     }
     if (!acquired)
         throw new Error("配置正被其他进程修改，请稍后重试");
+    return {
+        release() {
+            const current = readLockRecord(lock);
+            if (current?.record?.nonce === owner.nonce && current.record.pid === owner.pid) {
+                try {
+                    fs.unlinkSync(lock);
+                    (0, secure_metadata_js_1.fsyncDirectoryOf)(lock);
+                }
+                catch { /* best effort */ }
+            }
+        },
+    };
+}
+function withConfigLock(layout, action) {
+    const held = acquireConfigLock(layout);
     try {
-        recoverMigrationJournal(layout.root);
         recoverRollbackJournal(layout.root);
         return action();
     }
     finally {
-        const current = readLockRecord(lock);
-        if (current?.record?.nonce === owner.nonce && current.record.pid === owner.pid) {
-            try {
-                fs.unlinkSync(lock);
-                (0, secure_metadata_js_1.fsyncDirectoryOf)(lock);
-            }
-            catch { /* best effort */ }
-        }
+        held.release();
+    }
+}
+function withConfigMutationLock(env, action) {
+    return withConfigLock(root_layout_js_1.TargetRootLayout.fromConfigDir(resolveConfigDir(env)), action);
+}
+async function withConfigMutationLockAsync(env, action) {
+    const layout = root_layout_js_1.TargetRootLayout.fromConfigDir(resolveConfigDir(env));
+    const held = acquireConfigLock(layout);
+    try {
+        recoverRollbackJournal(layout.root);
+        return await action();
+    }
+    finally {
+        held.release();
     }
 }
 const CONFIG_ROLLBACK_JOURNAL_FILE = ".config-rollback-journal.json";
@@ -962,10 +1057,6 @@ function readConfigSnapshot(file, root) {
     if (JSON.stringify(beforeRaw) !== JSON.stringify(parsed.beforeConfig))
         throw new Error("config snapshot before config does not match bytes");
     validateApplyState(parsed.beforeApplyState);
-    if (parsed.migration !== undefined) {
-        (0, pi_profile_migration_js_1.validatePiProfileMigrationState)(parsed.migration);
-        assertMigrationTarget(root, parsed.targetAgentId, parsed.migration);
-    }
     return parsed;
 }
 function atomicWriteBytes(file, bytes, limit = CONFIG_LIMIT_BYTES) {
@@ -1009,12 +1100,6 @@ function mutateConfig(env, mutation, authority, options = {}) {
             throw new Error(`没找到配置 ${layout.configFile}，先跑 larkin setup`);
         const config = normalizeConfig(current.raw, layout.root);
         const priorSignatures = Object.fromEntries(Object.keys(config.agents).map((agentId) => [agentId, agentSignature(config, agentId)]));
-        if (options.importExternalProfile && (mutation.kind !== "set-agent-pi-distribution" || mutation.distribution !== "builtin")) {
-            throw new Error("external Pi profile import is only valid for builtin Pi distribution");
-        }
-        const migrationPlan = options.importExternalProfile && mutation.kind === "set-agent-pi-distribution"
-            ? (0, pi_profile_migration_js_1.preparePiProfileMigration)(env, layout.root, mutation.agentId, "builtin")
-            : undefined;
         const changed = applyMutation(config, mutation);
         const stored = toStored(config);
         normalizeConfig(stored, layout.root);
@@ -1035,16 +1120,8 @@ function mutateConfig(env, mutation, authority, options = {}) {
                 version: 2, targetAgentId: changed.agentId, beforeRevision: revision(current.bytes), afterRevision: nextRevision,
                 afterSignature: agentSignature(config, changed.agentId), beforeConfig: current.raw,
                 beforeConfigBytes: current.bytes.toString("base64"), beforeApplyState,
-                ...(migrationPlan ? { migration: migrationPlan.state } : {}),
             });
         }
-        if (migrationPlan) {
-            atomicWriteConfig(migrationJournalFile(layout.root), {
-                version: 1, phase: "forward", targetAgentId: changed.agentId, beforeRevision: revision(current.bytes),
-                expectedAfterRevision: nextRevision, migration: migrationPlan.state,
-            }, PROFILE_MIGRATION_ROLLBACK_LIMIT_BYTES);
-            (0, pi_profile_migration_js_1.applyPiProfileMigration)(migrationPlan);
-        }
         atomicWriteConfig(layout.configFile, stored);
         let fullyApplied = changed.affectedAgentIds.length === 0;
         try {
@@ -1068,17 +1145,6 @@ function mutateConfig(env, mutation, authority, options = {}) {
         catch {
             fullyApplied = false; /* Config persistence remains authoritative. */
         }
-        if (migrationPlan) {
-            (0, pi_profile_migration_js_1.releasePiProfileMigrationLock)(migrationPlan.state);
-            try {
-                fs.unlinkSync(migrationJournalFile(layout.root));
-                (0, secure_metadata_js_1.fsyncDirectoryOf)(migrationJournalFile(layout.root));
-            }
-            catch (error) {
-                if (error.code !== "ENOENT")
-                    throw error;
-            }
-        }
         return {
             revision: nextRevision, previousRevision: revision(current.bytes), changedScope: changed.scope,
             ...(changed.agentId ? { agentId: changed.agentId } : {}), persisted: true,
@@ -1102,11 +1168,8 @@ function rollbackConfig(env, snapshotFile) {
         const journal = {
             version: 1, targetAgentId: snapshot.targetAgentId, expectedAfterRevision: snapshot.afterRevision,
             beforeRevision: snapshot.beforeRevision, beforeConfigBytes: snapshot.beforeConfigBytes, beforeApplyState: snapshot.beforeApplyState,
-            ...(snapshot.migration ? { migration: snapshot.migration } : {}),
         };
         atomicWriteConfig(rollbackJournalFile(layout.root), journal, PROFILE_MIGRATION_ROLLBACK_LIMIT_BYTES);
-        if (snapshot.migration)
-            (0, pi_profile_migration_js_1.rollbackPiProfileMigration)(snapshot.migration);
         const bytes = atomicWriteBytes(layout.configFile, beforeBytes);
         restoreTargetApplyState(layout.root, snapshot.targetAgentId, snapshot.beforeRevision, snapshot.beforeApplyState);
         fs.unlinkSync(rollbackJournalFile(layout.root));
@@ -1128,7 +1191,7 @@ function commitSetupConfig(env, expectedRevision, nextStored) {
 function safeConfigView(config, onlyAgentId, chatId, applyState) {
     const entries = onlyAgentId ? [[onlyAgentId, config.agents[onlyAgentId]]] : Object.entries(config.agents);
     const agents = entries.filter((entry) => Boolean(entry[1])).map(([agentId, agent]) => ({
-        agentId, runtime: agent.runtime, runtimeOption: (0, user_runtime_js_1.toUserRuntime)(agent.runtime, agent.piDistribution), model: agent.model, piDistribution: agent.piDistribution ?? (agent.runtime === "pi" ? "external" : null), effort: agent.effort ?? null,
+        agentId, runtime: agent.runtime, runtimeOption: (0, user_runtime_js_1.toUserRuntime)(agent.runtime), model: agent.model, effort: agent.effort ?? null,
         mention: {
             override: agent.mentionPolicy ?? "inherit",
             effective: agent.mentionPolicy ?? config.mentionPolicy,