sensorium-mcp 2.16.150 → 2.16.152
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/dist/config.d.ts +13 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +21 -1
- package/dist/config.js.map +1 -1
- package/dist/dashboard/presets.d.ts.map +1 -1
- package/dist/dashboard/presets.js +3 -0
- package/dist/dashboard/presets.js.map +1 -1
- package/dist/dashboard/routes/settings.js +4 -4
- package/dist/dashboard/routes/settings.js.map +1 -1
- package/dist/dashboard/routes/templates.js +1 -1
- package/dist/dashboard/routes/templates.js.map +1 -1
- package/dist/dashboard/spa.html +1 -1
- package/dist/data/memory/bootstrap.d.ts.map +1 -1
- package/dist/data/memory/bootstrap.js +7 -6
- package/dist/data/memory/bootstrap.js.map +1 -1
- package/dist/data/memory/consolidation.d.ts.map +1 -1
- package/dist/data/memory/consolidation.js +2 -1
- package/dist/data/memory/consolidation.js.map +1 -1
- package/dist/data/memory/narrative.d.ts.map +1 -1
- package/dist/data/memory/narrative.js +2 -1
- package/dist/data/memory/narrative.js.map +1 -1
- package/dist/data/memory/reflection.d.ts.map +1 -1
- package/dist/data/memory/reflection.js +2 -1
- package/dist/data/memory/reflection.js.map +1 -1
- package/dist/intent.d.ts.map +1 -1
- package/dist/intent.js +7 -2
- package/dist/intent.js.map +1 -1
- package/dist/telegram.d.ts +5 -0
- package/dist/telegram.d.ts.map +1 -1
- package/dist/telegram.js +20 -0
- package/dist/telegram.js.map +1 -1
- package/dist/tools/defs/session-defs.d.ts.map +1 -1
- package/dist/tools/defs/session-defs.js +8 -4
- package/dist/tools/defs/session-defs.js.map +1 -1
- package/dist/tools/delegate-tool.d.ts.map +1 -1
- package/dist/tools/delegate-tool.js +17 -3
- package/dist/tools/delegate-tool.js.map +1 -1
- package/dist/tools/memory-tools.d.ts.map +1 -1
- package/dist/tools/memory-tools.js +2 -1
- package/dist/tools/memory-tools.js.map +1 -1
- package/dist/tools/start-session-tool.js +1 -1
- package/dist/tools/start-session-tool.js.map +1 -1
- package/dist/tools/thread-lifecycle.d.ts +31 -1
- package/dist/tools/thread-lifecycle.d.ts.map +1 -1
- package/dist/tools/thread-lifecycle.js +233 -6
- package/dist/tools/thread-lifecycle.js.map +1 -1
- package/dist/tools/wait/drive-handler.d.ts.map +1 -1
- package/dist/tools/wait/drive-handler.js +19 -0
- package/dist/tools/wait/drive-handler.js.map +1 -1
- package/dist/tools/wait/message-delivery.d.ts.map +1 -1
- package/dist/tools/wait/message-delivery.js +5 -4
- package/dist/tools/wait/message-delivery.js.map +1 -1
- package/dist/watcher-service.d.ts.map +1 -1
- package/dist/watcher-service.js +29 -3
- package/dist/watcher-service.js.map +1 -1
- package/package.json +1 -1
|
@@ -16,7 +16,7 @@ import { setThreadAgentType } from "../config.js";
|
|
|
16
16
|
import { lookupSession, persistSession, lookupTopicRegistry, registerTopic } from "../sessions.js";
|
|
17
17
|
import { log } from "../logger.js";
|
|
18
18
|
import { errorMessage, errorResult } from "../utils.js";
|
|
19
|
-
import { findAliveThread, isThreadRunning, ensureDirs, PENDING_TASKS_DIR, resolveMcpConfigPath, resolveClaudePath, resolveCopilotPath, spawnAgentProcess, spawnCopilotProcess, cleanupStalePidFiles, } from "./thread-lifecycle.js";
|
|
19
|
+
import { findAliveThread, isThreadRunning, ensureDirs, PENDING_TASKS_DIR, resolveMcpConfigPath, resolveClaudePath, resolveCopilotPath, resolveCodexPath, spawnAgentProcess, spawnCopilotProcess, spawnCodexProcess, cleanupStalePidFiles, } from "./thread-lifecycle.js";
|
|
20
20
|
// ---------------------------------------------------------------------------
|
|
21
21
|
// Topic resolution helper
|
|
22
22
|
// ---------------------------------------------------------------------------
|
|
@@ -64,11 +64,14 @@ export async function handleStartThread(args, ctx) {
|
|
|
64
64
|
const memorySourceThreadId = typeof args.memorySourceThreadId === "number" ? args.memorySourceThreadId
|
|
65
65
|
: typeof args.memorySourceThreadId === "string" ? (Number.isFinite(Number(args.memorySourceThreadId)) ? Number(args.memorySourceThreadId) : undefined)
|
|
66
66
|
: undefined;
|
|
67
|
+
const targetMemoryThreadId = typeof args.targetMemoryThreadId === "number" ? args.targetMemoryThreadId
|
|
68
|
+
: typeof args.targetMemoryThreadId === "string" ? (Number.isFinite(Number(args.targetMemoryThreadId)) ? Number(args.targetMemoryThreadId) : undefined)
|
|
69
|
+
: undefined;
|
|
67
70
|
// name is required unless an explicit threadId is provided
|
|
68
71
|
if (!name && explicitThreadId === undefined) {
|
|
69
72
|
return errorResult("Error: 'name' parameter is required for start_thread (unless threadId is provided).");
|
|
70
73
|
}
|
|
71
|
-
const agentType = rawAgentType === "copilot" || rawAgentType === "claude" || rawAgentType === "cursor"
|
|
74
|
+
const agentType = rawAgentType === "copilot" || rawAgentType === "claude" || rawAgentType === "cursor" || rawAgentType === "codex"
|
|
72
75
|
? rawAgentType
|
|
73
76
|
: "claude";
|
|
74
77
|
// ── Verify CLI availability ───────────────────────────────────────────
|
|
@@ -82,6 +85,14 @@ export async function handleStartThread(args, ctx) {
|
|
|
82
85
|
}
|
|
83
86
|
cliPath = copilotPath;
|
|
84
87
|
}
|
|
88
|
+
else if (agentType === "codex") {
|
|
89
|
+
const codexPath = resolveCodexPath();
|
|
90
|
+
if (!codexPath) {
|
|
91
|
+
return errorResult("Error: 'codex' CLI is not installed or not on PATH. " +
|
|
92
|
+
"Set CODEX_CLI_CMD env var or ensure 'codex' is on PATH.");
|
|
93
|
+
}
|
|
94
|
+
cliPath = codexPath;
|
|
95
|
+
}
|
|
85
96
|
else {
|
|
86
97
|
const claudePath = resolveClaudePath();
|
|
87
98
|
if (!claudePath) {
|
|
@@ -150,7 +161,9 @@ export async function handleStartThread(args, ctx) {
|
|
|
150
161
|
ensureDirs();
|
|
151
162
|
const result = agentType === "copilot"
|
|
152
163
|
? spawnCopilotProcess(cliPath, name, threadId, workingDirectory, memorySourceThreadId)
|
|
153
|
-
:
|
|
164
|
+
: agentType === "codex"
|
|
165
|
+
? spawnCodexProcess(cliPath, name, threadId, workingDirectory, memorySourceThreadId)
|
|
166
|
+
: spawnAgentProcess(cliPath, mcpConfigPath, name, threadId, workingDirectory, memorySourceThreadId, targetMemoryThreadId);
|
|
154
167
|
if ("error" in result)
|
|
155
168
|
return errorResult(`Error: ${result.error}`);
|
|
156
169
|
const status = topicExisted ? "restarted" : "created";
|
|
@@ -170,6 +183,7 @@ export async function handleStartThread(args, ctx) {
|
|
|
170
183
|
pid: result.pid,
|
|
171
184
|
logFile: result.logFile,
|
|
172
185
|
...(memorySourceThreadId !== undefined ? { memorySourceThreadId } : {}),
|
|
186
|
+
...(targetMemoryThreadId !== undefined ? { targetMemoryThreadId } : {}),
|
|
173
187
|
}),
|
|
174
188
|
}],
|
|
175
189
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delegate-tool.js","sourceRoot":"","sources":["../../src/tools/delegate-tool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"delegate-tool.js","sourceRoot":"","sources":["../../src/tools/delegate-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-tools.d.ts","sourceRoot":"","sources":["../../src/tools/memory-tools.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAQL,KAAK,YAAY,EAUlB,MAAM,cAAc,CAAC;AAGtB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"memory-tools.d.ts","sourceRoot":"","sources":["../../src/tools/memory-tools.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAQL,KAAK,YAAY,EAUlB,MAAM,cAAc,CAAC;AAGtB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAQ9C,6EAA6E;AAC7E,MAAM,WAAW,WAAW;IAC1B,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,GAAG,SAAS,CAAC;IACvE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,CAAC;IAC3D,WAAW,EAAE,MAAM,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACnD,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,UAAU,GAAG;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC;IAC7D,wDAAwD;IACxD,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,kFAAkF;IAClF,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;CAC9B;AAMD;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY5G;AA8TD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,GAAG,EAAE,WAAW,GACf,OAAO,CAAC,UAAU,CAAC,CAmCrB"}
|
|
@@ -7,6 +7,7 @@ import { findPotentialConflicts, forgetMemory, getMemoryStatus, getNotesWithoutE
|
|
|
7
7
|
import { generateEmbedding } from "../openai.js";
|
|
8
8
|
import { log } from "../logger.js";
|
|
9
9
|
import { errorMessage } from "../utils.js";
|
|
10
|
+
import { resolveKnowledgeThreadId } from "../config.js";
|
|
10
11
|
// ---------------------------------------------------------------------------
|
|
11
12
|
// Helpers
|
|
12
13
|
// ---------------------------------------------------------------------------
|
|
@@ -132,7 +133,7 @@ async function handleMemorySave(db, args, apiKey, threadId, getMemoryDb, reminde
|
|
|
132
133
|
keywords: Array.isArray(args.keywords) ? args.keywords.map(String) : typeof args.keywords === 'string' ? [args.keywords] : [],
|
|
133
134
|
confidence: typeof args.confidence === "number" ? args.confidence : 0.8,
|
|
134
135
|
priority: typeof args.priority === "number" ? args.priority : 0,
|
|
135
|
-
threadId: threadId
|
|
136
|
+
threadId: threadId != null ? resolveKnowledgeThreadId(threadId) : null,
|
|
136
137
|
isGuardrail: args.guardrail === true,
|
|
137
138
|
pinned: args.pinned === true,
|
|
138
139
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-tools.js","sourceRoot":"","sources":["../../src/tools/memory-tools.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"memory-tools.js","sourceRoot":"","sources":["../../src/tools/memory-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ export async function handleStartSession(args, ctx) {
|
|
|
29
29
|
? typedArgs.name.trim()
|
|
30
30
|
: undefined;
|
|
31
31
|
const rawAgentType = typeof typedArgs.agentType === "string" ? typedArgs.agentType.trim() : "";
|
|
32
|
-
const agentType = rawAgentType === "copilot" || rawAgentType === "claude" || rawAgentType === "cursor"
|
|
32
|
+
const agentType = rawAgentType === "copilot" || rawAgentType === "claude" || rawAgentType === "cursor" || rawAgentType === "codex"
|
|
33
33
|
? rawAgentType
|
|
34
34
|
: undefined;
|
|
35
35
|
// ── Re-entry guard ────────────────────────────────────────────────────
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start-session-tool.js","sourceRoot":"","sources":["../../src/tools/start-session-tool.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAkB,MAAM,cAAc,CAAC;AAC3F,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAqB,MAAM,cAAc,CAAC;AAChG,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EACL,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,EACb,mBAAmB,EACnB,aAAa,GACd,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAsCtD,qFAAqF;AACrF,MAAM,+BAA+B,GAAG,EAAE,CAAC;AAE3C,8EAA8E;AAC9E,UAAU;AACV,8EAA8E;AAE9E,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAA6B,EAC7B,GAAwB;IAExB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC;IAEzF,MAAM,SAAS,GAAG,IAAI,CAAC;IACvB,MAAM,WAAW,GAAG,SAAS,CAAC,QAAQ,CAAC;IACvC,MAAM,gBAAgB,GAAG,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW;QACpE,CAAC,CAAC,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5G,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,UAAU,GAAG,OAAO,SAAS,CAAC,IAAI,KAAK,QAAQ,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE;QAC5E,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE;QACvB,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,YAAY,GAAG,OAAO,SAAS,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/F,MAAM,SAAS,GACb,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,QAAQ,IAAI,YAAY,KAAK,QAAQ;
|
|
1
|
+
{"version":3,"file":"start-session-tool.js","sourceRoot":"","sources":["../../src/tools/start-session-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,10 @@ interface SpawnedThread {
|
|
|
9
9
|
threadId: number;
|
|
10
10
|
name: string;
|
|
11
11
|
startedAt: number;
|
|
12
|
+
createdAt: number;
|
|
12
13
|
logFile: string;
|
|
13
14
|
memorySourceThreadId?: number;
|
|
15
|
+
memoryTargetThreadId?: number;
|
|
14
16
|
}
|
|
15
17
|
/**
|
|
16
18
|
* Find a spawned thread entry by threadId whose process is still alive.
|
|
@@ -34,7 +36,12 @@ export declare function resolveClaudePath(): string | null;
|
|
|
34
36
|
* Checks COPILOT_CLI_CMD env var first, then PATH. Returns null if not found.
|
|
35
37
|
*/
|
|
36
38
|
export declare function resolveCopilotPath(): string | null;
|
|
37
|
-
|
|
39
|
+
/**
|
|
40
|
+
* Resolve the absolute path to the `codex` CLI executable.
|
|
41
|
+
* Checks CODEX_CLI_CMD env var first, then PATH. Returns null if not found.
|
|
42
|
+
*/
|
|
43
|
+
export declare function resolveCodexPath(): string | null;
|
|
44
|
+
export declare function spawnAgentProcess(claudePath: string, mcpConfigPath: string, name: string, threadId: number, workingDirectory?: string, memorySourceThreadId?: number, memoryTargetThreadId?: number): {
|
|
38
45
|
pid: number;
|
|
39
46
|
logFile: string;
|
|
40
47
|
} | {
|
|
@@ -51,11 +58,34 @@ export declare function spawnCopilotProcess(copilotPath: string, name: string, t
|
|
|
51
58
|
} | {
|
|
52
59
|
error: string;
|
|
53
60
|
};
|
|
61
|
+
/**
|
|
62
|
+
* Spawn an OpenAI Codex CLI agent process for the given thread.
|
|
63
|
+
* Writes Codex home files (TOML config + AGENTS.md) before spawning.
|
|
64
|
+
* Uses `codex exec` for non-interactive execution.
|
|
65
|
+
* Requires MCP_HTTP_PORT env var to be set.
|
|
66
|
+
*/
|
|
67
|
+
export declare function spawnCodexProcess(codexPath: string, name: string, threadId: number, workingDirectory?: string, memorySourceThreadId?: number): {
|
|
68
|
+
pid: number;
|
|
69
|
+
logFile: string;
|
|
70
|
+
} | {
|
|
71
|
+
error: string;
|
|
72
|
+
};
|
|
54
73
|
/**
|
|
55
74
|
* Remove PID files for processes that are no longer running.
|
|
56
75
|
* Called on server startup / before spawning new threads.
|
|
57
76
|
*/
|
|
58
77
|
export declare function cleanupStalePidFiles(): void;
|
|
78
|
+
/**
|
|
79
|
+
* Clean up expired worker threads.
|
|
80
|
+
* Workers are temporary threads (have memorySourceThreadId but no memoryTargetThreadId).
|
|
81
|
+
* After TTL expires: synthesize outcomes, kill process, delete PID, delete Telegram topic.
|
|
82
|
+
*/
|
|
83
|
+
export declare function cleanupExpiredWorkers(db: ReturnType<typeof import("../memory.js").initMemoryDb>, telegram: {
|
|
84
|
+
deleteForumTopic(chatId: string, threadId: number): Promise<void>;
|
|
85
|
+
}, chatId: string, ttlMs?: number): Promise<{
|
|
86
|
+
cleaned: number;
|
|
87
|
+
errors: string[];
|
|
88
|
+
}>;
|
|
59
89
|
/**
|
|
60
90
|
* Get comprehensive health status of all known threads.
|
|
61
91
|
* Merges data from topic registry, dashboard sessions, spawned processes,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thread-lifecycle.d.ts","sourceRoot":"","sources":["../../src/tools/thread-lifecycle.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAgBH,UAAU,aAAa;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAmCD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAM3E;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEzD;AAcD,eAAO,MAAM,iBAAiB,QAAkC,CAAC;AAKjE,wBAAgB,UAAU,IAAI,IAAI,CAIjC;AAwCD,wBAAgB,oBAAoB,IAAI,MAAM,GAAG,IAAI,CAgBpD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,IAAI,CASjD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAWlD;
|
|
1
|
+
{"version":3,"file":"thread-lifecycle.d.ts","sourceRoot":"","sources":["../../src/tools/thread-lifecycle.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAgBH,UAAU,aAAa;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAmCD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAM3E;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEzD;AAcD,eAAO,MAAM,iBAAiB,QAAkC,CAAC;AAKjE,wBAAgB,UAAU,IAAI,IAAI,CAIjC;AAwCD,wBAAgB,oBAAoB,IAAI,MAAM,GAAG,IAAI,CAgBpD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,IAAI,CASjD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAWlD;AAsCD;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,IAAI,CAkBhD;AAqCD,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,gBAAgB,CAAC,EAAE,MAAM,EACzB,oBAAoB,CAAC,EAAE,MAAM,EAC7B,oBAAoB,CAAC,EAAE,MAAM,GAC5B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CA4HtD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,gBAAgB,CAAC,EAAE,MAAM,EACzB,oBAAoB,CAAC,EAAE,MAAM,GAC5B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAsGtD;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,gBAAgB,CAAC,EAAE,MAAM,EACzB,oBAAoB,CAAC,EAAE,MAAM,GAC5B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CA4GtD;AAmDD;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CAS3C;AAID;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,EAAE,EAAE,UAAU,CAAC,cAAc,cAAc,EAAE,YAAY,CAAC,EAC1D,QAAQ,EAAE;IAAE,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,EAC/E,MAAM,EAAE,MAAM,EACd,KAAK,GAAE,MAA8B,GACpC,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAmBhD;AAsKD;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAmEzC"}
|
|
@@ -177,8 +177,8 @@ export function resolveCopilotPath() {
|
|
|
177
177
|
const COPILOT_HOME_DIR = join(BASE_DIR, "copilot-home");
|
|
178
178
|
const COPILOT_MCP_CONFIG_FILENAME = "mcp-config.json";
|
|
179
179
|
const COPILOT_INSTRUCTIONS_FILENAME = "copilot-instructions.md";
|
|
180
|
-
const COPILOT_SYSTEM_PROMPT = "You are a remote
|
|
181
|
-
"Start remote session with sensorium.";
|
|
180
|
+
const COPILOT_SYSTEM_PROMPT = "You are a remote Copilot agent. " +
|
|
181
|
+
"Start remote session with sensorium. Pass agentType='copilot' to start_session.";
|
|
182
182
|
const DEFAULT_COPILOT_MODEL = "claude-opus-4.6";
|
|
183
183
|
function writeCopilotHomeFiles(copilotHome, port, secret) {
|
|
184
184
|
mkdirSync(copilotHome, { recursive: true });
|
|
@@ -193,9 +193,70 @@ function writeCopilotHomeFiles(copilotHome, port, secret) {
|
|
|
193
193
|
writeFileSync(join(copilotHome, COPILOT_INSTRUCTIONS_FILENAME), COPILOT_SYSTEM_PROMPT, "utf-8");
|
|
194
194
|
}
|
|
195
195
|
// ---------------------------------------------------------------------------
|
|
196
|
+
// Codex home helpers
|
|
197
|
+
// ---------------------------------------------------------------------------
|
|
198
|
+
const CODEX_HOME_DIR = join(BASE_DIR, "codex-home");
|
|
199
|
+
const CODEX_CONFIG_FILENAME = "config.toml";
|
|
200
|
+
const CODEX_INSTRUCTIONS_FILENAME = "AGENTS.md";
|
|
201
|
+
const CODEX_SYSTEM_PROMPT = "You are a remote Codex agent. " +
|
|
202
|
+
"Start remote session with sensorium. Pass agentType='codex' to start_session.";
|
|
203
|
+
const DEFAULT_CODEX_MODEL = "o3";
|
|
204
|
+
/**
|
|
205
|
+
* Resolve the absolute path to the `codex` CLI executable.
|
|
206
|
+
* Checks CODEX_CLI_CMD env var first, then PATH. Returns null if not found.
|
|
207
|
+
*/
|
|
208
|
+
export function resolveCodexPath() {
|
|
209
|
+
const envCmd = process.env.CODEX_CLI_CMD;
|
|
210
|
+
if (envCmd)
|
|
211
|
+
return envCmd;
|
|
212
|
+
try {
|
|
213
|
+
const cmd = process.platform === "win32" ? "where" : "which";
|
|
214
|
+
const result = spawnSync(cmd, ["codex"], { timeout: 5000, encoding: "utf-8" });
|
|
215
|
+
if (result.status === 0 && result.stdout) {
|
|
216
|
+
const candidates = result.stdout.trim().split(/\r?\n/);
|
|
217
|
+
// On Windows, prefer codex.cmd over the bare bash shim so that needsShell
|
|
218
|
+
// is correctly set and stdio fd inheritance works (same pattern as claude.cmd).
|
|
219
|
+
if (process.platform === "win32") {
|
|
220
|
+
const cmdVariant = candidates.find(p => /\.cmd$/i.test(p));
|
|
221
|
+
if (cmdVariant)
|
|
222
|
+
return cmdVariant;
|
|
223
|
+
}
|
|
224
|
+
return candidates[0];
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
catch { /* not found */ }
|
|
228
|
+
return null;
|
|
229
|
+
}
|
|
230
|
+
/** Path to the optional user-maintained base TOML config for Codex MCP servers. */
|
|
231
|
+
const CODEX_BASE_CONFIG_PATH = join(BASE_DIR, "codex-base.toml");
|
|
232
|
+
/**
|
|
233
|
+
* Write Codex home files: config.toml (with MCP server) + AGENTS.md.
|
|
234
|
+
* Codex uses TOML config format, unlike Claude/Copilot's JSON.
|
|
235
|
+
*
|
|
236
|
+
* If `~/.remote-copilot-mcp/codex-base.toml` exists, its contents are used as
|
|
237
|
+
* the base config (allowing the operator to declare additional MCP servers).
|
|
238
|
+
* The sensorium-mcp entry is always appended/overwritten at the end.
|
|
239
|
+
*/
|
|
240
|
+
function writeCodexHomeFiles(codexHome, port, secret) {
|
|
241
|
+
mkdirSync(codexHome, { recursive: true });
|
|
242
|
+
// Start from user-provided base config if present, otherwise empty.
|
|
243
|
+
let toml = existsSync(CODEX_BASE_CONFIG_PATH)
|
|
244
|
+
? readFileSync(CODEX_BASE_CONFIG_PATH, "utf-8").trimEnd() + "\n"
|
|
245
|
+
: `# Auto-generated by sensorium-mcp for Codex thread spawning\n`;
|
|
246
|
+
// Always append/overwrite the sensorium-mcp entry so it reflects the current port/secret.
|
|
247
|
+
toml += `\n# Auto-injected by sensorium-mcp — do not edit this section manually\n`;
|
|
248
|
+
toml += `[mcp_servers.sensorium-mcp]\n`;
|
|
249
|
+
toml += `url = "http://127.0.0.1:${port}/mcp"\n`;
|
|
250
|
+
if (secret) {
|
|
251
|
+
toml += `http_headers = { Authorization = "Bearer ${secret}" }\n`;
|
|
252
|
+
}
|
|
253
|
+
writeFileSync(join(codexHome, CODEX_CONFIG_FILENAME), toml, "utf-8");
|
|
254
|
+
writeFileSync(join(codexHome, CODEX_INSTRUCTIONS_FILENAME), CODEX_SYSTEM_PROMPT, "utf-8");
|
|
255
|
+
}
|
|
256
|
+
// ---------------------------------------------------------------------------
|
|
196
257
|
// Spawn agent process
|
|
197
258
|
// ---------------------------------------------------------------------------
|
|
198
|
-
export function spawnAgentProcess(claudePath, mcpConfigPath, name, threadId, workingDirectory, memorySourceThreadId) {
|
|
259
|
+
export function spawnAgentProcess(claudePath, mcpConfigPath, name, threadId, workingDirectory, memorySourceThreadId, memoryTargetThreadId) {
|
|
199
260
|
const dateStr = new Date().toISOString().slice(0, 10);
|
|
200
261
|
const safeName = name.replace(/[^a-zA-Z0-9_-]/g, "_");
|
|
201
262
|
const logFileName = `${safeName}_${threadId}_${dateStr}.json`;
|
|
@@ -223,6 +284,9 @@ export function spawnAgentProcess(claudePath, mcpConfigPath, name, threadId, wor
|
|
|
223
284
|
if (memorySourceThreadId !== undefined) {
|
|
224
285
|
spawnEnv.MEMORY_SOURCE_THREAD_ID = String(memorySourceThreadId);
|
|
225
286
|
}
|
|
287
|
+
if (memoryTargetThreadId !== undefined) {
|
|
288
|
+
spawnEnv.MEMORY_TARGET_THREAD_ID = String(memoryTargetThreadId);
|
|
289
|
+
}
|
|
226
290
|
if (process.platform === "win32" && !spawnEnv.CLAUDE_CODE_GIT_BASH_PATH) {
|
|
227
291
|
const gitBashCandidates = [
|
|
228
292
|
join(homedir(), "AppData", "Local", "Programs", "Git", "bin", "bash.exe"),
|
|
@@ -273,8 +337,10 @@ export function spawnAgentProcess(claudePath, mcpConfigPath, name, threadId, wor
|
|
|
273
337
|
threadId,
|
|
274
338
|
name,
|
|
275
339
|
startedAt: Date.now(),
|
|
340
|
+
createdAt: Date.now(),
|
|
276
341
|
logFile: logFilePath,
|
|
277
342
|
...(memorySourceThreadId !== undefined ? { memorySourceThreadId } : {}),
|
|
343
|
+
...(memoryTargetThreadId !== undefined ? { memoryTargetThreadId } : {}),
|
|
278
344
|
};
|
|
279
345
|
spawnedThreads.push(entry);
|
|
280
346
|
// Monitor process exit — clean up stale entries, PID file, and log health info
|
|
@@ -326,13 +392,21 @@ export function spawnCopilotProcess(copilotPath, name, threadId, workingDirector
|
|
|
326
392
|
const logFd = openSync(logFilePath, "a");
|
|
327
393
|
const prompt = `Start remote session with sensorium. Thread name = '${name}'`;
|
|
328
394
|
const copilotModel = process.env.COPILOT_MODEL || DEFAULT_COPILOT_MODEL;
|
|
329
|
-
const cliArgs = [
|
|
395
|
+
const cliArgs = [
|
|
396
|
+
"-p", prompt,
|
|
397
|
+
"--allow-all-tools",
|
|
398
|
+
"--model", copilotModel,
|
|
399
|
+
"--no-alt-screen",
|
|
400
|
+
"--autopilot",
|
|
401
|
+
];
|
|
330
402
|
const spawnEnv = { ...process.env, COPILOT_HOME: COPILOT_HOME_DIR };
|
|
331
403
|
if (memorySourceThreadId !== undefined) {
|
|
332
404
|
spawnEnv.MEMORY_SOURCE_THREAD_ID = String(memorySourceThreadId);
|
|
333
405
|
}
|
|
334
|
-
//
|
|
335
|
-
|
|
406
|
+
// Use shell only when the resolved path is a Windows batch script (.cmd/.bat).
|
|
407
|
+
// copilot.exe is a direct executable and does not need shell wrapping — shell
|
|
408
|
+
// wrapping on Windows breaks stdio fd inheritance causing empty log files.
|
|
409
|
+
const needsShell = process.platform === "win32" && /\.(cmd|bat)$/i.test(copilotPath);
|
|
336
410
|
let child;
|
|
337
411
|
try {
|
|
338
412
|
child = spawn(copilotPath, cliArgs, {
|
|
@@ -366,6 +440,7 @@ export function spawnCopilotProcess(copilotPath, name, threadId, workingDirector
|
|
|
366
440
|
threadId,
|
|
367
441
|
name,
|
|
368
442
|
startedAt: Date.now(),
|
|
443
|
+
createdAt: Date.now(),
|
|
369
444
|
logFile: logFilePath,
|
|
370
445
|
...(memorySourceThreadId !== undefined ? { memorySourceThreadId } : {}),
|
|
371
446
|
};
|
|
@@ -397,6 +472,111 @@ export function spawnCopilotProcess(copilotPath, name, threadId, workingDirector
|
|
|
397
472
|
log.info(`[start_thread] Spawned Copilot process PID=${pid} for thread ${threadId} ("${name}")`);
|
|
398
473
|
return { pid, logFile: logFilePath };
|
|
399
474
|
}
|
|
475
|
+
/**
|
|
476
|
+
* Spawn an OpenAI Codex CLI agent process for the given thread.
|
|
477
|
+
* Writes Codex home files (TOML config + AGENTS.md) before spawning.
|
|
478
|
+
* Uses `codex exec` for non-interactive execution.
|
|
479
|
+
* Requires MCP_HTTP_PORT env var to be set.
|
|
480
|
+
*/
|
|
481
|
+
export function spawnCodexProcess(codexPath, name, threadId, workingDirectory, memorySourceThreadId) {
|
|
482
|
+
const httpPort = parseInt(process.env.MCP_HTTP_PORT || "0", 10);
|
|
483
|
+
if (!httpPort) {
|
|
484
|
+
return { error: "MCP_HTTP_PORT env var is not set or invalid. Codex threads require HTTP transport." };
|
|
485
|
+
}
|
|
486
|
+
const httpSecret = process.env.MCP_HTTP_SECRET || null;
|
|
487
|
+
writeCodexHomeFiles(CODEX_HOME_DIR, httpPort, httpSecret);
|
|
488
|
+
const dateStr = new Date().toISOString().slice(0, 10);
|
|
489
|
+
const safeName = name.replace(/[^a-zA-Z0-9_-]/g, "_");
|
|
490
|
+
const logFileName = `${safeName}_${threadId}_${dateStr}.log`;
|
|
491
|
+
const logFilePath = join(LOGS_DIR, logFileName);
|
|
492
|
+
const logFd = openSync(logFilePath, "a");
|
|
493
|
+
const prompt = `Start remote session with sensorium. Thread name = '${name}'`;
|
|
494
|
+
const codexModel = process.env.CODEX_MODEL || DEFAULT_CODEX_MODEL;
|
|
495
|
+
const cliArgs = [
|
|
496
|
+
"exec",
|
|
497
|
+
"--dangerously-bypass-approvals-and-sandbox",
|
|
498
|
+
"--skip-git-repo-check",
|
|
499
|
+
"-m", codexModel,
|
|
500
|
+
"--json",
|
|
501
|
+
prompt,
|
|
502
|
+
];
|
|
503
|
+
if (workingDirectory) {
|
|
504
|
+
cliArgs.splice(1, 0, "-C", workingDirectory);
|
|
505
|
+
}
|
|
506
|
+
const spawnEnv = { ...process.env, CODEX_HOME: CODEX_HOME_DIR };
|
|
507
|
+
if (memorySourceThreadId !== undefined) {
|
|
508
|
+
spawnEnv.MEMORY_SOURCE_THREAD_ID = String(memorySourceThreadId);
|
|
509
|
+
}
|
|
510
|
+
// Forward MCP secret so codex's bearer_token_env_var can reference it
|
|
511
|
+
if (httpSecret) {
|
|
512
|
+
spawnEnv.SENSORIUM_MCP_SECRET = httpSecret;
|
|
513
|
+
}
|
|
514
|
+
const needsShell = process.platform === "win32" && /\.(cmd|bat)$/i.test(codexPath);
|
|
515
|
+
let child;
|
|
516
|
+
try {
|
|
517
|
+
child = spawn(codexPath, cliArgs, {
|
|
518
|
+
detached: true,
|
|
519
|
+
stdio: ["ignore", logFd, logFd],
|
|
520
|
+
shell: needsShell,
|
|
521
|
+
windowsHide: true,
|
|
522
|
+
env: spawnEnv,
|
|
523
|
+
cwd: workingDirectory || undefined,
|
|
524
|
+
});
|
|
525
|
+
}
|
|
526
|
+
catch (err) {
|
|
527
|
+
closeSync(logFd);
|
|
528
|
+
return { error: `Failed to spawn Codex process: ${errorMessage(err)}` };
|
|
529
|
+
}
|
|
530
|
+
closeSync(logFd);
|
|
531
|
+
const pid = child.pid;
|
|
532
|
+
if (pid === undefined) {
|
|
533
|
+
return { error: "Codex process spawned but PID is undefined — spawn may have failed." };
|
|
534
|
+
}
|
|
535
|
+
const pidFilePath = join(PIDS_DIR, `${threadId}.pid`);
|
|
536
|
+
try {
|
|
537
|
+
const pidMeta = { pid, name, configPath: CODEX_HOME_DIR, startedAt: Date.now() };
|
|
538
|
+
writeFileSync(pidFilePath, JSON.stringify(pidMeta), "utf-8");
|
|
539
|
+
}
|
|
540
|
+
catch (err) {
|
|
541
|
+
log.debug(`[start_thread] Failed to write PID file: ${errorMessage(err)}`);
|
|
542
|
+
}
|
|
543
|
+
const entry = {
|
|
544
|
+
pid,
|
|
545
|
+
threadId,
|
|
546
|
+
name,
|
|
547
|
+
startedAt: Date.now(),
|
|
548
|
+
createdAt: Date.now(),
|
|
549
|
+
logFile: logFilePath,
|
|
550
|
+
...(memorySourceThreadId !== undefined ? { memorySourceThreadId } : {}),
|
|
551
|
+
};
|
|
552
|
+
spawnedThreads.push(entry);
|
|
553
|
+
child.on("exit", async (code) => {
|
|
554
|
+
const idx = spawnedThreads.indexOf(entry);
|
|
555
|
+
if (idx !== -1)
|
|
556
|
+
spawnedThreads.splice(idx, 1);
|
|
557
|
+
try {
|
|
558
|
+
unlinkSync(pidFilePath);
|
|
559
|
+
}
|
|
560
|
+
catch { /* already removed */ }
|
|
561
|
+
if (entry.memorySourceThreadId !== undefined) {
|
|
562
|
+
try {
|
|
563
|
+
const { initMemoryDb: getDb } = await import("../memory.js");
|
|
564
|
+
const db = getDb();
|
|
565
|
+
const result = await synthesizeGhostMemory(db, threadId, entry.memorySourceThreadId, entry.name);
|
|
566
|
+
if (result.synthesizedNotes > 0 || result.synthesizedEpisode) {
|
|
567
|
+
log.info(`[synthesis] Ghost ${threadId} → parent ${entry.memorySourceThreadId}: ${result.synthesizedNotes} notes, episode: ${result.synthesizedEpisode}`);
|
|
568
|
+
}
|
|
569
|
+
}
|
|
570
|
+
catch (err) {
|
|
571
|
+
log.warn(`[synthesis] Failed for ghost ${threadId}: ${errorMessage(err)}`);
|
|
572
|
+
}
|
|
573
|
+
}
|
|
574
|
+
log.info(`[start_thread] Codex process PID=${pid} for thread ${threadId} exited with code ${code}`);
|
|
575
|
+
});
|
|
576
|
+
child.unref();
|
|
577
|
+
log.info(`[start_thread] Spawned Codex process PID=${pid} for thread ${threadId} ("${name}")`);
|
|
578
|
+
return { pid, logFile: logFilePath };
|
|
579
|
+
}
|
|
400
580
|
/**
|
|
401
581
|
* Read all PID files from the pids directory.
|
|
402
582
|
* Supports both legacy (plain PID number) and new (JSON metadata) formats.
|
|
@@ -451,6 +631,53 @@ export function cleanupStalePidFiles() {
|
|
|
451
631
|
}
|
|
452
632
|
}
|
|
453
633
|
}
|
|
634
|
+
const DEFAULT_WORKER_TTL_MS = 60 * 60 * 1000; // 1 hour
|
|
635
|
+
/**
|
|
636
|
+
* Clean up expired worker threads.
|
|
637
|
+
* Workers are temporary threads (have memorySourceThreadId but no memoryTargetThreadId).
|
|
638
|
+
* After TTL expires: synthesize outcomes, kill process, delete PID, delete Telegram topic.
|
|
639
|
+
*/
|
|
640
|
+
export async function cleanupExpiredWorkers(db, telegram, chatId, ttlMs = DEFAULT_WORKER_TTL_MS) {
|
|
641
|
+
const result = { cleaned: 0, errors: [] };
|
|
642
|
+
const now = Date.now();
|
|
643
|
+
const isExpiredWorker = (t) => t.memorySourceThreadId !== undefined
|
|
644
|
+
&& t.memoryTargetThreadId === undefined
|
|
645
|
+
&& now - t.createdAt > ttlMs;
|
|
646
|
+
for (const thread of spawnedThreads.filter(isExpiredWorker)) {
|
|
647
|
+
try {
|
|
648
|
+
await cleanupSingleWorker(thread, db, telegram, chatId);
|
|
649
|
+
result.cleaned++;
|
|
650
|
+
}
|
|
651
|
+
catch (err) {
|
|
652
|
+
result.errors.push(`Thread ${thread.threadId}: ${err instanceof Error ? err.message : String(err)}`);
|
|
653
|
+
}
|
|
654
|
+
}
|
|
655
|
+
return result;
|
|
656
|
+
}
|
|
657
|
+
/** Perform cleanup steps for a single expired worker thread. */
|
|
658
|
+
async function cleanupSingleWorker(thread, db, telegram, chatId) {
|
|
659
|
+
// 1. Synthesize before cleanup (best-effort)
|
|
660
|
+
if (thread.memorySourceThreadId !== undefined) {
|
|
661
|
+
try {
|
|
662
|
+
await synthesizeGhostMemory(db, thread.threadId, thread.memorySourceThreadId, thread.name);
|
|
663
|
+
}
|
|
664
|
+
catch { /* synthesis is best-effort */ }
|
|
665
|
+
}
|
|
666
|
+
// 2. Kill process
|
|
667
|
+
try {
|
|
668
|
+
process.kill(thread.pid, "SIGTERM");
|
|
669
|
+
}
|
|
670
|
+
catch { /* already dead */ }
|
|
671
|
+
// 3. Delete Telegram topic
|
|
672
|
+
try {
|
|
673
|
+
await telegram.deleteForumTopic(chatId, thread.threadId);
|
|
674
|
+
}
|
|
675
|
+
catch { /* topic might not exist */ }
|
|
676
|
+
// 4. Remove from tracking (PID file cleanup happens in the exit handler)
|
|
677
|
+
const idx = spawnedThreads.indexOf(thread);
|
|
678
|
+
if (idx !== -1)
|
|
679
|
+
spawnedThreads.splice(idx, 1);
|
|
680
|
+
}
|
|
454
681
|
// ---------------------------------------------------------------------------
|
|
455
682
|
// Thread health monitoring
|
|
456
683
|
// ---------------------------------------------------------------------------
|