@ouro.bot/cli 0.1.0-alpha.3 → 0.1.0-alpha.300

package/dist/heart/hatch/specialist-tools.js

@@ -0,0 +1,283 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSpecialistTools = getSpecialistTools;
+exports.createSpecialistExecTool = createSpecialistExecTool;
+const crypto = __importStar(require("crypto"));
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const tools_base_1 = require("../../repertoire/tools-base");
+const hatch_flow_1 = require("./hatch-flow");
+const hatch_animation_1 = require("./hatch-animation");
+const bundle_manifest_1 = require("../../mind/bundle-manifest");
+const runtime_1 = require("../../nerves/runtime");
+const completeAdoptionTool = {
+    type: "function",
+    function: {
+        name: "complete_adoption",
+        description: "finalize the agent bundle and hatch the new agent. call this only when you have written all 5 psyche files and agent.json to the temp directory, and the human has approved the bundle.",
+        parameters: {
+            type: "object",
+            properties: {
+                name: {
+                    type: "string",
+                    description: "the PascalCase name for the new agent (e.g. 'Slugger')",
+                },
+                handoff_message: {
+                    type: "string",
+                    description: "a warm handoff message to display to the human after the agent is hatched",
+                },
+                phone: {
+                    type: "string",
+                    description: "the human's phone number (optional, for iMessage contact recognition)",
+                },
+                teams_handle: {
+                    type: "string",
+                    description: "the human's Teams email/handle (optional, for Teams contact recognition)",
+                },
+            },
+            required: ["name", "handoff_message"],
+        },
+    },
+};
+const readFileTool = tools_base_1.baseToolDefinitions.find((d) => d.tool.function.name === "read_file");
+const writeFileTool = tools_base_1.baseToolDefinitions.find((d) => d.tool.function.name === "write_file");
+const listDirToolSchema = {
+    type: "function",
+    function: {
+        name: "list_directory",
+        description: "list directory contents",
+        parameters: {
+            type: "object",
+            properties: { path: { type: "string" } },
+            required: ["path"],
+        },
+    },
+};
+/**
+ * Returns the specialist's tool schema array.
+ */
+function getSpecialistTools() {
+    return [completeAdoptionTool, tools_base_1.settleTool, readFileTool.tool, writeFileTool.tool, listDirToolSchema];
+}
+const PSYCHE_FILES = ["SOUL.md", "IDENTITY.md", "LORE.md", "TACIT.md", "ASPIRATIONS.md"];
+function isPascalCase(name) {
+    return /^[A-Z][a-zA-Z0-9]*$/.test(name);
+}
+function writeReadme(dir, purpose) {
+    fs.mkdirSync(dir, { recursive: true });
+    const readmePath = path.join(dir, "README.md");
+    /* v8 ignore next -- defensive: guard against re-scaffold on existing bundle @preserve */
+    if (!fs.existsSync(readmePath)) {
+        fs.writeFileSync(readmePath, `# ${path.basename(dir)}\n\n${purpose}\n`, "utf-8");
+    }
+}
+function scaffoldBundle(bundleRoot) {
+    writeReadme(path.join(bundleRoot, "memory"), "Persistent memory store.");
+    writeReadme(path.join(bundleRoot, "memory", "daily"), "Daily memory entries.");
+    writeReadme(path.join(bundleRoot, "memory", "archive"), "Archived memory.");
+    writeReadme(path.join(bundleRoot, "friends"), "Known friend records.");
+    writeReadme(path.join(bundleRoot, "tasks"), "Task files.");
+    writeReadme(path.join(bundleRoot, "tasks", "one-shots"), "One-shot tasks.");
+    writeReadme(path.join(bundleRoot, "habits"), "Recurring habits and autonomous rhythms.");
+    writeReadme(path.join(bundleRoot, "tasks", "ongoing"), "Ongoing tasks.");
+    writeReadme(path.join(bundleRoot, "skills"), "Local skill files.");
+    writeReadme(path.join(bundleRoot, "senses"), "Sense-specific config.");
+    writeReadme(path.join(bundleRoot, "senses", "teams"), "Teams sense config.");
+    // Memory scaffold files
+    const memoryRoot = path.join(bundleRoot, "memory");
+    const factsPath = path.join(memoryRoot, "facts.jsonl");
+    const entitiesPath = path.join(memoryRoot, "entities.json");
+    /* v8 ignore next -- defensive: guard against re-scaffold on existing bundle @preserve */
+    if (!fs.existsSync(factsPath))
+        fs.writeFileSync(factsPath, "", "utf-8");
+    /* v8 ignore next -- defensive: guard against re-scaffold on existing bundle @preserve */
+    if (!fs.existsSync(entitiesPath))
+        fs.writeFileSync(entitiesPath, "{}\n", "utf-8");
+    // bundle-meta.json
+    const meta = (0, bundle_manifest_1.createBundleMeta)();
+    fs.writeFileSync(path.join(bundleRoot, "bundle-meta.json"), JSON.stringify(meta, null, 2) + "\n", "utf-8");
+}
+function moveDir(src, dest) {
+    try {
+        fs.renameSync(src, dest);
+    }
+    catch {
+        /* v8 ignore start -- cross-device fallback: only triggers on EXDEV (e.g. /tmp → different mount), untestable in CI @preserve */
+        fs.cpSync(src, dest, { recursive: true });
+        fs.rmSync(src, { recursive: true, force: true });
+        /* v8 ignore stop */
+    }
+}
+async function execCompleteAdoption(args, deps) {
+    const name = args.name;
+    const handoffMessage = args.handoff_message;
+    if (!name) {
+        return "error: missing required 'name' parameter";
+    }
+    if (!isPascalCase(name)) {
+        return `error: name '${name}' must be PascalCase (e.g. 'Slugger', 'MyAgent')`;
+    }
+    // Validate psyche files exist
+    const psycheDir = path.join(deps.tempDir, "psyche");
+    const missingPsyche = PSYCHE_FILES.filter((f) => !fs.existsSync(path.join(psycheDir, f)));
+    if (missingPsyche.length > 0) {
+        return `error: missing psyche files in temp directory: ${missingPsyche.join(", ")}. write them first using write_file.`;
+    }
+    // Validate agent.json exists
+    const agentJsonPath = path.join(deps.tempDir, "agent.json");
+    if (!fs.existsSync(agentJsonPath)) {
+        return "error: agent.json not found in temp directory. write it first using write_file.";
+    }
+    // Validate target doesn't exist
+    const targetBundle = path.join(deps.bundlesRoot, `${name}.ouro`);
+    if (fs.existsSync(targetBundle)) {
+        return `error: bundle '${name}.ouro' already exists at ${deps.bundlesRoot}. choose a different name.`;
+    }
+    // Scaffold structural dirs into tempDir
+    scaffoldBundle(deps.tempDir);
+    // Move tempDir -> final bundle location
+    moveDir(deps.tempDir, targetBundle);
+    // Write secrets
+    try {
+        (0, hatch_flow_1.writeSecretsFile)(name, deps.provider, deps.credentials, deps.secretsRoot);
+    }
+    catch (e) {
+        // Rollback: remove the moved bundle
+        try {
+            fs.rmSync(targetBundle, { recursive: true, force: true });
+        }
+        catch {
+            // Best effort cleanup
+        }
+        return `error: failed to write secrets: ${e instanceof Error ? e.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(e)}`;
+    }
+    // Create initial friend record if contact info provided
+    const phone = args.phone;
+    const teamsHandle = args.teams_handle;
+    if (phone || teamsHandle) {
+        const friendId = crypto.randomUUID();
+        const now = new Date().toISOString();
+        const externalIds = [];
+        if (phone)
+            externalIds.push({ provider: "imessage-handle", externalId: phone, linkedAt: now });
+        if (teamsHandle)
+            externalIds.push({ provider: "aad", externalId: teamsHandle, linkedAt: now });
+        const friendRecord = {
+            id: friendId,
+            name: deps.humanName ?? "primary",
+            trustLevel: "family",
+            externalIds,
+            tenantMemberships: [],
+            toolPreferences: {},
+            notes: {},
+            createdAt: now,
+            updatedAt: now,
+            schemaVersion: 1,
+        };
+        const friendPath = path.join(targetBundle, "friends", `${friendId}.json`);
+        fs.writeFileSync(friendPath, JSON.stringify(friendRecord, null, 2), "utf-8");
+    }
+    // Play hatch animation
+    await (0, hatch_animation_1.playHatchAnimation)(name, deps.animationWriter);
+    // Display handoff message
+    /* v8 ignore next -- UI-only: handoff message display, covered by integration @preserve */
+    if (handoffMessage && deps.animationWriter) {
+        deps.animationWriter(`\n${handoffMessage}\n`);
+    }
+    (0, runtime_1.emitNervesEvent)({
+        component: "daemon",
+        event: "daemon.adoption_complete",
+        message: "adoption completed successfully",
+        meta: { agentName: name, bundlePath: targetBundle },
+    });
+    return JSON.stringify({ success: true, agentName: name, bundlePath: targetBundle });
+}
+/**
+ * Create a specialist tool executor with the given dependencies captured in closure.
+ */
+function createSpecialistExecTool(deps) {
+    (0, runtime_1.emitNervesEvent)({
+        component: "daemon",
+        event: "daemon.specialist_exec_tool_created",
+        message: "specialist exec tool created",
+        meta: { tempDir: deps.tempDir },
+    });
+    return async (name, args) => {
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.specialist_tool_exec",
+            message: "executing specialist tool",
+            meta: { tool: name },
+        });
+        if (name === "complete_adoption") {
+            return execCompleteAdoption(args, deps);
+        }
+        if (name === "read_file") {
+            try {
+                return fs.readFileSync(args.path, "utf-8");
+            }
+            catch (e) {
+                return `error: ${e instanceof Error ? e.message : /* v8 ignore next -- defensive @preserve */ String(e)}`;
+            }
+        }
+        if (name === "write_file") {
+            try {
+                const dir = path.dirname(args.path);
+                fs.mkdirSync(dir, { recursive: true });
+                const content = typeof args.content === "string"
+                    ? args.content
+                    : JSON.stringify(args.content, null, 2);
+                fs.writeFileSync(args.path, content, "utf-8");
+                return `wrote ${args.path}`;
+            }
+            catch (e) {
+                return `error: ${e instanceof Error ? e.message : /* v8 ignore next -- defensive @preserve */ String(e)}`;
+            }
+        }
+        if (name === "list_directory") {
+            try {
+                return fs
+                    .readdirSync(args.path, { withFileTypes: true })
+                    .map((e) => `${e.isDirectory() ? "d" : "-"}  ${e.name}`)
+                    .join("\n");
+            }
+            catch (e) {
+                return `error: ${e instanceof Error ? e.message : /* v8 ignore next -- defensive @preserve */ String(e)}`;
+            }
+        }
+        return `error: unknown tool '${name}'`;
+    };
+}

