refactor: split config module

src/auto-reply/reply.ts

@@ -107,7 +107,7 @@ function resolveElevatedAllowList(
       return allowFrom?.telegram;
     case "discord": {
       const hasExplicit = Boolean(
-        allowFrom && Object.prototype.hasOwnProperty.call(allowFrom, "discord"),
+        allowFrom && Object.hasOwn(allowFrom, "discord"),
       );
       if (hasExplicit) return allowFrom?.discord;
       return discordFallback;
@@ -308,7 +308,7 @@ export async function getReplyFromConfig(
     : "on";
   const resolvedBlockStreaming =
     agentCfg?.blockStreamingDefault === "off" ? "off" : "on";
-  const resolvedBlockStreamingBreak =
+  const resolvedBlockStreamingBreak: "text_end" | "message_end" =
     agentCfg?.blockStreamingBreak === "message_end"
       ? "message_end"
       : "text_end";
@@ -468,9 +468,10 @@ export async function getReplyFromConfig(
   const isGroupChat = sessionCtx.ChatType === "group";
   const wasMentioned = ctx.WasMentioned === true;
   const shouldEagerType = !isGroupChat || wasMentioned;
-  const shouldInjectGroupIntro =
+  const shouldInjectGroupIntro = Boolean(
     isGroupChat &&
-    (isFirstTurnInSession || sessionEntry?.groupActivationNeedsSystemIntro);
+      (isFirstTurnInSession || sessionEntry?.groupActivationNeedsSystemIntro),
+  );
   const groupIntro = shouldInjectGroupIntro
     ? buildGroupIntro({
         sessionCtx,
@@ -626,7 +627,7 @@ export async function getReplyFromConfig(
       ownerNumbers:
         command.ownerList.length > 0 ? command.ownerList : undefined,
       extraSystemPrompt: groupIntro || undefined,
-      enforceFinalTag: provider === "ollama" ? true : undefined,
+      ...(provider === "ollama" ? { enforceFinalTag: true } : {}),
     },
   };
 

src/auto-reply/reply/commands.ts

@@ -1,5 +1,9 @@
 import type { ClawdisConfig } from "../../config/config.js";
-import { type SessionEntry, saveSessionStore } from "../../config/sessions.js";
+import {
+  type SessionEntry,
+  type SessionScope,
+  saveSessionStore,
+} from "../../config/sessions.js";
 import { logVerbose } from "../../globals.js";
 import { triggerClawdisRestart } from "../../infra/restart.js";
 import { resolveSendPolicy } from "../../sessions/send-policy.js";
@@ -101,7 +105,7 @@ export async function handleCommands(params: {
   sessionStore?: Record<string, SessionEntry>;
   sessionKey?: string;
   storePath?: string;
-  sessionScope: string;
+  sessionScope?: SessionScope;
   workspaceDir: string;
   defaultGroupActivation: () => "always" | "mention";
   resolvedThinkLevel?: ThinkLevel;

src/auto-reply/reply/session.ts

@@ -11,6 +11,7 @@ import {
   resolveSessionKey,
   resolveStorePath,
   type SessionEntry,
+  type SessionScope,
   saveSessionStore,
 } from "../../config/sessions.js";
 import type { MsgContext, TemplateContext } from "../templating.js";
@@ -26,7 +27,7 @@ export type SessionInitResult = {
   systemSent: boolean;
   abortedLastRun: boolean;
   storePath: string;
-  sessionScope: string;
+  sessionScope: SessionScope;
   groupResolution?: GroupKeyResolution;
   isGroup: boolean;
   bodyStripped?: string;
@@ -66,7 +67,7 @@ export async function initSessionState(params: {
   let persistedModelOverride: string | undefined;
   let persistedProviderOverride: string | undefined;
 
-  const groupResolution = resolveGroupSessionKey(ctx);
+  const groupResolution = resolveGroupSessionKey(ctx) ?? undefined;
   const isGroup =
     ctx.ChatType?.trim().toLowerCase() === "group" || Boolean(groupResolution);
   const triggerBodyNormalized = stripStructuralPrefixes(ctx.Body ?? "")

src/auto-reply/status.ts

@@ -162,7 +162,7 @@ export function buildStatusMessage(args: StatusArgs): string {
   const verboseLevel =
     args.resolvedVerbose ?? args.agent?.verboseDefault ?? "off";
   const elevatedLevel =
-    args.entry?.elevatedLevel ?? args.agent?.elevatedDefault ?? "on";
+    args.sessionEntry?.elevatedLevel ?? args.agent?.elevatedDefault ?? "on";
 
   const webLine = (() => {
     if (args.webLinked === false) {