@scotthamilton77/sidekick 0.1.0 → 0.1.2

package/dist/daemon.js

@@ -16173,7 +16173,27 @@ var require_persona = __commonJS({
       /** Optional persona-specific snarky welcome examples for returning users (8-10 words max) */
       snarky_welcome_examples: zod_1.z.array(zod_1.z.string()).optional(),
       /** Optional situational context override (default: "You are watching over the shoulder of a software developer as they work.") */
-      situation: zod_1.z.string().optional()
+      situation: zod_1.z.string().optional(),
+      /** Optional recommended LLM profile for persona-driven outputs (snarky, resume) */
+      llmProfile: zod_1.z.string().optional()
+    });
+  }
+});
+
+// ../types/dist/services/user-profile.js
+var require_user_profile = __commonJS({
+  "../types/dist/services/user-profile.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.UserProfileSchema = void 0;
+    var zod_1 = require_zod();
+    exports2.UserProfileSchema = zod_1.z.object({
+      /** User's display name */
+      name: zod_1.z.string().min(1),
+      /** User's role (e.g., "Software Architect") */
+      role: zod_1.z.string().min(1),
+      /** User's interests as string array */
+      interests: zod_1.z.array(zod_1.z.string())
     });
   }
 });
@@ -16289,7 +16309,11 @@ var require_state = __commonJS({
       /** Snarky welcome message for returning user */
       snarky_comment: zod_1.z.string(),
       /** ISO8601 timestamp when this was generated */
-      timestamp: zod_1.z.string()
+      timestamp: zod_1.z.string(),
+      /** Persona ID that generated this message (null when persona disabled) */
+      persona_id: zod_1.z.string().nullable().default(null),
+      /** Display name for attribution (null when persona disabled) */
+      persona_display_name: zod_1.z.string().nullable().default(null)
     });
     exports2.TranscriptMetricsStateSchema = zod_1.z.object({
       /** Session identifier */
@@ -16605,6 +16629,7 @@ var require_services = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     __exportStar(require_config(), exports2);
     __exportStar(require_persona(), exports2);
+    __exportStar(require_user_profile(), exports2);
     __exportStar(require_service_factory(), exports2);
     __exportStar(require_staging(), exports2);
     __exportStar(require_state(), exports2);
@@ -26656,10 +26681,13 @@ var require_config2 = __commonJS({
   "../sidekick-core/dist/config.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.SidekickConfigSchema = exports2.FeaturesConfigSchema = exports2.TranscriptConfigSchema = exports2.LlmConfigSchema = exports2.CoreConfigSchema = void 0;
+    exports2.EXTERNAL_DEFAULTS_FILES = exports2.SidekickConfigSchema = exports2.FeaturesConfigSchema = exports2.TranscriptConfigSchema = exports2.LlmConfigSchema = exports2.CoreConfigSchema = exports2.DOMAIN_FILES = void 0;
+    exports2.deepMerge = deepMerge;
+    exports2.coerceValue = coerceValue;
+    exports2.setNestedValue = setNestedValue;
+    exports2.tryReadYaml = tryReadYaml;
     exports2.loadConfig = loadConfig;
     exports2.createConfigService = createConfigService;
-    exports2.parseUnifiedConfig = parseUnifiedConfig;
     var dotenv_1 = require_main();
     var node_fs_1 = require("node:fs");
     var node_os_1 = require("node:os");
@@ -26679,8 +26707,8 @@ var require_config2 = __commonJS({
       }
       return obj;
     }
-    var DOMAIN_FILES = {
-      core: "config.yaml",
+    exports2.DOMAIN_FILES = {
+      core: "core.yaml",
       llm: "llm.yaml",
       transcript: "transcript.yaml",
       features: "features.yaml"
@@ -26734,14 +26762,17 @@ var require_config2 = __commonJS({
       maxTokens: v4_1.z.number().positive(),
       timeout: v4_1.z.number().min(1).max(300),
       timeoutMaxRetries: v4_1.z.number().min(0).max(10),
+      // Optional fallback profile ID from fallbackProfiles namespace
+      fallbackProfileId: v4_1.z.string().optional(),
       // OpenRouter-specific provider routing (ignored for other providers)
       providerAllowlist: v4_1.z.array(v4_1.z.string()).optional(),
       providerBlocklist: v4_1.z.array(v4_1.z.string()).optional()
     });
     exports2.LlmConfigSchema = v4_1.z.object({
       defaultProfile: v4_1.z.string(),
+      defaultFallbackProfileId: v4_1.z.string().optional(),
       profiles: v4_1.z.record(v4_1.z.string(), LlmProfileSchema),
-      fallbacks: v4_1.z.record(v4_1.z.string(), LlmProfileSchema).optional(),
+      fallbackProfiles: v4_1.z.record(v4_1.z.string(), LlmProfileSchema).optional(),
       global: v4_1.z.object({
         debugDumpEnabled: v4_1.z.boolean(),
         emulatedProvider: EmulatedProviderSchema.optional()
@@ -26755,10 +26786,29 @@ var require_config2 = __commonJS({
           input: data.defaultProfile
         });
       }
+      if (data.defaultFallbackProfileId && !data.fallbackProfiles?.[data.defaultFallbackProfileId]) {
+        ctx.addIssue({
+          code: "custom",
+          message: `defaultFallbackProfileId "${data.defaultFallbackProfileId}" not found in fallbackProfiles`,
+          path: ["defaultFallbackProfileId"],
+          input: data.defaultFallbackProfileId
+        });
+      }
+      for (const [profileName, profile] of Object.entries(data.profiles)) {
+        if (profile.fallbackProfileId && !data.fallbackProfiles?.[profile.fallbackProfileId]) {
+          ctx.addIssue({
+            code: "custom",
+            message: `Profile "${profileName}" fallbackProfileId "${profile.fallbackProfileId}" not found in fallbackProfiles`,
+            path: ["profiles", profileName, "fallbackProfileId"],
+            input: profile.fallbackProfileId
+          });
+        }
+      }
     }).transform((val) => ({
       defaultProfile: val.defaultProfile,
+      defaultFallbackProfileId: val.defaultFallbackProfileId,
       profiles: val.profiles,
-      fallbacks: val.fallbacks ?? {},
+      fallbackProfiles: val.fallbackProfiles ?? {},
       global: val.global ?? { debugDumpEnabled: false, emulatedProvider: void 0 }
     }));
     exports2.TranscriptConfigSchema = v4_1.z.object({
@@ -26793,43 +26843,6 @@ var require_config2 = __commonJS({
       }
       return result;
     }
-    function parseUnifiedConfig(content, sourcePath) {
-      const result = {};
-      const overrides = [];
-      const warnings = [];
-      const sourceLabel = sourcePath ?? "sidekick.config";
-      const lines = content.split("\n");
-      for (let lineNum = 0; lineNum < lines.length; lineNum++) {
-        const line = lines[lineNum];
-        const trimmed = line.trim();
-        if (!trimmed || trimmed.startsWith("#")) {
-          continue;
-        }
-        const eqIndex = trimmed.indexOf("=");
-        const colonIndex = trimmed.indexOf(":");
-        if (eqIndex === -1 && colonIndex === -1) {
-          warnings.push(`${sourceLabel}:${lineNum + 1}: malformed line (missing '=' or ':'): ${trimmed}`);
-          continue;
-        }
-        const delimIndex = eqIndex === -1 ? colonIndex : colonIndex === -1 ? eqIndex : Math.min(eqIndex, colonIndex);
-        const key = trimmed.substring(0, delimIndex).trim();
-        const rawValue = trimmed.substring(delimIndex + 1).trim();
-        const parts = key.split(".");
-        if (parts.length < 2) {
-          warnings.push(`${sourceLabel}:${lineNum + 1}: invalid key format (need domain.key): ${key}`);
-          continue;
-        }
-        const domain = parts[0];
-        const path = parts.slice(1);
-        const value = coerceValue(rawValue);
-        if (!result[domain]) {
-          result[domain] = {};
-        }
-        setNestedValue(result[domain], path, value);
-        overrides.push({ key, value });
-      }
-      return { config: result, overrides, warnings };
-    }
     function coerceValue(raw) {
       if (raw === "true")
         return true;
@@ -26873,13 +26886,6 @@ var require_config2 = __commonJS({
         throw new Error(`Failed to parse YAML at ${filePath}: ${message}`, { cause: err });
       }
     }
-    function tryReadUnifiedConfig(filePath) {
-      if (!(0, node_fs_1.existsSync)(filePath)) {
-        return null;
-      }
-      const content = (0, node_fs_1.readFileSync)(filePath, "utf8");
-      return parseUnifiedConfig(content, filePath);
-    }
     function loadEnvFiles(homeDir, projectRoot) {
       const envPaths = [];
       const userEnv = (0, node_path_1.join)(homeDir, ".sidekick", ".env");
@@ -26927,7 +26933,7 @@ var require_config2 = __commonJS({
       }
       return result;
     }
-    var EXTERNAL_DEFAULTS_FILES = {
+    exports2.EXTERNAL_DEFAULTS_FILES = {
       core: "defaults/core.defaults.yaml",
       llm: "defaults/llm.defaults.yaml",
       transcript: "defaults/transcript.defaults.yaml",
@@ -26937,16 +26943,16 @@ var require_config2 = __commonJS({
       if (!assets) {
         return null;
       }
-      const filePath = EXTERNAL_DEFAULTS_FILES[domain];
+      const filePath = exports2.EXTERNAL_DEFAULTS_FILES[domain];
       return assets.resolveYaml(filePath) ?? null;
     }
-    function loadDomainConfig(domain, envConfig, userUnified, userDomainPath, projectUnified, projectDomainPath, projectLocalPath, assets) {
+    function loadDomainConfig(domain, envConfig, userDomainPath, projectDomainPath, projectLocalPath, assets) {
       const sources = [];
       let merged = {};
       const externalDefaults = loadExternalDefaults(domain, assets);
       if (externalDefaults) {
         merged = deepMerge(merged, externalDefaults);
-        sources.push({ source: `assets:${EXTERNAL_DEFAULTS_FILES[domain]}`, domain });
+        sources.push({ source: `assets:${exports2.EXTERNAL_DEFAULTS_FILES[domain]}`, domain });
       }
       if (envConfig[domain]) {
         merged = deepMerge(merged, envConfig[domain]);
@@ -26957,10 +26963,6 @@ var require_config2 = __commonJS({
         merged = deepMerge(merged, userDomain);
         sources.push({ source: userDomainPath, domain });
       }
-      if (userUnified?.[domain]) {
-        merged = deepMerge(merged, userUnified[domain]);
-        sources.push({ source: "user:sidekick.config", domain });
-      }
       if (projectDomainPath) {
         const projectDomain = tryReadYaml(projectDomainPath);
         if (projectDomain) {
@@ -26968,10 +26970,6 @@ var require_config2 = __commonJS({
           sources.push({ source: projectDomainPath, domain });
         }
       }
-      if (projectUnified?.[domain]) {
-        merged = deepMerge(merged, projectUnified[domain]);
-        sources.push({ source: "project:sidekick.config", domain });
-      }
       if (projectLocalPath) {
         const projectLocal = tryReadYaml(projectLocalPath);
         if (projectLocal) {
@@ -26983,7 +26981,7 @@ var require_config2 = __commonJS({
     }
     function validateProfileReferences(config) {
       const validProfiles = new Set(Object.keys(config.llm.profiles));
-      const validFallbacks = new Set(Object.keys(config.llm.fallbacks));
+      const validFallbacks = new Set(Object.keys(config.llm.fallbackProfiles));
       const errors = [];
       for (const [featureName, featureConfig] of Object.entries(config.features)) {
         const llmConfig = featureConfig.settings?.llm;
@@ -27016,24 +27014,33 @@ ${errors.join("\n")}`);
       const projectRoot = options.projectRoot;
       loadEnvFiles(homeDir, projectRoot);
       const envConfig = envToConfig(process.env);
-      const userUnifiedPath = (0, node_path_1.join)(homeDir, ".sidekick", "sidekick.config");
-      const userUnifiedParsed = tryReadUnifiedConfig(userUnifiedPath);
-      const projectUnifiedPath = projectRoot ? (0, node_path_1.join)(projectRoot, ".sidekick", "sidekick.config") : null;
-      const projectUnifiedParsed = projectUnifiedPath ? tryReadUnifiedConfig(projectUnifiedPath) : null;
-      const userUnified = userUnifiedParsed?.config ?? null;
-      const projectUnified = projectUnifiedParsed?.config ?? null;
       const userSidekick = (0, node_path_1.join)(homeDir, ".sidekick");
       const projectSidekick = projectRoot ? (0, node_path_1.join)(projectRoot, ".sidekick") : null;
       const domains = ["core", "llm", "transcript", "features"];
       const domainConfigs = {};
       for (const domain of domains) {
-        const filename = DOMAIN_FILES[domain];
+        const filename = exports2.DOMAIN_FILES[domain];
         const userDomainPath = (0, node_path_1.join)(userSidekick, filename);
         const projectDomainPath = projectSidekick ? (0, node_path_1.join)(projectSidekick, filename) : null;
-        const projectLocalPath = projectSidekick ? (0, node_path_1.join)(projectSidekick, `${filename}.local`) : null;
-        const { config } = loadDomainConfig(domain, envConfig, userUnified, userDomainPath, projectUnified, projectDomainPath, projectLocalPath, options.assets);
+        const projectLocalPath = projectSidekick ? (0, node_path_1.join)(projectSidekick, `${filename.replace(".yaml", ".local.yaml")}`) : null;
+        const { config } = loadDomainConfig(domain, envConfig, userDomainPath, projectDomainPath, projectLocalPath, options.assets);
         domainConfigs[domain] = config;
       }
+      const legacyDirs = [userSidekick, projectSidekick].filter(Boolean);
+      for (const dir of legacyDirs) {
+        const legacyPath = (0, node_path_1.join)(dir, "sidekick.config");
+        if ((0, node_fs_1.existsSync)(legacyPath)) {
+          options.logger?.warn(`Legacy sidekick.config found at "${legacyPath}" \u2014 this file is no longer read. Migrate settings to .sidekick/{domain}.yaml files (core.yaml, llm.yaml, transcript.yaml, features.yaml).`);
+        }
+        const oldConfigPath = (0, node_path_1.join)(dir, "config.yaml");
+        if ((0, node_fs_1.existsSync)(oldConfigPath)) {
+          options.logger?.warn(`Renamed config file found at "${oldConfigPath}" \u2014 "config.yaml" has been renamed to "core.yaml". Please rename your file.`);
+        }
+        const oldConfigLocalPath = (0, node_path_1.join)(dir, "config.local.yaml");
+        if ((0, node_fs_1.existsSync)(oldConfigLocalPath)) {
+          options.logger?.warn(`Renamed config file found at "${oldConfigLocalPath}" \u2014 "config.local.yaml" has been renamed to "core.local.yaml". Please rename your file.`);
+        }
+      }
       const result = exports2.SidekickConfigSchema.safeParse(domainConfigs);
       if (!result.success) {
         const issues = result.error.issues.map((issue) => `${issue.path.join(".")}: ${issue.message}`).join("; ");
@@ -27086,38 +27093,10 @@ ${errors.join("\n")}`);
       if (Object.keys(envConfig).length > 0) {
         sources.push("environment");
       }
-      const userUnifiedPath = (0, node_path_1.join)(homeDir, ".sidekick", "sidekick.config");
-      const userUnifiedParsed = tryReadUnifiedConfig(userUnifiedPath);
-      if (userUnifiedParsed) {
-        sources.push(userUnifiedPath);
-        for (const warning of userUnifiedParsed.warnings) {
-          logger?.warn("Config parse warning", { warning });
-        }
-        if (userUnifiedParsed.overrides.length > 0 && logger) {
-          logger.info("User config overrides loaded", {
-            source: userUnifiedPath,
-            overrides: userUnifiedParsed.overrides
-          });
-        }
-      }
-      const projectUnifiedPath = projectRoot ? (0, node_path_1.join)(projectRoot, ".sidekick", "sidekick.config") : null;
-      const projectUnifiedParsed = projectUnifiedPath ? tryReadUnifiedConfig(projectUnifiedPath) : null;
-      if (projectUnifiedParsed) {
-        sources.push(projectUnifiedPath);
-        for (const warning of projectUnifiedParsed.warnings) {
-          logger?.warn("Config parse warning", { warning });
-        }
-        if (projectUnifiedParsed.overrides.length > 0 && logger) {
-          logger.info("Project config overrides loaded", {
-            source: projectUnifiedPath,
-            overrides: projectUnifiedParsed.overrides
-          });
-        }
-      }
       const userSidekick = (0, node_path_1.join)(homeDir, ".sidekick");
       const projectSidekick = projectRoot ? (0, node_path_1.join)(projectRoot, ".sidekick") : null;
-      for (const domain of Object.keys(DOMAIN_FILES)) {
-        const filename = DOMAIN_FILES[domain];
+      for (const domain of Object.keys(exports2.DOMAIN_FILES)) {
+        const filename = exports2.DOMAIN_FILES[domain];
         const userDomainPath = (0, node_path_1.join)(userSidekick, filename);
         if ((0, node_fs_1.existsSync)(userDomainPath)) {
           sources.push(userDomainPath);
@@ -27127,7 +27106,7 @@ ${errors.join("\n")}`);
           if ((0, node_fs_1.existsSync)(projectDomainPath)) {
             sources.push(projectDomainPath);
           }
-          const projectLocalPath = (0, node_path_1.join)(projectSidekick, `${filename}.local`);
+          const projectLocalPath = (0, node_path_1.join)(projectSidekick, `${filename.replace(".yaml", ".local.yaml")}`);
           if ((0, node_fs_1.existsSync)(projectLocalPath)) {
             sources.push(projectLocalPath);
           }
@@ -27192,6 +27171,231 @@ ${errors.join("\n")}`);
   }
 });
 
+// ../sidekick-core/dist/config-writer.js
+var require_config_writer = __commonJS({
+  "../sidekick-core/dist/config-writer.js"(exports2) {
+    "use strict";
+    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.parseDotPath = parseDotPath;
+    exports2.getNestedValue = getNestedValue;
+    exports2.getScopeFilePath = getScopeFilePath;
+    exports2.configGet = configGet;
+    exports2.configSet = configSet;
+    exports2.configUnset = configUnset;
+    exports2.configList = configList;
+    var node_fs_1 = require("node:fs");
+    var node_os_1 = require("node:os");
+    var node_path_1 = require("node:path");
+    var yaml_1 = __importDefault(require_dist2());
+    var config_1 = require_config2();
+    var VALID_DOMAINS = /* @__PURE__ */ new Set(["core", "llm", "transcript", "features"]);
+    var FORBIDDEN_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
+    function parseDotPath(dotPath) {
+      if (!dotPath || dotPath.trim() === "") {
+        throw new Error("Config path must not be empty");
+      }
+      const segments = dotPath.split(".");
+      const domainCandidate = segments[0];
+      if (!VALID_DOMAINS.has(domainCandidate)) {
+        throw new Error(`Unknown domain "${domainCandidate}". Valid domains: ${[...VALID_DOMAINS].join(", ")}`);
+      }
+      const keyPath = segments.slice(1);
+      for (const key of keyPath) {
+        if (FORBIDDEN_KEYS.has(key)) {
+          throw new Error(`Invalid key segment "${key}" in config path`);
+        }
+      }
+      return {
+        domain: domainCandidate,
+        keyPath
+      };
+    }
+    function getNestedValue(obj, keyPath) {
+      if (keyPath.length === 0) {
+        return obj;
+      }
+      let current = obj;
+      for (const key of keyPath) {
+        if (current === null || current === void 0 || typeof current !== "object") {
+          return void 0;
+        }
+        current = current[key];
+      }
+      return current;
+    }
+    function getScopeFilePath(domain, scope, projectRoot, homeDir) {
+      const filename = config_1.DOMAIN_FILES[domain];
+      switch (scope) {
+        case "user":
+          return (0, node_path_1.join)(homeDir, ".sidekick", filename);
+        case "project":
+          if (!projectRoot)
+            return null;
+          return (0, node_path_1.join)(projectRoot, ".sidekick", filename);
+        case "local":
+          if (!projectRoot)
+            return null;
+          return (0, node_path_1.join)(projectRoot, ".sidekick", filename.replace(".yaml", ".local.yaml"));
+      }
+    }
+    function configGet(dotPath, options = {}) {
+      const { domain, keyPath } = parseDotPath(dotPath);
+      const home = options.homeDir ?? (0, node_os_1.homedir)();
+      if (options.scope) {
+        const filePath = getScopeFilePath(domain, options.scope, options.projectRoot, home);
+        if (!filePath) {
+          return void 0;
+        }
+        const raw = (0, config_1.tryReadYaml)(filePath);
+        if (!raw || Object.keys(raw).length === 0) {
+          return void 0;
+        }
+        const value2 = getNestedValue(raw, keyPath);
+        if (value2 === void 0) {
+          return void 0;
+        }
+        return { value: value2, domain, path: keyPath };
+      }
+      const config = (0, config_1.loadConfig)({
+        projectRoot: options.projectRoot,
+        homeDir: home,
+        assets: options.assets,
+        logger: options.logger
+      });
+      const domainConfig = config[domain];
+      const value = getNestedValue(domainConfig, keyPath);
+      if (value === void 0) {
+        return void 0;
+      }
+      return { value, domain, path: keyPath };
+    }
+    function configSet(dotPath, rawValue, options = {}) {
+      const { domain, keyPath } = parseDotPath(dotPath);
+      if (keyPath.length === 0) {
+        throw new Error('Cannot set an entire domain. Specify a key path (e.g., "core.logging.level")');
+      }
+      const home = options.homeDir ?? (0, node_os_1.homedir)();
+      const scope = options.scope ?? "project";
+      const coercedValue = (0, config_1.coerceValue)(rawValue);
+      const projectRoot = options.projectRoot ?? (scope !== "user" ? process.cwd() : void 0);
+      const filePath = getScopeFilePath(domain, scope, projectRoot, home);
+      if (!filePath) {
+        throw new Error(`Cannot resolve file path for domain "${domain}" at scope "${scope}". Is projectRoot set?`);
+      }
+      const fileExisted = (0, node_fs_1.existsSync)(filePath);
+      const originalContent = fileExisted ? (0, node_fs_1.readFileSync)(filePath, "utf8") : null;
+      let doc;
+      if (fileExisted) {
+        doc = yaml_1.default.parseDocument(originalContent);
+        throwOnYamlErrors(doc, `Failed to parse YAML at "${filePath}"`);
+      } else {
+        doc = seedDocumentFromDefaults(domain, options.assets) ?? new yaml_1.default.Document({});
+      }
+      doc.setIn(keyPath, coercedValue);
+      const dir = (0, node_path_1.dirname)(filePath);
+      if (!(0, node_fs_1.existsSync)(dir)) {
+        (0, node_fs_1.mkdirSync)(dir, { recursive: true });
+      }
+      (0, node_fs_1.writeFileSync)(filePath, doc.toString(), "utf8");
+      try {
+        (0, config_1.loadConfig)({
+          projectRoot,
+          homeDir: home,
+          assets: options.assets,
+          logger: options.logger
+        });
+      } catch (err) {
+        if (fileExisted) {
+          (0, node_fs_1.writeFileSync)(filePath, originalContent, "utf8");
+        } else {
+          try {
+            (0, node_fs_1.unlinkSync)(filePath);
+          } catch {
+          }
+        }
+        const message = err instanceof Error ? err.message : String(err);
+        throw new Error(`Configuration validation failed after setting "${dotPath}": ${message}`, { cause: err });
+      }
+      return {
+        domain,
+        path: keyPath,
+        value: coercedValue,
+        filePath
+      };
+    }
+    function configUnset(dotPath, options = {}) {
+      const { domain, keyPath } = parseDotPath(dotPath);
+      if (keyPath.length === 0) {
+        throw new Error('Cannot unset an entire domain. Specify a key path (e.g., "core.logging.level")');
+      }
+      const home = options.homeDir ?? (0, node_os_1.homedir)();
+      const scope = options.scope ?? "project";
+      const filePath = getScopeFilePath(domain, scope, options.projectRoot, home);
+      if (!filePath) {
+        throw new Error(`Cannot resolve file path for domain "${domain}" at scope "${scope}". Is projectRoot set?`);
+      }
+      if (!(0, node_fs_1.existsSync)(filePath)) {
+        return { domain, path: keyPath, filePath, existed: false };
+      }
+      const content = (0, node_fs_1.readFileSync)(filePath, "utf8");
+      const doc = yaml_1.default.parseDocument(content);
+      throwOnYamlErrors(doc, `Failed to parse YAML at "${filePath}"`);
+      const existed = doc.getIn(keyPath) !== void 0;
+      if (existed) {
+        doc.deleteIn(keyPath);
+        (0, node_fs_1.writeFileSync)(filePath, doc.toString(), "utf8");
+      }
+      return { domain, path: keyPath, filePath, existed };
+    }
+    function configList(options = {}) {
+      const home = options.homeDir ?? (0, node_os_1.homedir)();
+      const scope = options.scope ?? "project";
+      const entries = [];
+      for (const domain of VALID_DOMAINS) {
+        const filePath = getScopeFilePath(domain, scope, options.projectRoot, home);
+        if (!filePath)
+          continue;
+        const raw = (0, config_1.tryReadYaml)(filePath);
+        if (!raw || Object.keys(raw).length === 0)
+          continue;
+        flattenObject(raw, domain, entries);
+      }
+      return { scope, entries };
+    }
+    function flattenObject(obj, prefix, entries) {
+      for (const [key, value] of Object.entries(obj)) {
+        const path = `${prefix}.${key}`;
+        if (value !== null && typeof value === "object" && !Array.isArray(value)) {
+          flattenObject(value, path, entries);
+        } else {
+          entries.push({ path, value });
+        }
+      }
+    }
+    function throwOnYamlErrors(doc, context) {
+      if (doc.errors.length > 0) {
+        const messages = doc.errors.map((e) => e.message).join("; ");
+        throw new Error(`${context}: ${messages}`);
+      }
+    }
+    function seedDocumentFromDefaults(domain, assets) {
+      if (!assets)
+        return null;
+      const defaultsRelPath = config_1.EXTERNAL_DEFAULTS_FILES[domain];
+      const defaultsAbsPath = assets.resolvePath(defaultsRelPath);
+      if (!defaultsAbsPath || !(0, node_fs_1.existsSync)(defaultsAbsPath))
+        return null;
+      const raw = (0, node_fs_1.readFileSync)(defaultsAbsPath, "utf8");
+      const doc = yaml_1.default.parseDocument(raw);
+      throwOnYamlErrors(doc, `Invalid bundled defaults YAML for domain "${domain}"`);
+      return doc;
+    }
+  }
+});
+
 // ../sidekick-core/dist/feature-registry.js
 var require_feature_registry = __commonJS({
   "../sidekick-core/dist/feature-registry.js"(exports2) {
@@ -27797,7 +28001,7 @@ var require_ipc_service = __commonJS({
         this.client = new client_js_1.IpcClient((0, transport_js_1.getSocketPath)(projectDir2), logger, options);
       }
       /**
-       * Create IpcService from CoreConfig, using IPC settings from config.yaml.
+       * Create IpcService from CoreConfig, using IPC settings from core.yaml.
        *
        * @param projectDir - Project directory path
        * @param logger - Logger instance
@@ -55449,7 +55653,13 @@ var require_profile_factory = __commonJS({
       }
       /**
        * Creates a provider for a profile, reading config at call time.
-       * Wraps with FallbackProvider if fallbackProfile specified.
+       * Wraps with FallbackProvider if a fallback is resolved.
+       *
+       * Fallback resolution cascade:
+       *   1. Explicit fallbackProfileId parameter (caller override)
+       *   2. Profile-level fallbackProfileId (per-profile config)
+       *   3. Global defaultFallbackProfileId (llm config level)
+       *   4. No fallback
        */
       createForProfile(profileId, fallbackProfileId) {
         const profile = this.configService.llm.profiles[profileId];
@@ -55457,13 +55667,14 @@ var require_profile_factory = __commonJS({
           throw new Error(`Profile "${profileId}" not found`);
         }
         const primary = this.createProvider(profile, profileId);
-        if (!fallbackProfileId)
+        const resolvedFallbackId = fallbackProfileId ?? profile.fallbackProfileId ?? this.configService.llm.defaultFallbackProfileId;
+        if (!resolvedFallbackId)
           return primary;
-        const fallback = this.configService.llm.fallbacks[fallbackProfileId];
+        const fallback = this.configService.llm.fallbackProfiles[resolvedFallbackId];
         if (!fallback) {
-          throw new Error(`Fallback profile "${fallbackProfileId}" not found`);
+          throw new Error(`Fallback profile "${resolvedFallbackId}" not found`);
         }
-        return new fallback_1.FallbackProvider(primary, [this.createProvider(fallback, fallbackProfileId)], this.logger);
+        return new fallback_1.FallbackProvider(primary, [this.createProvider(fallback, resolvedFallbackId)], this.logger);
       }
       /**
        * Creates provider for the default profile.
@@ -55666,7 +55877,8 @@ var require_gitignore = __commonJS({
       ".sidekick/.env",
       ".sidekick/.env.local",
       ".sidekick/sidekick*.pid",
-      ".sidekick/sidekick*.token"
+      ".sidekick/sidekick*.token",
+      ".sidekick/*.local.yaml"
     ];
     async function installGitignoreSection(projectDir2) {
       const gitignorePath = path.join(projectDir2, ".gitignore");
@@ -62148,6 +62360,46 @@ var require_git_status = __commonJS({
   }
 });
 
+// ../sidekick-core/dist/user-profile-loader.js
+var require_user_profile_loader = __commonJS({
+  "../sidekick-core/dist/user-profile-loader.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.loadUserProfile = loadUserProfile;
+    var node_fs_1 = require("node:fs");
+    var node_os_1 = require("node:os");
+    var node_path_1 = require("node:path");
+    var yaml_1 = require_dist2();
+    var types_1 = require_dist();
+    function loadUserProfile(options) {
+      const home = options?.homeDir ?? (0, node_os_1.homedir)();
+      const filePath = (0, node_path_1.join)(home, ".sidekick", "user.yaml");
+      if (!(0, node_fs_1.existsSync)(filePath)) {
+        return null;
+      }
+      try {
+        const content = (0, node_fs_1.readFileSync)(filePath, "utf-8");
+        const parsed = (0, yaml_1.parse)(content);
+        const result = types_1.UserProfileSchema.safeParse(parsed);
+        if (!result.success) {
+          options?.logger?.warn("Invalid user profile, ignoring", {
+            path: filePath,
+            errors: result.error.issues.map((i) => i.message)
+          });
+          return null;
+        }
+        return result.data;
+      } catch (err) {
+        options?.logger?.warn("Failed to read user profile", {
+          path: filePath,
+          error: err instanceof Error ? err.message : String(err)
+        });
+        return null;
+      }
+    }
+  }
+});
+
 // ../sidekick-core/dist/index.js
 var require_dist4 = __commonJS({
   "../sidekick-core/dist/index.js"(exports2) {
@@ -62170,7 +62422,7 @@ var require_dist4 = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.SIDEKICK_SECTION_START = exports2.detectGitignoreStatus = exports2.removeGitignoreSection = exports2.installGitignoreSection = exports2.validateOpenAIKey = exports2.validateOpenRouterKey = exports2.createSetupStatusService = exports2.SetupStatusService = exports2.DaemonClient = exports2.findZombieDaemons = exports2.killZombieDaemons = exports2.killAllDaemons = exports2.logEvent = exports2.LogEvents = exports2.DEFAULT_MAX_FILES = exports2.DEFAULT_ROTATE_SIZE_BYTES = exports2.getComponentLogLevel = exports2.setupGlobalErrorHandlers = exports2.createLoggerFacade = exports2.createLogManager = exports2.createConsoleLogger = exports2.getUserDaemonsDir = exports2.getUserPidPath = exports2.getTokenPath = exports2.getSocketPath = exports2.getProjectHash = exports2.getPidPath = exports2.getLockPath = exports2.IpcService = exports2.IpcServer = exports2.loadPersonaFile = exports2.getDefaultPersonasDir = exports2.discoverPersonas = exports2.createPersonaLoader = exports2.reconstructTranscriptPath = exports2.encodeProjectPath = exports2.isPreCompactEvent = exports2.isStopEvent = exports2.isPostToolUseEvent = exports2.isPreToolUseEvent = exports2.isUserPromptSubmitEvent = exports2.isSessionEndEvent = exports2.isSessionStartEvent = exports2.isTranscriptEvent = exports2.isHookEvent = exports2.MetricsPersistPayloadSchema = exports2.CleanupPayloadSchema = exports2.ResumeGenerationPayloadSchema = exports2.SessionSummaryPayloadSchema = exports2.TaskTypes = void 0;
-    exports2.parseGitStatusOutput = exports2.getGitFileStatus = exports2.isInSandbox = exports2.updateDaemonHealth = exports2.readDaemonHealth = exports2.DaemonGlobalLogMetricsDescriptor = exports2.CliLogMetricsDescriptor = exports2.DaemonLogMetricsDescriptor = exports2.CompactionHistoryDescriptor = exports2.TranscriptMetricsDescriptor = exports2.GlobalStateAccessor = exports2.SessionStateAccessor = exports2.globalState = exports2.sessionState = exports2.StateCorruptError = exports2.StateNotFoundError = exports2.StateService = exports2.createHookableLogger = exports2.InstrumentedProfileProviderFactory = exports2.InstrumentedLLMProvider = exports2.ServiceFactoryImpl = exports2.TranscriptServiceImpl = exports2.createDefaultTokenUsage = exports2.createDefaultMetrics = exports2.copyWithTimestampSync = exports2.renameWithTimestampSync = exports2.renameWithTimestamp = exports2.copyWithTimestamp = exports2.getTimestampedPath = exports2.extractToolResultPreview = exports2.extractToolCallPreview = exports2.extractTextFromContent = exports2.extractContentPreview = exports2.HandlerRegistryImpl = exports2.extractConsumedTimestamp = exports2.createConsumedFilePattern = exports2.CONSUMED_FILE_PATTERN = exports2.filterActiveReminderFiles = exports2.validatePathSegment = exports2.isValidPathSegment = exports2.getReminderPath = exports2.getHookDir = exports2.getStagingRoot = exports2.SessionScopedStagingService = exports2.StagingServiceCore = exports2.GITIGNORE_ENTRIES = exports2.SIDEKICK_SECTION_END = void 0;
+    exports2.loadUserProfile = exports2.parseGitStatusOutput = exports2.getGitFileStatus = exports2.isInSandbox = exports2.updateDaemonHealth = exports2.readDaemonHealth = exports2.DaemonGlobalLogMetricsDescriptor = exports2.CliLogMetricsDescriptor = exports2.DaemonLogMetricsDescriptor = exports2.CompactionHistoryDescriptor = exports2.TranscriptMetricsDescriptor = exports2.GlobalStateAccessor = exports2.SessionStateAccessor = exports2.globalState = exports2.sessionState = exports2.StateCorruptError = exports2.StateNotFoundError = exports2.StateService = exports2.createHookableLogger = exports2.InstrumentedProfileProviderFactory = exports2.InstrumentedLLMProvider = exports2.ServiceFactoryImpl = exports2.TranscriptServiceImpl = exports2.createDefaultTokenUsage = exports2.createDefaultMetrics = exports2.copyWithTimestampSync = exports2.renameWithTimestampSync = exports2.renameWithTimestamp = exports2.copyWithTimestamp = exports2.getTimestampedPath = exports2.extractToolResultPreview = exports2.extractToolCallPreview = exports2.extractTextFromContent = exports2.extractContentPreview = exports2.HandlerRegistryImpl = exports2.extractConsumedTimestamp = exports2.createConsumedFilePattern = exports2.CONSUMED_FILE_PATTERN = exports2.filterActiveReminderFiles = exports2.validatePathSegment = exports2.isValidPathSegment = exports2.getReminderPath = exports2.getHookDir = exports2.getStagingRoot = exports2.SessionScopedStagingService = exports2.StagingServiceCore = exports2.GITIGNORE_ENTRIES = exports2.SIDEKICK_SECTION_END = void 0;
     var types_1 = require_dist();
     Object.defineProperty(exports2, "TaskTypes", { enumerable: true, get: function() {
       return types_1.TaskTypes;
@@ -62237,6 +62489,7 @@ var require_dist4 = __commonJS({
       return persona_loader_1.loadPersonaFile;
     } });
     __exportStar(require_config2(), exports2);
+    __exportStar(require_config_writer(), exports2);
     __exportStar(require_feature_registry(), exports2);
     __exportStar(require_feature_types(), exports2);
     __exportStar(require_client(), exports2);
@@ -62497,6 +62750,10 @@ var require_dist4 = __commonJS({
     Object.defineProperty(exports2, "parseGitStatusOutput", { enumerable: true, get: function() {
       return git_status_1.parseGitStatusOutput;
     } });
+    var user_profile_loader_1 = require_user_profile_loader();
+    Object.defineProperty(exports2, "loadUserProfile", { enumerable: true, get: function() {
+      return user_profile_loader_1.loadUserProfile;
+    } });
   }
 });
 
@@ -69726,7 +69983,8 @@ var require_types2 = __commonJS({
       PAUSE_AND_REFLECT: "pause-and-reflect",
       VERIFY_COMPLETION: "verify-completion",
       REMEMBER_YOUR_PERSONA: "remember-your-persona",
-      PERSONA_CHANGED: "persona-changed"
+      PERSONA_CHANGED: "persona-changed",
+      USER_PROFILE: "user-profile"
     };
   }
 });
@@ -71812,6 +72070,66 @@ var require_stage_persona_reminders = __commonJS({
   }
 });
 
+// ../feature-reminders/dist/handlers/staging/stage-user-profile-reminders.js
+var require_stage_user_profile_reminders = __commonJS({
+  "../feature-reminders/dist/handlers/staging/stage-user-profile-reminders.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.stageUserProfileRemindersForSession = stageUserProfileRemindersForSession;
+    exports2.registerStageUserProfileReminders = registerStageUserProfileReminders;
+    var core_1 = require_dist4();
+    var types_1 = require_dist();
+    var reminder_utils_js_1 = require_reminder_utils();
+    var types_js_1 = require_types2();
+    var USER_PROFILE_REMINDER_HOOKS = ["UserPromptSubmit", "SessionStart"];
+    async function stageUserProfileRemindersForSession(ctx, sessionId) {
+      const profile = (0, core_1.loadUserProfile)({ logger: ctx.logger });
+      if (!profile) {
+        for (const hook of USER_PROFILE_REMINDER_HOOKS) {
+          await ctx.staging.deleteReminder(hook, types_js_1.ReminderIds.USER_PROFILE);
+        }
+        return;
+      }
+      const templateContext = {
+        user_name: profile.name,
+        user_role: profile.role,
+        user_interests: profile.interests.join(", ")
+      };
+      const reminder = (0, reminder_utils_js_1.resolveReminder)(types_js_1.ReminderIds.USER_PROFILE, {
+        context: templateContext,
+        assets: ctx.assets
+      });
+      if (reminder) {
+        for (const targetHook of USER_PROFILE_REMINDER_HOOKS) {
+          await (0, reminder_utils_js_1.stageReminder)(ctx, targetHook, reminder);
+        }
+        ctx.logger.debug("Staged user profile reminders", { sessionId, userName: profile.name });
+      } else {
+        ctx.logger.warn("Failed to resolve user-profile reminder", { sessionId });
+      }
+    }
+    function registerStageUserProfileReminders(context) {
+      if (!(0, types_1.isDaemonContext)(context))
+        return;
+      context.handlers.register({
+        id: "reminders:stage-user-profile-reminders",
+        priority: 39,
+        // Run after persona reminders (priority 40)
+        filter: { kind: "hook", hooks: ["SessionStart"] },
+        handler: async (event, ctx) => {
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
+          if (!(0, types_1.isHookEvent)(event) || !(0, types_1.isSessionStartEvent)(event))
+            return;
+          const daemonCtx = ctx;
+          const sessionId = event.context.sessionId;
+          await stageUserProfileRemindersForSession(daemonCtx, sessionId);
+        }
+      });
+    }
+  }
+});
+
 // ../feature-reminders/dist/handlers/staging/index.js
 var require_staging2 = __commonJS({
   "../feature-reminders/dist/handlers/staging/index.js"(exports2) {
@@ -71824,6 +72142,7 @@ var require_staging2 = __commonJS({
     var stage_stop_bash_changes_1 = require_stage_stop_bash_changes();
     var unstage_verify_completion_1 = require_unstage_verify_completion();
     var stage_persona_reminders_1 = require_stage_persona_reminders();
+    var stage_user_profile_reminders_1 = require_stage_user_profile_reminders();
     function registerStagingHandlers(context) {
       (0, stage_default_user_prompt_1.registerStageDefaultUserPrompt)(context);
       (0, stage_pause_and_reflect_1.registerStagePauseAndReflect)(context);
@@ -71831,6 +72150,7 @@ var require_staging2 = __commonJS({
       (0, stage_stop_bash_changes_1.registerStageBashChanges)(context);
       (0, unstage_verify_completion_1.registerUnstageVerifyCompletion)(context);
       (0, stage_persona_reminders_1.registerStagePersonaReminders)(context);
+      (0, stage_user_profile_reminders_1.registerStageUserProfileReminders)(context);
     }
   }
 });
@@ -72785,10 +73105,14 @@ var require_types3 = __commonJS({
         resetThreshold: 0.7
       },
       personas: {
+        pinnedPersona: "",
         allowList: "",
         blockList: "disabled",
         resumeFreshnessHours: 4,
-        injectPersonaIntoClaude: true
+        injectPersonaIntoClaude: true,
+        defaultLlmProfile: "",
+        llmProfiles: {},
+        weights: {}
       }
     };
     exports2.RESUME_MIN_CONFIDENCE = 0.7;
@@ -72840,12 +73164,28 @@ var require_persona_selection = __commonJS({
       }
       return result;
     }
-    function selectRandomPersona(personas) {
+    function selectRandomPersona(personas, weights) {
       if (personas.length === 0) {
         return null;
       }
-      const index = Math.floor(Math.random() * personas.length);
-      return personas[index];
+      const weighted = personas.map((p) => {
+        const raw = weights?.[p.id];
+        const weight = raw === void 0 ? 1 : Number(raw);
+        return { persona: p, weight };
+      }).filter((entry) => Number.isFinite(entry.weight) && entry.weight > 0);
+      if (weighted.length === 0) {
+        return null;
+      }
+      const totalWeight = weighted.reduce((sum, entry) => sum + entry.weight, 0);
+      const threshold = Math.random() * totalWeight;
+      let accumulated = 0;
+      for (const entry of weighted) {
+        accumulated += entry.weight;
+        if (accumulated > threshold) {
+          return entry.persona;
+        }
+      }
+      return weighted[weighted.length - 1].persona;
     }
     async function selectPersonaForSession(sessionId, config, ctx) {
       const personaConfig = {
@@ -72862,6 +73202,30 @@ var require_persona_selection = __commonJS({
         ctx.logger.warn("No personas found, skipping persona selection", { sessionId });
         return null;
       }
+      const pinnedPersona = personaConfig.pinnedPersona?.trim();
+      if (pinnedPersona) {
+        const pinned = allPersonas.get(pinnedPersona);
+        if (pinned) {
+          const personaState2 = {
+            persona_id: pinned.id,
+            selected_from: [pinned.id],
+            timestamp: (/* @__PURE__ */ new Date()).toISOString()
+          };
+          const summaryState2 = (0, state_js_1.createSessionSummaryState)(ctx.stateService);
+          await summaryState2.sessionPersona.write(sessionId, personaState2);
+          ctx.logger.info("Using pinned persona for session", {
+            sessionId,
+            personaId: pinned.id,
+            personaName: pinned.display_name
+          });
+          return pinned.id;
+        }
+        ctx.logger.warn("Pinned persona not found, falling back to random selection", {
+          sessionId,
+          pinnedPersona,
+          availablePersonas: Array.from(allPersonas.keys())
+        });
+      }
       const allowList = parsePersonaList(personaConfig.allowList ?? "");
       const blockList = parsePersonaList(personaConfig.blockList ?? "");
       const eligiblePersonas = filterPersonas(allPersonas, allowList, blockList, ctx.logger);
@@ -72874,7 +73238,15 @@ var require_persona_selection = __commonJS({
         });
         return null;
       }
-      const selected = selectRandomPersona(eligiblePersonas);
+      const selected = selectRandomPersona(eligiblePersonas, personaConfig.weights);
+      if (!selected) {
+        ctx.logger.warn("No eligible personas after applying weights", {
+          sessionId,
+          weights: personaConfig.weights,
+          eligibleCount: eligiblePersonas.length
+        });
+        return null;
+      }
       const personaState = {
         persona_id: selected.id,
         selected_from: eligiblePersonas.map((p) => p.id),
@@ -73006,12 +73378,37 @@ var require_persona_utils = __commonJS({
   "../feature-session-summary/dist/handlers/persona-utils.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.buildUserProfileContext = buildUserProfileContext;
+    exports2.loadUserProfileContext = loadUserProfileContext;
     exports2.buildPersonaContext = buildPersonaContext;
     exports2.stripSurroundingQuotes = stripSurroundingQuotes;
     exports2.loadSessionPersona = loadSessionPersona;
+    exports2.resolvePersonaLlmProfile = resolvePersonaLlmProfile;
+    exports2._resetProfileWarningState = _resetProfileWarningState;
+    exports2.validatePersonaLlmProfile = validatePersonaLlmProfile;
+    exports2.mergePersonaConfig = mergePersonaConfig;
+    exports2.getEffectiveProfile = getEffectiveProfile;
     var core_1 = require_dist4();
     var state_js_1 = require_state4();
+    var types_js_1 = require_types3();
     var DEFAULT_PERSONA_SITUATION = "You are watching over the shoulder of a software developer as they work.";
+    function buildUserProfileContext(profile) {
+      if (!profile) {
+        return {
+          user_name: "",
+          user_role: "",
+          user_interests: ""
+        };
+      }
+      return {
+        user_name: profile.name,
+        user_role: profile.role,
+        user_interests: profile.interests.join(", ")
+      };
+    }
+    function loadUserProfileContext(logger) {
+      return buildUserProfileContext((0, core_1.loadUserProfile)({ logger }));
+    }
     function formatExamples(examples) {
       if (!examples || examples.length === 0)
         return "";
@@ -73065,6 +73462,60 @@ var require_persona_utils = __commonJS({
       const personas = loader.discover();
       return personas.get(result.data.persona_id) ?? null;
     }
+    function resolvePersonaLlmProfile(personaId, personaDef, personaConfig) {
+      const perPersona = personaConfig.llmProfiles?.[personaId];
+      if (perPersona)
+        return perPersona;
+      if (personaDef?.llmProfile)
+        return personaDef.llmProfile;
+      if (personaConfig.defaultLlmProfile)
+        return personaConfig.defaultLlmProfile;
+      return void 0;
+    }
+    var _warnedProfiles = /* @__PURE__ */ new Set();
+    var _erroredDefaults = /* @__PURE__ */ new Set();
+    function _resetProfileWarningState() {
+      _warnedProfiles.clear();
+      _erroredDefaults.clear();
+    }
+    function validatePersonaLlmProfile(resolvedProfile, personaId, featureProfile, availableProfiles, isFromDefault, logger) {
+      if (resolvedProfile in availableProfiles) {
+        return { profileId: resolvedProfile };
+      }
+      if (isFromDefault) {
+        if (!_erroredDefaults.has(resolvedProfile)) {
+          _erroredDefaults.add(resolvedProfile);
+          logger.error("Invalid defaultLlmProfile in persona config", {
+            profileId: resolvedProfile,
+            personaId,
+            availableProfiles: Object.keys(availableProfiles)
+          });
+        }
+        return { errorMessage: `Persona ${personaId}'s profile ${resolvedProfile} is not recognized` };
+      }
+      if (!_warnedProfiles.has(resolvedProfile)) {
+        _warnedProfiles.add(resolvedProfile);
+        logger.warn("Persona LLM profile not found, falling back to feature profile", {
+          resolvedProfile,
+          personaId,
+          fallbackProfile: featureProfile,
+          availableProfiles: Object.keys(availableProfiles)
+        });
+      }
+      return { profileId: featureProfile };
+    }
+    function mergePersonaConfig(config) {
+      return { ...types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG.personas, ...config.personas };
+    }
+    function getEffectiveProfile(persona, llmConfig, config, availableProfiles, logger) {
+      const personaId = persona?.id ?? "";
+      const personaConfig = mergePersonaConfig(config);
+      const resolvedProfile = resolvePersonaLlmProfile(personaId, persona, personaConfig);
+      if (!resolvedProfile) {
+        return { profileId: llmConfig.profile };
+      }
+      return validatePersonaLlmProfile(resolvedProfile, personaId, llmConfig.profile, availableProfiles, resolvedProfile === personaConfig.defaultLlmProfile, logger);
+    }
   }
 });
 
@@ -73366,8 +73817,10 @@ var require_update_summary = __commonJS({
         return;
       }
       const personaContext = (0, persona_utils_js_1.buildPersonaContext)(persona);
+      const userProfileContext = (0, persona_utils_js_1.loadUserProfileContext)(ctx.logger);
       const prompt = interpolateTemplate(promptTemplate, {
         ...personaContext,
+        ...userProfileContext,
         session_title: summary.session_title,
         latest_intent: summary.latest_intent,
         turn_count: ctx.transcript.getMetrics().turnCount,
@@ -73376,7 +73829,16 @@ var require_update_summary = __commonJS({
         maxSnarkyWords: config.maxSnarkyWords
       });
       const llmConfig = config.llm?.snarkyComment ?? types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG.llm.snarkyComment;
-      const provider = ctx.profileFactory.createForProfile(llmConfig.profile, llmConfig.fallbackProfile);
+      const profileResult = (0, persona_utils_js_1.getEffectiveProfile)(persona, llmConfig, config, ctx.config.llm.profiles, ctx.logger);
+      if ("errorMessage" in profileResult) {
+        const snarkyState = {
+          message: profileResult.errorMessage,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+        };
+        await summaryState.snarkyMessage.write(sessionId, snarkyState);
+        return;
+      }
+      const provider = ctx.profileFactory.createForProfile(profileResult.profileId, llmConfig.fallbackProfile);
       try {
         const response = await provider.complete({
           messages: [{ role: "user", content: prompt }]
@@ -73413,7 +73875,9 @@ var require_update_summary = __commonJS({
           last_task_id: null,
           session_title: summary.session_title,
           snarky_comment: summary.latest_intent,
-          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          persona_id: null,
+          persona_display_name: null
         };
         await summaryState.resumeMessage.write(sessionId, resumeState);
         (0, core_1.logEvent)(ctx.logger, core_1.LogEvents.resumeUpdated({ sessionId }, {
@@ -73432,9 +73896,11 @@ var require_update_summary = __commonJS({
         intent_confidence: summary.latest_intent_confidence
       }));
       const personaContext = (0, persona_utils_js_1.buildPersonaContext)(persona);
+      const userProfileContext = (0, persona_utils_js_1.loadUserProfileContext)(ctx.logger);
       const keyPhrases = summary.session_title_key_phrases?.join(", ") ?? "";
       const prompt = interpolateTemplate(promptTemplate, {
         ...personaContext,
+        ...userProfileContext,
         sessionTitle: summary.session_title,
         confidence: summary.session_title_confidence,
         latestIntent: summary.latest_intent,
@@ -73443,7 +73909,15 @@ var require_update_summary = __commonJS({
         maxResumeWords: config.maxResumeWords
       });
       const llmConfig = config.llm?.resumeMessage ?? types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG.llm.resumeMessage;
-      const provider = ctx.profileFactory.createForProfile(llmConfig.profile, llmConfig.fallbackProfile);
+      const profileResult = (0, persona_utils_js_1.getEffectiveProfile)(persona, llmConfig, config, ctx.config.llm.profiles, ctx.logger);
+      if ("errorMessage" in profileResult) {
+        ctx.logger.error("Skipping resume generation due to invalid persona profile", {
+          sessionId,
+          errorMessage: profileResult.errorMessage
+        });
+        return;
+      }
+      const provider = ctx.profileFactory.createForProfile(profileResult.profileId, llmConfig.fallbackProfile);
       try {
         const response = await provider.complete({
           messages: [{ role: "user", content: prompt }]
@@ -73454,7 +73928,9 @@ var require_update_summary = __commonJS({
           // Not tracked in summary
           session_title: summary.session_title,
           snarky_comment: snarkyWelcome,
-          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          persona_id: persona?.id ?? null,
+          persona_display_name: persona?.display_name ?? null
         };
         await summaryState.resumeMessage.write(sessionId, resumeState);
         (0, core_1.logEvent)(ctx.logger, core_1.LogEvents.resumeUpdated({ sessionId }, {
@@ -73540,10 +74016,12 @@ var require_on_demand_generation = __commonJS({
         };
       }
       const personaContext = (0, persona_utils_js_1.buildPersonaContext)(persona);
+      const userProfileContext = (0, persona_utils_js_1.loadUserProfileContext)(ctx.logger);
       const featureConfig = ctx.config.getFeature("session-summary");
       const config = { ...types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG, ...featureConfig.settings };
       const prompt = (0, update_summary_js_1.interpolateTemplate)(promptTemplate, {
         ...personaContext,
+        ...userProfileContext,
         session_title: summary.session_title,
         latest_intent: summary.latest_intent,
         turn_count: ctx.transcript.getMetrics().turnCount,
@@ -73552,7 +74030,11 @@ var require_on_demand_generation = __commonJS({
         maxSnarkyWords: config.maxSnarkyWords
       });
       const llmConfig = config.llm?.snarkyComment ?? types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG.llm.snarkyComment;
-      const provider = ctx.profileFactory.createForProfile(llmConfig.profile, llmConfig.fallbackProfile);
+      const profileResult = (0, persona_utils_js_1.getEffectiveProfile)(persona, llmConfig, config, ctx.config.llm.profiles, ctx.logger);
+      if ("errorMessage" in profileResult) {
+        return { success: false, error: profileResult.errorMessage };
+      }
+      const provider = ctx.profileFactory.createForProfile(profileResult.profileId, llmConfig.fallbackProfile);
       try {
         const response = await provider.complete({
           messages: [{ role: "user", content: prompt }]
@@ -73599,7 +74081,9 @@ var require_on_demand_generation = __commonJS({
           last_task_id: null,
           session_title: summary.session_title,
           snarky_comment: summary.latest_intent,
-          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          persona_id: null,
+          persona_display_name: null
         };
         await summaryState.resumeMessage.write(sessionId, resumeState);
         ctx.logger.info("Generated deterministic resume message (disabled persona)", { sessionId });
@@ -73613,6 +74097,7 @@ var require_on_demand_generation = __commonJS({
         };
       }
       const personaContext = (0, persona_utils_js_1.buildPersonaContext)(persona);
+      const userProfileContext = (0, persona_utils_js_1.loadUserProfileContext)(ctx.logger);
       const featureConfig = ctx.config.getFeature("session-summary");
       const config = { ...types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG, ...featureConfig.settings };
       const excerpt = ctx.transcript.getExcerpt({
@@ -73624,6 +74109,7 @@ var require_on_demand_generation = __commonJS({
       const keyPhrases = summary.session_title_key_phrases?.join(", ") ?? "";
       const prompt = (0, update_summary_js_1.interpolateTemplate)(promptTemplate, {
         ...personaContext,
+        ...userProfileContext,
         sessionTitle: summary.session_title,
         confidence: summary.session_title_confidence,
         latestIntent: summary.latest_intent,
@@ -73632,7 +74118,11 @@ var require_on_demand_generation = __commonJS({
         maxResumeWords: config.maxResumeWords
       });
       const llmConfig = config.llm?.resumeMessage ?? types_js_1.DEFAULT_SESSION_SUMMARY_CONFIG.llm.resumeMessage;
-      const provider = ctx.profileFactory.createForProfile(llmConfig.profile, llmConfig.fallbackProfile);
+      const profileResult = (0, persona_utils_js_1.getEffectiveProfile)(persona, llmConfig, config, ctx.config.llm.profiles, ctx.logger);
+      if ("errorMessage" in profileResult) {
+        return { success: false, error: profileResult.errorMessage };
+      }
+      const provider = ctx.profileFactory.createForProfile(profileResult.profileId, llmConfig.fallbackProfile);
       try {
         const response = await provider.complete({
           messages: [{ role: "user", content: prompt }]
@@ -73642,7 +74132,9 @@ var require_on_demand_generation = __commonJS({
           last_task_id: null,
           session_title: summary.session_title,
           snarky_comment: snarkyWelcome,
-          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          persona_id: persona?.id ?? null,
+          persona_display_name: persona?.display_name ?? null
         };
         await summaryState.resumeMessage.write(sessionId, resumeState);
         ctx.logger.info("Generated resume message on-demand", {
@@ -75958,8 +76450,9 @@ var require_daemon = __commonJS({
             },
             llm: {
               defaultProfile: this.configService.llm.defaultProfile,
+              defaultFallbackProfileId: this.configService.llm.defaultFallbackProfileId,
               profiles: this.configService.llm.profiles,
-              fallbacks: this.configService.llm.fallbacks
+              fallbackProfiles: this.configService.llm.fallbackProfiles
             },
             getAll: () => this.configService.getAll(),
             getFeature: (name) => this.configService.getFeature(name)
@@ -76151,8 +76644,9 @@ var require_daemon = __commonJS({
             },
             llm: {
               defaultProfile: this.configService.llm.defaultProfile,
+              defaultFallbackProfileId: this.configService.llm.defaultFallbackProfileId,
               profiles: this.configService.llm.profiles,
-              fallbacks: this.configService.llm.fallbacks
+              fallbackProfiles: this.configService.llm.fallbackProfiles
             },
             getAll: () => this.configService.getAll(),
             getFeature: (name) => {
@@ -76232,8 +76726,9 @@ var require_daemon = __commonJS({
             },
             llm: {
               defaultProfile: this.configService.llm.defaultProfile,
+              defaultFallbackProfileId: this.configService.llm.defaultFallbackProfileId,
               profiles: this.configService.llm.profiles,
-              fallbacks: this.configService.llm.fallbacks
+              fallbackProfiles: this.configService.llm.fallbackProfiles
             },
             getAll: () => this.configService.getAll(),
             getFeature: (name) => this.configService.getFeature(name)
@@ -76519,8 +77014,9 @@ var require_daemon = __commonJS({
             },
             llm: {
               defaultProfile: this.configService.llm.defaultProfile,
+              defaultFallbackProfileId: this.configService.llm.defaultFallbackProfileId,
               profiles: this.configService.llm.profiles,
-              fallbacks: this.configService.llm.fallbacks
+              fallbackProfiles: this.configService.llm.fallbackProfiles
             },
             getAll: () => this.configService.getAll(),
             getFeature: (name) => this.configService.getFeature(name)