package/dist/heart/identity.js

@@ -33,20 +33,40 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_AGENT_PHRASES = exports.DEFAULT_AGENT_CONTEXT = void 0;
+exports.HARNESS_CANONICAL_REPO_URL = exports.DEFAULT_AGENT_SENSES = exports.DEFAULT_VAULT_SERVER_URL = exports.DEFAULT_AGENT_PHRASES = exports.DEFAULT_AGENT_CONTEXT = exports.PROVIDER_CREDENTIALS = void 0;
+exports.resolveVaultConfig = resolveVaultConfig;
+exports.normalizeSenses = normalizeSenses;
 exports.buildDefaultAgentTemplate = buildDefaultAgentTemplate;
 exports.getAgentName = getAgentName;
 exports.getRepoRoot = getRepoRoot;
 exports.getAgentBundlesRoot = getAgentBundlesRoot;
 exports.getAgentRoot = getAgentRoot;
+exports.getAgentStateRoot = getAgentStateRoot;
+exports.getAgentRepoWorkspacesRoot = getAgentRepoWorkspacesRoot;
+exports.getAgentDaemonStateRoot = getAgentDaemonStateRoot;
+exports.getAgentDaemonLogsDir = getAgentDaemonLogsDir;
+exports.getAgentDaemonLoggingConfigPath = getAgentDaemonLoggingConfigPath;
+exports.getAgentMessagesRoot = getAgentMessagesRoot;
+exports.getAgentToolsRoot = getAgentToolsRoot;
 exports.getAgentSecretsPath = getAgentSecretsPath;
 exports.loadAgentConfig = loadAgentConfig;
 exports.setAgentName = setAgentName;
