jiva-core 0.3.44 → 0.3.46-dev.f6c17ab
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/code/tools/bash.d.ts.map +1 -1
- package/dist/code/tools/bash.js +2 -0
- package/dist/code/tools/bash.js.map +1 -1
- package/dist/code/tools/grep.js +1 -1
- package/dist/code/tools/grep.js.map +1 -1
- package/dist/code/tools/read.js +2 -2
- package/dist/core/client-agent.d.ts +3 -1
- package/dist/core/client-agent.d.ts.map +1 -1
- package/dist/core/client-agent.js +6 -4
- package/dist/core/client-agent.js.map +1 -1
- package/dist/core/dual-agent.d.ts +8 -0
- package/dist/core/dual-agent.d.ts.map +1 -1
- package/dist/core/dual-agent.js +14 -10
- package/dist/core/dual-agent.js.map +1 -1
- package/dist/core/manager-agent.d.ts +3 -1
- package/dist/core/manager-agent.d.ts.map +1 -1
- package/dist/core/manager-agent.js +8 -6
- package/dist/core/manager-agent.js.map +1 -1
- package/dist/core/worker-agent.d.ts +3 -1
- package/dist/core/worker-agent.d.ts.map +1 -1
- package/dist/core/worker-agent.js +10 -8
- package/dist/core/worker-agent.js.map +1 -1
- package/dist/interfaces/http/session-manager.d.ts +7 -1
- package/dist/interfaces/http/session-manager.d.ts.map +1 -1
- package/dist/interfaces/http/session-manager.js +60 -26
- package/dist/interfaces/http/session-manager.js.map +1 -1
- package/dist/storage/factory.d.ts.map +1 -1
- package/dist/storage/factory.js +5 -0
- package/dist/storage/factory.js.map +1 -1
- package/dist/storage/gcp-bucket-provider.d.ts +10 -0
- package/dist/storage/gcp-bucket-provider.d.ts.map +1 -1
- package/dist/storage/gcp-bucket-provider.js +61 -6
- package/dist/storage/gcp-bucket-provider.js.map +1 -1
- package/dist/storage/local-provider.d.ts +7 -0
- package/dist/storage/local-provider.d.ts.map +1 -1
- package/dist/storage/local-provider.js +12 -0
- package/dist/storage/local-provider.js.map +1 -1
- package/dist/storage/provider.d.ts +15 -0
- package/dist/storage/provider.d.ts.map +1 -1
- package/dist/storage/provider.js +19 -0
- package/dist/storage/provider.js.map +1 -1
- package/dist/utils/orchestration-logger.d.ts +16 -4
- package/dist/utils/orchestration-logger.d.ts.map +1 -1
- package/dist/utils/orchestration-logger.js +24 -4
- package/dist/utils/orchestration-logger.js.map +1 -1
- package/package.json +1 -1
|
@@ -13,6 +13,7 @@ import { WorkspaceManager } from './workspace.js';
|
|
|
13
13
|
import { PersonaManager } from '../personas/persona-manager.js';
|
|
14
14
|
import { AgentSpawner } from './agent-spawner.js';
|
|
15
15
|
import { AgentContext } from './types/agent-context.js';
|
|
16
|
+
import { OrchestrationLogger } from '../utils/orchestration-logger.js';
|
|
16
17
|
export interface WorkerSubtask {
|
|
17
18
|
instruction: string;
|
|
18
19
|
context?: string;
|
|
@@ -38,7 +39,8 @@ export declare class WorkerAgent {
|
|
|
38
39
|
private agentSpawner?;
|
|
39
40
|
private maxIterations;
|
|
40
41
|
private contextMemory;
|
|
41
|
-
|
|
42
|
+
private readonly orchLogger;
|
|
43
|
+
constructor(orchestrator: ModelOrchestrator, mcpManager: MCPServerManager, workspace: WorkspaceManager, maxIterations?: number, personaManager?: PersonaManager, orchLogger?: OrchestrationLogger);
|
|
42
44
|
/**
|
|
43
45
|
* Set agent spawner (enables sub-agent spawning)
|
|
44
46
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-agent.d.ts","sourceRoot":"","sources":["../../src/core/worker-agent.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"worker-agent.d.ts","sourceRoot":"","sources":["../../src/core/worker-agent.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAIxD,OAAO,EAAE,mBAAmB,EAAuB,MAAM,kCAAkC,CAAC;AAwD5F,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,EAAE,WAAW,EAAE,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,UAAU,CAAmB;IACrC,OAAO,CAAC,SAAS,CAAmB;IACpC,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,YAAY,CAAC,CAAe;IACpC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsB;gBAG/C,YAAY,EAAE,iBAAiB,EAC/B,UAAU,EAAE,gBAAgB,EAC5B,SAAS,EAAE,gBAAgB,EAC3B,aAAa,GAAE,MAAW,EAC1B,cAAc,CAAC,EAAE,cAAc,EAC/B,UAAU,CAAC,EAAE,mBAAmB;IAsBlC;;OAEG;IACH,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAI5C;;OAEG;IACG,cAAc,CAAC,OAAO,EAAE,aAAa,EAAE,YAAY,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAy0BhG,OAAO,CAAC,gBAAgB;CAMzB"}
|
|
@@ -56,12 +56,14 @@ export class WorkerAgent {
|
|
|
56
56
|
agentSpawner;
|
|
57
57
|
maxIterations;
|
|
58
58
|
contextMemory;
|
|
59
|
-
|
|
59
|
+
orchLogger;
|
|
60
|
+
constructor(orchestrator, mcpManager, workspace, maxIterations = 20, personaManager, orchLogger) {
|
|
60
61
|
this.orchestrator = orchestrator;
|
|
61
62
|
this.mcpManager = mcpManager;
|
|
62
63
|
this.workspace = workspace;
|
|
63
64
|
this.personaManager = personaManager;
|
|
64
65
|
this.maxIterations = maxIterations;
|
|
66
|
+
this.orchLogger = orchLogger ?? orchestrationLogger;
|
|
65
67
|
this.contextMemory = {
|
|
66
68
|
recentFileReads: new Map(),
|
|
67
69
|
filesJustModified: new Set(),
|
|
@@ -85,7 +87,7 @@ export class WorkerAgent {
|
|
|
85
87
|
*/
|
|
86
88
|
async executeSubtask(subtask, agentContext) {
|
|
87
89
|
logger.info(`[Worker] Starting: "${subtask.instruction}"`);
|
|
88
|
-
|
|
90
|
+
this.orchLogger.logWorkerStart(subtask.instruction, subtask.context || '');
|
|
89
91
|
// Reset context memory for new subtask
|
|
90
92
|
this.contextMemory = {
|
|
91
93
|
recentFileReads: new Map(),
|
|
@@ -224,7 +226,7 @@ Please complete this subtask and report your findings.`,
|
|
|
224
226
|
for (let iteration = 0; iteration < this.maxIterations; iteration++) {
|
|
225
227
|
iterationCount = iteration + 1;
|
|
226
228
|
logger.debug(` [Worker] Iteration ${iteration + 1}/${this.maxIterations}`);
|
|
227
|
-
|
|
229
|
+
this.orchLogger.logWorkerIteration(iteration + 1, this.maxIterations);
|
|
228
230
|
// Two-phase nudges: keep-going at 70%, wrap-up at 90%
|
|
229
231
|
const iterPct = iteration / this.maxIterations;
|
|
230
232
|
if (iterPct >= 0.7 && !continueNudgeInjected) {
|
|
@@ -557,7 +559,7 @@ Please complete this subtask and report your findings.`,
|
|
|
557
559
|
break;
|
|
558
560
|
}
|
|
559
561
|
try {
|
|
560
|
-
|
|
562
|
+
this.orchLogger.logWorkerToolCall(toolName, args);
|
|
561
563
|
// Handle spawn_agent specially
|
|
562
564
|
if (toolName === 'spawn_agent') {
|
|
563
565
|
if (!this.agentSpawner) {
|
|
@@ -578,7 +580,7 @@ ${spawnResult.result}
|
|
|
578
580
|
|
|
579
581
|
Iterations: ${spawnResult.iterations}
|
|
580
582
|
Tools used: ${spawnResult.toolsUsed.join(', ')}`;
|
|
581
|
-
|
|
583
|
+
this.orchLogger.logWorkerToolResult(toolName, true, false);
|
|
582
584
|
const toolMessage = formatToolResult(toolCall.id, toolName, resultText);
|
|
583
585
|
conversationHistory.push(toolMessage);
|
|
584
586
|
logger.success(` ✓ [Worker] Sub-agent completed task`);
|
|
@@ -611,7 +613,7 @@ Tools used: ${spawnResult.toolsUsed.join(', ')}`;
|
|
|
611
613
|
else {
|
|
612
614
|
toolResultText = typeof result === 'string' ? result : JSON.stringify(result);
|
|
613
615
|
}
|
|
614
|
-
|
|
616
|
+
this.orchLogger.logWorkerToolResult(toolName, true, hasImages);
|
|
615
617
|
const toolMessage = formatToolResult(toolCall.id, toolName, toolResultText);
|
|
616
618
|
conversationHistory.push(toolMessage);
|
|
617
619
|
// If the model used dryRun=true the file was NOT modified.
|
|
@@ -628,7 +630,7 @@ Tools used: ${spawnResult.toolsUsed.join(', ')}`;
|
|
|
628
630
|
catch (error) {
|
|
629
631
|
const errorMsg = error instanceof Error ? error.message : String(error);
|
|
630
632
|
logger.error(` ✗ [Worker] Tool ${toolName} failed:`, error);
|
|
631
|
-
|
|
633
|
+
this.orchLogger.logWorkerToolResult(toolName, false, false);
|
|
632
634
|
// Always push the raw tool error so the LLM sees what happened
|
|
633
635
|
conversationHistory.push({
|
|
634
636
|
role: 'tool',
|
|
@@ -826,7 +828,7 @@ Tools used: ${spawnResult.toolsUsed.join(', ')}`;
|
|
|
826
828
|
!finalResult.includes('encountered errors') &&
|
|
827
829
|
!finalResult.includes('Max iterations reached') &&
|
|
828
830
|
!finalResult.includes('Validation required');
|
|
829
|
-
|
|
831
|
+
this.orchLogger.logWorkerComplete(success, toolsUsed, iterationCount);
|
|
830
832
|
return {
|
|
831
833
|
success,
|
|
832
834
|
result: finalResult,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-agent.js","sourceRoot":"","sources":["../../src/core/worker-agent.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"worker-agent.js","sourceRoot":"","sources":["../../src/core/worker-agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,10 +29,16 @@ export interface SessionInfo {
|
|
|
29
29
|
}
|
|
30
30
|
export declare class SessionManager extends EventEmitter {
|
|
31
31
|
private sessions;
|
|
32
|
+
/** Deduplicates concurrent creation requests for the same session key. */
|
|
33
|
+
private pendingSessions;
|
|
32
34
|
private config;
|
|
33
35
|
constructor(config: SessionConfig);
|
|
34
36
|
/**
|
|
35
|
-
* Get or create a session
|
|
37
|
+
* Get or create a session.
|
|
38
|
+
*
|
|
39
|
+
* Concurrent calls for the same (tenantId, sessionId) are deduplicated:
|
|
40
|
+
* the second caller awaits the same creation Promise so only one session
|
|
41
|
+
* object (and its MCP sub-processes) is ever created per key.
|
|
36
42
|
*/
|
|
37
43
|
getOrCreateSession(tenantId: string, sessionId: string): Promise<IAgent>;
|
|
38
44
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../../src/interfaces/http/session-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAMtC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAO5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAE5D,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,eAAe,CAAC;IACjC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,IAAI,CAAC;IAChB,cAAc,EAAE,IAAI,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,cAAc,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,CAAC;CACxD;
|
|
1
|
+
{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../../src/interfaces/http/session-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAMtC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAO5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAE5D,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,eAAe,CAAC;IACjC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,IAAI,CAAC;IAChB,cAAc,EAAE,IAAI,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,cAAc,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,CAAC;CACxD;AAiBD,qBAAa,cAAe,SAAQ,YAAY;IAC9C,OAAO,CAAC,QAAQ,CAAyC;IACzD,0EAA0E;IAC1E,OAAO,CAAC,eAAe,CAAkD;IACzE,OAAO,CAAC,MAAM,CAAgB;gBAElB,MAAM,EAAE,aAAa;IAMjC;;;;;;OAMG;IACG,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAkD9E;;OAEG;YACW,aAAa;IA+N3B;;OAEG;IACG,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkExE;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAMvE;;OAEG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,EAAE;IAU7C;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAczD;;OAEG;IACH,OAAO,CAAC,cAAc;IAiBtB;;OAEG;YACW,mBAAmB;IAqBjC;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAa/B;;OAEG;IACH,QAAQ,IAAI;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE;IAc/D;;;;OAIG;IACH,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAKlE,OAAO,CAAC,aAAa;CAGtB"}
|
|
@@ -18,12 +18,14 @@ import { MCPServerManager } from '../../mcp/server-manager.js';
|
|
|
18
18
|
import { WorkspaceManager } from '../../core/workspace.js';
|
|
19
19
|
import { ConversationManager } from '../../core/conversation-manager.js';
|
|
20
20
|
import { logger } from '../../utils/logger.js';
|
|
21
|
-
import {
|
|
21
|
+
import { OrchestrationLogger } from '../../utils/orchestration-logger.js';
|
|
22
22
|
import { createModelClient } from '../../models/model-client.js';
|
|
23
23
|
import { PersonaManager } from '../../personas/persona-manager.js';
|
|
24
24
|
import { getDefaultFilesystemAllowedPath } from '../../utils/platform.js';
|
|
25
25
|
export class SessionManager extends EventEmitter {
|
|
26
26
|
sessions = new Map();
|
|
27
|
+
/** Deduplicates concurrent creation requests for the same session key. */
|
|
28
|
+
pendingSessions = new Map();
|
|
27
29
|
config;
|
|
28
30
|
constructor(config) {
|
|
29
31
|
super();
|
|
@@ -31,11 +33,15 @@ export class SessionManager extends EventEmitter {
|
|
|
31
33
|
logger.info(`[SessionManager] Initialized (max: ${config.maxConcurrentSessions}, timeout: ${config.idleTimeoutMs}ms)`);
|
|
32
34
|
}
|
|
33
35
|
/**
|
|
34
|
-
* Get or create a session
|
|
36
|
+
* Get or create a session.
|
|
37
|
+
*
|
|
38
|
+
* Concurrent calls for the same (tenantId, sessionId) are deduplicated:
|
|
39
|
+
* the second caller awaits the same creation Promise so only one session
|
|
40
|
+
* object (and its MCP sub-processes) is ever created per key.
|
|
35
41
|
*/
|
|
36
42
|
async getOrCreateSession(tenantId, sessionId) {
|
|
37
43
|
const key = this.getSessionKey(tenantId, sessionId);
|
|
38
|
-
//
|
|
44
|
+
// Fast path — session already active
|
|
39
45
|
if (this.sessions.has(key)) {
|
|
40
46
|
const session = this.sessions.get(key);
|
|
41
47
|
this.resetIdleTimer(key);
|
|
@@ -44,25 +50,37 @@ export class SessionManager extends EventEmitter {
|
|
|
44
50
|
logger.debug(`[SessionManager] Reusing session: ${key}`);
|
|
45
51
|
return session.agent;
|
|
46
52
|
}
|
|
53
|
+
// Deduplication — a concurrent request is already creating this session
|
|
54
|
+
if (this.pendingSessions.has(key)) {
|
|
55
|
+
logger.debug(`[SessionManager] Awaiting pending session creation: ${key}`);
|
|
56
|
+
const session = await this.pendingSessions.get(key);
|
|
57
|
+
return session.agent;
|
|
58
|
+
}
|
|
47
59
|
// Check session limit
|
|
48
60
|
if (this.sessions.size >= this.config.maxConcurrentSessions) {
|
|
49
|
-
// Try to clean up idle sessions
|
|
50
61
|
await this.cleanupIdleSessions();
|
|
51
62
|
if (this.sessions.size >= this.config.maxConcurrentSessions) {
|
|
52
63
|
throw new Error(`Maximum concurrent sessions reached (${this.config.maxConcurrentSessions})`);
|
|
53
64
|
}
|
|
54
65
|
}
|
|
55
|
-
// Create new session
|
|
66
|
+
// Create new session; register the Promise before awaiting so concurrent
|
|
67
|
+
// callers that arrive while we await find it in pendingSessions.
|
|
56
68
|
logger.info(`[SessionManager] Creating session: ${key}`);
|
|
57
69
|
const codeModeEnabled = process.env.JIVA_CODE_MODE === 'true';
|
|
58
|
-
const
|
|
59
|
-
this.
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
70
|
+
const creationPromise = this.createSession(tenantId, sessionId, codeModeEnabled);
|
|
71
|
+
this.pendingSessions.set(key, creationPromise);
|
|
72
|
+
try {
|
|
73
|
+
const session = await creationPromise;
|
|
74
|
+
this.sessions.set(key, session);
|
|
75
|
+
this.resetIdleTimer(key);
|
|
76
|
+
logger.setSessionId(sessionId);
|
|
77
|
+
this.emit('sessionCreated', { tenantId, sessionId });
|
|
78
|
+
return session.agent;
|
|
79
|
+
}
|
|
80
|
+
finally {
|
|
81
|
+
// Always remove from pending, even on error
|
|
82
|
+
this.pendingSessions.delete(key);
|
|
83
|
+
}
|
|
66
84
|
}
|
|
67
85
|
/**
|
|
68
86
|
* Create a new session with all components
|
|
@@ -77,10 +95,19 @@ export class SessionManager extends EventEmitter {
|
|
|
77
95
|
status: 'initializing',
|
|
78
96
|
};
|
|
79
97
|
try {
|
|
80
|
-
//
|
|
81
|
-
|
|
98
|
+
// Obtain a session-scoped storage provider. This is a new, isolated
|
|
99
|
+
// instance whose context (tenantId / sessionId) is fixed for the lifetime
|
|
100
|
+
// of this session. It shares the underlying GCS bucket connection and
|
|
101
|
+
// per-tenant config cache with the singleton parent, but has its own
|
|
102
|
+
// mutable state (logBuffer, context), so concurrent sessions from
|
|
103
|
+
// different tenants never clobber each other's GCS paths.
|
|
104
|
+
const storageProvider = this.config.storageProvider.createSessionScoped({ tenantId, sessionId });
|
|
105
|
+
// Per-session orchestration logger. Instantiated here (not via the
|
|
106
|
+
// module-level singleton) so every session writes to its own buffer and
|
|
107
|
+
// GCS path — concurrent tenants no longer cross-contaminate log output.
|
|
108
|
+
const orchLogger = new OrchestrationLogger(storageProvider, sessionId);
|
|
82
109
|
// Load or create config
|
|
83
|
-
let modelConfig = await
|
|
110
|
+
let modelConfig = await storageProvider.getConfig('models');
|
|
84
111
|
// Always use environment variables if set, otherwise use stored config or defaults
|
|
85
112
|
const envEndpoint = process.env.JIVA_MODEL_BASE_URL;
|
|
86
113
|
const envApiKey = process.env.JIVA_MODEL_API_KEY;
|
|
@@ -96,7 +123,7 @@ export class SessionManager extends EventEmitter {
|
|
|
96
123
|
},
|
|
97
124
|
multimodal: null, // Optional
|
|
98
125
|
};
|
|
99
|
-
await
|
|
126
|
+
await storageProvider.setConfig('models', modelConfig);
|
|
100
127
|
}
|
|
101
128
|
else {
|
|
102
129
|
// Override stored config with environment variables if present
|
|
@@ -159,7 +186,7 @@ export class SessionManager extends EventEmitter {
|
|
|
159
186
|
logger.info(`[SessionManager] Filesystem MCP paths: ${allowedPaths.join(', ')}`);
|
|
160
187
|
}
|
|
161
188
|
// Load MCP server config from storage
|
|
162
|
-
const mcpConfig = await
|
|
189
|
+
const mcpConfig = await storageProvider.getConfig('mcpServers');
|
|
163
190
|
if (mcpConfig && Array.isArray(mcpConfig)) {
|
|
164
191
|
for (const serverConfig of mcpConfig) {
|
|
165
192
|
// Add to base servers (will override filesystem if configured)
|
|
@@ -174,13 +201,13 @@ export class SessionManager extends EventEmitter {
|
|
|
174
201
|
// Initialize all MCP servers (base + configured)
|
|
175
202
|
await mcpManager.initialize(baseMcpServers);
|
|
176
203
|
// Initialize workspace
|
|
177
|
-
const workspace = new WorkspaceManager(
|
|
204
|
+
const workspace = new WorkspaceManager(storageProvider);
|
|
178
205
|
await workspace.initialize();
|
|
179
206
|
// Initialize conversation manager
|
|
180
|
-
const conversationManager = new ConversationManager(
|
|
207
|
+
const conversationManager = new ConversationManager(storageProvider);
|
|
181
208
|
// Initialize persona manager with per-tenant storage provider
|
|
182
209
|
// This ensures persona config is isolated per tenant, not shared globally
|
|
183
|
-
const personaManager = new PersonaManager([], false,
|
|
210
|
+
const personaManager = new PersonaManager([], false, storageProvider);
|
|
184
211
|
await personaManager.initialize();
|
|
185
212
|
// Merge persona MCP servers with session MCP servers
|
|
186
213
|
const personaMCPServers = personaManager.getPersonaMCPServers();
|
|
@@ -197,7 +224,7 @@ export class SessionManager extends EventEmitter {
|
|
|
197
224
|
}
|
|
198
225
|
}
|
|
199
226
|
// Load or create conversation
|
|
200
|
-
const existingConversation = await
|
|
227
|
+
const existingConversation = await storageProvider.loadConversation(sessionId);
|
|
201
228
|
let conversationHistory = [];
|
|
202
229
|
if (existingConversation) {
|
|
203
230
|
conversationHistory = existingConversation.messages;
|
|
@@ -228,6 +255,7 @@ export class SessionManager extends EventEmitter {
|
|
|
228
255
|
maxSubtasks: 20,
|
|
229
256
|
maxIterations: 10,
|
|
230
257
|
autoSave: true,
|
|
258
|
+
orchestrationLogger: orchLogger,
|
|
231
259
|
});
|
|
232
260
|
}
|
|
233
261
|
info.status = 'active';
|
|
@@ -237,6 +265,8 @@ export class SessionManager extends EventEmitter {
|
|
|
237
265
|
workspace,
|
|
238
266
|
conversationManager,
|
|
239
267
|
personaManager,
|
|
268
|
+
storageProvider,
|
|
269
|
+
orchestrationLogger: orchLogger,
|
|
240
270
|
info,
|
|
241
271
|
};
|
|
242
272
|
}
|
|
@@ -262,11 +292,15 @@ export class SessionManager extends EventEmitter {
|
|
|
262
292
|
clearTimeout(session.idleTimer);
|
|
263
293
|
}
|
|
264
294
|
try {
|
|
295
|
+
// Use the session's own scoped provider and logger so we write to the
|
|
296
|
+
// right tenant path regardless of which tenant's context is currently
|
|
297
|
+
// set on the shared singleton.
|
|
298
|
+
const { storageProvider, orchestrationLogger: orchLogger } = session;
|
|
265
299
|
// Persist conversation state
|
|
266
300
|
const conversationHistory = session.agent.getConversationHistory();
|
|
267
301
|
if (conversationHistory.length > 0) {
|
|
268
302
|
const tokenUsage = session.agent.getTokenUsage();
|
|
269
|
-
await
|
|
303
|
+
await storageProvider.saveConversation({
|
|
270
304
|
metadata: {
|
|
271
305
|
id: sessionId,
|
|
272
306
|
created: session.info.createdAt.toISOString(),
|
|
@@ -280,10 +314,10 @@ export class SessionManager extends EventEmitter {
|
|
|
280
314
|
});
|
|
281
315
|
logger.debug(`[SessionManager] Persisted ${conversationHistory.length} messages`);
|
|
282
316
|
}
|
|
283
|
-
// Flush orchestration logs
|
|
284
|
-
await
|
|
317
|
+
// Flush orchestration logs for this session
|
|
318
|
+
await orchLogger.flush();
|
|
285
319
|
// Flush structured logs
|
|
286
|
-
await
|
|
320
|
+
await storageProvider.flushLogs();
|
|
287
321
|
// Clean up session-specific logger context
|
|
288
322
|
logger.clearSessionContext(sessionId);
|
|
289
323
|
// Cleanup agent (shuts down LSP servers in code mode)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-manager.js","sourceRoot":"","sources":["../../../src/interfaces/http/session-manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session-manager.js","sourceRoot":"","sources":["../../../src/interfaces/http/session-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAuErF;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CACzC,mBAAmB,CAAC,EAAE,kBAAkB,EACxC,YAAY,CAAC,EAAE,mBAAmB,GACjC,OAAO,CAAC,eAAe,CAAC,CAwC1B;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,oBAAoB,CAAC,CAK/B;AAED;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,CAAC,CAQ5B;AAED;;;;;;;GAOG;AACH,wBAAsB,gCAAgC,CACpD,OAAO,EAAE,cAAc,EACvB,WAAW,CAAC,EAAE,kBAAkB,EAChC,YAAY,CAAC,EAAE,mBAAmB,GACjC,OAAO,CAAC,eAAe,CAAC,CAI1B"}
|
package/dist/storage/factory.js
CHANGED
|
@@ -51,6 +51,11 @@ function determineProviderType(infraConfig) {
|
|
|
51
51
|
// Explicit environment variable takes precedence
|
|
52
52
|
const envProvider = process.env[ENV_VARS.PROVIDER];
|
|
53
53
|
if (envProvider) {
|
|
54
|
+
// Normalise common aliases so ops can use short names in Cloud Run env vars
|
|
55
|
+
if (envProvider === 'gcp')
|
|
56
|
+
return StorageProviderType.GCP_BUCKET;
|
|
57
|
+
if (envProvider === 's3' || envProvider === 'aws')
|
|
58
|
+
return StorageProviderType.AWS_S3;
|
|
54
59
|
return envProvider;
|
|
55
60
|
}
|
|
56
61
|
// Infer from available configuration
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,16 @@ export declare class GCPBucketProvider extends StorageProvider {
|
|
|
33
33
|
private deleteFile;
|
|
34
34
|
private listFiles;
|
|
35
35
|
private hashWorkspacePath;
|
|
36
|
+
/**
|
|
37
|
+
* Returns a new GCPBucketProvider instance that shares the underlying GCS
|
|
38
|
+
* bucket connection and the per-tenant config cache with this parent, but has
|
|
39
|
+
* its own immutable context (tenantId / sessionId).
|
|
40
|
+
*
|
|
41
|
+
* This means concurrent sessions from different tenants each read/write their
|
|
42
|
+
* own GCS paths without ever touching this.context on the shared singleton.
|
|
43
|
+
*/
|
|
44
|
+
createSessionScoped(context: import('./types.js').StorageContext): GCPBucketProvider;
|
|
45
|
+
setContext(context: import('./types.js').StorageContext): void;
|
|
36
46
|
private loadConfigCache;
|
|
37
47
|
getConfig<T>(key: string): Promise<T | undefined>;
|
|
38
48
|
setConfig<T>(key: string, value: T): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gcp-bucket-provider.d.ts","sourceRoot":"","sources":["../../src/storage/gcp-bucket-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"gcp-bucket-provider.d.ts","sourceRoot":"","sources":["../../src/storage/gcp-bucket-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,oBAAoB,EACpB,SAAS,EACV,MAAM,YAAY,CAAC;AAIpB,qBAAa,iBAAkB,SAAQ,eAAe;IACpD,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAA+C;gBAEtD,WAAW,EAAE,kBAAkB;IAWrC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YA8BnB,QAAQ;YAoBR,SAAS;YAST,SAAS;YAST,QAAQ;YAoBR,UAAU;YAUV,SAAS;IAOvB,OAAO,CAAC,iBAAiB;IAQzB;;;;;;;OAOG;IACM,mBAAmB,CAAC,OAAO,EAAE,OAAO,YAAY,EAAE,cAAc,GAAG,iBAAiB;IAiBpF,UAAU,CAAC,OAAO,EAAE,OAAO,YAAY,EAAE,cAAc,GAAG,IAAI;YAgBzD,eAAe;IAmBvB,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKjD,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlD,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAQlD,OAAO,CAAC,yBAAyB;IAI3B,gBAAgB,CAAC,YAAY,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAMlE,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAK/D,iBAAiB,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAmBpD,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7C,aAAa,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAOjE,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUpE,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBxD,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB1B,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAgBjC,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBlD;;OAEG;IACG,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD;;OAEG;IACG,iBAAiB,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;CAIrD"}
|