@geminixiang/mama 0.2.0-beta.5 → 0.2.0-beta.7

package/dist/config.js

@@ -2,15 +2,33 @@ import { existsSync, mkdirSync, readFileSync } from "fs";
 import { homedir } from "os";
 import { dirname, join, resolve } from "path";
 import { atomicWritePrivateFile } from "./fs-atomic.js";
-const DEFAULTS = {
-    provider: "anthropic",
-    model: "claude-sonnet-4-5",
-    thinkingLevel: "off",
-    sessionScope: "thread",
-    logFormat: "console",
-    logLevel: "info",
+export class MissingGlobalSettingsError extends Error {
+    constructor(settingsPath) {
+        super(`Missing global settings file at ${settingsPath}`);
+        this.settingsPath = settingsPath;
+        this.name = "MissingGlobalSettingsError";
+    }
+}
+const ONBOARD_SETTINGS = {
+    llm: {
+        provider: "anthropic",
+        model: "claude-sonnet-4-5",
+        thinkingLevel: "off",
+    },
+    log: {
+        format: "console",
+        level: "info",
+    },
+    sandbox: {
+        cpus: "0.5",
+        memory: "1g",
+        boost: {
+            cpus: "2",
+            memory: "4g",
+        },
+    },
 };
-function loadConfigFile(settingsPath) {
+function loadSettingsFile(settingsPath) {
     if (!existsSync(settingsPath)) {
         return undefined;
     }
@@ -32,32 +50,104 @@ function getStateDir() {
     const raw = process.env.MAMA_STATE_DIR?.trim();
     return raw ? resolve(raw) : join(homedir(), ".mama");
 }
-function loadRawAgentConfig() {
-    return loadConfigFile(join(getStateDir(), "settings.json")) ?? {};
+function normalizeSettingsConfig(config) {
+    return {
+        ...(config.llm?.provider !== undefined ? { provider: config.llm.provider } : {}),
+        ...(config.llm?.model !== undefined ? { model: config.llm.model } : {}),
+        ...(config.llm?.thinkingLevel !== undefined ? { thinkingLevel: config.llm.thinkingLevel } : {}),
+        ...(config.log?.format !== undefined ? { logFormat: config.log.format } : {}),
+        ...(config.log?.level !== undefined ? { logLevel: config.log.level } : {}),
+        ...(config.sentry?.dsn !== undefined ? { sentryDsn: config.sentry.dsn } : {}),
+        ...(config.sandbox?.cpus !== undefined ? { sandboxCpus: config.sandbox.cpus } : {}),
+        ...(config.sandbox?.memory !== undefined ? { sandboxMemory: config.sandbox.memory } : {}),
+        ...(config.sandbox?.boost?.cpus !== undefined
+            ? { sandboxBoostCpus: config.sandbox.boost.cpus }
+            : {}),
+        ...(config.sandbox?.boost?.memory !== undefined
+            ? { sandboxBoostMemory: config.sandbox.boost.memory }
+            : {}),
+    };
 }
-export function loadAgentConfig() {
-    const fromFile = loadRawAgentConfig();
-    const provider = fromFile.provider || process.env.MAMA_AI_PROVIDER || DEFAULTS.provider;
-    const model = fromFile.model || process.env.MAMA_AI_MODEL || DEFAULTS.model;
-    const thinkingLevel = fromFile.thinkingLevel ?? DEFAULTS.thinkingLevel;
-    const sessionScope = fromFile.sessionScope ?? DEFAULTS.sessionScope;
-    const logFormat = fromFile.logFormat ?? DEFAULTS.logFormat;
-    const logLevel = fromFile.logLevel ?? DEFAULTS.logLevel;
+function getSettingsPath() {
+    return join(getStateDir(), "settings.json");
+}
+function requireGlobalSettings() {
+    const settingsPath = getSettingsPath();
+    const config = loadSettingsFile(settingsPath);
+    if (!config) {
+        throw new MissingGlobalSettingsError(settingsPath);
+    }
+    return config;
+}
+function requireString(value, path) {
+    if (!value) {
+        throw new Error(`Missing required global setting: ${path}. Run \`mama --onboard\` to create settings.json.`);
+    }
+    return value;
+}
+function requireThinkingLevel(value) {
+    return requireString(value, "llm.thinkingLevel");
+}
+function requireLogFormat(value) {
+    if (value !== "console" && value !== "json") {
+        throw new Error("Missing or invalid required global setting: log.format");
+    }
+    return value;
+}
+function requireLogLevel(value) {
+    const allowed = ["trace", "debug", "info", "warn", "error"];
+    if (!value || !allowed.includes(value)) {
+        throw new Error("Missing or invalid required global setting: log.level");
+    }
+    return value;
+}
+function toAgentConfig(fromFile) {
+    const provider = requireString(fromFile.provider, "llm.provider");
+    const model = requireString(fromFile.model, "llm.model");
+    const thinkingLevel = requireThinkingLevel(fromFile.thinkingLevel);
+    const logFormat = requireLogFormat(fromFile.logFormat);
+    const logLevel = requireLogLevel(fromFile.logLevel);
     const sentryDsn = fromFile.sentryDsn ?? process.env.SENTRY_DSN;
     const sandboxCpus = fromFile.sandboxCpus;
     const sandboxMemory = fromFile.sandboxMemory;
+    const sandboxBoostCpus = fromFile.sandboxBoostCpus;
+    const sandboxBoostMemory = fromFile.sandboxBoostMemory;
     return {
         provider,
         model,
         thinkingLevel,
-        sessionScope,
         logFormat,
         logLevel,
         sentryDsn,
         sandboxCpus,
         sandboxMemory,
+        sandboxBoostCpus,
+        sandboxBoostMemory,
     };
 }
+function loadRawAgentConfig() {
+    return normalizeSettingsConfig(requireGlobalSettings());
+}
+export function loadAgentConfig() {
+    return toAgentConfig(loadRawAgentConfig());
+}
+export function loadAgentConfigForConversation(conversationDir) {
+    const globalConfig = loadRawAgentConfig();
+    const conversationConfig = normalizeSettingsConfig(loadSettingsFile(join(conversationDir, "settings.json")) ?? {});
+    return toAgentConfig({ ...globalConfig, ...conversationConfig });
+}
+export function saveConversationModelConfig(conversationDir, config) {
+    if (!existsSync(conversationDir)) {
+        mkdirSync(conversationDir, { recursive: true });
+    }
+    const settingsPath = join(conversationDir, "settings.json");
+    const existing = loadSettingsFile(settingsPath) ?? {};
+    const scopedConfig = {
+        ...existing,
+        llm: { ...existing.llm, ...config },
+    };
+    atomicWritePrivateFile(settingsPath, JSON.stringify(scopedConfig, null, 2));
+}
 export function resolveWorkspaceDirFromArgv(args = process.argv.slice(2)) {
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
@@ -65,7 +155,7 @@ export function resolveWorkspaceDirFromArgv(args = process.argv.slice(2)) {
             i += 1;
             continue;
         }
-        if (arg === "--version" || arg === "-v" || arg === "-V") {
+        if (arg === "--version" || arg === "-v" || arg === "-V" || arg === "--onboard") {
             continue;
         }
         if (arg.startsWith("--sandbox=") ||
@@ -92,12 +182,23 @@ export function resolveStateDirFromArgv(args = process.argv.slice(2)) {
     return join(homedir(), ".mama");
 }
 export function resolveSentryDsn() {
-    const fromFile = loadRawAgentConfig();
+    const fromFile = normalizeSettingsConfig(loadSettingsFile(getSettingsPath()) ?? {});
     if (fromFile.sentryDsn) {
         return fromFile.sentryDsn;
     }
     return process.env.SENTRY_DSN;
 }
+export function createGlobalSettingsFile(stateDir) {
+    const settingsPath = join(stateDir, "settings.json");
+    if (existsSync(settingsPath)) {
+        throw new Error(`Global settings already exists at ${settingsPath}`);
+    }
+    if (!existsSync(stateDir)) {
+        mkdirSync(stateDir, { recursive: true });
+    }
+    atomicWritePrivateFile(settingsPath, JSON.stringify(ONBOARD_SETTINGS, null, 2));
+    return settingsPath;
+}
 /**
  * Externally-visible base URL of the link/OAuth server, e.g.
  * `https://mama.example.com` (no trailing slash). Read from `MAMA_LINK_URL`,
@@ -109,25 +210,70 @@ export function resolveLinkBaseUrl() {
         return undefined;
     return raw.replace(/\/+$/, "");
 }
+function hasDefinedValue(values) {
+    return values !== undefined && Object.values(values).some((value) => value !== undefined);
+}
+function compactSettingsConfig(config) {
+    return {
+        ...(hasDefinedValue(config.llm) ? { llm: config.llm } : {}),
+        ...(hasDefinedValue(config.log) ? { log: config.log } : {}),
+        ...(hasDefinedValue(config.sentry) ? { sentry: config.sentry } : {}),
+        ...(hasDefinedValue(config.sandbox) ? { sandbox: config.sandbox } : {}),
+    };
+}
+function patchSettingsConfig(existing, config) {
+    const patched = {
+        ...existing,
+        llm: {
+            ...existing.llm,
+            ...(config.provider !== undefined ? { provider: config.provider } : {}),
+            ...(config.model !== undefined ? { model: config.model } : {}),
+            ...(config.thinkingLevel !== undefined ? { thinkingLevel: config.thinkingLevel } : {}),
+        },
+        log: {
+            ...existing.log,
+            ...(config.logFormat !== undefined ? { format: config.logFormat } : {}),
+            ...(config.logLevel !== undefined ? { level: config.logLevel } : {}),
+        },
+        sentry: {
+            ...existing.sentry,
+            ...(config.sentryDsn !== undefined ? { dsn: config.sentryDsn } : {}),
+        },
+        sandbox: {
+            ...existing.sandbox,
+            ...(config.sandboxCpus !== undefined ? { cpus: config.sandboxCpus } : {}),
+            ...(config.sandboxMemory !== undefined ? { memory: config.sandboxMemory } : {}),
+            ...(config.sandboxBoostCpus !== undefined || config.sandboxBoostMemory !== undefined
+                ? {
+                    boost: {
+                        ...existing.sandbox?.boost,
+                        ...(config.sandboxBoostCpus !== undefined ? { cpus: config.sandboxBoostCpus } : {}),
+                        ...(config.sandboxBoostMemory !== undefined
+                            ? { memory: config.sandboxBoostMemory }
+                            : {}),
+                    },
+                }
+                : {}),
+        },
+    };
+    return compactSettingsConfig(patched);
+}
 export function saveAgentConfig(config) {
     const settingsPath = join(getStateDir(), "settings.json");
-    let existing = {};
+    let existing = ONBOARD_SETTINGS;
     if (existsSync(settingsPath)) {
-        const raw = readFileSync(settingsPath, "utf-8");
-        let parsed;
         try {
-            parsed = JSON.parse(raw);
+            existing = loadSettingsFile(settingsPath) ?? {};
         }
         catch (err) {
             const detail = err instanceof Error ? err.message : String(err);
-            throw new Error(`Refusing to overwrite malformed settings file at ${settingsPath}: ${detail}`);
-        }
-        if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-            throw new Error(`Refusing to overwrite malformed settings file at ${settingsPath}: expected a JSON object at the top level`);
+            const message = detail.startsWith("Malformed settings file")
+                ? detail.replace("Malformed settings file", "Refusing to overwrite malformed settings file")
+                : detail;
+            throw new Error(message);
         }
-        existing = parsed;
     }
-    const merged = { ...existing, ...config };
+    const merged = patchSettingsConfig(existing, config);
     const dir = dirname(settingsPath);
     if (!existsSync(dir)) {
         mkdirSync(dir, { recursive: true });

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync, mkdirSync, readFileSync } from \"fs\";\nimport { homedir } from \"os\";\nimport { dirname, join, resolve } from \"path\";\nimport { atomicWritePrivateFile } from \"./fs-atomic.js\";\n\nexport interface AgentConfig {\n  provider: string;\n  model: string;\n  thinkingLevel?: string;\n  sessionScope?: \"thread\" | \"channel\";\n  logFormat?: \"console\" | \"json\";\n  logLevel?: \"trace\" | \"debug\" | \"info\" | \"warn\" | \"error\";\n  sentryDsn?: string;\n  sandboxCpus?: string;\n  sandboxMemory?: string;\n}\n\nconst DEFAULTS: AgentConfig = {\n  provider: \"anthropic\",\n  model: \"claude-sonnet-4-5\",\n  thinkingLevel: \"off\",\n  sessionScope: \"thread\",\n  logFormat: \"console\",\n  logLevel: \"info\",\n};\n\nfunction loadConfigFile(settingsPath: string): Partial<AgentConfig> | undefined {\n  if (!existsSync(settingsPath)) {\n    return undefined;\n  }\n\n  const raw = readFileSync(settingsPath, \"utf-8\");\n  let parsed: unknown;\n  try {\n    parsed = JSON.parse(raw);\n  } catch (err) {\n    const detail = err instanceof Error ? err.message : String(err);\n    throw new Error(`Malformed settings file at ${settingsPath}: ${detail}`);\n  }\n  if (!parsed || typeof parsed !== \"object\" || Array.isArray(parsed)) {\n    throw new Error(\n      `Malformed settings file at ${settingsPath}: expected a JSON object at the top level`,\n    );\n  }\n  return parsed as Partial<AgentConfig>;\n}\n\nfunction getStateDir(): string {\n  const raw = process.env.MAMA_STATE_DIR?.trim();\n  return raw ? resolve(raw) : join(homedir(), \".mama\");\n}\n\nfunction loadRawAgentConfig(): Partial<AgentConfig> {\n  return loadConfigFile(join(getStateDir(), \"settings.json\")) ?? {};\n}\n\nexport function loadAgentConfig(): AgentConfig {\n  const fromFile = loadRawAgentConfig();\n\n  const provider = fromFile.provider || process.env.MAMA_AI_PROVIDER || DEFAULTS.provider;\n  const model = fromFile.model || process.env.MAMA_AI_MODEL || DEFAULTS.model;\n  const thinkingLevel = fromFile.thinkingLevel ?? DEFAULTS.thinkingLevel;\n  const sessionScope = fromFile.sessionScope ?? DEFAULTS.sessionScope;\n  const logFormat = fromFile.logFormat ?? DEFAULTS.logFormat;\n  const logLevel = fromFile.logLevel ?? DEFAULTS.logLevel;\n  const sentryDsn = fromFile.sentryDsn ?? process.env.SENTRY_DSN;\n  const sandboxCpus = fromFile.sandboxCpus;\n  const sandboxMemory = fromFile.sandboxMemory;\n\n  return {\n    provider,\n    model,\n    thinkingLevel,\n    sessionScope,\n    logFormat,\n    logLevel,\n    sentryDsn,\n    sandboxCpus,\n    sandboxMemory,\n  };\n}\n\nexport function resolveWorkspaceDirFromArgv(args = process.argv.slice(2)): string | undefined {\n  for (let i = 0; i < args.length; i++) {\n    const arg = args[i];\n\n    if (arg === \"--sandbox\" || arg === \"--download\" || arg === \"--state-dir\") {\n      i += 1;\n      continue;\n    }\n\n    if (arg === \"--version\" || arg === \"-v\" || arg === \"-V\") {\n      continue;\n    }\n\n    if (\n      arg.startsWith(\"--sandbox=\") ||\n      arg.startsWith(\"--download=\") ||\n      arg.startsWith(\"--state-dir=\")\n    ) {\n      continue;\n    }\n\n    if (!arg.startsWith(\"-\")) {\n      return arg;\n    }\n  }\n\n  return undefined;\n}\n\nexport function resolveStateDirFromArgv(args = process.argv.slice(2)): string {\n  for (let i = 0; i < args.length; i++) {\n    const arg = args[i];\n    if (arg.startsWith(\"--state-dir=\")) {\n      return resolve(arg.slice(\"--state-dir=\".length));\n    }\n    if (arg === \"--state-dir\") {\n      return resolve(args[++i] || \"\");\n    }\n  }\n\n  return join(homedir(), \".mama\");\n}\n\nexport function resolveSentryDsn(): string | undefined {\n  const fromFile = loadRawAgentConfig();\n  if (fromFile.sentryDsn) {\n    return fromFile.sentryDsn;\n  }\n\n  return process.env.SENTRY_DSN;\n}\n\n/**\n * Externally-visible base URL of the link/OAuth server, e.g.\n * `https://mama.example.com` (no trailing slash). Read from `MAMA_LINK_URL`,\n * the same env var the bot uses to build credential onboarding links.\n */\nexport function resolveLinkBaseUrl(): string | undefined {\n  const raw = process.env.MAMA_LINK_URL?.trim();\n  if (!raw) return undefined;\n  return raw.replace(/\\/+$/, \"\");\n}\n\nexport function saveAgentConfig(config: Partial<AgentConfig>): void {\n  const settingsPath = join(getStateDir(), \"settings.json\");\n\n  let existing: Partial<AgentConfig> = {};\n  if (existsSync(settingsPath)) {\n    const raw = readFileSync(settingsPath, \"utf-8\");\n    let parsed: unknown;\n    try {\n      parsed = JSON.parse(raw);\n    } catch (err) {\n      const detail = err instanceof Error ? err.message : String(err);\n      throw new Error(\n        `Refusing to overwrite malformed settings file at ${settingsPath}: ${detail}`,\n      );\n    }\n    if (!parsed || typeof parsed !== \"object\" || Array.isArray(parsed)) {\n      throw new Error(\n        `Refusing to overwrite malformed settings file at ${settingsPath}: expected a JSON object at the top level`,\n      );\n    }\n    existing = parsed as Partial<AgentConfig>;\n  }\n\n  const merged = { ...existing, ...config };\n\n  const dir = dirname(settingsPath);\n  if (!existsSync(dir)) {\n    mkdirSync(dir, { recursive: true });\n  }\n\n  atomicWritePrivateFile(settingsPath, JSON.stringify(merged, null, 2));\n}\n"]}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ThinkingLevel } from \"@earendil-works/pi-agent-core\";\nimport { existsSync, mkdirSync, readFileSync } from \"fs\";\nimport { homedir } from \"os\";\nimport { dirname, join, resolve } from \"path\";\nimport { atomicWritePrivateFile } from \"./fs-atomic.js\";\n\nexport class MissingGlobalSettingsError extends Error {\n  constructor(public readonly settingsPath: string) {\n    super(`Missing global settings file at ${settingsPath}`);\n    this.name = \"MissingGlobalSettingsError\";\n  }\n}\n\nexport interface AgentConfig {\n  provider: string;\n  model: string;\n  thinkingLevel: ThinkingLevel;\n  logFormat: \"console\" | \"json\";\n  logLevel: \"trace\" | \"debug\" | \"info\" | \"warn\" | \"error\";\n  sentryDsn?: string;\n  sandboxCpus?: string;\n  sandboxMemory?: string;\n  sandboxBoostCpus?: string;\n  sandboxBoostMemory?: string;\n}\n\nconst ONBOARD_SETTINGS: SettingsFileConfig = {\n  llm: {\n    provider: \"anthropic\",\n    model: \"claude-sonnet-4-5\",\n    thinkingLevel: \"off\",\n  },\n  log: {\n    format: \"console\",\n    level: \"info\",\n  },\n  sandbox: {\n    cpus: \"0.5\",\n    memory: \"1g\",\n    boost: {\n      cpus: \"2\",\n      memory: \"4g\",\n    },\n  },\n};\n\ninterface SettingsFileConfig {\n  llm?: Partial<Pick<AgentConfig, \"provider\" | \"model\" | \"thinkingLevel\">>;\n  log?: { format?: AgentConfig[\"logFormat\"]; level?: AgentConfig[\"logLevel\"] };\n  sentry?: { dsn?: string };\n  sandbox?: { cpus?: string; memory?: string; boost?: { cpus?: string; memory?: string } };\n}\n\nfunction loadSettingsFile(settingsPath: string): SettingsFileConfig | undefined {\n  if (!existsSync(settingsPath)) {\n    return undefined;\n  }\n\n  const raw = readFileSync(settingsPath, \"utf-8\");\n  let parsed: unknown;\n  try {\n    parsed = JSON.parse(raw);\n  } catch (err) {\n    const detail = err instanceof Error ? err.message : String(err);\n    throw new Error(`Malformed settings file at ${settingsPath}: ${detail}`);\n  }\n  if (!parsed || typeof parsed !== \"object\" || Array.isArray(parsed)) {\n    throw new Error(\n      `Malformed settings file at ${settingsPath}: expected a JSON object at the top level`,\n    );\n  }\n  return parsed as SettingsFileConfig;\n}\n\nfunction getStateDir(): string {\n  const raw = process.env.MAMA_STATE_DIR?.trim();\n  return raw ? resolve(raw) : join(homedir(), \".mama\");\n}\n\nfunction normalizeSettingsConfig(config: SettingsFileConfig): Partial<AgentConfig> {\n  return {\n    ...(config.llm?.provider !== undefined ? { provider: config.llm.provider } : {}),\n    ...(config.llm?.model !== undefined ? { model: config.llm.model } : {}),\n    ...(config.llm?.thinkingLevel !== undefined ? { thinkingLevel: config.llm.thinkingLevel } : {}),\n    ...(config.log?.format !== undefined ? { logFormat: config.log.format } : {}),\n    ...(config.log?.level !== undefined ? { logLevel: config.log.level } : {}),\n    ...(config.sentry?.dsn !== undefined ? { sentryDsn: config.sentry.dsn } : {}),\n    ...(config.sandbox?.cpus !== undefined ? { sandboxCpus: config.sandbox.cpus } : {}),\n    ...(config.sandbox?.memory !== undefined ? { sandboxMemory: config.sandbox.memory } : {}),\n    ...(config.sandbox?.boost?.cpus !== undefined\n      ? { sandboxBoostCpus: config.sandbox.boost.cpus }\n      : {}),\n    ...(config.sandbox?.boost?.memory !== undefined\n      ? { sandboxBoostMemory: config.sandbox.boost.memory }\n      : {}),\n  };\n}\n\nfunction getSettingsPath(): string {\n  return join(getStateDir(), \"settings.json\");\n}\n\nfunction requireGlobalSettings(): SettingsFileConfig {\n  const settingsPath = getSettingsPath();\n  const config = loadSettingsFile(settingsPath);\n  if (!config) {\n    throw new MissingGlobalSettingsError(settingsPath);\n  }\n  return config;\n}\n\nfunction requireString(value: string | undefined, path: string): string {\n  if (!value) {\n    throw new Error(\n      `Missing required global setting: ${path}. Run \\`mama --onboard\\` to create settings.json.`,\n    );\n  }\n  return value;\n}\n\nfunction requireThinkingLevel(value: ThinkingLevel | undefined): ThinkingLevel {\n  return requireString(value, \"llm.thinkingLevel\") as ThinkingLevel;\n}\n\nfunction requireLogFormat(value: AgentConfig[\"logFormat\"] | undefined): AgentConfig[\"logFormat\"] {\n  if (value !== \"console\" && value !== \"json\") {\n    throw new Error(\"Missing or invalid required global setting: log.format\");\n  }\n  return value;\n}\n\nfunction requireLogLevel(value: AgentConfig[\"logLevel\"] | undefined): AgentConfig[\"logLevel\"] {\n  const allowed = [\"trace\", \"debug\", \"info\", \"warn\", \"error\"];\n  if (!value || !allowed.includes(value)) {\n    throw new Error(\"Missing or invalid required global setting: log.level\");\n  }\n  return value;\n}\n\nfunction toAgentConfig(fromFile: Partial<AgentConfig>): AgentConfig {\n  const provider = requireString(fromFile.provider, \"llm.provider\");\n  const model = requireString(fromFile.model, \"llm.model\");\n  const thinkingLevel = requireThinkingLevel(fromFile.thinkingLevel);\n  const logFormat = requireLogFormat(fromFile.logFormat);\n  const logLevel = requireLogLevel(fromFile.logLevel);\n  const sentryDsn = fromFile.sentryDsn ?? process.env.SENTRY_DSN;\n  const sandboxCpus = fromFile.sandboxCpus;\n  const sandboxMemory = fromFile.sandboxMemory;\n  const sandboxBoostCpus = fromFile.sandboxBoostCpus;\n  const sandboxBoostMemory = fromFile.sandboxBoostMemory;\n\n  return {\n    provider,\n    model,\n    thinkingLevel,\n    logFormat,\n    logLevel,\n    sentryDsn,\n    sandboxCpus,\n    sandboxMemory,\n    sandboxBoostCpus,\n    sandboxBoostMemory,\n  };\n}\n\nfunction loadRawAgentConfig(): Partial<AgentConfig> {\n  return normalizeSettingsConfig(requireGlobalSettings());\n}\n\nexport function loadAgentConfig(): AgentConfig {\n  return toAgentConfig(loadRawAgentConfig());\n}\n\nexport function loadAgentConfigForConversation(conversationDir: string): AgentConfig {\n  const globalConfig = loadRawAgentConfig();\n  const conversationConfig = normalizeSettingsConfig(\n    loadSettingsFile(join(conversationDir, \"settings.json\")) ?? {},\n  );\n  return toAgentConfig({ ...globalConfig, ...conversationConfig });\n}\n\nexport function saveConversationModelConfig(\n  conversationDir: string,\n  config: Pick<AgentConfig, \"provider\" | \"model\"> & Partial<Pick<AgentConfig, \"thinkingLevel\">>,\n): void {\n  if (!existsSync(conversationDir)) {\n    mkdirSync(conversationDir, { recursive: true });\n  }\n  const settingsPath = join(conversationDir, \"settings.json\");\n  const existing = loadSettingsFile(settingsPath) ?? {};\n  const scopedConfig: SettingsFileConfig = {\n    ...existing,\n    llm: { ...existing.llm, ...config },\n  };\n  atomicWritePrivateFile(settingsPath, JSON.stringify(scopedConfig, null, 2));\n}\n\nexport function resolveWorkspaceDirFromArgv(args = process.argv.slice(2)): string | undefined {\n  for (let i = 0; i < args.length; i++) {\n    const arg = args[i];\n\n    if (arg === \"--sandbox\" || arg === \"--download\" || arg === \"--state-dir\") {\n      i += 1;\n      continue;\n    }\n\n    if (arg === \"--version\" || arg === \"-v\" || arg === \"-V\" || arg === \"--onboard\") {\n      continue;\n    }\n\n    if (\n      arg.startsWith(\"--sandbox=\") ||\n      arg.startsWith(\"--download=\") ||\n      arg.startsWith(\"--state-dir=\")\n    ) {\n      continue;\n    }\n\n    if (!arg.startsWith(\"-\")) {\n      return arg;\n    }\n  }\n\n  return undefined;\n}\n\nexport function resolveStateDirFromArgv(args = process.argv.slice(2)): string {\n  for (let i = 0; i < args.length; i++) {\n    const arg = args[i];\n    if (arg.startsWith(\"--state-dir=\")) {\n      return resolve(arg.slice(\"--state-dir=\".length));\n    }\n    if (arg === \"--state-dir\") {\n      return resolve(args[++i] || \"\");\n    }\n  }\n\n  return join(homedir(), \".mama\");\n}\n\nexport function resolveSentryDsn(): string | undefined {\n  const fromFile = normalizeSettingsConfig(loadSettingsFile(getSettingsPath()) ?? {});\n  if (fromFile.sentryDsn) {\n    return fromFile.sentryDsn;\n  }\n\n  return process.env.SENTRY_DSN;\n}\n\nexport function createGlobalSettingsFile(stateDir: string): string {\n  const settingsPath = join(stateDir, \"settings.json\");\n  if (existsSync(settingsPath)) {\n    throw new Error(`Global settings already exists at ${settingsPath}`);\n  }\n  if (!existsSync(stateDir)) {\n    mkdirSync(stateDir, { recursive: true });\n  }\n  atomicWritePrivateFile(settingsPath, JSON.stringify(ONBOARD_SETTINGS, null, 2));\n  return settingsPath;\n}\n\n/**\n * Externally-visible base URL of the link/OAuth server, e.g.\n * `https://mama.example.com` (no trailing slash). Read from `MAMA_LINK_URL`,\n * the same env var the bot uses to build credential onboarding links.\n */\nexport function resolveLinkBaseUrl(): string | undefined {\n  const raw = process.env.MAMA_LINK_URL?.trim();\n  if (!raw) return undefined;\n  return raw.replace(/\\/+$/, \"\");\n}\n\nfunction hasDefinedValue(values: Record<string, unknown> | undefined): boolean {\n  return values !== undefined && Object.values(values).some((value) => value !== undefined);\n}\n\nfunction compactSettingsConfig(config: SettingsFileConfig): SettingsFileConfig {\n  return {\n    ...(hasDefinedValue(config.llm) ? { llm: config.llm } : {}),\n    ...(hasDefinedValue(config.log) ? { log: config.log } : {}),\n    ...(hasDefinedValue(config.sentry) ? { sentry: config.sentry } : {}),\n    ...(hasDefinedValue(config.sandbox) ? { sandbox: config.sandbox } : {}),\n  };\n}\n\nfunction patchSettingsConfig(\n  existing: SettingsFileConfig,\n  config: Partial<AgentConfig>,\n): SettingsFileConfig {\n  const patched: SettingsFileConfig = {\n    ...existing,\n    llm: {\n      ...existing.llm,\n      ...(config.provider !== undefined ? { provider: config.provider } : {}),\n      ...(config.model !== undefined ? { model: config.model } : {}),\n      ...(config.thinkingLevel !== undefined ? { thinkingLevel: config.thinkingLevel } : {}),\n    },\n    log: {\n      ...existing.log,\n      ...(config.logFormat !== undefined ? { format: config.logFormat } : {}),\n      ...(config.logLevel !== undefined ? { level: config.logLevel } : {}),\n    },\n    sentry: {\n      ...existing.sentry,\n      ...(config.sentryDsn !== undefined ? { dsn: config.sentryDsn } : {}),\n    },\n    sandbox: {\n      ...existing.sandbox,\n      ...(config.sandboxCpus !== undefined ? { cpus: config.sandboxCpus } : {}),\n      ...(config.sandboxMemory !== undefined ? { memory: config.sandboxMemory } : {}),\n      ...(config.sandboxBoostCpus !== undefined || config.sandboxBoostMemory !== undefined\n        ? {\n            boost: {\n              ...existing.sandbox?.boost,\n              ...(config.sandboxBoostCpus !== undefined ? { cpus: config.sandboxBoostCpus } : {}),\n              ...(config.sandboxBoostMemory !== undefined\n                ? { memory: config.sandboxBoostMemory }\n                : {}),\n            },\n          }\n        : {}),\n    },\n  };\n  return compactSettingsConfig(patched);\n}\n\nexport function saveAgentConfig(config: Partial<AgentConfig>): void {\n  const settingsPath = join(getStateDir(), \"settings.json\");\n\n  let existing: SettingsFileConfig = ONBOARD_SETTINGS;\n  if (existsSync(settingsPath)) {\n    try {\n      existing = loadSettingsFile(settingsPath) ?? {};\n    } catch (err) {\n      const detail = err instanceof Error ? err.message : String(err);\n      const message = detail.startsWith(\"Malformed settings file\")\n        ? detail.replace(\"Malformed settings file\", \"Refusing to overwrite malformed settings file\")\n        : detail;\n      throw new Error(message);\n    }\n  }\n\n  const merged = patchSettingsConfig(existing, config);\n\n  const dir = dirname(settingsPath);\n  if (!existsSync(dir)) {\n    mkdirSync(dir, { recursive: true });\n  }\n\n  atomicWritePrivateFile(settingsPath, JSON.stringify(merged, null, 2));\n}\n"]}

package/dist/context.d.ts

@@ -9,7 +9,7 @@
  * - syncLogToSessionManager: Syncs messages from log.jsonl to SessionManager
  * - createMamaSettingsManager: Creates an in-memory SettingsManager for AgentSession
  */
-import { type SessionManager, SettingsManager } from "@mariozechner/pi-coding-agent";
+import { type SessionManager, SettingsManager } from "@earendil-works/pi-coding-agent";
 /**
  * Time range for filtering log messages
  */

package/dist/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EACL,KAAK,cAAc,EAEnB,eAAe,EAChB,MAAM,+BAA+B,CAAC;AAUvC;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAOD,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAQD;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,sGAAsG;IACtG,KAAK,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC;IAC/B,uFAAuF;IACvF,MAAM,EAAE,MAAM,CAAC;IACf,6FAA6F;IAC7F,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,uBAAuB,CAC3C,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,MAAM,EACvB,cAAc,CAAC,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,SAAS,EACrB,YAAY,CAAC,EAAE,YAAY,GAC1B,OAAO,CAAC,MAAM,CAAC,CAuIjB;AASD,wBAAgB,yBAAyB,CAAC,aAAa,EAAE,MAAM,GAAG,eAAe,CAEhF;AAED,wBAAsB,kBAAkB,CACtC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAwBxC","sourcesContent":["/**\n * Context management for mama.\n *\n * Mama uses two data sources per conversation:\n * - sessions/*.jsonl: Structured session history for agent context\n * - log.jsonl: Human-readable conversation history for grep (no tool results)\n *\n * This module provides:\n * - syncLogToSessionManager: Syncs messages from log.jsonl to SessionManager\n * - createMamaSettingsManager: Creates an in-memory SettingsManager for AgentSession\n */\n\nimport type { Message, UserMessage } from \"@mariozechner/pi-ai\";\nimport {\n  type SessionManager,\n  type SessionMessageEntry,\n  SettingsManager,\n} from \"@mariozechner/pi-coding-agent\";\nimport { existsSync } from \"fs\";\nimport { readFile } from \"fs/promises\";\nimport { join } from \"path\";\nimport * as log from \"./log.js\";\n\n// ============================================================================\n// Sync log.jsonl to SessionManager\n// ============================================================================\n\n/**\n * Time range for filtering log messages\n */\nexport interface TimeRange {\n  start: number; // Unix timestamp in ms\n  end: number;\n}\n\n/**\n * Default number of days to sync when no time range is specified\n */\nconst DEFAULT_SYNC_DAYS = 10;\n\nexport interface ConversationLogMessage {\n  date?: string;\n  ts?: string;\n  threadTs?: string;\n  user?: string;\n  userName?: string;\n  text?: string;\n  isBot?: boolean;\n}\n\ninterface ExistingSessionMessage {\n  timestamp?: number;\n  rawText: string;\n  normalizedText: string;\n}\n\n/**\n * Thread filter for scoping log sync to a specific thread session.\n * When provided, only messages belonging to this thread are synced,\n * preventing cross-thread context contamination.\n */\nexport interface ThreadFilter {\n  /** Filter mode: a specific thread, or top-level messages only for persistent channel/chat sessions */\n  scope?: \"thread\" | \"top-level\";\n  /** The root message timestamp (user's original message ts, derived from sessionKey) */\n  rootTs: string;\n  /** The thread anchor timestamp (bot's first reply ts, used as thread_ts by Slack replies) */\n  threadTs?: string;\n}\n\n/**\n * Sync user messages from log.jsonl to SessionManager.\n *\n * This ensures that messages logged while mama wasn't running (conversation chatter,\n * backfilled messages, messages while busy) are added to the LLM context.\n *\n * @param sessionManager - The SessionManager to sync to\n * @param conversationDir - Path to the conversation directory containing log.jsonl\n * @param excludeSlackTs - Current platform message ID/timestamp (will be added via prompt(), not sync)\n * @param timeRange - Optional time range to filter log entries (defaults to last 10 days)\n * @param threadFilter - Optional thread filter to scope sync to a specific thread\n * @returns Number of messages synced\n */\nexport async function syncLogToSessionManager(\n  sessionManager: SessionManager,\n  conversationDir: string,\n  excludeSlackTs?: string,\n  timeRange?: TimeRange,\n  threadFilter?: ThreadFilter,\n): Promise<number> {\n  // Calculate default time range (last 10 days) if not provided\n  const now = Date.now();\n  const defaultStart = now - DEFAULT_SYNC_DAYS * 24 * 60 * 60 * 1000;\n  const range = timeRange ?? { start: defaultStart, end: now };\n  const logFile = join(conversationDir, \"log.jsonl\");\n\n  if (!existsSync(logFile)) return 0;\n\n  // Build a list of existing session messages for dedupe.\n  // Live user prompts carry a formatted timestamp in the text and use Date.now(),\n  // while log.jsonl uses the platform event timestamp. We therefore need a small\n  // fuzzy match window in addition to the exact timestamp/content match used for\n  // already-synced log entries.\n  const existingMessages: ExistingSessionMessage[] = [];\n  const existingMessageKeys = new Set<string>();\n  for (const entry of sessionManager.getEntries()) {\n    if (entry.type !== \"message\") continue;\n    const msgEntry = entry as SessionMessageEntry;\n    const message = msgEntry.message as Message;\n    const contentText = Array.isArray(message.content)\n      ? message.content\n          .filter((part): part is { type: \"text\"; text: string } => part.type === \"text\")\n          .map((part) => part.text)\n          .join(\"\\n\\n\")\n      : typeof message.content === \"string\"\n        ? message.content\n        : \"\";\n    existingMessages.push({\n      timestamp: typeof message.timestamp === \"number\" ? message.timestamp : undefined,\n      rawText: contentText,\n      normalizedText: normalizeComparableUserText(contentText),\n    });\n    if (typeof message.timestamp === \"number\") {\n      existingMessageKeys.add(`${message.timestamp}:${contentText}`);\n    }\n  }\n\n  // Read log.jsonl and find user messages not in context\n  const logContent = await readFile(logFile, \"utf-8\");\n  const logLines = logContent.trim().split(\"\\n\").filter(Boolean);\n\n  const newMessages: Array<{ timestamp: number; message: UserMessage }> = [];\n\n  for (let lineIdx = 0; lineIdx < logLines.length; lineIdx++) {\n    const line = logLines[lineIdx];\n    let logMsg: ConversationLogMessage;\n    try {\n      logMsg = JSON.parse(line) as ConversationLogMessage;\n    } catch (err) {\n      log.logWarning(\n        `Skipping malformed log entry at ${logFile}:${lineIdx + 1}`,\n        err instanceof Error ? err.message : String(err),\n      );\n      continue;\n    }\n\n    const slackTs = logMsg.ts;\n    const date = logMsg.date;\n    if (!slackTs || !date) continue;\n\n    // Skip the current message being processed (will be added via prompt())\n    if (excludeSlackTs && slackTs === excludeSlackTs) continue;\n\n    // While queued messages are being processed, newer messages may already be present\n    // in log.jsonl. Do not look ahead into those future messages when building the\n    // current turn's context.\n    if (!isMessageAtOrBeforeCurrent(slackTs, excludeSlackTs)) continue;\n\n    // Skip bot messages - added through agent flow\n    if (logMsg.isBot) continue;\n\n    // Thread filtering: only sync messages belonging to this session's thread\n    if (threadFilter) {\n      if (threadFilter.scope === \"top-level\") {\n        // Persistent top-level sessions should only ingest top-level messages.\n        // This avoids pulling in unrelated replies from other threads.\n        if (logMsg.threadTs) {\n          continue;\n        }\n      } else {\n        if (logMsg.threadTs) {\n          // Thread reply: only include if threadTs matches our thread anchor or rootTs\n          if (\n            logMsg.threadTs !== threadFilter.threadTs &&\n            logMsg.threadTs !== threadFilter.rootTs\n          ) {\n            continue;\n          }\n        } else {\n          // Top-level message: only include if it's this session's root message\n          if (slackTs !== threadFilter.rootTs) {\n            continue;\n          }\n        }\n      }\n    }\n\n    // Build the message text as it would appear in context\n    const threadContext = logMsg.threadTs ? ` [in-thread:${logMsg.threadTs}]` : \"\";\n    const messageText = `[${logMsg.userName || logMsg.user || \"unknown\"}]${threadContext}: ${logMsg.text || \"\"}`;\n\n    const msgTime = new Date(date).getTime() || Date.now();\n    const messageKey = `${msgTime}:${messageText}`;\n    if (existingMessageKeys.has(messageKey)) continue;\n    if (hasExistingSessionMessage(existingMessages, msgTime, messageText)) continue;\n\n    // Skip messages outside the time range\n    if (msgTime < range.start || msgTime > range.end) continue;\n\n    const userMessage: UserMessage = {\n      role: \"user\",\n      content: [{ type: \"text\", text: messageText }],\n      timestamp: msgTime,\n    };\n\n    newMessages.push({ timestamp: msgTime, message: userMessage });\n    existingMessages.push({\n      timestamp: msgTime,\n      rawText: messageText,\n      normalizedText: normalizeComparableUserText(messageText),\n    });\n    existingMessageKeys.add(messageKey); // Track to avoid duplicates within this sync\n  }\n\n  if (newMessages.length === 0) return 0;\n\n  // Sort by timestamp and add to session\n  newMessages.sort((a, b) => a.timestamp - b.timestamp);\n\n  for (const { message } of newMessages) {\n    sessionManager.appendMessage(message);\n  }\n\n  return newMessages.length;\n}\n\n// ============================================================================\n// Settings manager for mama\n// ============================================================================\n\n// Mama manages model/provider config through its own config.ts / settings.json.\n// We use an in-memory SettingsManager so AgentSession has valid defaults\n// without interfering with coding-agent's global settings files.\nexport function createMamaSettingsManager(_workspaceDir: string): SettingsManager {\n  return SettingsManager.inMemory();\n}\n\nexport async function findLogMessageById(\n  conversationDir: string,\n  messageId: string,\n): Promise<ConversationLogMessage | null> {\n  const logFile = join(conversationDir, \"log.jsonl\");\n  if (!existsSync(logFile)) return null;\n\n  const logContent = await readFile(logFile, \"utf-8\");\n  const logLines = logContent.trim().split(\"\\n\").filter(Boolean);\n\n  for (let i = logLines.length - 1; i >= 0; i--) {\n    let entry: ConversationLogMessage;\n    try {\n      entry = JSON.parse(logLines[i]) as ConversationLogMessage;\n    } catch (err) {\n      log.logWarning(\n        `Skipping malformed log entry at ${logFile}:${i + 1}`,\n        err instanceof Error ? err.message : String(err),\n      );\n      continue;\n    }\n    if (entry.ts === messageId) {\n      return entry;\n    }\n  }\n\n  return null;\n}\n\nfunction stripSlackAttachmentBlock(text: string): string {\n  return text.replace(/\\n*<slack_attachments>\\n[\\s\\S]*?\\n<\\/slack_attachments>\\s*$/g, \"\");\n}\n\nfunction normalizeComparableUserText(text: string): string {\n  const withoutTimestamp = text.replace(\n    /^\\[[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}[+-][0-9]{2}:[0-9]{2}\\]\\s+(?=\\[[^\\]]+\\](?:\\s+\\[in-thread:[^\\]]+\\])?:\\s)/,\n    \"\",\n  );\n  return stripSlackAttachmentBlock(withoutTimestamp).trim();\n}\n\nfunction hasExistingSessionMessage(\n  existingMessages: ExistingSessionMessage[],\n  timestamp: number,\n  text: string,\n): boolean {\n  const normalizedText = normalizeComparableUserText(text);\n  return existingMessages.some((existing) => {\n    if (existing.timestamp === timestamp && existing.rawText === text) {\n      return true;\n    }\n    if (existing.normalizedText !== normalizedText || existing.timestamp === undefined) {\n      return false;\n    }\n    return existing.timestamp >= timestamp;\n  });\n}\n\nfunction isMessageAtOrBeforeCurrent(messageId: string, currentMessageId?: string): boolean {\n  if (!currentMessageId) return true;\n  const comparison = compareMessageIds(messageId, currentMessageId);\n  return comparison === null || comparison <= 0;\n}\n\nfunction compareMessageIds(a: string, b: string): number | null {\n  if (/^\\d+$/.test(a) && /^\\d+$/.test(b)) {\n    const left = BigInt(a);\n    const right = BigInt(b);\n    return left < right ? -1 : left > right ? 1 : 0;\n  }\n\n  const left = Number(a);\n  const right = Number(b);\n  if (Number.isFinite(left) && Number.isFinite(right)) {\n    return left < right ? -1 : left > right ? 1 : 0;\n  }\n\n  return null;\n}\n"]}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EACL,KAAK,cAAc,EAEnB,eAAe,EAChB,MAAM,iCAAiC,CAAC;AAWzC;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAOD,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAQD;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,sGAAsG;IACtG,KAAK,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC;IAC/B,uFAAuF;IACvF,MAAM,EAAE,MAAM,CAAC;IACf,6FAA6F;IAC7F,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,uBAAuB,CAC3C,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,MAAM,EACvB,cAAc,CAAC,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,SAAS,EACrB,YAAY,CAAC,EAAE,YAAY,GAC1B,OAAO,CAAC,MAAM,CAAC,CAmHjB;AASD,wBAAgB,yBAAyB,CAAC,aAAa,EAAE,MAAM,GAAG,eAAe,CAEhF;AAED,wBAAsB,kBAAkB,CACtC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAwBxC","sourcesContent":["/**\n * Context management for mama.\n *\n * Mama uses two data sources per conversation:\n * - sessions/*.jsonl: Structured session history for agent context\n * - log.jsonl: Human-readable conversation history for grep (no tool results)\n *\n * This module provides:\n * - syncLogToSessionManager: Syncs messages from log.jsonl to SessionManager\n * - createMamaSettingsManager: Creates an in-memory SettingsManager for AgentSession\n */\n\nimport type { Message, UserMessage } from \"@earendil-works/pi-ai\";\nimport {\n  type SessionManager,\n  type SessionMessageEntry,\n  SettingsManager,\n} from \"@earendil-works/pi-coding-agent\";\nimport { existsSync } from \"fs\";\nimport { readFile } from \"fs/promises\";\nimport { join } from \"path\";\nimport { parseNewCommand } from \"./commands/new.js\";\nimport * as log from \"./log.js\";\n\n// ============================================================================\n// Sync log.jsonl to SessionManager\n// ============================================================================\n\n/**\n * Time range for filtering log messages\n */\nexport interface TimeRange {\n  start: number; // Unix timestamp in ms\n  end: number;\n}\n\n/**\n * Default number of days to sync when no time range is specified\n */\nconst DEFAULT_SYNC_DAYS = 10;\n\nexport interface ConversationLogMessage {\n  date?: string;\n  ts?: string;\n  threadTs?: string;\n  user?: string;\n  userName?: string;\n  text?: string;\n  isBot?: boolean;\n}\n\ninterface ExistingSessionMessage {\n  timestamp?: number;\n  rawText: string;\n  normalizedText: string;\n}\n\n/**\n * Thread filter for scoping log sync to a specific thread session.\n * When provided, only messages belonging to this thread are synced,\n * preventing cross-thread context contamination.\n */\nexport interface ThreadFilter {\n  /** Filter mode: a specific thread, or top-level messages only for persistent channel/chat sessions */\n  scope?: \"thread\" | \"top-level\";\n  /** The root message timestamp (user's original message ts, derived from sessionKey) */\n  rootTs: string;\n  /** The thread anchor timestamp (bot's first reply ts, used as thread_ts by Slack replies) */\n  threadTs?: string;\n}\n\n/**\n * Sync user messages from log.jsonl to SessionManager.\n *\n * This ensures that messages logged while mama wasn't running (conversation chatter,\n * backfilled messages, messages while busy) are added to the LLM context.\n *\n * @param sessionManager - The SessionManager to sync to\n * @param conversationDir - Path to the conversation directory containing log.jsonl\n * @param excludeSlackTs - Current platform message ID/timestamp (will be added via prompt(), not sync)\n * @param timeRange - Optional time range to filter log entries (defaults to last 10 days)\n * @param threadFilter - Optional thread filter to scope sync to a specific thread\n * @returns Number of messages synced\n */\nexport async function syncLogToSessionManager(\n  sessionManager: SessionManager,\n  conversationDir: string,\n  excludeSlackTs?: string,\n  timeRange?: TimeRange,\n  threadFilter?: ThreadFilter,\n): Promise<number> {\n  // Calculate default time range (last 10 days) if not provided\n  const now = Date.now();\n  const defaultStart = now - DEFAULT_SYNC_DAYS * 24 * 60 * 60 * 1000;\n  const range = timeRange ?? { start: defaultStart, end: now };\n  const logFile = join(conversationDir, \"log.jsonl\");\n\n  if (!existsSync(logFile)) return 0;\n\n  // Build a list of existing session messages for dedupe.\n  // Live user prompts carry a formatted timestamp in the text and use Date.now(),\n  // while log.jsonl uses the platform event timestamp. We therefore need a small\n  // fuzzy match window in addition to the exact timestamp/content match used for\n  // already-synced log entries.\n  const existingMessages: ExistingSessionMessage[] = [];\n  const existingMessageKeys = new Set<string>();\n  for (const entry of sessionManager.getEntries()) {\n    if (entry.type !== \"message\") continue;\n    const msgEntry = entry as SessionMessageEntry;\n    const message = msgEntry.message as Message;\n    const contentText = Array.isArray(message.content)\n      ? message.content\n          .filter((part): part is { type: \"text\"; text: string } => part.type === \"text\")\n          .map((part) => part.text)\n          .join(\"\\n\\n\")\n      : typeof message.content === \"string\"\n        ? message.content\n        : \"\";\n    existingMessages.push({\n      timestamp: typeof message.timestamp === \"number\" ? message.timestamp : undefined,\n      rawText: contentText,\n      normalizedText: normalizeComparableUserText(contentText),\n    });\n    if (typeof message.timestamp === \"number\") {\n      existingMessageKeys.add(`${message.timestamp}:${contentText}`);\n    }\n  }\n\n  // Read log.jsonl and find user messages not in context\n  const logContent = await readFile(logFile, \"utf-8\");\n  const logLines = logContent.trim().split(\"\\n\").filter(Boolean);\n  const logEntries: ConversationLogMessage[] = [];\n\n  for (let lineIdx = 0; lineIdx < logLines.length; lineIdx++) {\n    try {\n      logEntries.push(JSON.parse(logLines[lineIdx]) as ConversationLogMessage);\n    } catch (err) {\n      log.logWarning(\n        `Skipping malformed log entry at ${logFile}:${lineIdx + 1}`,\n        err instanceof Error ? err.message : String(err),\n      );\n    }\n  }\n\n  const resetCutoff = findLatestResetCutoff(logEntries, excludeSlackTs, threadFilter);\n  const newMessages: Array<{ timestamp: number; message: UserMessage }> = [];\n\n  for (const logMsg of logEntries) {\n    const slackTs = logMsg.ts;\n    const date = logMsg.date;\n    if (!slackTs || !date) continue;\n\n    // Skip the current message being processed (will be added via prompt())\n    if (excludeSlackTs && slackTs === excludeSlackTs) continue;\n\n    // While queued messages are being processed, newer messages may already be present\n    // in log.jsonl. Do not look ahead into those future messages when building the\n    // current turn's context.\n    if (!isMessageAtOrBeforeCurrent(slackTs, excludeSlackTs)) continue;\n\n    // Skip mama's own responses - added through agent flow. Keep external app/bot\n    // messages (for example Sentry alerts) in context so mama can reason about them.\n    if (logMsg.isBot && logMsg.user === \"bot\") continue;\n\n    const msgTime = new Date(date).getTime() || Date.now();\n    if (resetCutoff !== null && msgTime <= resetCutoff) continue;\n\n    if (!isLogMessageInThreadScope(logMsg, threadFilter)) continue;\n\n    // Build the message text as it would appear in context\n    const threadContext = logMsg.threadTs ? ` [in-thread:${logMsg.threadTs}]` : \"\";\n    const messageText = `[${logMsg.userName || logMsg.user || \"unknown\"}]${threadContext}: ${logMsg.text || \"\"}`;\n\n    const messageKey = `${msgTime}:${messageText}`;\n    if (existingMessageKeys.has(messageKey)) continue;\n    if (hasExistingSessionMessage(existingMessages, msgTime, messageText)) continue;\n\n    // Skip messages outside the time range\n    if (msgTime < range.start || msgTime > range.end) continue;\n\n    const userMessage: UserMessage = {\n      role: \"user\",\n      content: [{ type: \"text\", text: messageText }],\n      timestamp: msgTime,\n    };\n\n    newMessages.push({ timestamp: msgTime, message: userMessage });\n    existingMessages.push({\n      timestamp: msgTime,\n      rawText: messageText,\n      normalizedText: normalizeComparableUserText(messageText),\n    });\n    existingMessageKeys.add(messageKey); // Track to avoid duplicates within this sync\n  }\n\n  if (newMessages.length === 0) return 0;\n\n  // Sort by timestamp and add to session\n  newMessages.sort((a, b) => a.timestamp - b.timestamp);\n\n  for (const { message } of newMessages) {\n    sessionManager.appendMessage(message);\n  }\n\n  return newMessages.length;\n}\n\n// ============================================================================\n// Settings manager for mama\n// ============================================================================\n\n// Mama manages model/provider config through its own config.ts / settings.json.\n// We use an in-memory SettingsManager so AgentSession has valid defaults\n// without interfering with coding-agent's global settings files.\nexport function createMamaSettingsManager(_workspaceDir: string): SettingsManager {\n  return SettingsManager.inMemory();\n}\n\nexport async function findLogMessageById(\n  conversationDir: string,\n  messageId: string,\n): Promise<ConversationLogMessage | null> {\n  const logFile = join(conversationDir, \"log.jsonl\");\n  if (!existsSync(logFile)) return null;\n\n  const logContent = await readFile(logFile, \"utf-8\");\n  const logLines = logContent.trim().split(\"\\n\").filter(Boolean);\n\n  for (let i = logLines.length - 1; i >= 0; i--) {\n    let entry: ConversationLogMessage;\n    try {\n      entry = JSON.parse(logLines[i]) as ConversationLogMessage;\n    } catch (err) {\n      log.logWarning(\n        `Skipping malformed log entry at ${logFile}:${i + 1}`,\n        err instanceof Error ? err.message : String(err),\n      );\n      continue;\n    }\n    if (entry.ts === messageId) {\n      return entry;\n    }\n  }\n\n  return null;\n}\n\nfunction findLatestResetCutoff(\n  entries: ConversationLogMessage[],\n  currentMessageId?: string,\n  threadFilter?: ThreadFilter,\n): number | null {\n  let cutoff: number | null = null;\n\n  for (const entry of entries) {\n    if (!entry.ts || !entry.date) continue;\n    if (!isMessageAtOrBeforeCurrent(entry.ts, currentMessageId)) continue;\n    if (!isResetCommandLogMessage(entry)) continue;\n    if (!isLogMessageInThreadScope(entry, threadFilter)) continue;\n\n    const timestamp = new Date(entry.date).getTime();\n    if (!Number.isFinite(timestamp)) continue;\n    cutoff = cutoff === null ? timestamp : Math.max(cutoff, timestamp);\n  }\n\n  return cutoff;\n}\n\nfunction isResetCommandLogMessage(entry: ConversationLogMessage): boolean {\n  if (entry.isBot) return false;\n  return parseNewCommand(entry.text ?? \"\") !== null;\n}\n\nfunction isLogMessageInThreadScope(\n  entry: ConversationLogMessage,\n  threadFilter?: ThreadFilter,\n): boolean {\n  if (!threadFilter) return true;\n  if (threadFilter.scope === \"top-level\") return !entry.threadTs;\n  if (entry.threadTs) {\n    return entry.threadTs === threadFilter.threadTs || entry.threadTs === threadFilter.rootTs;\n  }\n  return entry.ts === threadFilter.rootTs;\n}\n\nfunction stripSlackAttachmentBlock(text: string): string {\n  return text.replace(/\\n*<slack_attachments>\\n[\\s\\S]*?\\n<\\/slack_attachments>\\s*$/g, \"\");\n}\n\nfunction normalizeComparableUserText(text: string): string {\n  const withoutTimestamp = text.replace(\n    /^\\[[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}[+-][0-9]{2}:[0-9]{2}\\]\\s+(?=\\[[^\\]]+\\](?:\\s+\\[in-thread:[^\\]]+\\])?:\\s)/,\n    \"\",\n  );\n  return stripSlackAttachmentBlock(withoutTimestamp).trim();\n}\n\nfunction hasExistingSessionMessage(\n  existingMessages: ExistingSessionMessage[],\n  timestamp: number,\n  text: string,\n): boolean {\n  const normalizedText = normalizeComparableUserText(text);\n  return existingMessages.some((existing) => {\n    if (existing.timestamp === timestamp && existing.rawText === text) {\n      return true;\n    }\n    if (existing.normalizedText !== normalizedText || existing.timestamp === undefined) {\n      return false;\n    }\n    return existing.timestamp >= timestamp;\n  });\n}\n\nfunction isMessageAtOrBeforeCurrent(messageId: string, currentMessageId?: string): boolean {\n  if (!currentMessageId) return true;\n  const comparison = compareMessageIds(messageId, currentMessageId);\n  return comparison === null || comparison <= 0;\n}\n\nfunction compareMessageIds(a: string, b: string): number | null {\n  if (/^\\d+$/.test(a) && /^\\d+$/.test(b)) {\n    const left = BigInt(a);\n    const right = BigInt(b);\n    return left < right ? -1 : left > right ? 1 : 0;\n  }\n\n  const left = Number(a);\n  const right = Number(b);\n  if (Number.isFinite(left) && Number.isFinite(right)) {\n    return left < right ? -1 : left > right ? 1 : 0;\n  }\n\n  return null;\n}\n"]}

package/dist/context.js

@@ -9,10 +9,11 @@
  * - syncLogToSessionManager: Syncs messages from log.jsonl to SessionManager
  * - createMamaSettingsManager: Creates an in-memory SettingsManager for AgentSession
  */
-import { SettingsManager, } from "@mariozechner/pi-coding-agent";
+import { SettingsManager, } from "@earendil-works/pi-coding-agent";
 import { existsSync } from "fs";
 import { readFile } from "fs/promises";
 import { join } from "path";
+import { parseNewCommand } from "./commands/new.js";
 import * as log from "./log.js";
 /**
  * Default number of days to sync when no time range is specified
@@ -71,17 +72,18 @@ export async function syncLogToSessionManager(sessionManager, conversationDir, e
     // Read log.jsonl and find user messages not in context
     const logContent = await readFile(logFile, "utf-8");
     const logLines = logContent.trim().split("\n").filter(Boolean);
-    const newMessages = [];
+    const logEntries = [];
     for (let lineIdx = 0; lineIdx < logLines.length; lineIdx++) {
-        const line = logLines[lineIdx];
-        let logMsg;
         try {
-            logMsg = JSON.parse(line);
+            logEntries.push(JSON.parse(logLines[lineIdx]));
         }
         catch (err) {
             log.logWarning(`Skipping malformed log entry at ${logFile}:${lineIdx + 1}`, err instanceof Error ? err.message : String(err));
-            continue;
         }
+    }
+    const resetCutoff = findLatestResetCutoff(logEntries, excludeSlackTs, threadFilter);
+    const newMessages = [];
+    for (const logMsg of logEntries) {
         const slackTs = logMsg.ts;
         const date = logMsg.date;
         if (!slackTs || !date)
@@ -94,38 +96,18 @@ export async function syncLogToSessionManager(sessionManager, conversationDir, e
         // current turn's context.
         if (!isMessageAtOrBeforeCurrent(slackTs, excludeSlackTs))
             continue;
-        // Skip bot messages - added through agent flow
-        if (logMsg.isBot)
-            continue;
-        // Thread filtering: only sync messages belonging to this session's thread
-        if (threadFilter) {
-            if (threadFilter.scope === "top-level") {
-                // Persistent top-level sessions should only ingest top-level messages.
-                // This avoids pulling in unrelated replies from other threads.
-                if (logMsg.threadTs) {
-                    continue;
-                }
-            }
-            else {
-                if (logMsg.threadTs) {
-                    // Thread reply: only include if threadTs matches our thread anchor or rootTs
-                    if (logMsg.threadTs !== threadFilter.threadTs &&
-                        logMsg.threadTs !== threadFilter.rootTs) {
-                        continue;
-                    }
-                }
-                else {
-                    // Top-level message: only include if it's this session's root message
-                    if (slackTs !== threadFilter.rootTs) {
-                        continue;
-                    }
-                }
-            }
-        }
+        // Skip mama's own responses - added through agent flow. Keep external app/bot
+        // messages (for example Sentry alerts) in context so mama can reason about them.
+        if (logMsg.isBot && logMsg.user === "bot")
+            continue;
+        const msgTime = new Date(date).getTime() || Date.now();
+        if (resetCutoff !== null && msgTime <= resetCutoff)
+            continue;
+        if (!isLogMessageInThreadScope(logMsg, threadFilter))
+            continue;
         // Build the message text as it would appear in context
         const threadContext = logMsg.threadTs ? ` [in-thread:${logMsg.threadTs}]` : "";
         const messageText = `[${logMsg.userName || logMsg.user || "unknown"}]${threadContext}: ${logMsg.text || ""}`;
-        const msgTime = new Date(date).getTime() || Date.now();
         const messageKey = `${msgTime}:${messageText}`;
         if (existingMessageKeys.has(messageKey))
             continue;
@@ -186,6 +168,39 @@ export async function findLogMessageById(conversationDir, messageId) {
     }
     return null;
 }
+function findLatestResetCutoff(entries, currentMessageId, threadFilter) {
+    let cutoff = null;
+    for (const entry of entries) {
+        if (!entry.ts || !entry.date)
+            continue;
+        if (!isMessageAtOrBeforeCurrent(entry.ts, currentMessageId))
+            continue;
+        if (!isResetCommandLogMessage(entry))
+            continue;
+        if (!isLogMessageInThreadScope(entry, threadFilter))
+            continue;
+        const timestamp = new Date(entry.date).getTime();
+        if (!Number.isFinite(timestamp))
+            continue;
+        cutoff = cutoff === null ? timestamp : Math.max(cutoff, timestamp);
+    }
+    return cutoff;
+}
+function isResetCommandLogMessage(entry) {
+    if (entry.isBot)
+        return false;
+    return parseNewCommand(entry.text ?? "") !== null;
+}
+function isLogMessageInThreadScope(entry, threadFilter) {
+    if (!threadFilter)
+        return true;
+    if (threadFilter.scope === "top-level")
+        return !entry.threadTs;
+    if (entry.threadTs) {
+        return entry.threadTs === threadFilter.threadTs || entry.threadTs === threadFilter.rootTs;
+    }
+    return entry.ts === threadFilter.rootTs;
+}
 function stripSlackAttachmentBlock(text) {
     return text.replace(/\n*<slack_attachments>\n[\s\S]*?\n<\/slack_attachments>\s*$/g, "");
 }