@ouro.bot/cli 0.1.0-alpha.6 → 0.1.0-alpha.60

package/dist/heart/config.js

@@ -35,25 +35,29 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadConfig = loadConfig;
 exports.resetConfigCache = resetConfigCache;
-exports.setTestConfig = setTestConfig;
+exports.patchRuntimeConfig = patchRuntimeConfig;
 exports.getAzureConfig = getAzureConfig;
 exports.getMinimaxConfig = getMinimaxConfig;
 exports.getAnthropicConfig = getAnthropicConfig;
 exports.getOpenAICodexConfig = getOpenAICodexConfig;
 exports.getTeamsConfig = getTeamsConfig;
+exports.getTeamsSecondaryConfig = getTeamsSecondaryConfig;
 exports.getContextConfig = getContextConfig;
 exports.getOAuthConfig = getOAuthConfig;
+exports.resolveOAuthForTenant = resolveOAuthForTenant;
 exports.getTeamsChannelConfig = getTeamsChannelConfig;
 exports.getBlueBubblesConfig = getBlueBubblesConfig;
 exports.getBlueBubblesChannelConfig = getBlueBubblesChannelConfig;
 exports.getIntegrationsConfig = getIntegrationsConfig;
 exports.getOpenAIEmbeddingsApiKey = getOpenAIEmbeddingsApiKey;
 exports.getLogsDir = getLogsDir;
+exports.sanitizeKey = sanitizeKey;
+exports.slugify = slugify;
+exports.resolveSessionPath = resolveSessionPath;
 exports.sessionPath = sessionPath;
 exports.logPath = logPath;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const os = __importStar(require("os"));
 const identity_1 = require("./identity");
 const runtime_1 = require("../nerves/runtime");
 const DEFAULT_SECRETS_TEMPLATE = {
@@ -66,6 +70,7 @@ const DEFAULT_SECRETS_TEMPLATE = {
             endpoint: "",
             deployment: "",
             apiVersion: "2025-04-01-preview",
+            managedIdentityClientId: "",
         },
         minimax: {
             model: "",
@@ -76,7 +81,7 @@ const DEFAULT_SECRETS_TEMPLATE = {
             setupToken: "",
         },
         "openai-codex": {
-            model: "gpt-5.2",
+            model: "gpt-5.4",
             oauthAccessToken: "",
         },
     },
@@ -84,12 +89,19 @@ const DEFAULT_SECRETS_TEMPLATE = {
         clientId: "",
         clientSecret: "",
         tenantId: "",
+        managedIdentityClientId: "",
     },
     oauth: {
         graphConnectionName: "graph",
         adoConnectionName: "ado",
         githubConnectionName: "",
     },
+    teamsSecondary: {
+        clientId: "",
+        clientSecret: "",
+        tenantId: "",
+        managedIdentityClientId: "",
+    },
     teamsChannel: {
         skipConfirmation: true,
         port: 3978,
@@ -118,6 +130,7 @@ function defaultRuntimeConfig() {
             "openai-codex": { ...DEFAULT_SECRETS_TEMPLATE.providers["openai-codex"] },
         },
         teams: { ...DEFAULT_SECRETS_TEMPLATE.teams },
+        teamsSecondary: { ...DEFAULT_SECRETS_TEMPLATE.teamsSecondary },
         oauth: { ...DEFAULT_SECRETS_TEMPLATE.oauth },
         context: { ...identity_1.DEFAULT_AGENT_CONTEXT },
         teamsChannel: { ...DEFAULT_SECRETS_TEMPLATE.teamsChannel },
@@ -126,7 +139,7 @@ function defaultRuntimeConfig() {
         integrations: { ...DEFAULT_SECRETS_TEMPLATE.integrations },
     };
 }
-let _cachedConfig = null;
+let _runtimeConfigOverride = null;
 let _testContextOverride = null;
 function resolveConfigPath() {
     return (0, identity_1.getAgentSecretsPath)();
@@ -148,15 +161,6 @@ function deepMerge(defaults, partial) {
     return result;
 }
 function loadConfig() {
-    if (_cachedConfig) {
-        (0, runtime_1.emitNervesEvent)({
-            event: "config.load",
-            component: "config/identity",
-            message: "config loaded from cache",
-            meta: { source: "cache" },
-        });
-        return _cachedConfig;
-    }
     const configPath = resolveConfigPath();
     // Auto-create config directory if it doesn't exist
     const configDir = path.dirname(configPath);
@@ -217,7 +221,10 @@ function loadConfig() {
             },
         });
     }