+exports.setAgentConfigOverride = setAgentConfigOverride;
+exports.resetAgentConfigCache = resetAgentConfigCache;
 exports.resetIdentity = resetIdentity;
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const runtime_1 = require("../nerves/runtime");
+const migrate_config_1 = require("./migrate-config");
+/** Single source of truth for per-provider credential field names, env var mappings, and prompt labels. */
+exports.PROVIDER_CREDENTIALS = {
+    anthropic: { required: ["setupToken"], envVars: { ANTHROPIC_API_KEY: "setupToken" }, promptLabels: { setupToken: "Anthropic setup-token" } },
+    "openai-codex": { required: ["oauthAccessToken"], envVars: { OPENAI_API_KEY: "oauthAccessToken" }, promptLabels: { oauthAccessToken: "OpenAI Codex OAuth token" } },
+    azure: { required: ["apiKey", "endpoint", "deployment"], envVars: { AZURE_OPENAI_API_KEY: "apiKey", AZURE_OPENAI_KEY: "apiKey", AZURE_OPENAI_ENDPOINT: "endpoint", AZURE_OPENAI_DEPLOYMENT: "deployment" }, promptLabels: { apiKey: "Azure API key", endpoint: "Azure endpoint", deployment: "Azure deployment" } },
+    minimax: { required: ["apiKey"], envVars: { MINIMAX_API_KEY: "apiKey" }, promptLabels: { apiKey: "MiniMax API key" } },
+    "github-copilot": { required: ["githubToken", "baseUrl"], envVars: { GH_TOKEN: "githubToken", GITHUB_TOKEN: "githubToken" }, promptLabels: { githubToken: "GitHub token" } },
+};
 exports.DEFAULT_AGENT_CONTEXT = {
     maxTokens: 80000,
     contextMargin: 20,
@@ -56,12 +76,85 @@ exports.DEFAULT_AGENT_PHRASES = {
     tool: ["running tool"],
     followup: ["processing"],
 };
+exports.DEFAULT_VAULT_SERVER_URL = "https://vault.ouro.bot";
+/**
+ * Resolve the vault config for an agent, applying defaults.
+ * If vault is not configured in agent.json, returns default values.
+ */
+function resolveVaultConfig(agentName, config) {
+    return {
+        email: config?.email ?? `${agentName}@ouro.bot`,
+        serverUrl: config?.serverUrl ?? exports.DEFAULT_VAULT_SERVER_URL,
+    };
+}
+exports.DEFAULT_AGENT_SENSES = {
+    cli: { enabled: true },
+    teams: { enabled: false },
+    bluebubbles: { enabled: false },
+};
+function normalizeSenses(value, configFile) {
+    const defaults = {
+        cli: { ...exports.DEFAULT_AGENT_SENSES.cli },
+        teams: { ...exports.DEFAULT_AGENT_SENSES.teams },
+        bluebubbles: { ...exports.DEFAULT_AGENT_SENSES.bluebubbles },
+    };
+    if (value === undefined) {
+        return defaults;
+    }
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "error",
+            event: "config_identity.error",
+            component: "config/identity",
+            message: "agent config has invalid senses block",
+            meta: { path: configFile },
+        });
+        throw new Error(`agent.json at ${configFile} must include senses as an object when present.`);
+    }
+    const raw = value;
+    const senseNames = ["cli", "teams", "bluebubbles"];
+    for (const senseName of senseNames) {
+        const rawSense = raw[senseName];
+        if (rawSense === undefined) {
+            continue;
+        }
+        if (!rawSense || typeof rawSense !== "object" || Array.isArray(rawSense)) {
+            (0, runtime_1.emitNervesEvent)({
+                level: "error",
+                event: "config_identity.error",
+                component: "config/identity",
+                message: "agent config has invalid sense config",
+                meta: { path: configFile, sense: senseName },
+            });
+            throw new Error(`agent.json at ${configFile} has invalid senses.${senseName} config.`);
+        }
+        const enabled = rawSense.enabled;
+        if (typeof enabled !== "boolean") {
+            (0, runtime_1.emitNervesEvent)({
+                level: "error",
+                event: "config_identity.error",
+                component: "config/identity",
+                message: "agent config has invalid sense enabled flag",
+                meta: { path: configFile, sense: senseName, enabled: enabled ?? null },
+            });
+            throw new Error(`agent.json at ${configFile} must include senses.${senseName}.enabled as boolean.`);
+        }
+        defaults[senseName] = { enabled };
+    }
+    return defaults;
+}
 function buildDefaultAgentTemplate(_agentName) {
     return {
-        version: 1,
+        version: 2,
         enabled: true,
-        provider: "anthropic",
+        humanFacing: { provider: "anthropic", model: "claude-opus-4-6" },
+        agentFacing: { provider: "anthropic", model: "claude-opus-4-6" },
         context: { ...exports.DEFAULT_AGENT_CONTEXT },
+        senses: {
+            cli: { ...exports.DEFAULT_AGENT_SENSES.cli },
+            teams: { ...exports.DEFAULT_AGENT_SENSES.teams },
+            bluebubbles: { ...exports.DEFAULT_AGENT_SENSES.bluebubbles },
+        },
         phrases: {
             thinking: [...exports.DEFAULT_AGENT_PHRASES.thinking],
             tool: [...exports.DEFAULT_AGENT_PHRASES.tool],
@@ -70,7 +163,7 @@ function buildDefaultAgentTemplate(_agentName) {
     };
 }
 let _cachedAgentName = null;
-let _cachedAgentConfig = null;
+let _agentConfigOverride = null;
 /**
  * Parse `--agent <name>` from process.argv.
  * Caches the result after first parse.
@@ -111,13 +204,49 @@ function getRepoRoot() {
  * Returns the shared bundle root directory: `~/AgentBundles/`
  */
 function getAgentBundlesRoot() {
-    return path.join(os.homedir(), "AgentBundles");
+    const homeBase = process.env.WEBSITE_SITE_NAME ? "/home" : os.homedir();
+    return path.join(homeBase, "AgentBundles");
 }
 /**
  * Returns the agent-specific bundle directory: `~/AgentBundles/<agentName>.ouro/`
  */
-function getAgentRoot() {
-    return path.join(getAgentBundlesRoot(), `${getAgentName()}.ouro`);
+function getAgentRoot(agentName = getAgentName()) {
+    return path.join(getAgentBundlesRoot(), `${agentName}.ouro`);
+}
+function resolveOptionalAgentName(agentName) {
+    if (agentName && agentName.trim().length > 0)
+        return agentName.trim();
+    try {
+        return getAgentName();
+    }
+    catch {
+        return "slugger";
+    }
+}
+/**
+ * Returns the bundle-local runtime state directory: `~/AgentBundles/<agentName>.ouro/state/`
+ */
+function getAgentStateRoot(agentName) {
+    return path.join(getAgentRoot(resolveOptionalAgentName(agentName)), "state");
+}
+exports.HARNESS_CANONICAL_REPO_URL = "https://github.com/ouroborosbot/ouroboros.git";
+function getAgentRepoWorkspacesRoot(agentName) {
+    return path.join(getAgentStateRoot(resolveOptionalAgentName(agentName)), "workspaces");
+}
+function getAgentDaemonStateRoot(agentName) {
+    return path.join(getAgentStateRoot(resolveOptionalAgentName(agentName)), "daemon");
+}
+function getAgentDaemonLogsDir(agentName) {
+    return path.join(getAgentDaemonStateRoot(resolveOptionalAgentName(agentName)), "logs");
+}
+function getAgentDaemonLoggingConfigPath(agentName) {
+    return path.join(getAgentDaemonStateRoot(resolveOptionalAgentName(agentName)), "logging.json");
+}
+function getAgentMessagesRoot(agentName) {
+    return path.join(getAgentStateRoot(resolveOptionalAgentName(agentName)), "messages");
+}
+function getAgentToolsRoot(agentName) {
+    return path.join(getAgentStateRoot(resolveOptionalAgentName(agentName)), "tools");
 }
 /**
  * Returns the conventional secrets path: `~/.agentsecrets/<agentName>/secrets.json`
@@ -125,23 +254,11 @@ function getAgentRoot() {
 function getAgentSecretsPath(agentName = getAgentName()) {
     return path.join(os.homedir(), ".agentsecrets", agentName, "secrets.json");
 }
-/**
- * Load and parse `<agentRoot>/agent.json`.
- * Caches the result after first load.
- * Throws descriptive error if file is missing or contains invalid JSON.
- */
-function loadAgentConfig() {
-    if (_cachedAgentConfig) {
-        (0, runtime_1.emitNervesEvent)({
-            event: "identity.resolve",
-            component: "config/identity",
-            message: "loaded agent config from cache",
-            meta: { source: "cache" },
-        });
-        return _cachedAgentConfig;
-    }
-    const agentRoot = getAgentRoot();
-    const configFile = path.join(agentRoot, "agent.json");
+const VALID_PROVIDERS = ["azure", "minimax", "anthropic", "openai-codex", "github-copilot"];
+function isValidProvider(value) {
+    return typeof value === "string" && VALID_PROVIDERS.includes(value);
+}
+function readAndParseAgentJson(configFile) {
     let raw;
     try {
         raw = fs.readFileSync(configFile, "utf-8");
@@ -159,9 +276,8 @@ function loadAgentConfig() {
         });
         throw new Error(`Cannot read agent.json at ${configFile}. Does the agent directory exist?`);
     }
-    let parsed;
     try {
-        parsed = JSON.parse(raw);
+        return JSON.parse(raw);
     }
     catch (error) {
         (0, runtime_1.emitNervesEvent)({
@@ -176,6 +292,62 @@ function loadAgentConfig() {
         });
         throw new Error(`Invalid JSON in agent.json at ${configFile}. Check syntax.`);
     }
+}
+function validateFacingConfig(parsed, facingName, configFile) {
+    const raw = parsed[facingName];
+    if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "error",
+            event: "config_identity.error",
+            component: "config/identity",
+            message: `agent config missing or invalid ${facingName}`,
+            meta: { path: configFile, [facingName]: raw ?? null },
+        });
+        throw new Error(`agent.json at ${configFile} must include ${facingName} as { provider, model }.`);
+    }
+    const facing = raw;
+    if (!isValidProvider(facing.provider)) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "error",
+            event: "config_identity.error",
+            component: "config/identity",
+            message: `agent config has invalid provider in ${facingName}`,
+            meta: { path: configFile, provider: facing.provider ?? null },
+        });
+        throw new Error(`agent.json at ${configFile} ${facingName}.provider must be one of: ${VALID_PROVIDERS.join(", ")}.`);
+    }
+    if (typeof facing.model !== "string") {
+        (0, runtime_1.emitNervesEvent)({
+            level: "error",
+            event: "config_identity.error",
+            component: "config/identity",
+            message: `agent config has invalid model in ${facingName}`,
+            meta: { path: configFile, model: facing.model ?? null },
+        });
+        throw new Error(`agent.json at ${configFile} ${facingName}.model must be a string.`);
+    }
+    return { provider: facing.provider, model: facing.model };
+}
+/**
+ * Load and parse `<agentRoot>/agent.json`.
+ * Reads the file fresh on each call unless an override is set.
+ * If the config is v1, auto-migrates to v2 via migrateAgentConfigV1ToV2 and re-reads.
+ * Throws descriptive error if file is missing or contains invalid JSON.
+ */
+function loadAgentConfig() {
+    if (_agentConfigOverride) {
+        return _agentConfigOverride;
+    }
+    const agentRoot = getAgentRoot();
+    const configFile = path.join(agentRoot, "agent.json");
+    let parsed = readAndParseAgentJson(configFile);
+    // Inline migration: v1 -> v2
+    const rawVersion = parsed.version;
+    const initialVersion = typeof rawVersion === "number" ? rawVersion : 1;
+    if (initialVersion < 2) {
+        (0, migrate_config_1.migrateAgentConfigV1ToV2)(agentRoot);
+        parsed = readAndParseAgentJson(configFile);
+    }
     const existingPhrases = parsed.phrases;
     const needsFill = !existingPhrases ||
         !existingPhrases.thinking ||
@@ -197,27 +369,11 @@ function loadAgentConfig() {
         });
         fs.writeFileSync(configFile, JSON.stringify(parsed, null, 2) + "\n", "utf-8");
     }
