@geminixiang/mama 0.2.0-beta.1 → 0.2.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +133 -78
- package/dist/adapter.d.ts +22 -10
- package/dist/adapter.d.ts.map +1 -1
- package/dist/adapter.js.map +1 -1
- package/dist/adapters/discord/bot.d.ts +10 -7
- package/dist/adapters/discord/bot.d.ts.map +1 -1
- package/dist/adapters/discord/bot.js +228 -69
- package/dist/adapters/discord/bot.js.map +1 -1
- package/dist/adapters/discord/context.d.ts.map +1 -1
- package/dist/adapters/discord/context.js +92 -34
- package/dist/adapters/discord/context.js.map +1 -1
- package/dist/adapters/shared.d.ts +23 -0
- package/dist/adapters/shared.d.ts.map +1 -0
- package/dist/adapters/shared.js +57 -0
- package/dist/adapters/shared.js.map +1 -0
- package/dist/adapters/slack/bot.d.ts +19 -11
- package/dist/adapters/slack/bot.d.ts.map +1 -1
- package/dist/adapters/slack/bot.js +356 -96
- package/dist/adapters/slack/bot.js.map +1 -1
- package/dist/adapters/slack/branch-manager.d.ts +21 -0
- package/dist/adapters/slack/branch-manager.d.ts.map +1 -0
- package/dist/adapters/slack/branch-manager.js +96 -0
- package/dist/adapters/slack/branch-manager.js.map +1 -0
- package/dist/adapters/slack/context.d.ts.map +1 -1
- package/dist/adapters/slack/context.js +100 -67
- package/dist/adapters/slack/context.js.map +1 -1
- package/dist/adapters/slack/session.d.ts +3 -0
- package/dist/adapters/slack/session.d.ts.map +1 -0
- package/dist/adapters/slack/session.js +16 -0
- package/dist/adapters/slack/session.js.map +1 -0
- package/dist/adapters/telegram/bot.d.ts +4 -2
- package/dist/adapters/telegram/bot.d.ts.map +1 -1
- package/dist/adapters/telegram/bot.js +141 -74
- package/dist/adapters/telegram/bot.js.map +1 -1
- package/dist/adapters/telegram/context.d.ts.map +1 -1
- package/dist/adapters/telegram/context.js +49 -109
- package/dist/adapters/telegram/context.js.map +1 -1
- package/dist/adapters/telegram/html.d.ts +3 -0
- package/dist/adapters/telegram/html.d.ts.map +1 -0
- package/dist/adapters/telegram/html.js +98 -0
- package/dist/adapters/telegram/html.js.map +1 -0
- package/dist/agent.d.ts +4 -11
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +116 -196
- package/dist/agent.js.map +1 -1
- package/dist/bindings.d.ts +1 -20
- package/dist/bindings.d.ts.map +1 -1
- package/dist/bindings.js +1 -21
- package/dist/bindings.js.map +1 -1
- package/dist/config.d.ts +9 -27
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +89 -63
- package/dist/config.js.map +1 -1
- package/dist/context.d.ts +13 -3
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +102 -18
- package/dist/context.js.map +1 -1
- package/dist/events.d.ts +18 -6
- package/dist/events.d.ts.map +1 -1
- package/dist/events.js +86 -35
- package/dist/events.js.map +1 -1
- package/dist/execution-resolver.d.ts.map +1 -1
- package/dist/execution-resolver.js +1 -3
- package/dist/execution-resolver.js.map +1 -1
- package/dist/instrument.d.ts.map +1 -1
- package/dist/instrument.js +5 -11
- package/dist/instrument.js.map +1 -1
- package/dist/{login.d.ts → login/index.d.ts} +2 -2
- package/dist/login/index.d.ts.map +1 -0
- package/dist/{login.js → login/index.js} +2 -2
- package/dist/login/index.js.map +1 -0
- package/dist/{link-server.d.ts → login/portal.d.ts} +6 -4
- package/dist/login/portal.d.ts.map +1 -0
- package/dist/login/portal.js +1453 -0
- package/dist/login/portal.js.map +1 -0
- package/dist/{link-token.d.ts → login/session.d.ts} +1 -1
- package/dist/login/session.d.ts.map +1 -0
- package/dist/{link-token.js → login/session.js} +1 -1
- package/dist/login/session.js.map +1 -0
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +175 -119
- package/dist/main.js.map +1 -1
- package/dist/provisioner.d.ts +17 -43
- package/dist/provisioner.d.ts.map +1 -1
- package/dist/provisioner.js +84 -50
- package/dist/provisioner.js.map +1 -1
- package/dist/sandbox/host.d.ts +0 -2
- package/dist/sandbox/host.d.ts.map +1 -1
- package/dist/sandbox/host.js +1 -5
- package/dist/sandbox/host.js.map +1 -1
- package/dist/sentry.d.ts.map +1 -1
- package/dist/sentry.js +2 -0
- package/dist/sentry.js.map +1 -1
- package/dist/session-policy.d.ts +13 -0
- package/dist/session-policy.d.ts.map +1 -0
- package/dist/session-policy.js +23 -0
- package/dist/session-policy.js.map +1 -0
- package/dist/session-store.d.ts +27 -1
- package/dist/session-store.d.ts.map +1 -1
- package/dist/session-store.js +162 -9
- package/dist/session-store.js.map +1 -1
- package/dist/session-view/command.d.ts +5 -0
- package/dist/session-view/command.d.ts.map +1 -0
- package/dist/session-view/command.js +11 -0
- package/dist/session-view/command.js.map +1 -0
- package/dist/session-view/portal.d.ts +9 -0
- package/dist/session-view/portal.d.ts.map +1 -0
- package/dist/session-view/portal.js +766 -0
- package/dist/session-view/portal.js.map +1 -0
- package/dist/session-view/service.d.ts +34 -0
- package/dist/session-view/service.d.ts.map +1 -0
- package/dist/session-view/service.js +380 -0
- package/dist/session-view/service.js.map +1 -0
- package/dist/session-view/store.d.ts +16 -0
- package/dist/session-view/store.d.ts.map +1 -0
- package/dist/session-view/store.js +38 -0
- package/dist/session-view/store.js.map +1 -0
- package/dist/store.d.ts +3 -6
- package/dist/store.d.ts.map +1 -1
- package/dist/store.js +15 -35
- package/dist/store.js.map +1 -1
- package/dist/tools/event.d.ts +3 -0
- package/dist/tools/event.d.ts.map +1 -1
- package/dist/tools/event.js +27 -8
- package/dist/tools/event.js.map +1 -1
- package/dist/tools/index.d.ts +3 -0
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +2 -2
- package/dist/tools/index.js.map +1 -1
- package/dist/ui-copy.d.ts +1 -0
- package/dist/ui-copy.d.ts.map +1 -1
- package/dist/ui-copy.js +3 -0
- package/dist/ui-copy.js.map +1 -1
- package/dist/vault-routing.d.ts +1 -2
- package/dist/vault-routing.d.ts.map +1 -1
- package/dist/vault-routing.js +1 -7
- package/dist/vault-routing.js.map +1 -1
- package/package.json +1 -1
- package/dist/link-server.d.ts.map +0 -1
- package/dist/link-server.js +0 -839
- package/dist/link-server.js.map +0 -1
- package/dist/link-token.d.ts.map +0 -1
- package/dist/link-token.js.map +0 -1
- package/dist/login.d.ts.map +0 -1
- package/dist/login.js.map +0 -1
- package/dist/vault.test.d.ts +0 -2
- package/dist/vault.test.d.ts.map +0 -1
- package/dist/vault.test.js +0 -67
- package/dist/vault.test.js.map +0 -1
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IACpC,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC/B,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACzD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAmDD,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW,CAwBjE;AAED,wBAAgB,2BAA2B,CAAC,IAAI,WAAwB,GAAG,MAAM,GAAG,SAAS,CA2B5F;AAED,wBAAgB,uBAAuB,CAAC,IAAI,WAAwB,GAAG,MAAM,CAY5E;AAED,wBAAgB,gBAAgB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO1E;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,GAAG,SAAS,CAIvD;AAED,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAwBxF","sourcesContent":["import { existsSync, mkdirSync, readFileSync, writeFileSync } from \"fs\";\nimport { homedir } from \"os\";\nimport { dirname, join, resolve } from \"path\";\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 try {\n const raw = readFileSync(settingsPath, \"utf-8\");\n const parsed = JSON.parse(raw);\n if (parsed && typeof parsed === \"object\") {\n return parsed as Partial<AgentConfig>;\n }\n } catch {\n // Ignore parse errors, fall through to next candidate\n }\n\n return undefined;\n}\n\nfunction getConfiguredStateDir(): string | undefined {\n const raw = process.env.MAMA_STATE_DIR?.trim();\n return raw ? resolve(raw) : undefined;\n}\n\nfunction loadRawAgentConfig(workspaceDir?: string): Partial<AgentConfig> {\n const stateDir = getConfiguredStateDir();\n const candidates = [\n ...(stateDir ? [join(stateDir, \"settings.json\")] : []),\n ...(workspaceDir ? [join(workspaceDir, \"settings.json\")] : []),\n ];\n\n for (const settingsPath of candidates) {\n const config = loadConfigFile(settingsPath);\n if (config) {\n return config;\n }\n }\n\n return {};\n}\n\nexport function loadAgentConfig(workspaceDir: string): AgentConfig {\n const fromFile = loadRawAgentConfig(workspaceDir);\n\n const provider = fromFile.provider || process.env.MOM_AI_PROVIDER || DEFAULTS.provider;\n const model = fromFile.model || process.env.MOM_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(workspaceDir?: string): string | undefined {\n const fromFile = loadRawAgentConfig(workspaceDir);\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 `MOM_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.MOM_LINK_URL?.trim();\n if (!raw) return undefined;\n return raw.replace(/\\/+$/, \"\");\n}\n\nexport function saveAgentConfig(workspaceDir: string, config: Partial<AgentConfig>): void {\n const settingsPath = join(workspaceDir, \"settings.json\");\n\n let existing: Partial<AgentConfig> = {};\n if (existsSync(settingsPath)) {\n try {\n const raw = readFileSync(settingsPath, \"utf-8\");\n const parsed = JSON.parse(raw);\n if (parsed && typeof parsed === \"object\") {\n existing = parsed as Partial<AgentConfig>;\n }\n } catch {\n // Start fresh if file is malformed\n }\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 writeFileSync(settingsPath, JSON.stringify(merged, null, 2), \"utf-8\");\n}\n"]}
|
package/dist/config.js
CHANGED
|
@@ -1,60 +1,84 @@
|
|
|
1
1
|
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
|
|
2
|
-
import {
|
|
3
|
-
|
|
2
|
+
import { homedir } from "os";
|
|
3
|
+
import { dirname, join, resolve } from "path";
|
|
4
|
+
const DEFAULTS = {
|
|
4
5
|
provider: "anthropic",
|
|
5
|
-
model: "claude-sonnet-4-
|
|
6
|
+
model: "claude-sonnet-4-5",
|
|
6
7
|
thinkingLevel: "off",
|
|
7
8
|
sessionScope: "thread",
|
|
8
9
|
logFormat: "console",
|
|
9
10
|
logLevel: "info",
|
|
10
11
|
};
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
function loadConfigFile(settingsPath) {
|
|
13
|
+
if (!existsSync(settingsPath)) {
|
|
14
|
+
return undefined;
|
|
15
|
+
}
|
|
14
16
|
try {
|
|
15
17
|
const raw = readFileSync(settingsPath, "utf-8");
|
|
16
18
|
const parsed = JSON.parse(raw);
|
|
17
19
|
if (parsed && typeof parsed === "object") {
|
|
18
|
-
|
|
20
|
+
return parsed;
|
|
19
21
|
}
|
|
20
22
|
}
|
|
21
23
|
catch {
|
|
22
|
-
//
|
|
24
|
+
// Ignore parse errors, fall through to next candidate
|
|
23
25
|
}
|
|
24
|
-
return
|
|
26
|
+
return undefined;
|
|
25
27
|
}
|
|
26
|
-
function
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
provider: process.env.MOM_AI_PROVIDER ?? config.provider,
|
|
30
|
-
model: process.env.MOM_AI_MODEL ?? config.model,
|
|
31
|
-
};
|
|
28
|
+
function getConfiguredStateDir() {
|
|
29
|
+
const raw = process.env.MAMA_STATE_DIR?.trim();
|
|
30
|
+
return raw ? resolve(raw) : undefined;
|
|
32
31
|
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
const settingsPath
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
32
|
+
function loadRawAgentConfig(workspaceDir) {
|
|
33
|
+
const stateDir = getConfiguredStateDir();
|
|
34
|
+
const candidates = [
|
|
35
|
+
...(stateDir ? [join(stateDir, "settings.json")] : []),
|
|
36
|
+
...(workspaceDir ? [join(workspaceDir, "settings.json")] : []),
|
|
37
|
+
];
|
|
38
|
+
for (const settingsPath of candidates) {
|
|
39
|
+
const config = loadConfigFile(settingsPath);
|
|
40
|
+
if (config) {
|
|
41
|
+
return config;
|
|
42
|
+
}
|
|
44
43
|
}
|
|
45
|
-
return {
|
|
44
|
+
return {};
|
|
45
|
+
}
|
|
46
|
+
export function loadAgentConfig(workspaceDir) {
|
|
47
|
+
const fromFile = loadRawAgentConfig(workspaceDir);
|
|
48
|
+
const provider = fromFile.provider || process.env.MOM_AI_PROVIDER || DEFAULTS.provider;
|
|
49
|
+
const model = fromFile.model || process.env.MOM_AI_MODEL || DEFAULTS.model;
|
|
50
|
+
const thinkingLevel = fromFile.thinkingLevel ?? DEFAULTS.thinkingLevel;
|
|
51
|
+
const sessionScope = fromFile.sessionScope ?? DEFAULTS.sessionScope;
|
|
52
|
+
const logFormat = fromFile.logFormat ?? DEFAULTS.logFormat;
|
|
53
|
+
const logLevel = fromFile.logLevel ?? DEFAULTS.logLevel;
|
|
54
|
+
const sentryDsn = fromFile.sentryDsn ?? process.env.SENTRY_DSN;
|
|
55
|
+
const sandboxCpus = fromFile.sandboxCpus;
|
|
56
|
+
const sandboxMemory = fromFile.sandboxMemory;
|
|
57
|
+
return {
|
|
58
|
+
provider,
|
|
59
|
+
model,
|
|
60
|
+
thinkingLevel,
|
|
61
|
+
sessionScope,
|
|
62
|
+
logFormat,
|
|
63
|
+
logLevel,
|
|
64
|
+
sentryDsn,
|
|
65
|
+
sandboxCpus,
|
|
66
|
+
sandboxMemory,
|
|
67
|
+
};
|
|
46
68
|
}
|
|
47
69
|
export function resolveWorkspaceDirFromArgv(args = process.argv.slice(2)) {
|
|
48
70
|
for (let i = 0; i < args.length; i++) {
|
|
49
71
|
const arg = args[i];
|
|
50
|
-
if (arg === "--sandbox" || arg === "--download") {
|
|
72
|
+
if (arg === "--sandbox" || arg === "--download" || arg === "--state-dir") {
|
|
51
73
|
i += 1;
|
|
52
74
|
continue;
|
|
53
75
|
}
|
|
54
76
|
if (arg === "--version" || arg === "-v" || arg === "-V") {
|
|
55
77
|
continue;
|
|
56
78
|
}
|
|
57
|
-
if (arg.startsWith("--sandbox=") ||
|
|
79
|
+
if (arg.startsWith("--sandbox=") ||
|
|
80
|
+
arg.startsWith("--download=") ||
|
|
81
|
+
arg.startsWith("--state-dir=")) {
|
|
58
82
|
continue;
|
|
59
83
|
}
|
|
60
84
|
if (!arg.startsWith("-")) {
|
|
@@ -63,19 +87,29 @@ export function resolveWorkspaceDirFromArgv(args = process.argv.slice(2)) {
|
|
|
63
87
|
}
|
|
64
88
|
return undefined;
|
|
65
89
|
}
|
|
66
|
-
export function
|
|
67
|
-
|
|
90
|
+
export function resolveStateDirFromArgv(args = process.argv.slice(2)) {
|
|
91
|
+
for (let i = 0; i < args.length; i++) {
|
|
92
|
+
const arg = args[i];
|
|
93
|
+
if (arg.startsWith("--state-dir=")) {
|
|
94
|
+
return resolve(arg.slice("--state-dir=".length));
|
|
95
|
+
}
|
|
96
|
+
if (arg === "--state-dir") {
|
|
97
|
+
return resolve(args[++i] || "");
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
return join(homedir(), ".mama");
|
|
101
|
+
}
|
|
102
|
+
export function resolveSentryDsn(workspaceDir) {
|
|
103
|
+
const fromFile = loadRawAgentConfig(workspaceDir);
|
|
104
|
+
if (fromFile.sentryDsn) {
|
|
105
|
+
return fromFile.sentryDsn;
|
|
106
|
+
}
|
|
107
|
+
return process.env.SENTRY_DSN;
|
|
68
108
|
}
|
|
69
109
|
/**
|
|
70
110
|
* Externally-visible base URL of the link/OAuth server, e.g.
|
|
71
111
|
* `https://mama.example.com` (no trailing slash). Read from `MOM_LINK_URL`,
|
|
72
|
-
* the same env var the bot uses to build
|
|
73
|
-
*
|
|
74
|
-
* Used by the link server to build OAuth `redirect_uri` values that must
|
|
75
|
-
* match the registered callback URL at the identity provider. When unset,
|
|
76
|
-
* the link server falls back to deriving the base from request headers
|
|
77
|
-
* (Host / X-Forwarded-*), which is insecure in production because those
|
|
78
|
-
* headers are client-controlled.
|
|
112
|
+
* the same env var the bot uses to build credential onboarding links.
|
|
79
113
|
*/
|
|
80
114
|
export function resolveLinkBaseUrl() {
|
|
81
115
|
const raw = process.env.MOM_LINK_URL?.trim();
|
|
@@ -83,34 +117,26 @@ export function resolveLinkBaseUrl() {
|
|
|
83
117
|
return undefined;
|
|
84
118
|
return raw.replace(/\/+$/, "");
|
|
85
119
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
* (default: ~/.mama/settings.json) and the legacy workspace location for backwards compatibility.
|
|
89
|
-
* Returns undefined if not found in either location.
|
|
90
|
-
*/
|
|
91
|
-
export function resolveSentryDsnFromConfig(stateDir, workingDir) {
|
|
92
|
-
// First check the new stateDir location
|
|
93
|
-
const stateDirDsn = resolveSentryDsn(stateDir);
|
|
94
|
-
if (stateDirDsn) {
|
|
95
|
-
return stateDirDsn;
|
|
96
|
-
}
|
|
97
|
-
// Fall back to legacy workspace location for backwards compatibility
|
|
98
|
-
return workingDir ? resolveSentryDsn(workingDir) : undefined;
|
|
99
|
-
}
|
|
100
|
-
export function saveAgentConfig(stateDir, config) {
|
|
101
|
-
const settingsPath = join(stateDir, "settings.json");
|
|
120
|
+
export function saveAgentConfig(workspaceDir, config) {
|
|
121
|
+
const settingsPath = join(workspaceDir, "settings.json");
|
|
102
122
|
let existing = {};
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
123
|
+
if (existsSync(settingsPath)) {
|
|
124
|
+
try {
|
|
125
|
+
const raw = readFileSync(settingsPath, "utf-8");
|
|
126
|
+
const parsed = JSON.parse(raw);
|
|
127
|
+
if (parsed && typeof parsed === "object") {
|
|
128
|
+
existing = parsed;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
catch {
|
|
132
|
+
// Start fresh if file is malformed
|
|
108
133
|
}
|
|
109
134
|
}
|
|
110
|
-
|
|
111
|
-
|
|
135
|
+
const merged = { ...existing, ...config };
|
|
136
|
+
const dir = dirname(settingsPath);
|
|
137
|
+
if (!existsSync(dir)) {
|
|
138
|
+
mkdirSync(dir, { recursive: true });
|
|
112
139
|
}
|
|
113
|
-
|
|
114
|
-
writeFileSync(settingsPath, JSON.stringify({ ...existing, ...config }, null, 2), "utf-8");
|
|
140
|
+
writeFileSync(settingsPath, JSON.stringify(merged, null, 2), "utf-8");
|
|
115
141
|
}
|
|
116
142
|
//# sourceMappingURL=config.js.map
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync, mkdirSync, readFileSync, writeFileSync } from \"fs\";\nimport { homedir } from \"os\";\nimport { dirname, join, resolve } from \"path\";\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 try {\n const raw = readFileSync(settingsPath, \"utf-8\");\n const parsed = JSON.parse(raw);\n if (parsed && typeof parsed === \"object\") {\n return parsed as Partial<AgentConfig>;\n }\n } catch {\n // Ignore parse errors, fall through to next candidate\n }\n\n return undefined;\n}\n\nfunction getConfiguredStateDir(): string | undefined {\n const raw = process.env.MAMA_STATE_DIR?.trim();\n return raw ? resolve(raw) : undefined;\n}\n\nfunction loadRawAgentConfig(workspaceDir?: string): Partial<AgentConfig> {\n const stateDir = getConfiguredStateDir();\n const candidates = [\n ...(stateDir ? [join(stateDir, \"settings.json\")] : []),\n ...(workspaceDir ? [join(workspaceDir, \"settings.json\")] : []),\n ];\n\n for (const settingsPath of candidates) {\n const config = loadConfigFile(settingsPath);\n if (config) {\n return config;\n }\n }\n\n return {};\n}\n\nexport function loadAgentConfig(workspaceDir: string): AgentConfig {\n const fromFile = loadRawAgentConfig(workspaceDir);\n\n const provider = fromFile.provider || process.env.MOM_AI_PROVIDER || DEFAULTS.provider;\n const model = fromFile.model || process.env.MOM_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(workspaceDir?: string): string | undefined {\n const fromFile = loadRawAgentConfig(workspaceDir);\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 `MOM_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.MOM_LINK_URL?.trim();\n if (!raw) return undefined;\n return raw.replace(/\\/+$/, \"\");\n}\n\nexport function saveAgentConfig(workspaceDir: string, config: Partial<AgentConfig>): void {\n const settingsPath = join(workspaceDir, \"settings.json\");\n\n let existing: Partial<AgentConfig> = {};\n if (existsSync(settingsPath)) {\n try {\n const raw = readFileSync(settingsPath, \"utf-8\");\n const parsed = JSON.parse(raw);\n if (parsed && typeof parsed === \"object\") {\n existing = parsed as Partial<AgentConfig>;\n }\n } catch {\n // Start fresh if file is malformed\n }\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 writeFileSync(settingsPath, JSON.stringify(merged, null, 2), \"utf-8\");\n}\n"]}
|
package/dist/context.d.ts
CHANGED
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
* Context management for mama.
|
|
3
3
|
*
|
|
4
4
|
* Mama uses two data sources per conversation:
|
|
5
|
-
* - sessions/*.jsonl: Structured session history for
|
|
5
|
+
* - sessions/*.jsonl: Structured session history for agent context
|
|
6
6
|
* - log.jsonl: Human-readable conversation history for grep (no tool results)
|
|
7
7
|
*
|
|
8
8
|
* This module provides:
|
|
9
9
|
* - syncLogToSessionManager: Syncs messages from log.jsonl to SessionManager
|
|
10
|
-
* - createMamaSettingsManager: Creates
|
|
10
|
+
* - createMamaSettingsManager: Creates an in-memory SettingsManager for AgentSession
|
|
11
11
|
*/
|
|
12
12
|
import { type SessionManager, SettingsManager } from "@mariozechner/pi-coding-agent";
|
|
13
13
|
/**
|
|
@@ -17,6 +17,15 @@ export interface TimeRange {
|
|
|
17
17
|
start: number;
|
|
18
18
|
end: number;
|
|
19
19
|
}
|
|
20
|
+
export interface ConversationLogMessage {
|
|
21
|
+
date?: string;
|
|
22
|
+
ts?: string;
|
|
23
|
+
threadTs?: string;
|
|
24
|
+
user?: string;
|
|
25
|
+
userName?: string;
|
|
26
|
+
text?: string;
|
|
27
|
+
isBot?: boolean;
|
|
28
|
+
}
|
|
20
29
|
/**
|
|
21
30
|
* Thread filter for scoping log sync to a specific thread session.
|
|
22
31
|
* When provided, only messages belonging to this thread are synced,
|
|
@@ -38,11 +47,12 @@ export interface ThreadFilter {
|
|
|
38
47
|
*
|
|
39
48
|
* @param sessionManager - The SessionManager to sync to
|
|
40
49
|
* @param conversationDir - Path to the conversation directory containing log.jsonl
|
|
41
|
-
* @param excludeSlackTs -
|
|
50
|
+
* @param excludeSlackTs - Current platform message ID/timestamp (will be added via prompt(), not sync)
|
|
42
51
|
* @param timeRange - Optional time range to filter log entries (defaults to last 10 days)
|
|
43
52
|
* @param threadFilter - Optional thread filter to scope sync to a specific thread
|
|
44
53
|
* @returns Number of messages synced
|
|
45
54
|
*/
|
|
46
55
|
export declare function syncLogToSessionManager(sessionManager: SessionManager, conversationDir: string, excludeSlackTs?: string, timeRange?: TimeRange, threadFilter?: ThreadFilter): Promise<number>;
|
|
47
56
|
export declare function createMamaSettingsManager(_workspaceDir: string): SettingsManager;
|
|
57
|
+
export declare function findLogMessageById(conversationDir: string, messageId: string): Promise<ConversationLogMessage | null>;
|
|
48
58
|
//# sourceMappingURL=context.d.ts.map
|
package/dist/context.d.ts.map
CHANGED
|
@@ -1 +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;AASvC;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAiBD;;;;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,CAyGjB;AASD,wBAAgB,yBAAyB,CAAC,aAAa,EAAE,MAAM,GAAG,eAAe,CAEhF","sourcesContent":["/**\n * Context management for mama.\n *\n * Mama uses two data sources per conversation:\n * - sessions/*.jsonl: Structured session history for the 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 a SettingsManager backed by workspace settings.json\n */\n\nimport type { 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\";\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\ninterface LogMessage {\n date?: string;\n ts?: string;\n threadTs?: string;\n user?: string;\n userName?: string;\n text?: string;\n isBot?: boolean;\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 - Slack timestamp of current message (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 set of existing timestamps from session entries\n // We use ts (Slack timestamp) as the unique key instead of message content\n const existingTimestamps = new Set<string>();\n for (const entry of sessionManager.getEntries()) {\n if (entry.type === \"message\") {\n const msgEntry = entry as SessionMessageEntry;\n // SessionMessageEntry has a timestamp field (number, Unix ms)\n if (msgEntry.timestamp) {\n existingTimestamps.add(msgEntry.timestamp.toString());\n }\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 (const line of logLines) {\n try {\n const logMsg: LogMessage = JSON.parse(line);\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 // 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 // Skip if this Slack timestamp is already in the session (dedupe by ts, not content)\n // Convert Slack ts (e.g., \"1234567890.123456\") to Unix ms for comparison\n const slackTsMs = Math.floor(parseFloat(slackTs) * 1000).toString();\n if (existingTimestamps.has(slackTsMs)) 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 msgTime = new Date(date).getTime() || Date.now();\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 existingTimestamps.add(slackTsMs); // Track to avoid duplicates within this sync\n } catch {\n // Skip malformed lines\n }\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"]}
|
|
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;AASvC;;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,CAiIjB;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,CAmBxC","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\";\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 (const line of logLines) {\n try {\n const logMsg: ConversationLogMessage = JSON.parse(line);\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 } catch {\n // Skip malformed lines\n }\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 try {\n const entry = JSON.parse(logLines[i]) as ConversationLogMessage;\n if (entry.ts === messageId) {\n return entry;\n }\n } catch {\n // Skip malformed lines\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"]}
|
package/dist/context.js
CHANGED
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
* Context management for mama.
|
|
3
3
|
*
|
|
4
4
|
* Mama uses two data sources per conversation:
|
|
5
|
-
* - sessions/*.jsonl: Structured session history for
|
|
5
|
+
* - sessions/*.jsonl: Structured session history for agent context
|
|
6
6
|
* - log.jsonl: Human-readable conversation history for grep (no tool results)
|
|
7
7
|
*
|
|
8
8
|
* This module provides:
|
|
9
9
|
* - syncLogToSessionManager: Syncs messages from log.jsonl to SessionManager
|
|
10
|
-
* - createMamaSettingsManager: Creates
|
|
10
|
+
* - createMamaSettingsManager: Creates an in-memory SettingsManager for AgentSession
|
|
11
11
|
*/
|
|
12
12
|
import { SettingsManager, } from "@mariozechner/pi-coding-agent";
|
|
13
13
|
import { existsSync } from "fs";
|
|
@@ -25,7 +25,7 @@ const DEFAULT_SYNC_DAYS = 10;
|
|
|
25
25
|
*
|
|
26
26
|
* @param sessionManager - The SessionManager to sync to
|
|
27
27
|
* @param conversationDir - Path to the conversation directory containing log.jsonl
|
|
28
|
-
* @param excludeSlackTs -
|
|
28
|
+
* @param excludeSlackTs - Current platform message ID/timestamp (will be added via prompt(), not sync)
|
|
29
29
|
* @param timeRange - Optional time range to filter log entries (defaults to last 10 days)
|
|
30
30
|
* @param threadFilter - Optional thread filter to scope sync to a specific thread
|
|
31
31
|
* @returns Number of messages synced
|
|
@@ -38,16 +38,33 @@ export async function syncLogToSessionManager(sessionManager, conversationDir, e
|
|
|
38
38
|
const logFile = join(conversationDir, "log.jsonl");
|
|
39
39
|
if (!existsSync(logFile))
|
|
40
40
|
return 0;
|
|
41
|
-
// Build
|
|
42
|
-
//
|
|
43
|
-
|
|
41
|
+
// Build a list of existing session messages for dedupe.
|
|
42
|
+
// Live user prompts carry a formatted timestamp in the text and use Date.now(),
|
|
43
|
+
// while log.jsonl uses the platform event timestamp. We therefore need a small
|
|
44
|
+
// fuzzy match window in addition to the exact timestamp/content match used for
|
|
45
|
+
// already-synced log entries.
|
|
46
|
+
const existingMessages = [];
|
|
47
|
+
const existingMessageKeys = new Set();
|
|
44
48
|
for (const entry of sessionManager.getEntries()) {
|
|
45
|
-
if (entry.type
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
49
|
+
if (entry.type !== "message")
|
|
50
|
+
continue;
|
|
51
|
+
const msgEntry = entry;
|
|
52
|
+
const message = msgEntry.message;
|
|
53
|
+
const contentText = Array.isArray(message.content)
|
|
54
|
+
? message.content
|
|
55
|
+
.filter((part) => part.type === "text")
|
|
56
|
+
.map((part) => part.text)
|
|
57
|
+
.join("\n\n")
|
|
58
|
+
: typeof message.content === "string"
|
|
59
|
+
? message.content
|
|
60
|
+
: "";
|
|
61
|
+
existingMessages.push({
|
|
62
|
+
timestamp: typeof message.timestamp === "number" ? message.timestamp : undefined,
|
|
63
|
+
rawText: contentText,
|
|
64
|
+
normalizedText: normalizeComparableUserText(contentText),
|
|
65
|
+
});
|
|
66
|
+
if (typeof message.timestamp === "number") {
|
|
67
|
+
existingMessageKeys.add(`${message.timestamp}:${contentText}`);
|
|
51
68
|
}
|
|
52
69
|
}
|
|
53
70
|
// Read log.jsonl and find user messages not in context
|
|
@@ -64,6 +81,11 @@ export async function syncLogToSessionManager(sessionManager, conversationDir, e
|
|
|
64
81
|
// Skip the current message being processed (will be added via prompt())
|
|
65
82
|
if (excludeSlackTs && slackTs === excludeSlackTs)
|
|
66
83
|
continue;
|
|
84
|
+
// While queued messages are being processed, newer messages may already be present
|
|
85
|
+
// in log.jsonl. Do not look ahead into those future messages when building the
|
|
86
|
+
// current turn's context.
|
|
87
|
+
if (!isMessageAtOrBeforeCurrent(slackTs, excludeSlackTs))
|
|
88
|
+
continue;
|
|
67
89
|
// Skip bot messages - added through agent flow
|
|
68
90
|
if (logMsg.isBot)
|
|
69
91
|
continue;
|
|
@@ -92,15 +114,15 @@ export async function syncLogToSessionManager(sessionManager, conversationDir, e
|
|
|
92
114
|
}
|
|
93
115
|
}
|
|
94
116
|
}
|
|
95
|
-
// Skip if this Slack timestamp is already in the session (dedupe by ts, not content)
|
|
96
|
-
// Convert Slack ts (e.g., "1234567890.123456") to Unix ms for comparison
|
|
97
|
-
const slackTsMs = Math.floor(parseFloat(slackTs) * 1000).toString();
|
|
98
|
-
if (existingTimestamps.has(slackTsMs))
|
|
99
|
-
continue;
|
|
100
117
|
// Build the message text as it would appear in context
|
|
101
118
|
const threadContext = logMsg.threadTs ? ` [in-thread:${logMsg.threadTs}]` : "";
|
|
102
119
|
const messageText = `[${logMsg.userName || logMsg.user || "unknown"}]${threadContext}: ${logMsg.text || ""}`;
|
|
103
120
|
const msgTime = new Date(date).getTime() || Date.now();
|
|
121
|
+
const messageKey = `${msgTime}:${messageText}`;
|
|
122
|
+
if (existingMessageKeys.has(messageKey))
|
|
123
|
+
continue;
|
|
124
|
+
if (hasExistingSessionMessage(existingMessages, msgTime, messageText))
|
|
125
|
+
continue;
|
|
104
126
|
// Skip messages outside the time range
|
|
105
127
|
if (msgTime < range.start || msgTime > range.end)
|
|
106
128
|
continue;
|
|
@@ -110,7 +132,12 @@ export async function syncLogToSessionManager(sessionManager, conversationDir, e
|
|
|
110
132
|
timestamp: msgTime,
|
|
111
133
|
};
|
|
112
134
|
newMessages.push({ timestamp: msgTime, message: userMessage });
|
|
113
|
-
|
|
135
|
+
existingMessages.push({
|
|
136
|
+
timestamp: msgTime,
|
|
137
|
+
rawText: messageText,
|
|
138
|
+
normalizedText: normalizeComparableUserText(messageText),
|
|
139
|
+
});
|
|
140
|
+
existingMessageKeys.add(messageKey); // Track to avoid duplicates within this sync
|
|
114
141
|
}
|
|
115
142
|
catch {
|
|
116
143
|
// Skip malformed lines
|
|
@@ -134,4 +161,61 @@ export async function syncLogToSessionManager(sessionManager, conversationDir, e
|
|
|
134
161
|
export function createMamaSettingsManager(_workspaceDir) {
|
|
135
162
|
return SettingsManager.inMemory();
|
|
136
163
|
}
|
|
164
|
+
export async function findLogMessageById(conversationDir, messageId) {
|
|
165
|
+
const logFile = join(conversationDir, "log.jsonl");
|
|
166
|
+
if (!existsSync(logFile))
|
|
167
|
+
return null;
|
|
168
|
+
const logContent = await readFile(logFile, "utf-8");
|
|
169
|
+
const logLines = logContent.trim().split("\n").filter(Boolean);
|
|
170
|
+
for (let i = logLines.length - 1; i >= 0; i--) {
|
|
171
|
+
try {
|
|
172
|
+
const entry = JSON.parse(logLines[i]);
|
|
173
|
+
if (entry.ts === messageId) {
|
|
174
|
+
return entry;
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
catch {
|
|
178
|
+
// Skip malformed lines
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
return null;
|
|
182
|
+
}
|
|
183
|
+
function stripSlackAttachmentBlock(text) {
|
|
184
|
+
return text.replace(/\n*<slack_attachments>\n[\s\S]*?\n<\/slack_attachments>\s*$/g, "");
|
|
185
|
+
}
|
|
186
|
+
function normalizeComparableUserText(text) {
|
|
187
|
+
const withoutTimestamp = text.replace(/^\[[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)/, "");
|
|
188
|
+
return stripSlackAttachmentBlock(withoutTimestamp).trim();
|
|
189
|
+
}
|
|
190
|
+
function hasExistingSessionMessage(existingMessages, timestamp, text) {
|
|
191
|
+
const normalizedText = normalizeComparableUserText(text);
|
|
192
|
+
return existingMessages.some((existing) => {
|
|
193
|
+
if (existing.timestamp === timestamp && existing.rawText === text) {
|
|
194
|
+
return true;
|
|
195
|
+
}
|
|
196
|
+
if (existing.normalizedText !== normalizedText || existing.timestamp === undefined) {
|
|
197
|
+
return false;
|
|
198
|
+
}
|
|
199
|
+
return existing.timestamp >= timestamp;
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
function isMessageAtOrBeforeCurrent(messageId, currentMessageId) {
|
|
203
|
+
if (!currentMessageId)
|
|
204
|
+
return true;
|
|
205
|
+
const comparison = compareMessageIds(messageId, currentMessageId);
|
|
206
|
+
return comparison === null || comparison <= 0;
|
|
207
|
+
}
|
|
208
|
+
function compareMessageIds(a, b) {
|
|
209
|
+
if (/^\d+$/.test(a) && /^\d+$/.test(b)) {
|
|
210
|
+
const left = BigInt(a);
|
|
211
|
+
const right = BigInt(b);
|
|
212
|
+
return left < right ? -1 : left > right ? 1 : 0;
|
|
213
|
+
}
|
|
214
|
+
const left = Number(a);
|
|
215
|
+
const right = Number(b);
|
|
216
|
+
if (Number.isFinite(left) && Number.isFinite(right)) {
|
|
217
|
+
return left < right ? -1 : left > right ? 1 : 0;
|
|
218
|
+
}
|
|
219
|
+
return null;
|
|
220
|
+
}
|
|
137
221
|
//# sourceMappingURL=context.js.map
|