-    _cachedConfig = deepMerge(defaultRuntimeConfig(), sanitizedFileData);
+    const mergedConfig = deepMerge(defaultRuntimeConfig(), sanitizedFileData);
+    const config = _runtimeConfigOverride
+        ? deepMerge(mergedConfig, _runtimeConfigOverride)
+        : mergedConfig;
     (0, runtime_1.emitNervesEvent)({
         event: "config.load",
         component: "config/identity",
@@ -225,22 +232,22 @@ function loadConfig() {
         meta: {
             source: "disk",
             used_defaults_only: Object.keys(fileData).length === 0,
+            override_applied: _runtimeConfigOverride !== null,
         },
     });
-    return _cachedConfig;
+    return config;
 }
 function resetConfigCache() {
-    _cachedConfig = null;
+    _runtimeConfigOverride = null;
     _testContextOverride = null;
 }
-function setTestConfig(partial) {
-    loadConfig(); // ensure _cachedConfig exists
+function patchRuntimeConfig(partial) {
     const contextPatch = partial.context;
     if (contextPatch) {
         const base = _testContextOverride ?? identity_1.DEFAULT_AGENT_CONTEXT;
         _testContextOverride = deepMerge(base, contextPatch);
     }
-    _cachedConfig = deepMerge(_cachedConfig, partial);
+    _runtimeConfigOverride = deepMerge((_runtimeConfigOverride ?? {}), partial);
 }
 function getAzureConfig() {
     const config = loadConfig();
@@ -262,6 +269,10 @@ function getTeamsConfig() {
     const config = loadConfig();
     return { ...config.teams };
 }
+function getTeamsSecondaryConfig() {
+    const config = loadConfig();
+    return { ...config.teamsSecondary };
+}
 function getContextConfig() {
     if (_testContextOverride) {
         return { ..._testContextOverride };
@@ -282,6 +293,16 @@ function getOAuthConfig() {
     const config = loadConfig();
     return { ...config.oauth };
 }
+/** Resolve OAuth connection names for a specific tenant, falling back to defaults. */
+function resolveOAuthForTenant(tenantId) {
+    const base = getOAuthConfig();
+    const overrides = tenantId ? base.tenantOverrides?.[tenantId] : undefined;
+    return {
+        graphConnectionName: overrides?.graphConnectionName ?? base.graphConnectionName,
+        adoConnectionName: overrides?.adoConnectionName ?? base.adoConnectionName,
+        githubConnectionName: overrides?.githubConnectionName ?? base.githubConnectionName,
+    };
+}
 function getTeamsChannelConfig() {
     const config = loadConfig();
     const { skipConfirmation, flushIntervalMs, port } = config.teamsChannel;
@@ -315,16 +336,29 @@ function getOpenAIEmbeddingsApiKey() {
     return getIntegrationsConfig().openaiEmbeddingsApiKey;
 }
 function getLogsDir() {
-    return path.join(os.homedir(), ".agentstate", (0, identity_1.getAgentName)(), "logs");
+    return path.join((0, identity_1.getAgentRoot)(), "state", "logs");
 }
 function sanitizeKey(key) {
     return key.replace(/[/:]/g, "_");
 }
-function sessionPath(friendId, channel, key) {
-    const dir = path.join(os.homedir(), ".agentstate", (0, identity_1.getAgentName)(), "sessions", friendId, channel);
-    fs.mkdirSync(dir, { recursive: true });
+function slugify(value) {
+    return value
+        .trim()
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, "-")
+        .replace(/^-+/, "")
+        .replace(/-+$/, "");
+}
+function resolveSessionPath(friendId, channel, key, options) {
+    const dir = path.join((0, identity_1.getAgentRoot)(), "state", "sessions", friendId, channel);
+    if (options?.ensureDir) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
     return path.join(dir, sanitizeKey(key) + ".json");
 }
+function sessionPath(friendId, channel, key) {
+    return resolveSessionPath(friendId, channel, key, { ensureDir: true });
+}
 function logPath(channel, key) {
     return path.join(getLogsDir(), channel, sanitizeKey(key) + ".ndjson");
 }