@epoch-agent/runtime 0.2.0 → 0.3.2

package/dist/index.js

@@ -1,10 +1,10 @@
-import { loadCommandDefinitions, SLASH_COMMANDS_DIAG_MODULE, createToolScope, expandCommand, RecentWorkspaces, clearModelCache, discoverModels, ScheduleStore, isWithinWindow, acquireScheduleLock, triggerPeriodMs, ScheduleRecorder, pruneRecordings, suggestRuleFromApproval, needsAllowlist, isNonInteractive, loadPlugins, assertLevelAllowed, discoverProject, ProviderRouter, ProviderError, PROVIDER_NO_CREDENTIAL, SessionManager, GoalService, MemoryManager, MemoryReviewer, resolveSkillDirs, SkillSystem, SkillLearner, HookManager, loadHookSources, ApprovalCache, PermissionManager, resolvePolicyDirs, resolvePoliciesDir, loadPolicyFiles, checkShadowing, compileRuleLists, ContextCompressor, compressionOptions, TrackerDB, getConfigOrigins, mapOperationType, affectedPaths, workspaceDisplayPath, persistParts, persistToolResults, ToolRegistry, createTodoTool, createGoalTool, createMemoryTool, createCodeExecTool, createRunCodeTool, createSkillViewTool, createToolSearchTool, createToolRevealState, createAskQuestionTool, resolveWorkspace, unloadedInstructionFiles, resolveProjectRoot, loadConfig, CodeSandbox, CheckpointManager, createDelegateTool, findRole, resolveInWorkspace, listWorkspaceFiles, loadRoleDefinitions, mergeRoles, AGENT_ROLE_DIAG_MODULE, builtinRoles, unknownRoleTools, BLOCKED_TOOLS, blockedRoleTools, unknownRoleSkills, BudgetStore, mergeHeadlessPolicy, describeHeadlessPolicy, importSkills, previewSkillImport, removeSessionArtifacts, gateForTool, managedSwitchNotes, originOf, EpochConfigSchema, defaultConfig, SettingsFileSchema, isWritableSettingKey, writeSettingValue, SETTING_WRITE_APPLY, resolveSettings, SETTING_WRITE_LAYERS, readProviderKeyEnv, validateSchedule, createAllowAllGate, setTrustGate, TrustManager, createTrustGate, createDenyAllGate, getImportGate, setImportGate, createAllowAllImportGate, ImportTrustStore, createDenyAllImportGate, createImportGate, getCapability, restoreParts, createSessionSearchTools, PlanModeState, createPlanModeTools, toolTableTokens, explainSetting, settingWriteTargets, uninstallPlugin, readMarketplaces, searchMarketplaces, resolveEntrySource, resolveSource, readPluginRecords, createRoleFile, AgentLoop, resolveArtifactRetention, roleScopedProvider, createRoleScope, revealScopedProvider, withGoalPrompt, withGoalCompression, ScheduleRegistrar, resolveScheduleBackend, updateMarketplace, addMarketplace, SETTINGS_LAYER_ORDER, resolveMarketplaceRef, BudgetGuard, installPlugin, currentEpochVersion } from '@epoch-agent/core';
+import { loadCommandDefinitions, SLASH_COMMANDS_DIAG_MODULE, createToolScope, expandCommand, RecentWorkspaces, clearModelCache, discoverModels, substitutePluginRoot, ScheduleStore, isWithinWindow, acquireScheduleLock, triggerPeriodMs, ScheduleRecorder, pruneRecordings, suggestRuleFromApproval, needsAllowlist, isNonInteractive, loadPlugins, assertLevelAllowed, discoverProject, ProviderRouter, ProviderError, PROVIDER_NO_CREDENTIAL, SessionManager, GoalService, MemoryManager, MemoryReviewer, resolveSkillDirs, SkillSystem, SkillLearner, HookManager, loadHookSources, ApprovalCache, PermissionManager, resolvePolicyDirs, resolvePoliciesDir, loadPolicyFiles, checkShadowing, compileRuleLists, ContextCompressor, compressionOptions, TrackerDB, getConfigOrigins, resolveComplianceDirs, resolveComplianceDir, loadLexiconFiles, ComplianceEngine, DEFAULT_COMPLIANCE_SETTINGS, mapOperationType, affectedPaths, workspaceDisplayPath, persistParts, persistToolResults, ToolRegistry, createTodoTool, createGoalTool, createMemoryTool, createCodeExecTool, createRunCodeTool, createSkillViewTool, createSkillWriteTools, createToolSearchTool, createToolRevealState, createAskQuestionTool, resolveWorkspace, unloadedInstructionFiles, resolveProjectRoot, loadConfig, CodeSandbox, CheckpointManager, createDelegateTool, findRole, persistedUsage, systemOpenArgv, resolveInWorkspace, listWorkspaceFiles, loadRoleDefinitions, mergeRoles, AGENT_ROLE_DIAG_MODULE, builtinRoles, unknownRoleTools, BLOCKED_TOOLS, blockedRoleTools, unknownRoleSkills, BudgetStore, mergeHeadlessPolicy, describeHeadlessPolicy, importSkills, previewSkillImport, removeSessionArtifacts, gateForTool, managedSwitchNotes, originOf, EpochConfigSchema, defaultConfig, SettingsFileSchema, isWritableSettingKey, writeSettingValue, SETTING_WRITE_APPLY, resolveSettings, SETTING_WRITE_LAYERS, readProviderKeyEnv, validateSchedule, createAllowAllGate, setTrustGate, TrustManager, createTrustGate, createDenyAllGate, getImportGate, setImportGate, createAllowAllImportGate, ImportTrustStore, createDenyAllImportGate, createImportGate, getCapability, restoreParts, createSessionSearchTools, PlanModeState, createPlanModeTools, toolTableTokens, explainSetting, settingWriteTargets, settingValueKind, settingValueChoices, uninstallPlugin, removeMarketplace, addMarketplace, readMarketplaces, searchMarketplaces, resolveEntrySource, resolveSource, readPluginRecords, createRoleFile, AgentLoop, resolveArtifactRetention, roleScopedProvider, createRoleScope, revealScopedProvider, withGoalPrompt, withGoalCompression, ScheduleRegistrar, resolveScheduleBackend, updateMarketplace, SETTINGS_LAYER_ORDER, resolveMarketplaceRef, BudgetGuard, installPlugin, currentEpochVersion } from '@epoch-agent/core';
 export { DEFAULT_GOAL_MAX_ROUNDS, MAX_GOAL_MAX_ROUNDS, MAX_OBJECTIVE_CHARS, MAX_REASON_CHARS, SANDBOX_COVERS, SANDBOX_EXCLUDES, SCHEDULE_DEFAULTS, SCHEDULE_DEFAULT_ALLOWLIST, nextRunAt, readRecording, skillIndexDescription } from '@epoch-agent/core';
-import { projectCommandsDir, commandsDir, t, issueDetails, resolveHomeDir, configPath, readKey, setScalar, setSectionField, mcpConfigPath, workspacesPath, dbPath, automationLogsDir, pluginsStatePath, safeInit, memoriesDir, skillsDir, claudeUserSettingsPath, hooksPath, artifactsDir, resolveRipgrep, withTimeout, createProcessTable, marketplacesPath, pluginsDir, agentsDir, budgetStatePath, createSecretStore, setSecretStore, prefetchProviderSecrets, setSecretValues, migrateEnvSecrets, envPath, setDataKey, parseDataKey, generateDataKey, i18nDiagnostics, automationWorkDir, trustPath, trustedImportsPath, setShell, probeShell } from '@epoch-agent/infra';
+import { projectCommandsDir, commandsDir, t, issueDetails, resolveHomeDir, configPath, readKey, setScalar, setSectionField, mcpConfigPath, workspacesPath, writeProviderSecret, envPath, maskApiKey, dbPath, automationLogsDir, pluginsStatePath, safeInit, memoriesDir, skillsDir, claudeUserSettingsPath, hooksPath, artifactsDir, resolveRipgrep, withTimeout, createProcessTable, marketplacesPath, pluginsDir, agentsDir, budgetStatePath, createSecretStore, setSecretStore, prefetchProviderSecrets, setSecretValues, migrateEnvSecrets, setDataKey, parseDataKey, generateDataKey, i18nDiagnostics, automationWorkDir, trustPath, trustedImportsPath, setShell, probeShell } from '@epoch-agent/infra';
 export { t } from '@epoch-agent/infra';
-import { isAbsolute, dirname, delimiter, resolve, join } from 'path';
+import { isAbsolute, dirname, delimiter, resolve, join, relative, sep } from 'path';
 import { AGENT_ROLE_NAME_PATTERN, isValidAgentRoleName, apiKeyEnvVar, getProviderInfo, PROVIDER_INFOS, parseModelRef, contentToText, assistantTurnText, systemNote, ToolExposure, isMentionableFilePath, DiagnosticSink, METRIC, API_KEY_ENV_VARS, MCP_DATA_KEY_NAME, isPermissionLevel, NOOP_TELEMETRY, DEFAULT_AGENT_ROLE } from '@epoch-agent/protocol';