-    const rawProvider = parsed.provider;
-    if (rawProvider !== "azure" &&
-        rawProvider !== "minimax" &&
-        rawProvider !== "anthropic" &&
-        rawProvider !== "openai-codex") {
-        (0, runtime_1.emitNervesEvent)({
-            level: "error",
-            event: "config_identity.error",
-            component: "config/identity",
-            message: "agent config missing or invalid provider",
-            meta: {
-                path: configFile,
-                provider: rawProvider,
-            },
-        });
-        throw new Error(`agent.json at ${configFile} must include provider: "azure", "minimax", "anthropic", or "openai-codex".`);
-    }
-    const rawVersion = parsed.version;
-    const version = rawVersion === undefined ? 1 : rawVersion;
-    if (typeof version !== "number" ||
-        !Number.isInteger(version) ||
+    // Validate v2 facing configs
+    const humanFacing = validateFacingConfig(parsed, "humanFacing", configFile);
+    const agentFacing = validateFacingConfig(parsed, "agentFacing", configFile);
+    const version = typeof parsed.version === "number" ? parsed.version : 1;
+    if (!Number.isInteger(version) ||
         version < 1) {
         (0, runtime_1.emitNervesEvent)({
             level: "error",
@@ -226,7 +382,7 @@ function loadAgentConfig() {
             message: "agent config missing or invalid version",
             meta: {
                 path: configFile,
-                version: rawVersion,
+                version: parsed.version,
             },
         });
         throw new Error(`agent.json at ${configFile} must include version as integer >= 1.`);
@@ -246,21 +402,37 @@ function loadAgentConfig() {
         });
         throw new Error(`agent.json at ${configFile} must include enabled as boolean.`);
     }
-    _cachedAgentConfig = {
+    // Tolerate deprecated provider field for backward compatibility
+    const rawProvider = parsed.provider;
+    const provider = isValidProvider(rawProvider) ? rawProvider : undefined;
+    // Spread parsed first so any field present in AgentConfig is carried
+    // through by default, then explicitly override the fields that need
+    // validation or normalization. This eliminates the field-drop bug class
+    // that caused the `sync` block (and previously `shell`) to be silently
+    // omitted from the returned config. Regression-guarded by the
+    // Required<AgentConfig> contract test in identity-contract.test.ts.
+    const config = {
+        ...parsed,
         version,
         enabled,
-        provider: rawProvider,
-        context: parsed.context,
-        logging: parsed.logging,
+        humanFacing,
+        agentFacing,
+        senses: normalizeSenses(parsed.senses, configFile),
         phrases: parsed.phrases,
     };
+    if (provider !== undefined) {
+        config.provider = provider;
+    }
+    else {
+        delete config.provider;
+    }
     (0, runtime_1.emitNervesEvent)({
         event: "identity.resolve",
         component: "config/identity",
         message: "loaded agent config from disk",
         meta: { source: "disk" },
     });
-    return _cachedAgentConfig;
+    return config;
 }
 /**
  * Prime the agent name cache explicitly.
@@ -271,11 +443,26 @@ function loadAgentConfig() {
 function setAgentName(name) {
     _cachedAgentName = name;
 }
+/**
+ * Override the agent config returned by loadAgentConfig().
+ * When set to a non-null AgentConfig, loadAgentConfig() returns the override
+ * instead of reading from disk. When set to null, normal disk-based loading resumes.
+ */
+function setAgentConfigOverride(config) {
+    _agentConfigOverride = config;
+}
+/**
+ * Preserve the compatibility hook for callers that previously cleared cached
+ * disk-backed agent config. Agent config is now read fresh on every call.
+ */
+function resetAgentConfigCache() {
+    // No-op: disk-backed agent config is no longer memoized in-process.
+}
 /**
  * Clear all cached identity state.
  * Used in tests and when switching agent context.
  */
 function resetIdentity() {
     _cachedAgentName = null;
-    _cachedAgentConfig = null;
+    _agentConfigOverride = null;
 }