-import { existsSync, mkdirSync, writeFileSync, readFileSync, statSync, renameSync, rmSync, appendFileSync } from 'fs';
+import { existsSync, mkdirSync, writeFileSync, readFileSync, statSync, renameSync, rmSync, realpathSync, openSync, readSync, closeSync, appendFileSync } from 'fs';
 import { randomUUID, createHash } from 'crypto';
 import { parseMcpConfig, McpRegistry, McpAuthStore, mcpAuthStatus, loginToMcpServer, logoutFromMcpServer } from '@epoch-agent/plugin-mcp';
 import { filePlugin } from '@epoch-agent/plugin-file';
@@ -58,7 +58,7 @@ function wireCommands(opts) {
       "no-command-loaded"
     );
   }
-  const available = new Set(toolProvider.list().map((t23) => t23.name));
+  const available = new Set(toolProvider.list().map((t25) => t25.name));
   for (const cmd of summary.commands) {
     const unknown = (cmd.allowedTools ?? []).filter((name) => !available.has(name));
     if (unknown.length > 0) {
@@ -589,6 +589,223 @@ var init_host_preset = __esm({
     HOST_PRESET_MODULE = "HostPreset";
   }
 });
+function fail(message, start, code, suggestion) {
+  return {
+    success: false,
+    output: "",
+    error: { code, message, ...suggestion ? { suggestion } : {} },
+    duration: Date.now() - start
+  };
+}
+function done(output, start) {
+  return { success: true, output, duration: Date.now() - start };
+}
+function str(args, key) {
+  const raw = args[key];
+  return typeof raw === "string" ? raw : "";
+}
+function toAddInput(args) {
+  const name = str(args, "name").trim();
+  if (!name) return "name must not be empty";
+  const transport = str(args, "transport").trim();
+  if (transport !== "stdio" && transport !== "sse" && transport !== "http") {
+    return `transport must be one of "stdio" / "sse" / "http", got ${JSON.stringify(transport)}`;
+  }
+  const rawArgs = args["args"];
+  if (rawArgs !== void 0 && !isStringArray(rawArgs)) {
+    return "args must be an array of strings";
+  }
+  const rawEnv = args["env"];
+  if (rawEnv !== void 0 && !isStringRecord(rawEnv)) {
+    return "env must be an object whose values are all strings";
+  }
+  const command = str(args, "command").trim();
+  const url = str(args, "url").trim();
+  return {
+    name,
+    transport,
+    ...command ? { command } : {},
+    ...rawArgs === void 0 ? {} : { args: rawArgs },
+    ...url ? { url } : {},
+    ...rawEnv === void 0 ? {} : { env: rawEnv }
+  };
+}
+function isStringArray(value) {
+  return Array.isArray(value) && value.every((v) => typeof v === "string");
+}
+function isStringRecord(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+  return Object.values(value).every((v) => typeof v === "string");
+}
+function listTool(deps) {
+  return {
+    name: "mcp_list",
+    description: "\u5217\u51FA\u8FD9\u4E2A\u8FDB\u7A0B\u91CC\u6240\u6709 MCP server \u7684\u72B6\u6001\uFF1A\u540D\u5B57\u3001\u6765\u6E90\u3001\u8FDE\u4E0A\u6CA1\u6709\u3001\u51E0\u4E2A\u5DE5\u5177\u3001\u4E0A\u6B21\u9519\u5728\u54EA\u3002\u6539\u4E00\u53F0\u4E4B\u524D\u5148\u770B\u4E00\u773C\u3002\nsource \u51B3\u5B9A\u6539\u4E0D\u6539\u5F97\u52A8\uFF1A\u53EA\u6709 user \u90A3\u6279\u662F\u7528\u6237\u914D\u7684\uFF1Bhost / plugin \u4E24\u6279\u4E0D\u5728 mcp.json \u91CC\uFF0C\u6539\u4E0D\u4E86\u3002\n\u26A0\uFE0F \u4E0D\u56DE command / url / env \u2014\u2014 \u90A3\u51E0\u683C\u5E38\u85CF\u4EE4\u724C\uFF0C\u8981\u770B\u8BA9\u7528\u6237\u81EA\u5DF1\u6253\u5F00 ~/.epoch/mcp.json\u3002",
+    parameters: { type: "object", properties: {} },
+    exposure: ToolExposure.Direct,
+    supportsParallel: true,
+    annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true },
+    operation: "file_read",
+    describeTarget: () => MCP_LIST_TOOL,
+    execute() {
+      const start = Date.now();
+      const rows = deps.servers();
+      if (rows.length === 0) {
+        return Promise.resolve(
+          done("No MCP servers are configured in this process. Use mcp_add to add one.", start)
+        );
+      }
+      const lines = rows.map((s) => {
+        const state = s.connected ? "connected" : "disconnected";
+        const login = s.needsLogin === true ? ", needs login" : "";
+        const err = s.lastError === void 0 ? "" : ` \u2014 ${s.lastError}`;
+        return `${s.name} [${s.source}] ${state}, ${s.toolCount} tools${login}${err}`;
+      });
+      return Promise.resolve(done(lines.join("\n"), start));
+    }
+  };
+}
+function runWrite(deps, args, kind) {
+  const start = Date.now();
+  const input = toAddInput(args);
+  if (typeof input === "string") return Promise.resolve(fail(input, start, 3201));
+  const call = kind === "add" ? deps.control.add(input) : deps.control.update(input);
+  return call.then((outcome) => {
+    if (!outcome.ok) {
+      return fail(
+        `${outcome.reason}: ${outcome.detail}`,
+        start,
+        3202,
+        HINT_BY_REASON[outcome.reason]
+      );
+    }
+    return done(describeWrite(kind, outcome.configPath, outcome.status), start);
+  });
+}
+function describeWrite(kind, configPath2, status) {
+  const verb = kind === "add" ? "Added" : "Updated";
+  const why = status.lastError === void 0 ? "" : ` \u2014 ${status.lastError}`;
+  const login = status.needsLogin === true ? " It needs a login: run `epoch mcp login`." : "";
+  const live = status.connected ? `It is connected and exposes ${status.toolCount} tools now.` : `It is NOT connected right now${why}. The config is saved either way \u2014 the server may just not be up yet.`;
+  return `${verb} MCP server "${status.name}" in ${configPath2}. ${live}${login}`;
+}
+function addTool(deps) {
+  return {
+    name: "mcp_add",
+    description: "\u52A0\u4E00\u53F0 MCP server\uFF1A\u5199\u8FDB ~/.epoch/mcp.json\uFF0C\u7136\u540E\u5F53\u573A\u8FDE\u4E00\u6B21\u3002\n\u26A0\uFE0F \u5F71\u54CD\u7684\u4E0D\u53EA\u662F\u8FD9\u6BB5\u4F1A\u8BDD \u2014\u2014 \u90A3\u53F0\u4EE5\u540E\u6BCF\u4E2A epoch \u8FDB\u7A0B\u90FD\u4F1A\u8FDE\u5B83\uFF08stdio \u90A3\u6863\u8981\u8D77\u5B50\u8FDB\u7A0B\uFF09\u3002\u52A0\u4E4B\u524D\u5148\u8DDF\u7528\u6237\u8BF4\u6E05\u4F60\u8981\u52A0\u4EC0\u4E48\u3002\n\u8FDE\u4E0D\u4E0A\u4E0D\u7B97\u5931\u8D25\uFF08\u914D\u7F6E\u5BF9\u3001\u5BF9\u9762\u6CA1\u8D77\u6765\u7167\u6837\u52A0\u5F97\u8FDB\u53BB\uFF0C\u56DE\u6267\u4F1A\u8BF4\u6E05\uFF09\u3002\u540D\u5B57\u88AB\u5360\u4F1A\u88AB\u62D2 \u2014\u2014 \u90A3\u65F6\u6539\u7528 mcp_update\u3002",
+    parameters: {
+      type: "object",
+      properties: SERVER_PROPERTIES,
+      required: ["name", "transport"]
+    },
+    exposure: ToolExposure.Direct,
+    supportsParallel: false,
+    annotations: ADMIN_ANNOTATIONS,
+    operation: "command",
+    describeTarget: (args) => `${MCP_ADD_TOOL}:${String(args["name"] ?? "")} ${String(args["command"] ?? args["url"] ?? "")}`.trim(),
+    execute: (args) => runWrite(deps, args, "add")
+  };
+}
+function updateTool(deps) {
+  return {
+    name: "mcp_update",
+    description: "\u6539\u4E00\u53F0\u5DF2\u6709 MCP server\uFF1A\u5C31\u5730\u6362\u6389 ~/.epoch/mcp.json \u91CC\u90A3\u4E00\u6BB5\uFF0C\u518D\u6309\u65B0\u914D\u7F6E\u91CD\u8FDE\u5B83\u3002\u522B\u7684 server \u548C\u6587\u4EF6\u91CC\u7684\u6CE8\u91CA\u6392\u7248\u4E00\u4E2A\u5B57\u8282\u4E0D\u52A8\u3002\n\u26A0\uFE0F \u6536\u7684\u662F**\u6574\u5957**\u914D\u7F6E\u4E0D\u662F\u8865\u4E01 \u2014\u2014 \u6CA1\u7ED9\u7684\u683C\u5B50\uFF08args / url / env\uFF09\u4F1A\u88AB\u5F53\u6210\u300C\u4E0D\u8981\u4E86\u300D\uFF0C\u8981\u4FDD\u4F4F\u7684\u6BCF\u6B21\u90FD\u5F97\u539F\u6837\u518D\u7ED9\u3002\n\u540D\u5B57\u6539\u4E0D\u4E86\uFF08\u90A3\u7B49\u4E8E\u6362\u4E00\u6279\u5DE5\u5177\u540D\uFF0C\u8981\u6539\u540D\u5C31 mcp_remove \u518D mcp_add\uFF09\u3002\u6587\u4EF6\u91CC\u6CA1\u8FD9\u4E2A\u540D\u5B57\u4F1A\u88AB\u62D2\u3002",
+    parameters: {
+      type: "object",
+      properties: SERVER_PROPERTIES,
+      required: ["name", "transport"]
+    },
+    exposure: ToolExposure.Direct,
+    supportsParallel: false,
+    annotations: ADMIN_ANNOTATIONS,
+    operation: "command",
+    describeTarget: (args) => `${MCP_UPDATE_TOOL}:${String(args["name"] ?? "")} ${String(args["command"] ?? args["url"] ?? "")}`.trim(),
+    execute: (args) => runWrite(deps, args, "update")
+  };
+}
+function removeTool(deps) {
+  return {
+    name: "mcp_remove",
+    description: "\u5220\u6389\u4E00\u53F0 MCP server\uFF1A\u4ECE ~/.epoch/mcp.json \u91CC\u53BB\u6389\u90A3\u4E00\u6BB5\uFF0C\u5E76\u65AD\u5F00\u5B83\u3001\u628A\u5B83\u90A3\u6279\u5DE5\u5177\u6458\u6389\u3002\u522B\u7684 server \u548C\u6CE8\u91CA\u6392\u7248\u4E00\u4E2A\u5B57\u8282\u4E0D\u52A8\u3002\n\u26A0\uFE0F \u4E0D\u53EF\u64A4\u9500 \u2014\u2014 \u90A3\u4E00\u6BB5\u914D\u7F6E\uFF08\u542B env \u91CC\u7684\u4EE4\u724C\uFF09\u4ECE\u6587\u4EF6\u91CC\u6D88\u5931\uFF0C\u8981\u56DE\u6765\u53EA\u80FD\u91CD\u586B\u3002\u5220\u4E4B\u524D\u5148\u8DDF\u7528\u6237\u786E\u8BA4\u3002\n\u6587\u4EF6\u91CC\u6CA1\u8FD9\u4E2A\u540D\u5B57\u4F1A\u88AB\u62D2\uFF08host / plugin \u90A3\u4E24\u6279\u5220\u4E0D\u6389\uFF09\u3002",
+    parameters: {
+      type: "object",
+      properties: { name: SERVER_PROPERTIES.name },
+      required: ["name"]
+    },
+    exposure: ToolExposure.Direct,
+    supportsParallel: false,
+    annotations: ADMIN_ANNOTATIONS,
+    operation: "command",
+    describeTarget: (args) => `${MCP_REMOVE_TOOL}:${String(args["name"] ?? "")}`,
+    async execute(args) {
+      const start = Date.now();
+      const name = str(args, "name").trim();
+      if (!name) return fail("name must not be empty", start, 3201);
+      const outcome = await deps.control.remove(name);
+      if (!outcome.ok) {
+        return fail(
+          `${outcome.reason}: ${outcome.detail}`,
+          start,
+          3202,
+          HINT_BY_REASON[outcome.reason]
+        );
+      }
+      return done(
+        `removed MCP server "${name}" from ${outcome.configPath}. Its tools are gone from this process.`,
+        start
+      );
+    }
+  };
+}
+function createMcpTools(deps) {
+  return [listTool(deps), addTool(deps), updateTool(deps), removeTool(deps)];
+}
+var MCP_LIST_TOOL, MCP_ADD_TOOL, MCP_UPDATE_TOOL, MCP_REMOVE_TOOL, SERVER_PROPERTIES, ADMIN_ANNOTATIONS, HINT_BY_REASON;
+var init_mcp_tools = __esm({
+  "src/mcp-tools.ts"() {
+    MCP_LIST_TOOL = "mcp_list";
+    MCP_ADD_TOOL = "mcp_add";
+    MCP_UPDATE_TOOL = "mcp_update";
+    MCP_REMOVE_TOOL = "mcp_remove";
+    SERVER_PROPERTIES = {
+      name: {
+        type: "string",
+        description: "server \u540D\u3002\u4F1A\u539F\u6837\u53D8\u6210\u5DE5\u5177\u540D\u7684\u4E00\u90E8\u5206\uFF08mcp__<name>__<\u5DE5\u5177>\uFF09"
+      },
+      transport: {
+        type: "string",
+        enum: ["stdio", "sse", "http"],
+        description: "\u4F20\u8F93\u7C7B\u578B\uFF1Astdio \u8D77\u4E00\u4E2A\u672C\u5730\u5B50\u8FDB\u7A0B\uFF0Csse / http \u8FDE\u4E00\u4E2A\u5730\u5740"
+      },
+      command: { type: "string", description: "stdio \u90A3\u4E00\u6863\u7684\u53EF\u6267\u884C\u6587\u4EF6\uFF0C\u5982 npx" },
+      args: {
+        type: "array",
+        items: { type: "string" },
+        description: "stdio \u90A3\u4E00\u6863\u7684\u547D\u4EE4\u884C\u53C2\u6570\uFF0C\u5143\u7D20\u5FC5\u987B\u5168\u662F\u5B57\u7B26\u4E32"
+      },
+      url: { type: "string", description: "sse / http \u90A3\u4E24\u6863\u7684\u5730\u5740" },
+      env: {
+        type: "object",
+        additionalProperties: { type: "string" },
+        description: "\u5B50\u8FDB\u7A0B\u73AF\u5883\u53D8\u91CF\uFF0C\u503C\u5FC5\u987B\u5168\u662F\u5B57\u7B26\u4E32"
+      }
+    };
+    ADMIN_ANNOTATIONS = {
+      readOnlyHint: false,
+      destructiveHint: true,
+      idempotentHint: false,
+      openWorldHint: true
+    };
+    HINT_BY_REASON = {
+      "invalid-name": 'Use only letters, digits, "_" and "-", starting with a letter or digit (max 48 chars) \u2014 the name becomes part of every tool name this server exposes.',
+      "invalid-config": 'stdio needs "command"; sse and http need a valid "url". Fix that one field and retry.',
+      duplicate: "That name is already taken \u2014 call mcp_list, then use mcp_update instead of mcp_add.",
+      "not-found": "That name is not in ~/.epoch/mcp.json \u2014 call mcp_list first, or use mcp_add.",
+      unwritable: "The config file could not be read, written, or parsed. Do not retry \u2014 tell the user to look at ~/.epoch/mcp.json themselves.",
+      "apply-failed": "The config file was written but this process could not be brought in line. The change takes effect on the next epoch start."
+    };
+  }
+});
 function providerLabel(info, lang) {
   switch (info.type) {
     case "ollama":
@@ -607,12 +824,16 @@ function buildModelCatalogControl(opts) {
   };
   return {
     providers() {
-      return PROVIDER_INFOS.filter((p) => p.interactive).map((p) => ({
-        type: p.type,
-        label: p.label,
-        envVar: p.apiKeyEnv,
-        hasKey: p.apiKeyEnv === null || keyOf(p.apiKeyEnv) !== ""
-      }));
+      return PROVIDER_INFOS.filter((p) => p.interactive).map((p) => {
+        const key = p.apiKeyEnv ? keyOf(p.apiKeyEnv) : "";
+        return {
+          type: p.type,
+          label: p.label,
+          envVar: p.apiKeyEnv,
+          hasKey: p.apiKeyEnv === null || key !== "",
+          keyHint: key === "" ? null : maskApiKey(key)
+        };
+      });
     },
     async discover(provider, discoverOpts) {
       const envVar = getProviderInfo(provider)?.apiKeyEnv ?? null;
@@ -632,6 +853,19 @@ function buildModelCatalogControl(opts) {
         source: result.source,
         status: probeStatus(result, { needsKey: envVar !== null, hasKey: apiKey !== "" })
       };
+    },
+    async setKey(provider, apiKey) {
+      const envVar = getProviderInfo(provider)?.apiKeyEnv ?? null;
+      if (!envVar) throw new Error(t("provider.key_not_applicable", { provider }));
+      const written = await writeProviderSecret(envVar, apiKey, envPath(homeDir));
+      clearModelCache(homeDir, provider);
+      return {
+        envVar,
+        backend: written.backend,
+        encrypted: written.encrypted,
+        envPath: written.envPath,
+        keyHint: maskApiKey(apiKey)
+      };
     }
   };
 }
@@ -761,6 +995,15 @@ function createPluginControl(deps) {
     }
     return { ok: true, source: hit.ref.source, marketplace: hit.ref.marketplace };
   };
+  const resolveLocal = (path, lang) => {
+    const refuse2 = {
+      ok: false,
+      reason: "not-local",
+      detail: t("plugin_control.not_local_path", { path: path === "" ? "(empty)" : path }, lang)
+    };
+    if (path === "" || !isAbsolute(path)) return refuse2;
+    return resolveSource(path)?.type === "local" ? { ok: true, source: path } : refuse2;
+  };
   const recordOf = (name, lang) => {
     const record = readPluginRecords(deps.statePath).records.find((r) => r.name === name);
     if (!record) {
@@ -817,6 +1060,58 @@ function createPluginControl(deps) {
       const target = resolveRef(ref, lang);
       return target.ok ? mark(await flow.install(target.source, token, { marketplace: target.marketplace }, lang)) : target;
     },
+    previewLocal: async (path, lang) => {
+      const target = resolveLocal(path, lang);
+      return target.ok ? flow.preview(target.source, {}, lang) : target;
+    },
+    installLocal: async (path, token, lang) => {
+      const target = resolveLocal(path, lang);
+      return target.ok ? mark(await flow.install(target.source, token, {}, lang)) : target;
+    },
+    marketplaces: () => readMarketplaces(deps.marketplacesPath).records.map((r) => ({
+      name: r.name,
+      source: r.source,
+      entries: r.catalog.plugins.length,
+      addedAt: r.addedAt,
+      local: isLocalSource(r.source)
+    })),
+    addMarketplace: async (source, lang) => {
+      const raw = source.trim();
+      if (raw === "") {
+        return {
+          ok: false,
+          reason: "unknown-ref",
+          detail: t("plugin_control.market_source_empty", void 0, lang)
+        };
+      }
+      if (!deps.allowRemote && !isLocalSource(raw)) {
+        return {
+          ok: false,
+          reason: "remote-disabled",
+          detail: t("plugin_control.market_add_remote_off", { source: raw }, lang)
+        };
+      }
+      const outcome = await addMarketplace(raw, { statePath: deps.marketplacesPath });
+      if (!outcome.ok) return { ok: false, reason: "failed", detail: outcome.reason };
+      return {
+        ok: true,
+        marketplace: {
+          name: outcome.record.name,
+          source: outcome.record.source,
+          entries: outcome.record.catalog.plugins.length,
+          addedAt: outcome.record.addedAt,
+          local: isLocalSource(outcome.record.source)
+        }
+      };
+    },
+    removeMarketplace: async (name, lang) => {
+      const outcome = await removeMarketplace(name, { statePath: deps.marketplacesPath });
+      return outcome.ok ? { ok: true } : {
+        ok: false,
+        reason: "not-installed",
+        detail: outcome.reason ?? t("plugin_control.market_missing", { name }, lang)
+      };
+    },
     previewUpdate: async (name, lang) => {
       const found = recordOf(name, lang);
       return found.ok ? flow.preview(found.record.source, replaceOpts(found.record), lang) : found;
@@ -871,6 +1166,7 @@ function readOne(ref, diags) {
   for (const issue of parsed.issues) {
     diags.warn(`${MODULE} ${issue.path}`, issue.message, "mcp-config-invalid");
   }
+  const root = dirname(ref.path);
   const servers = [];
   for (const server of parsed.servers) {
     if (!AGENT_ROLE_NAME_PATTERN.test(server.name)) {
@@ -881,10 +1177,21 @@ function readOne(ref, diags) {
       );
       continue;
     }
-    servers.push({ ...server, name: `${ref.plugin}__${server.name}` });
+    servers.push(withPluginRoot({ ...server, name: `${ref.plugin}__${server.name}` }, root));
   }
   return servers;
 }
+function withPluginRoot(server, root) {
+  const out = { ...server };
+  if (out.command !== void 0) out.command = substitutePluginRoot(out.command, root);
+  if (out.args !== void 0) out.args = out.args.map((a) => substitutePluginRoot(a, root));
+  if (out.env !== void 0) {
+    out.env = Object.fromEntries(
+      Object.entries(out.env).map(([k, v]) => [k, substitutePluginRoot(v, root)])
+    );
+  }
+  return out;
+}
 function reason(err) {
   return err instanceof Error ? err.message : String(err);
 }
@@ -1204,7 +1511,7 @@ async function runOnce(store, def, opts, startedAt, now) {
       });
       return { status: "failed", exitCode: SCHEDULE_EXIT_CODES.FAILURE, run, detail: reason2 };
     }
-    const level = runtime.permissions.setLevel(def.permission);
+    const level = runtime.permissions.setLevel(def.permission, { remember: false });
     if (!level.ok) {
       const reason2 = `managed-policy: ${def.permission}`;
       const run = store.recordRun({
@@ -1498,7 +1805,6 @@ function resolveModelCapability(config, diags) {
     const cap = getCapability(config.model, config.homeDir);
     return {
       contextLength: cap.contextLength,
-      supportsImages: cap.supportsImages,
       ...cap.pricing ? { pricing: cap.pricing } : {}
     };
   } catch {
@@ -1507,7 +1813,7 @@ function resolveModelCapability(config, diags) {
       t("boot.no_model_metadata", { model: config.model }),
       "no-model-metadata"
     );
-    return { contextLength: config.contextLength, supportsImages: false };
+    return { contextLength: config.contextLength };
   }
 }
 function reportUtilityModel(info, diags) {
@@ -1534,7 +1840,7 @@ function buildTrust(config, workDir, diags, interactive) {
     const gate2 = createAllowAllGate(t("boot.trust_disabled"));
     setTrustGate(gate2);
     const trust2 = gate2.decide(workDir);
-    diags.warn("Trust", trust2.reason, "trust-disabled");
+    diags.skipped("Trust", trust2.reason);
     const disabled = safeInit("Trust", () => new TrustManager(trustPath(config.homeDir)), diags);
     for (const err of disabled?.loadErrors ?? []) diags.warn("Trust", err, "trust-load-error");
     return { manager: disabled, trust: trust2, root, gate: gate2 };
@@ -1630,11 +1936,19 @@ function buildServices(baseConfig, diags, workDir = process.cwd(), opts = {}) {
     }
   }
   if (provider) provider.refreshMetadata();
-  const providerBridge = provider ? {
-    generate: provider.generate.bind(provider),
-    stream: provider.stream.bind(provider),
+  const router = provider;
+  const providerBridge = router ? {
+    generate: router.generate.bind(router),
+    stream: router.stream.bind(router),
     get capabilities() {
-      return { supportsImages: capability.supportsImages };
+      try {
+        return { supportsImages: router.getCapability().supportsImages };
+      } catch {
+        return { supportsImages: false };
+      }
+    },
+    get modelId() {
+      return router.getSelection().model;
     }
   } : null;
   const session = safeInit("Session", () => new SessionManager(config.dbPath), diags);
@@ -1765,6 +2079,7 @@ function buildServices(baseConfig, diags, workDir = process.cwd(), opts = {}) {
       }
     }
   }
+  const compliance = buildCompliance(config, projectContext.rootDir, trust.trusted, diags);
   let contextEngine = null;
   if (provider) {
     reportUtilityModel(provider.getUtilityInfo(), diags);
@@ -1816,9 +2131,53 @@ function buildServices(baseConfig, diags, workDir = process.cwd(), opts = {}) {
     policy: policyStatus,
     hook: hookStatus,
     plugins,
+    compliance,
     cleanups
   };
 }
+function buildCompliance(config, projectRoot, trusted, diags) {
+  const settings = resolveComplianceSettings(config.compliance);
+  if (!settings.enabled) {
+    diags.skipped("Compliance", t("boot.compliance_off"));
+    return null;
+  }
+  const rules = [];
+  const exempt = [];
+  try {
+    const dirs = resolveComplianceDirs({
+      userDir: resolveComplianceDir(config.homeDir),
+      ...projectRoot ? { projectRoot } : {},
+      trusted,
+      diags
+    });
+    for (const spec of dirs.dirs) {
+      const loaded = loadLexiconFiles(spec.dir, spec.source, diags);
+      rules.push(...loaded.rules);
+      exempt.push(...loaded.exempt);
+    }
+  } catch {
+    diags.warn("Compliance", t("boot.compliance_load_failed"), "compliance-load-failed");
+  }
+  const engine = new ComplianceEngine({ settings, rules, exempt });
+  diags.ok(
+    "Compliance",
+    t("boot.compliance_ready", {
+      active: engine.activeRuleCount,
+      builtin: engine.counts.builtin,
+      external: engine.counts.user + engine.counts.project
+    })
+  );
+  return engine;
+}
+function resolveComplianceSettings(raw) {
+  return {
+    enabled: raw?.enabled ?? DEFAULT_COMPLIANCE_SETTINGS.enabled,
+    scope: { ...DEFAULT_COMPLIANCE_SETTINGS.scope, ...raw?.scope },
+    skipCodeBlocks: raw?.skipCodeBlocks ?? DEFAULT_COMPLIANCE_SETTINGS.skipCodeBlocks,
+    maxHoldChars: raw?.maxHoldChars ?? DEFAULT_COMPLIANCE_SETTINGS.maxHoldChars,
+    actions: { ...DEFAULT_COMPLIANCE_SETTINGS.actions, ...raw?.actions }
+  };
+}
 var init_services = __esm({
   "src/services.ts"() {
   }
@@ -1966,11 +2325,11 @@ var init_agent_session = __esm({
           }
         };
         return {
-          onApprovalRequest: (req) => new Promise((resolve3) => {
-            enqueue({ kind: "approval", req, resolve: resolve3 });
+          onApprovalRequest: (req) => new Promise((resolve4) => {
+            enqueue({ kind: "approval", req, resolve: resolve4 });
           }),
-          onQuestionRequest: (req) => new Promise((resolve3) => {
-            enqueue({ kind: "question", req, resolve: resolve3 });
+          onQuestionRequest: (req) => new Promise((resolve4) => {
+            enqueue({ kind: "question", req, resolve: resolve4 });
           }),
           attach: (session) => {
             target = session;
@@ -2090,8 +2449,8 @@ var init_agent_session = __esm({
               }
               continue;
             }
-            const { value: event, done } = await pendingNext;
-            if (done) break;
+            const { value: event, done: done2 } = await pendingNext;
+            if (done2) break;
             pendingNext = iter.next();
             if (event.type === "text-delta") assistantText += event.text;
             turn.observe(event);
@@ -2208,7 +2567,7 @@ function buildSessionGuards(input) {
     permission,
     planState,
     managed,
-    startLevel,
+    defaultLevel,
     requestApproval,
     interactive,
     deferredTools
@@ -2218,7 +2577,7 @@ function buildSessionGuards(input) {
     const reveal = own ? createToolRevealState() : bootstrapReveal;
     return {
       permission: perm,
-      permissions: perm ? buildSessionPermissions(perm, managed, state) : null,
+      permissions: perm ? buildSessionPermissions(perm, managed, state, defaultLevel) : null,
       plan: state ? buildPlanControl(state) : null,
       planState: state,
       tools: own ? [
@@ -2233,22 +2592,24 @@ function buildSessionGuards(input) {
     bootstrap: () => bootstrapScope,
     open: () => {
       if (!permission) return scopeOf(null, null, true);
-      const own = permission.scoped(startLevel);
+      const own = permission.scoped(defaultLevel.get());
       return scopeOf(own, planState ? new PlanModeState(own) : null, true);
     }
   };
 }
-function buildSessionPermissions(permission, managed, planState) {
+function buildSessionPermissions(permission, managed, planState, defaultLevel) {
   return {
     level: () => permission.getLevel(),
     managed: () => ({ bypassDisabled: managed.disableBypassPermissionsMode }),
-    setLevel: (level) => {
+    setLevel: (level, opts) => {
       if (level === "bypass" && managed.disableBypassPermissionsMode) {
         return { ok: false, reason: "managed-bypass-disabled" };
       }
       permission.setLevel(level);
       planState?.forget();
-      return { ok: true };
+      if (!opts.remember) return { ok: true };
+      const failure = defaultLevel.remember(level);
+      return failure ? { ok: true, notRemembered: failure } : { ok: true };
     }
   };
 }
@@ -2699,9 +3060,6 @@ var init_mcp_config_apply = __esm({
     init_mcp_config_file();
   }
 });
-function isWritableName(name) {
-  return /^[A-Za-z0-9][A-Za-z0-9_-]{0,47}$/.test(name);
-}
 function skipTrivia(raw, from) {
   let i = from;
   for (; ; ) {
@@ -2765,13 +3123,15 @@ function walkObject(raw, braceAt) {
   const entries = [];
   let i = skipTrivia(raw, braceAt + 1);
   while (i < raw.length && raw[i] !== "}") {
+    const keyAt = i;
     const key = readString(raw, i);
     if (!key) return { entries, clean: false };
     const afterKey = skipTrivia(raw, key[1]);
     if (raw[afterKey] !== ":") return { entries, clean: false };
     const valueAt2 = skipTrivia(raw, afterKey + 1);
-    entries.push({ key: key[0], valueAt: valueAt2 });
-    i = skipTrivia(raw, skipValue(raw, valueAt2));
+    const valueEnd = skipValue(raw, valueAt2);
+    entries.push({ key: key[0], keyAt, valueAt: valueAt2, valueEnd });
+    i = skipTrivia(raw, valueEnd);
     if (raw[i] === ",") i = skipTrivia(raw, i + 1);
     else if (raw[i] !== "}") return { entries, clean: false };
   }
@@ -2789,10 +3149,14 @@ function locate(raw) {
     }
     const inner = walkObject(raw, servers.valueAt);
     if (!inner.clean) return { ok: false, detail: t("mcp_write.servers_unreadable") };
-    const keys = inner.entries.map((e) => e.key);
     return {
       ok: true,
-      landing: { braceAt: servers.valueAt, hasMembers: keys.length > 0, keys, kind: "servers" }
+      landing: {
+        braceAt: servers.valueAt,
+        hasMembers: inner.entries.length > 0,
+        entries: inner.entries,
+        kind: "servers"
+      }
     };
   }
   if (top.entries.some((e) => e.key === "mcpServers")) {
@@ -2800,15 +3164,29 @@ function locate(raw) {
   }
   return {
     ok: true,
-    landing: { braceAt: start, hasMembers: top.entries.length > 0, keys: [], kind: "top" }
+    landing: { braceAt: start, hasMembers: top.entries.length > 0, entries: [], kind: "top" }
   };
 }
 function indentOf(raw) {
   return /\n([ \t]+)\S/.exec(raw)?.[1] ?? "  ";
 }
-function renderEntry(input, indent) {
-  const pad = indent.repeat(2);
-  const inner = indent.repeat(3);
+function eolOf(raw) {
+  const at = raw.indexOf("\n");
+  if (at < 0) return "\n";
+  return raw[at - 1] === "\r" ? "\r\n" : "\n";
+}
+function withEol(block, eol) {
+  return eol === "\n" ? block : block.replaceAll("\n", eol);
+}
+var init_mcp_json_scan = __esm({
+  "src/mcp-json-scan.ts"() {
+  }
+});
+function isWritableName(name) {
+  return /^[A-Za-z0-9][A-Za-z0-9_-]{0,47}$/.test(name);
+}
+function renderEntry(input, indent, pad = indent.repeat(2)) {
+  const inner = pad + indent;
   const fields = [`${inner}"transport": ${JSON.stringify(input.transport)}`];
   if (input.command) fields.push(`${inner}"command": ${JSON.stringify(input.command)}`);
   if (input.args && input.args.length > 0) {
@@ -2832,7 +3210,7 @@ function insertServerText(raw, input) {
   const scan = locate(raw);
   if (!scan.ok) return { ok: false, reason: "unwritable", detail: scan.detail };
   const { landing } = scan;
-  if (landing.keys.includes(input.name)) {
+  if (landing.entries.some((e) => e.key === input.name)) {
     return { ok: false, reason: "duplicate", detail: input.name };
   }
   const indent = indentOf(raw);
@@ -2844,7 +3222,8 @@ ${indent}"servers": {
 ${entry}
 ${indent}}${landing.hasMembers ? "," : "\n"}`;
   const at = landing.braceAt + 1;
-  return { ok: true, text: raw.slice(0, at) + block + raw.slice(at) };
+  const eol = eolOf(raw);
+  return { ok: true, text: raw.slice(0, at) + withEol(block, eol) + raw.slice(at) };
 }
 function writeMcpServer(input, opts = {}) {
   if (!isWritableName(input.name)) {
@@ -2853,17 +3232,8 @@ function writeMcpServer(input, opts = {}) {
   for (const name of opts.taken ?? []) {
     if (name === input.name) return { ok: false, reason: "duplicate", detail: input.name };
   }
-  const probe = parseMcpConfig(
-    JSON.stringify({ servers: { [input.name]: rawFields(input) } }),
-    "(add-form)"
-  );
-  if (probe.servers.length === 0) {
-    return {
-      ok: false,
-      reason: "invalid-config",
-      detail: probe.issues.map((i) => i.message).join("; ") || t("mcp_write.invalid")
-    };
-  }
+  const invalid = validateAddInput(input);
+  if (invalid !== null) return { ok: false, reason: "invalid-config", detail: invalid };
   const configPath2 = mcpConfigPath(opts.homeDir);
   let raw;
   try {
@@ -2881,6 +3251,14 @@ function writeMcpServer(input, opts = {}) {
   }
   return { ok: true, configPath: configPath2 };
 }
+function validateAddInput(input, lang) {
+  const probe = parseMcpConfig(
+    JSON.stringify({ servers: { [input.name]: rawFields(input) } }),
+    "(add-form)"
+  );
+  if (probe.servers.length > 0) return null;
+  return probe.issues.map((i) => i.message).join("; ") || t("mcp_write.invalid", {}, lang);
+}
 function rawFields(input) {
   return {
     transport: input.transport,
@@ -2907,9 +3285,172 @@ function toServerConfig(input) {
 var EMPTY_CONFIG;
 var init_mcp_config_write = __esm({
   "src/mcp-config-write.ts"() {
+    init_mcp_json_scan();
     EMPTY_CONFIG = '{\n  "servers": {}\n}\n';
   }
 });
+function skipSpaces(raw, from) {
+  let i = from;
+  while (i < raw.length && /[ \t\r\n]/.test(raw[i])) i++;
+  return i;
+}
+function lineStart(raw, at) {
+  return raw.lastIndexOf("\n", at - 1) + 1;
+}
+function lineEnd(raw, at) {
+  const nl = raw.indexOf("\n", at);
+  return nl === -1 ? raw.length : nl;
+}
+function padBefore(raw, at) {
+  const ls = lineStart(raw, at);
+  const head = raw.slice(ls, at);
+  return /^[ \t]*$/.test(head) ? head : "";
+}
+function findEntry(raw, name) {
+  const scan = locate(raw);
+  if (!scan.ok) return { detail: scan.detail };
+  const entries = scan.landing.entries;
+  const index = entries.findIndex((e) => e.key === name);
+  return index === -1 ? null : { entries, index };
+}
+function replaceServerText(raw, input) {
+  const found = findEntry(raw, input.name);
+  if (found !== null && "detail" in found) {
+    return { ok: false, reason: "unwritable", detail: found.detail };
+  }
+  if (found === null) return { ok: false, reason: "invalid-name", detail: input.name };
+  const target = found.entries[found.index];
+  const pad = padBefore(raw, target.keyAt);
+  const entry = renderEntry(input, indentOf(raw), pad);
+  const block = withEol(entry.slice(pad.length), eolOf(raw));
+  const text = raw.slice(0, target.keyAt) + block + raw.slice(target.valueEnd);
+  return { ok: true, text };
+}
+function removeCuts(raw, entries, index) {
+  const self = entries[index];
+  const afterValue = skipTrivia(raw, self.valueEnd);
+  if (raw[afterValue] === ",") {
+    return skipSpaces(raw, self.valueEnd) === afterValue ? [tidyLine(raw, self.keyAt, afterValue + 1)] : [
+      [self.keyAt, self.valueEnd],
+      [afterValue, afterValue + 1]
+    ];
+  }
+  const prev = index > 0 ? entries[index - 1] : void 0;
+  const prevComma = prev === void 0 ? -1 : skipTrivia(raw, prev.valueEnd);
+  if (prevComma < 0 || raw[prevComma] !== ",") {
+    return [tidyLine(raw, self.keyAt, self.valueEnd)];
+  }
+  return [
+    [prevComma, prevComma + 1],
+    [lineStartIfBlank(raw, self.keyAt), self.valueEnd]
+  ];
+}
+function tidyLine(raw, keyAt, to) {
+  const ls = lineStart(raw, keyAt);
+  const le = lineEnd(raw, to);
+  const headBlank = /^[ \t]*$/.test(raw.slice(ls, keyAt));
+  const tailBlank = /^[ \t\r]*$/.test(raw.slice(to, le));
+  if (!headBlank || !tailBlank) return [keyAt, to];
+  return [ls, Math.min(le + 1, raw.length)];
+}
+function lineStartIfBlank(raw, at) {
+  const ls = lineStart(raw, at);
+  return /^[ \t]*$/.test(raw.slice(ls, at)) ? ls : at;
+}
+function removeServerText(raw, name) {
+  const found = findEntry(raw, name);
+  if (found !== null && "detail" in found) {
+    return { ok: false, reason: "unwritable", detail: found.detail };
+  }
+  if (found === null) return { ok: false, reason: "invalid-name", detail: name };
+  const cuts = [...removeCuts(raw, found.entries, found.index)].sort((a, b) => b[0] - a[0]);
+  let text = raw;
+  for (const [from, to] of cuts) text = text.slice(0, from) + text.slice(to);
+  return { ok: true, text };
+}
+function commit(splice, expectKeys, opts) {
+  const configPath2 = mcpConfigPath(opts.homeDir);
+  if (!existsSync(configPath2)) return { ok: false, reason: "not-found", detail: configPath2 };
+  let raw;
+  try {
+    raw = readFileSync(configPath2, "utf-8");
+  } catch (err) {
+    return { ok: false, reason: "unwritable", detail: describe5(err) };
+  }
+  const before = locate(raw);
+  if (!before.ok) return { ok: false, reason: "unwritable", detail: before.detail };
+  const spliced = splice(raw);
+  if (!spliced.ok) {
+    return spliced.reason === "invalid-name" ? { ok: false, reason: "not-found", detail: spliced.detail } : spliced;
+  }
+  const bad = checkSpliced(
+    spliced.text,
+    expectKeys(before.landing.entries.map((e) => e.key)),
+    opts.lang
+  );
+  if (bad !== null) return { ok: false, reason: "unwritable", detail: bad };
+  return write(configPath2, raw, spliced.text);
+}
+function checkSpliced(text, expect, lang) {
+  const after = locate(text);
+  if (!after.ok) return after.detail;
+  const got = after.landing.entries.map((e) => e.key);
+  if (got.length !== expect.length || got.some((k, i) => k !== expect[i])) {
+    return `${t("mcp_write.invalid", {}, lang)} (servers: [${got.join(", ")}] != [${expect.join(", ")}])`;
+  }
+  return null;
+}
+function write(configPath2, expectDisk, body) {
+  let disk;
+  try {
+    disk = readFileSync(configPath2, "utf-8");
+  } catch (err) {
+    return { ok: false, reason: "unwritable", detail: describe5(err) };
+  }
+  if (disk !== expectDisk) {
+    return { ok: false, reason: "unwritable", detail: t("mcp_config.stale_disk") };
+  }
+  const tmp = `${configPath2}.${process.pid}.tmp`;
+  try {
+    mkdirSync(dirname(configPath2), { recursive: true });
+    const mode = statSync(configPath2).mode & 511;
+    try {
+      writeFileSync(tmp, body, { encoding: "utf-8", mode });
+      renameSync(tmp, configPath2);
+    } catch (err) {
+      rmSync(tmp, { force: true });
+      throw err;
+    }
+  } catch (err) {
+    return { ok: false, reason: "unwritable", detail: describe5(err) };
+  }
+  return { ok: true, configPath: configPath2 };
+}
+function updateMcpServer(input, opts = {}) {
+  const invalid = validateAddInput(input, opts.lang);
+  if (invalid !== null) return { ok: false, reason: "invalid-config", detail: invalid };
+  return commit(
+    (raw) => replaceServerText(raw, input),
+    (before) => before,
+    opts
+  );
+}
+function removeMcpServer(name, opts = {}) {
+  return commit(
+    (raw) => removeServerText(raw, name),
+    (before) => before.filter((k) => k !== name),
+    opts
+  );
+}
+function describe5(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+var init_mcp_config_edit = __esm({
+  "src/mcp-config-edit.ts"() {
+    init_mcp_config_write();
+    init_mcp_json_scan();
+  }
+});
 function foldToolMode(mode) {
   if (mode === "both") return "both";
   if (mode === "code") return "code";
@@ -2948,6 +3489,12 @@ function registerLocalTools(input) {
   const rg = resolveRipgrep();
   if (rg.mode === "missing") {
     diags.warn("Ripgrep", t("boot.ripgrep_missing", { hint: rg.hint ?? "" }), "ripgrep-missing");
+  } else if (rg.mode === "not-executable") {
+    diags.warn(
+      "Ripgrep",
+      t("boot.ripgrep_not_executable", { hint: rg.hint ?? "" }),
+      "ripgrep-not-executable"
+    );
   } else if (rg.mode === "system") {
     diags.ok("Ripgrep", t("boot.ripgrep_system"));
   } else {
@@ -2976,6 +3523,7 @@ function registerLocalTools(input) {
     registry.registerTool(createRunCodeTool());
   }
   if (skills) registry.registerTool(createSkillViewTool({ skills }));
+  if (skills) registry.registerTools(createSkillWriteTools({ skills }));
   if (input.deferMcp === true) {
     registry.registerTool(
       createToolSearchTool({
@@ -3063,7 +3611,7 @@ function createToolSync(mcp, registry, defer) {
         registry.unregisterBySource(`mcp:${server}`);
         registerMcpBatch(
           registry,
-          fresh.filter((t23) => t23.name.startsWith(prefix)),
+          fresh.filter((t25) => t25.name.startsWith(prefix)),
           server,
           defer
         );
@@ -3132,6 +3680,32 @@ async function addServer(mcp, sync, input, homeDir) {
     }
   };
 }
+async function updateServer(mcp, sync, input, homeDir) {
+  const written = updateMcpServer(input, { homeDir });
+  if (!written.ok) return written;
+  await mcp.disconnect(input.name);
+  const config = toServerConfig(input);
+  const [status] = await mcp.connectAll([config], "user");
+  await sync.replace(input.name);
+  return {
+    ok: true,
+    configPath: written.configPath,
+    status: status ?? mcp.getStatus(input.name) ?? {
+      name: input.name,
+      connected: false,
+      toolCount: 0,
+      reconnectAttempts: 0,
+      source: "user"
+    }
+  };
+}
+async function removeServer(mcp, sync, name, homeDir) {
+  const written = removeMcpServer(name, { homeDir });
+  if (!written.ok) return written;
+  await mcp.disconnect(name);
+  await sync.replace(name);
+  return { ok: true, configPath: written.configPath };
+}
 async function connectAllServers(mcp, batches, budgetMs = MCP_CONNECT_BUDGET_MS) {
   const all = await withTimeout(
     Promise.all(batches.map((b) => mcp.connectAll([...b.servers], b.source))),
@@ -3179,6 +3753,12 @@ async function registerMcpTools(registry, homeDir, diags, injected = [], defer =
         if (outcome.ok) wireToolRefresh(mcp, registry, sync);
         return outcome;
       },
+      update: async (input) => {
+        const outcome = await updateServer(mcp, sync, input, homeDir);
+        if (outcome.ok) wireToolRefresh(mcp, registry, sync);
+        return outcome;
+      },
+      remove: (name) => removeServer(mcp, sync, name, homeDir),
       readConfig: () => readMcpConfigFile({ homeDir }),
       writeConfig: (text, revision, lang) => writeMcpConfigFile(text, {
         revision,
@@ -3228,7 +3808,7 @@ async function registerMcpTools(registry, homeDir, diags, injected = [], defer =
         );
         continue;
       }
-      const own = mcpTools.filter((t23) => t23.name.startsWith(`mcp__${st.name}__`));
+      const own = mcpTools.filter((t25) => t25.name.startsWith(`mcp__${st.name}__`));
       const registered = dropOverlongToolNames(
         own,
         `MCP ${st.name}`,
@@ -3257,6 +3837,7 @@ var init_tools = __esm({
   "src/tools.ts"() {
     init_host_capabilities();
     init_mcp_config_apply();
+    init_mcp_config_edit();
     init_mcp_config_file();
     init_mcp_config_write();
     MCP_CONNECT_BUDGET_MS = 15e3;
@@ -3443,6 +4024,7 @@ var init_session_factory = __esm({
             contextLength: services.contextLength,
             artifactRetention: resolveArtifactRetention(config.artifacts),
             sandboxTerminal: config.sandbox?.terminal !== false,
+            compliance: this.opts.compliance ?? void 0,
             ...role ? { role: () => ({ name: role.name, ...role.prompt ? { prompt: role.prompt } : {} }) } : {},
             ...permission ? { permissionManager: permission } : {},
             ...services.hookManager ? { hookManager: services.hookManager } : {},
@@ -3524,6 +4106,7 @@ ${context}` : goal,
             multimodal: { homeDir: config.homeDir },
             artifactRetention: resolveArtifactRetention(config.artifacts),
             sandboxTerminal: config.sandbox?.terminal !== false,
+            compliance: opts.compliance ?? void 0,
             maxTurns: active?.maxTurns ?? config.maxTurns,
             role: () => {
               const now = roleScope.current;
@@ -3636,6 +4219,9 @@ function toProvider(router) {
       } catch {
         return { supportsImages: false };
       }
+    },
+    get modelId() {
+      return router.getSelection().model;
     }
   };
 }
@@ -4018,20 +4604,96 @@ var init_utility = __esm({
     LABEL_SHAPE = /^[a-z0-9_-]{1,32}$/;
   }
 });
+function isSystemOpenable(path) {
+  const dot = path.lastIndexOf(".");
+  if (dot < 0) return false;
+  return SYSTEM_OPENABLE_EXTENSIONS.has(path.slice(dot).toLowerCase());
+}
+function toWorkspaceRelative(root, userPath) {
+  const trimmed = userPath.trim();
+  if (trimmed === "") return null;
+  if (!isAbsolute(trimmed)) return trimmed.replace(/^\.\/+/, "") || null;
+  const rel = relative(resolve(root), resolve(trimmed));
+  if (rel === "" || rel.startsWith("..")) return null;
+  return rel.split(sep).join("/");
+}
+function insideRoot(root, abs) {
+  let realRoot;
+  try {
+    realRoot = realpathSync(root);
+  } catch {
+    return false;
+  }
+  const rel = relative(realRoot, abs);
+  return rel !== "" && !rel.startsWith("..") && !isAbsolute(rel);
+}
+function sniffKind(absPath) {
+  let fd;
+  try {
+    fd = openSync(absPath, "r");
+    const buf = Buffer.alloc(8192);
+    const read = readSync(fd, buf, 0, buf.length, 0);
+    return buf.subarray(0, read).includes(0) ? "binary" : "text";
+  } catch {
+    return null;
+  } finally {
+    if (fd !== void 0) {
+      try {
+        closeSync(fd);
+      } catch {
+      }
+    }
+  }
+}
 function withinWorkspace(resolveInWorkspace2, root, rel) {
   return resolveInWorkspace2(root, rel) !== null;
 }
 function buildWorkspaceFilesControl(deps, permission) {
   let cache = null;
   const now = () => Date.now();
+  function statFileImpl(path, root) {
+    const rel = toWorkspaceRelative(root, path);
+    if (rel === null) return { ok: false, reason: "denied" };
+    const full = deps.resolveInWorkspace(root, rel);
+    if (!full) return { ok: false, reason: "denied" };
+    const decision = permission?.check({
+      type: "file_read",
+      detail: rel,
+      workDir: root,
+      target: full,
+      toolName: "file_read"
+    });
+    if (permission && !decision?.allowed) return { ok: false, reason: "denied" };
+    let stat;
+    try {
+      stat = statSync(full);
+    } catch (err) {
+      const code = err.code;
+      return {
+        ok: false,
+        reason: code === "ENOENT" || code === "ENOTDIR" ? "missing" : "unreadable"
+      };
+    }
+    if (!stat.isFile()) return { ok: false, reason: "not-a-file" };
+    let absPath;
+    try {
+      absPath = realpathSync(full);
+    } catch {
+      return { ok: false, reason: "unreadable" };
+    }
+    if (!insideRoot(root, absPath)) return { ok: false, reason: "denied" };
+    const kind = sniffKind(absPath);
+    if (kind === null) return { ok: false, reason: "unreadable" };
+    return { ok: true, rel, absPath, bytes: stat.size, mtimeMs: stat.mtimeMs, kind };
+  }
   function computeList(root) {
     const { files, truncated } = deps.listFiles(root);
     return { files, truncated, at: now(), root };
   }
   function listFor(root) {
-    const t23 = now();
+    const t25 = now();
     if (!cache || cache.root !== root) cache = computeList(root);
-    else if (t23 - cache.at > LIST_TTL_MS) cache = computeList(root);
+    else if (t25 - cache.at > LIST_TTL_MS) cache = computeList(root);
     return cache;
   }
   return {
@@ -4090,12 +4752,55 @@ function buildWorkspaceFilesControl(deps, permission) {
         return { ok: false, reason: "binary", bytes: stat.size };
       }
       return { ok: true, text: raw.toString("utf8"), bytes: stat.size };
+    },
+    statFile: statFileImpl,
+    planSystemOpen(path, root) {
+      const stat = statFileImpl(path, root);
+      if (!stat.ok) return { ok: false, reason: stat.reason };
+      if (!isSystemOpenable(stat.absPath)) return { ok: false, reason: "extension-not-allowed" };
+      const { command, args } = deps.systemOpenArgv(stat.absPath);
+      return { ok: true, command, args, absPath: stat.absPath };
     }
   };
 }
-var LIST_TTL_MS;
+var SYSTEM_OPENABLE_EXTENSIONS, LIST_TTL_MS;
 var init_workspace_files = __esm({
   "src/workspace-files.ts"() {
+    SYSTEM_OPENABLE_EXTENSIONS = /* @__PURE__ */ new Set([
+      ".doc",
+      ".docx",
+      ".xls",
+      ".xlsx",
+      ".ppt",
+      ".pptx",
+      ".rtf",
+      ".odt",
+      ".ods",
+      ".odp",
+      ".pages",
+      ".numbers",
+      ".key",
+      ".pdf",
+      ".tif",
+      ".tiff",
+      ".heic",
+      ".heif",
+      ".psd",
+      ".sketch",
+      ".fig",
+      ".mp4",
+      ".mov",
+      ".m4v",
+      ".mkv",
+      ".avi",
+      ".webm",
+      ".mp3",
+      ".wav",
+      ".m4a",
+      ".flac",
+      ".aac",
+      ".ogg"
+    ]);
     LIST_TTL_MS = 6e4;
   }
 });
@@ -4414,6 +5119,9 @@ async function assembleRuntime(opts, opened, processes) {
     config.tools?.deferMcp === true
   );
   cleanups.push(mcpWiring.dispose);
+  registry.registerTools(
+    createMcpTools({ control: mcpWiring.control, servers: () => mcpWiring.status() })
+  );
   const bridges = new SessionBridges(opts.onApprovalRequest);
   const interactive = !services.permission?.isNonInteractive();
   const requestPlanApproval = (req, sessionId2) => bridges.approve(sessionId2, req);
@@ -4423,13 +5131,14 @@ async function assembleRuntime(opts, opened, processes) {
     requestPlanApproval,
     interactive
   );
+  const defaultLevel = buildDefaultLevelSlot(services);
   const guards = buildSessionGuards({
     permission: services.permission,
     planState,
     managed: services.managedPolicy,
     deferredTools: () => registry.byExposure(ToolExposure.Deferred),
     bootstrapReveal,
-    startLevel: services.permissionLevel,
+    defaultLevel,
     requestApproval: requestPlanApproval,
     interactive
   });
@@ -4503,6 +5212,7 @@ async function assembleRuntime(opts, opened, processes) {
     deferredTools: () => registry.byExposure(ToolExposure.Deferred),
     codeModeTools: () => registry.codeModeDeclared(),
     telemetry,
+    compliance: services.compliance,
     budget: budgetWiring,
     ...opts.onApprovalRequest ? { hostApproval: opts.onApprovalRequest } : {},
     workspaces,
@@ -4604,7 +5314,7 @@ async function assembleRuntime(opts, opened, processes) {
     sessionStore: store ?? null,
     sessionReferences: services.session?.references ?? null,
     workspaceFiles: buildWorkspaceFilesControl(
-      { listFiles: listWorkspaceFiles, resolveInWorkspace },
+      { listFiles: listWorkspaceFiles, resolveInWorkspace, systemOpenArgv },
       services.permission
     ),
     checkpoints: bootstrap?.checkpoints ?? buildCheckpointControl(checkpoints, null, () => sessionId),
@@ -4631,6 +5341,10 @@ async function assembleRuntime(opts, opened, processes) {
       }));
     },
     usageScope: budgetWiring.budgetStore ? "session" : "run",
+    sessionUsage: (sessionId2) => {
+      const saved = budgetWiring.budgetStore?.load(sessionId2);
+      return saved ? persistedUsage(saved) : void 0;
+    },
     compression: compressionLine(config, services),
     get providerInfo() {
       return provider ? { provider: provider.getProviderType(), apiKeyHint: provider.getApiKeyHint() } : null;
@@ -4657,7 +5371,7 @@ async function assembleRuntime(opts, opened, processes) {
     skillIndexResidency: (role) => services.skill?.indexResidency({
       only: role === null ? void 0 : findRole(agentRoles, role)?.skills
     }) ?? /* @__PURE__ */ new Map(),
-    skillImport: buildSkillControl(services),
+    skillWrite: buildSkillControl(services),
     roleWrite: createRoleWriteControl({
       userDir: agentsDir(config.homeDir),
       roles: () => agentRoles,
@@ -4945,6 +5659,34 @@ function buildSkillControl(services) {
       const outcome = await importSkills(source, { ...opts, token });
       if (outcome.ok && outcome.imported.length > 0) services.skill?.invalidateCache();
       return outcome;
+    },
+    remove: async (name, lang) => {
+      const skill = services.skill;
+      if (!skill) {
+        return {
+          ok: false,
+          reason: "missing",
+          detail: t("skill.remove_no_system", void 0, lang)
+        };
+      }
+      const found = skill.list().find((s) => s.name === name);
+      if (!found) {
+        return {
+          ok: false,
+          reason: "not-found",
+          detail: t("skill.remove_unknown", { name }, lang)
+        };
+      }
+      try {
+        const path = await skill.delete(name);
+        return { ok: true, name, path };
+      } catch (err) {
+        return {
+          ok: false,
+          reason: found.scope === "user" ? "failed" : "readonly",
+          detail: err instanceof Error ? err.message : String(err)
+        };
+      }
     }
   };
 }
@@ -5080,7 +5822,7 @@ function buildPermissionsControl(services, bootstrap, tools) {
         bypassDisabled: p.disableBypassPermissionsMode
       };
     },
-    setLevel: (level) => bootstrap?.setLevel(level) ?? { ok: true },
+    setLevel: (level, opts) => bootstrap?.setLevel(level, opts) ?? { ok: true },
     gates: (level) => {
       const rules = compileRuleLists(services.config.permissions);
       const isolation = services.permission?.getSandboxIsolation() ?? "process";
@@ -5125,15 +5867,20 @@ function buildSettingsControl(services, workspaces, opts) {
         row.scalar ? { key: row.scalar, layers: scope.layers } : void 0
       );
       const overridable = row.scalar !== void 0;
+      const writes = scope.paths === null ? [] : settingWriteTargets({
+        key: row.key,
+        winner: chain.layer,
+        paths: scope.paths,
+        trusted: scope.trusted
+      });
+      const kind = writes.length === 0 ? null : settingValueKind(row.key);
+      const choices = writes.length === 0 ? null : settingValueChoices(row.key);
       return {
         ...chain,
         overridable,
-        writes: scope.paths === null ? [] : settingWriteTargets({
-          winner: chain.layer,
-          overridable,
-          paths: scope.paths,
-          trusted: scope.trusted
-        })
+        writes,
+        ...kind === null ? {} : { valueKind: kind },
+        ...choices === null ? {} : { choices }
       };
     });
   };
@@ -5152,7 +5899,7 @@ function buildSettingsControl(services, workspaces, opts) {
         value: input.value
       });
       if (!outcome.ok) return { ok: false, reason: outcome.reason, path };
-      const target = rows(input.sessionId).find((row) => row.key === input.key)?.writes.find((write) => write.layer === input.layer);
+      const target = rows(input.sessionId).find((row) => row.key === input.key)?.writes.find((write2) => write2.layer === input.layer);
       return {
         ok: true,
         key: input.key,
@@ -5203,6 +5950,31 @@ function writePathsOf(layers) {
   }
   return paths;
 }
+function buildDefaultLevelSlot(services) {
+  let current = services.permissionLevel;
+  return {
+    get: () => current,
+    remember: (level) => {
+      current = level;
+      const paths = writePathsOf(services.settingsLayers);
+      if (!paths) return { reason: "no-user-config" };
+      const outcome = writeSettingValue({
+        layer: "user",
+        path: paths.user,
+        key: "permission",
+        value: level
+      });
+      if (!outcome.ok) {
+        const reason2 = outcome.reason === "unwritable-file" ? "unwritable" : "io";
+        return { reason: reason2, path: paths.user };
+      }
+      if (originOf(services.configOrigins, "permission") === "env") {
+        return { reason: "env-pinned", path: paths.user };
+      }
+      return void 0;
+    }
+  };
+}
 function valueAt(config, key) {
   let cursor = config;
   for (const segment of key.split(".")) {
@@ -5236,6 +6008,7 @@ var init_build = __esm({
     init_host_capabilities();
     init_host_marketplaces();
     init_host_preset();
+    init_mcp_tools();
     init_model_catalog();
     init_plugin_control();
     init_plugin_mcp_servers();
@@ -5339,7 +6112,7 @@ async function probeMcpServer(name, opts = {}) {
     const tools = status?.connected ? await registry.getAllTools() : [];
     return {
       connected: status?.connected ?? false,
-      toolNames: tools.map((t23) => t23.name),
+      toolNames: tools.map((t25) => t25.name),
       ...status?.lastError ? { error: status.lastError } : {},
       needsLogin: status?.needsLogin ?? false
     };
@@ -5360,5 +6133,7 @@ async function requireServer(name, opts) {
 // src/index.ts
 init_mcp_config_file();
 init_mcp_config_apply();
+init_mcp_config_edit();
+init_mcp_tools();
 
-export { AgentRoleError, AgentSession, ApprovalRelay, HOST_CAPABILITIES_MODULE, HOST_MARKETPLACE_MODULE, HOST_PRESET_MODULE, QuestionRelay, SCHEDULE_EXIT_CODES, SessionStore, SessionWorkspaces, applyHostPreset, applyMcpConfig, buildModelCatalogControl, buildRuntime, buildServices, buildWorkspaceFilesControl, collectFileChanges, createScheduleControl, createUserActions, ensureSecretsReady, exitCodeFor, fireSchedule, listMcpServers, mcpConfigRevision, mcpLogin, mcpLogout, probeMcpServer, providerLabel, readMcpConfigFile, registerAskQuestion, registerLocalTools, registerMcpTools, serializeStream, splitDirList, toSerializable, utilityBudgetKey, wireCommands, wireHostCapabilities, wirePluginMcpServers, wireWorkspace, withModelScope, withRoleScope, withToolScope, writeMcpConfigFile, writeMcpServer };
+export { AgentRoleError, AgentSession, ApprovalRelay, HOST_CAPABILITIES_MODULE, HOST_MARKETPLACE_MODULE, HOST_PRESET_MODULE, MCP_ADD_TOOL, MCP_LIST_TOOL, MCP_REMOVE_TOOL, MCP_UPDATE_TOOL, QuestionRelay, SCHEDULE_EXIT_CODES, SessionStore, SessionWorkspaces, applyHostPreset, applyMcpConfig, buildModelCatalogControl, buildRuntime, buildServices, buildWorkspaceFilesControl, collectFileChanges, createMcpTools, createScheduleControl, createUserActions, ensureSecretsReady, exitCodeFor, fireSchedule, isSystemOpenable, listMcpServers, mcpConfigRevision, mcpLogin, mcpLogout, probeMcpServer, providerLabel, readMcpConfigFile, registerAskQuestion, registerLocalTools, registerMcpTools, removeMcpServer, removeServerText, replaceServerText, serializeStream, splitDirList, toSerializable, updateMcpServer, utilityBudgetKey, wireCommands, wireHostCapabilities, wirePluginMcpServers, wireWorkspace, withModelScope, withRoleScope, withToolScope, writeMcpConfigFile, writeMcpServer };