@roackb2/heddle 1.1.0 → 1.2.0
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/src/cli/ask.d.ts.map +1 -1
- package/dist/src/cli/ask.js +11 -1
- package/dist/src/cli/ask.js.map +1 -1
- package/dist/src/cli/chat/App.d.ts.map +1 -1
- package/dist/src/cli/chat/App.js +11 -143
- package/dist/src/cli/chat/App.js.map +1 -1
- package/dist/src/cli/chat/adapters/slash-command-context.js +1 -1
- package/dist/src/cli/chat/adapters/slash-command-context.js.map +1 -1
- package/dist/src/cli/chat/hooks/{tui-agent-turn-lifecycle.d.ts → controllers/run/tui-agent-turn-lifecycle.d.ts} +1 -1
- package/dist/src/cli/chat/hooks/controllers/run/tui-agent-turn-lifecycle.d.ts.map +1 -0
- package/dist/src/cli/chat/hooks/controllers/run/tui-agent-turn-lifecycle.js.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-agent-turn-result.d.ts → controllers/run/tui-agent-turn-result.d.ts} +4 -4
- package/dist/src/cli/chat/hooks/controllers/run/tui-agent-turn-result.d.ts.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-agent-turn-result.js → controllers/run/tui-agent-turn-result.js} +6 -6
- package/dist/src/cli/chat/hooks/controllers/run/tui-agent-turn-result.js.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-compaction-status.d.ts → controllers/run/tui-compaction-status.d.ts} +4 -4
- package/dist/src/cli/chat/hooks/controllers/run/tui-compaction-status.d.ts.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-compaction-status.js → controllers/run/tui-compaction-status.js} +1 -1
- package/dist/src/cli/chat/hooks/controllers/run/tui-compaction-status.js.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-direct-shell-result.d.ts → controllers/run/tui-direct-shell-result.d.ts} +3 -3
- package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell-result.d.ts.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-direct-shell-result.js → controllers/run/tui-direct-shell-result.js} +3 -3
- package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell-result.js.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-direct-shell.d.ts → controllers/run/tui-direct-shell.d.ts} +5 -5
- package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell.d.ts.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-direct-shell.js → controllers/run/tui-direct-shell.js} +9 -8
- package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell.js.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-drift-observer.d.ts → controllers/run/tui-drift-observer.d.ts} +3 -3
- package/dist/src/cli/chat/hooks/controllers/run/tui-drift-observer.d.ts.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-drift-observer.js → controllers/run/tui-drift-observer.js} +2 -2
- package/dist/src/cli/chat/hooks/controllers/run/tui-drift-observer.js.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-ordinary-turn.d.ts → controllers/run/tui-ordinary-turn.d.ts} +5 -5
- package/dist/src/cli/chat/hooks/controllers/run/tui-ordinary-turn.d.ts.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-ordinary-turn.js → controllers/run/tui-ordinary-turn.js} +2 -2
- package/dist/src/cli/chat/hooks/controllers/run/tui-ordinary-turn.js.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-run-loop-events.d.ts → controllers/run/tui-run-loop-events.d.ts} +4 -4
- package/dist/src/cli/chat/hooks/controllers/run/tui-run-loop-events.d.ts.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-run-loop-events.js → controllers/run/tui-run-loop-events.js} +4 -4
- package/dist/src/cli/chat/hooks/controllers/run/tui-run-loop-events.js.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-tool-approval.d.ts → controllers/run/tui-tool-approval.d.ts} +3 -3
- package/dist/src/cli/chat/hooks/controllers/run/tui-tool-approval.d.ts.map +1 -0
- package/dist/src/cli/chat/hooks/{tui-tool-approval.js → controllers/run/tui-tool-approval.js} +4 -4
- package/dist/src/cli/chat/hooks/controllers/run/tui-tool-approval.js.map +1 -0
- package/dist/src/cli/chat/hooks/{useAgentRun.d.ts → controllers/useAgentRunController.d.ts} +9 -9
- package/dist/src/cli/chat/hooks/controllers/useAgentRunController.d.ts.map +1 -0
- package/dist/src/cli/chat/hooks/{useAgentRun.js → controllers/useAgentRunController.js} +14 -14
- package/dist/src/cli/chat/hooks/controllers/useAgentRunController.js.map +1 -0
- package/dist/src/cli/chat/hooks/controllers/useChatAppController.d.ts +24 -0
- package/dist/src/cli/chat/hooks/controllers/useChatAppController.d.ts.map +1 -0
- package/dist/src/cli/chat/hooks/controllers/useChatAppController.js +174 -0
- package/dist/src/cli/chat/hooks/controllers/useChatAppController.js.map +1 -0
- package/dist/src/cli/chat/hooks/{usePromptSubmission.d.ts → controllers/usePromptSubmissionController.d.ts} +7 -7
- package/dist/src/cli/chat/hooks/controllers/usePromptSubmissionController.d.ts.map +1 -0
- package/dist/src/cli/chat/hooks/{usePromptSubmission.js → controllers/usePromptSubmissionController.js} +4 -4
- package/dist/src/cli/chat/hooks/controllers/usePromptSubmissionController.js.map +1 -0
- package/dist/src/cli/chat/hooks/useApprovalFlow.d.ts +1 -1
- package/dist/src/cli/chat/hooks/useApprovalFlow.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/useChatSessions.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/useChatSessions.js +49 -77
- package/dist/src/cli/chat/hooks/useChatSessions.js.map +1 -1
- package/dist/src/cli/chat/submit.js +1 -1
- package/dist/src/cli/chat/submit.js.map +1 -1
- package/dist/src/cli/session.js +1 -1
- package/dist/src/cli/session.js.map +1 -1
- package/dist/src/core/awareness/domains/coding/collectors/project-signals.d.ts +12 -0
- package/dist/src/core/awareness/domains/coding/collectors/project-signals.d.ts.map +1 -0
- package/dist/src/core/awareness/domains/coding/collectors/project-signals.js +187 -0
- package/dist/src/core/awareness/domains/coding/collectors/project-signals.js.map +1 -0
- package/dist/src/core/awareness/domains/coding/collectors/workspace.d.ts +3 -1
- package/dist/src/core/awareness/domains/coding/collectors/workspace.d.ts.map +1 -1
- package/dist/src/core/awareness/domains/coding/collectors/workspace.js +20 -11
- package/dist/src/core/awareness/domains/coding/collectors/workspace.js.map +1 -1
- package/dist/src/core/awareness/domains/coding/detectors/go.d.ts +3 -0
- package/dist/src/core/awareness/domains/coding/detectors/go.d.ts.map +1 -0
- package/dist/src/core/awareness/domains/coding/detectors/go.js +48 -0
- package/dist/src/core/awareness/domains/coding/detectors/go.js.map +1 -0
- package/dist/src/core/awareness/domains/coding/detectors/javascript.d.ts +3 -0
- package/dist/src/core/awareness/domains/coding/detectors/javascript.d.ts.map +1 -0
- package/dist/src/core/awareness/domains/coding/detectors/javascript.js +90 -0
- package/dist/src/core/awareness/domains/coding/detectors/javascript.js.map +1 -0
- package/dist/src/core/awareness/domains/coding/detectors/python.d.ts +3 -0
- package/dist/src/core/awareness/domains/coding/detectors/python.d.ts.map +1 -0
- package/dist/src/core/awareness/domains/coding/detectors/python.js +79 -0
- package/dist/src/core/awareness/domains/coding/detectors/python.js.map +1 -0
- package/dist/src/core/awareness/domains/coding/detectors/types.d.ts +18 -0
- package/dist/src/core/awareness/domains/coding/detectors/types.d.ts.map +1 -0
- package/dist/src/core/awareness/domains/coding/detectors/types.js +2 -0
- package/dist/src/core/awareness/domains/coding/detectors/types.js.map +1 -0
- package/dist/src/core/awareness/domains/coding/format.d.ts.map +1 -1
- package/dist/src/core/awareness/domains/coding/format.js +6 -0
- package/dist/src/core/awareness/domains/coding/format.js.map +1 -1
- package/dist/src/core/awareness/domains/coding/provider.d.ts.map +1 -1
- package/dist/src/core/awareness/domains/coding/provider.js +18 -1
- package/dist/src/core/awareness/domains/coding/provider.js.map +1 -1
- package/dist/src/core/awareness/domains/coding/types.d.ts +68 -1
- package/dist/src/core/awareness/domains/coding/types.d.ts.map +1 -1
- package/dist/src/core/awareness/types.d.ts +1 -1
- package/dist/src/core/awareness/types.d.ts.map +1 -1
- package/dist/src/core/chat/engine/sessions/{storage.d.ts → repository/file-chat-session-repository.d.ts} +16 -18
- package/dist/src/core/chat/engine/sessions/repository/file-chat-session-repository.d.ts.map +1 -0
- package/dist/src/core/chat/engine/sessions/{storage.js → repository/file-chat-session-repository.js} +62 -51
- package/dist/src/core/chat/engine/sessions/repository/file-chat-session-repository.js.map +1 -0
- package/dist/src/core/chat/engine/sessions/service.d.ts +6 -1
- package/dist/src/core/chat/engine/sessions/service.d.ts.map +1 -1
- package/dist/src/core/chat/engine/sessions/service.js +95 -13
- package/dist/src/core/chat/engine/sessions/service.js.map +1 -1
- package/dist/src/core/chat/engine/sessions/session-record.d.ts +15 -0
- package/dist/src/core/chat/engine/sessions/session-record.d.ts.map +1 -0
- package/dist/src/core/chat/engine/sessions/session-record.js +59 -0
- package/dist/src/core/chat/engine/sessions/session-record.js.map +1 -0
- package/dist/src/core/chat/engine/turns/context.js +1 -1
- package/dist/src/core/chat/engine/turns/context.js.map +1 -1
- package/dist/src/core/chat/engine/turns/memory-maintenance.d.ts.map +1 -1
- package/dist/src/core/chat/engine/turns/memory-maintenance.js +2 -1
- package/dist/src/core/chat/engine/turns/memory-maintenance.js.map +1 -1
- package/dist/src/core/chat/engine/turns/persistence.d.ts.map +1 -1
- package/dist/src/core/chat/engine/turns/persistence.js +2 -1
- package/dist/src/core/chat/engine/turns/persistence.js.map +1 -1
- package/dist/src/core/chat/engine/turns/preflight.d.ts.map +1 -1
- package/dist/src/core/chat/engine/turns/preflight.js +2 -1
- package/dist/src/core/chat/engine/turns/preflight.js.map +1 -1
- package/dist/src/core/chat/engine/turns/result.js +1 -1
- package/dist/src/core/chat/engine/turns/result.js.map +1 -1
- package/dist/src/core/chat/engine/turns/run-conversation-turn.d.ts.map +1 -1
- package/dist/src/core/chat/engine/turns/run-conversation-turn.js +2 -1
- package/dist/src/core/chat/engine/turns/run-conversation-turn.js.map +1 -1
- package/dist/src/core/chat/engine/turns/service.js +1 -1
- package/dist/src/core/chat/engine/turns/service.js.map +1 -1
- package/dist/src/core/chat/engine/types.d.ts +1 -0
- package/dist/src/core/chat/engine/types.d.ts.map +1 -1
- package/dist/src/core/tools/toolkits/coding-awareness/project-dashboard.d.ts.map +1 -1
- package/dist/src/core/tools/toolkits/coding-awareness/project-dashboard.js +9 -4
- package/dist/src/core/tools/toolkits/coding-awareness/project-dashboard.js.map +1 -1
- package/dist/src/server/features/control-plane/services/chat-sessions.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/services/chat-sessions.js +11 -1
- package/dist/src/server/features/control-plane/services/chat-sessions.js.map +1 -1
- package/package.json +1 -1
- package/dist/src/cli/chat/hooks/tui-agent-turn-lifecycle.d.ts.map +0 -1
- package/dist/src/cli/chat/hooks/tui-agent-turn-lifecycle.js.map +0 -1
- package/dist/src/cli/chat/hooks/tui-agent-turn-result.d.ts.map +0 -1
- package/dist/src/cli/chat/hooks/tui-agent-turn-result.js.map +0 -1
- package/dist/src/cli/chat/hooks/tui-compaction-status.d.ts.map +0 -1
- package/dist/src/cli/chat/hooks/tui-compaction-status.js.map +0 -1
- package/dist/src/cli/chat/hooks/tui-direct-shell-result.d.ts.map +0 -1
- package/dist/src/cli/chat/hooks/tui-direct-shell-result.js.map +0 -1
- package/dist/src/cli/chat/hooks/tui-direct-shell.d.ts.map +0 -1
- package/dist/src/cli/chat/hooks/tui-direct-shell.js.map +0 -1
- package/dist/src/cli/chat/hooks/tui-drift-observer.d.ts.map +0 -1
- package/dist/src/cli/chat/hooks/tui-drift-observer.js.map +0 -1
- package/dist/src/cli/chat/hooks/tui-ordinary-turn.d.ts.map +0 -1
- package/dist/src/cli/chat/hooks/tui-ordinary-turn.js.map +0 -1
- package/dist/src/cli/chat/hooks/tui-run-loop-events.d.ts.map +0 -1
- package/dist/src/cli/chat/hooks/tui-run-loop-events.js.map +0 -1
- package/dist/src/cli/chat/hooks/tui-tool-approval.d.ts.map +0 -1
- package/dist/src/cli/chat/hooks/tui-tool-approval.js.map +0 -1
- package/dist/src/cli/chat/hooks/useAgentRun.d.ts.map +0 -1
- package/dist/src/cli/chat/hooks/useAgentRun.js.map +0 -1
- package/dist/src/cli/chat/hooks/usePromptSubmission.d.ts.map +0 -1
- package/dist/src/cli/chat/hooks/usePromptSubmission.js.map +0 -1
- package/dist/src/cli/chat/state/storage.d.ts +0 -2
- package/dist/src/cli/chat/state/storage.d.ts.map +0 -1
- package/dist/src/cli/chat/state/storage.js +0 -2
- package/dist/src/cli/chat/state/storage.js.map +0 -1
- package/dist/src/core/chat/engine/sessions/storage.d.ts.map +0 -1
- package/dist/src/core/chat/engine/sessions/storage.js.map +0 -1
- /package/dist/src/cli/chat/hooks/{tui-agent-turn-lifecycle.js → controllers/run/tui-agent-turn-lifecycle.js} +0 -0
package/dist/src/core/chat/engine/sessions/{storage.js → repository/file-chat-session-repository.js}
RENAMED
|
@@ -1,53 +1,40 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* File-backed chat session repository.
|
|
3
|
+
*
|
|
4
|
+
* Owns file paths, migration, serialization, deserialization, and orphan-file
|
|
5
|
+
* cleanup for chat sessions. Session services should depend on this module
|
|
6
|
+
* rather than embedding file I/O logic themselves.
|
|
7
|
+
*
|
|
8
|
+
* Current compromise:
|
|
9
|
+
* some older host or test paths may still import repository functions directly.
|
|
10
|
+
* The intended direction is host -> service -> repository -> files.
|
|
11
|
+
*/
|
|
1
12
|
import { existsSync, mkdirSync, readdirSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
|
|
2
|
-
import { dirname, join } from 'node:path';
|
|
3
|
-
import {
|
|
4
|
-
export function
|
|
5
|
-
|
|
6
|
-
{
|
|
7
|
-
id: 'intro',
|
|
8
|
-
role: 'assistant',
|
|
9
|
-
text: 'Heddle conversational mode.\n\nAsk a question about this workspace.\nEach turn runs the current agent loop and carries the transcript into the next turn.\nUse !<command> to run a shell command directly in chat.',
|
|
10
|
-
},
|
|
11
|
-
...(!apiKeyPresent ?
|
|
12
|
-
[{
|
|
13
|
-
id: 'missing-key',
|
|
14
|
-
role: 'assistant',
|
|
15
|
-
text: 'No provider credential detected. For OpenAI, run `heddle auth login openai` or set OPENAI_API_KEY. For Anthropic, set ANTHROPIC_API_KEY. Dev fallback conventions also work: PERSONAL_OPENAI_API_KEY and PERSONAL_ANTHROPIC_API_KEY.',
|
|
16
|
-
}]
|
|
17
|
-
: []),
|
|
18
|
-
];
|
|
19
|
-
}
|
|
20
|
-
export function createChatSession(options) {
|
|
21
|
-
const now = new Date().toISOString();
|
|
13
|
+
import { basename, dirname, join } from 'node:path';
|
|
14
|
+
import { createChatSession, createInitialMessages } from '../session-record.js';
|
|
15
|
+
export function createFileChatSessionRepository(args) {
|
|
16
|
+
const { sessionStoragePath } = args;
|
|
22
17
|
return {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
18
|
+
list(apiKeyPresent) {
|
|
19
|
+
return loadChatSessions(sessionStoragePath, apiKeyPresent);
|
|
20
|
+
},
|
|
21
|
+
readCatalog() {
|
|
22
|
+
return readChatSessionCatalog(sessionStoragePath);
|
|
23
|
+
},
|
|
24
|
+
read(sessionId, apiKeyPresent) {
|
|
25
|
+
return readChatSession(sessionStoragePath, sessionId, apiKeyPresent);
|
|
26
|
+
},
|
|
27
|
+
migrateLegacy(apiKeyPresent) {
|
|
28
|
+
return migrateLegacyChatSessions(sessionStoragePath, apiKeyPresent);
|
|
29
|
+
},
|
|
30
|
+
save(sessions) {
|
|
31
|
+
saveChatSessions(sessionStoragePath, sessions);
|
|
32
|
+
},
|
|
33
|
+
deriveStoragePaths() {
|
|
34
|
+
return deriveSessionStoragePaths(sessionStoragePath);
|
|
35
|
+
},
|
|
38
36
|
};
|
|
39
37
|
}
|
|
40
|
-
export function touchSession(session) {
|
|
41
|
-
return { ...session, updatedAt: new Date().toISOString() };
|
|
42
|
-
}
|
|
43
|
-
export function summarizeSession(session) {
|
|
44
|
-
const latestTurn = session.turns[session.turns.length - 1];
|
|
45
|
-
const latestPrompt = latestTurn ? truncate(latestTurn.prompt, 44) : 'no turns yet';
|
|
46
|
-
return `${session.turns.length} turns • ${latestPrompt}`;
|
|
47
|
-
}
|
|
48
|
-
export function isGenericSessionName(name) {
|
|
49
|
-
return /^Session \d+$/.test(name.trim());
|
|
50
|
-
}
|
|
51
38
|
export function loadChatSessions(sessionsPath, apiKeyPresent) {
|
|
52
39
|
const resolved = loadChatSessionsFromCurrentStorage(sessionsPath, apiKeyPresent);
|
|
53
40
|
if (resolved.length > 0) {
|
|
@@ -112,11 +99,35 @@ export function saveChatSessions(sessionsPath, sessions) {
|
|
|
112
99
|
}
|
|
113
100
|
export function deriveSessionStoragePaths(storagePath) {
|
|
114
101
|
const stateDir = dirname(storagePath);
|
|
115
|
-
const
|
|
102
|
+
const fileName = basename(storagePath);
|
|
103
|
+
const catalogSuffix = '.catalog.json';
|
|
104
|
+
const legacySuffix = '.json';
|
|
105
|
+
if (fileName.endsWith(catalogSuffix)) {
|
|
106
|
+
const catalogStem = fileName.slice(0, -catalogSuffix.length);
|
|
107
|
+
return {
|
|
108
|
+
// Current layout: preserve the configured catalog path exactly.
|
|
109
|
+
catalogPath: storagePath,
|
|
110
|
+
// Legacy fallback: older callers may still look for a flat JSON file.
|
|
111
|
+
legacyPath: join(stateDir, `${catalogStem}${legacySuffix}`),
|
|
112
|
+
sessionsDir: join(stateDir, catalogStem),
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
if (fileName.endsWith(legacySuffix)) {
|
|
116
|
+
const catalogStem = fileName.slice(0, -legacySuffix.length);
|
|
117
|
+
return {
|
|
118
|
+
// Current layout: upgrade legacy flat JSON paths to sibling catalog files.
|
|
119
|
+
catalogPath: join(stateDir, `${catalogStem}${catalogSuffix}`),
|
|
120
|
+
// Legacy fallback: keep reading and migrating from the original flat JSON path.
|
|
121
|
+
legacyPath: storagePath,
|
|
122
|
+
sessionsDir: join(stateDir, catalogStem),
|
|
123
|
+
};
|
|
124
|
+
}
|
|
116
125
|
return {
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
126
|
+
// Non-JSON inputs are already explicit. Preserve them without inventing
|
|
127
|
+
// extra fallback paths.
|
|
128
|
+
catalogPath: storagePath,
|
|
129
|
+
legacyPath: storagePath,
|
|
130
|
+
sessionsDir: join(stateDir, fileName),
|
|
120
131
|
};
|
|
121
132
|
}
|
|
122
133
|
function loadChatSessionsFromCurrentStorage(sessionsPath, apiKeyPresent) {
|
|
@@ -454,4 +465,4 @@ function parseArchiveRecord(value) {
|
|
|
454
465
|
function readObjectRecord(value) {
|
|
455
466
|
return value && typeof value === 'object' && !Array.isArray(value) ? value : undefined;
|
|
456
467
|
}
|
|
457
|
-
//# sourceMappingURL=
|
|
468
|
+
//# sourceMappingURL=file-chat-session-repository.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"file-chat-session-repository.js","sourceRoot":"","sources":["../../../../../../../src/core/chat/engine/sessions/repository/file-chat-session-repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
|
+
import type { ChatSession } from '../../types.js';
|
|
2
|
+
import type { ConversationEngineConfig } from '../types.js';
|
|
1
3
|
import type { NormalizedConversationEngineConfig } from '../config.js';
|
|
2
4
|
import type { ConversationSessionService } from '../types.js';
|
|
3
5
|
export declare function createConversationSessionService(args: {
|
|
4
|
-
config: NormalizedConversationEngineConfig;
|
|
6
|
+
config: NormalizedConversationEngineConfig | ConversationSessionServiceConfig;
|
|
5
7
|
}): ConversationSessionService;
|
|
8
|
+
type ConversationSessionServiceConfig = Pick<ConversationEngineConfig, 'workspaceRoot' | 'stateRoot' | 'model' | 'reasoningEffort' | 'sessionStoragePath' | 'workspaceId' | 'apiKeyPresent'>;
|
|
9
|
+
export declare function summarizeConversationSession(session: ChatSession): string;
|
|
10
|
+
export {};
|
|
6
11
|
//# sourceMappingURL=service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/sessions/service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/sessions/service.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAE9D,wBAAgB,gCAAgC,CAAC,IAAI,EAAE;IACrD,MAAM,EAAE,kCAAkC,GAAG,gCAAgC,CAAC;CAC/E,GAAG,0BAA0B,CA4E7B;AAED,KAAK,gCAAgC,GAAG,IAAI,CAC1C,wBAAwB,EACxB,eAAe,GAAG,WAAW,GAAG,OAAO,GAAG,iBAAiB,GAAG,oBAAoB,GAAG,aAAa,GAAG,eAAe,CACrH,CAAC;AAoDF,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAEzE"}
|
|
@@ -1,41 +1,76 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Conversation session service.
|
|
3
|
+
*
|
|
4
|
+
* Boundary rule:
|
|
5
|
+
* - hosts should call this service (or a later richer session service), not
|
|
6
|
+
* file-backed storage helpers directly;
|
|
7
|
+
* - storage/repository code stays behind the service boundary;
|
|
8
|
+
* - session semantics should grow here rather than leaking back into TUI/web
|
|
9
|
+
* host code.
|
|
10
|
+
*
|
|
11
|
+
* Current compromise:
|
|
12
|
+
* this service currently uses the file-backed repository directly. That is the
|
|
13
|
+
* intended direction for session persistence ownership, but some older host
|
|
14
|
+
* flows still bypass the service and call the repository themselves. Those
|
|
15
|
+
* flows should move inward to this service over time.
|
|
16
|
+
*/
|
|
17
|
+
import { join, resolve } from 'node:path';
|
|
18
|
+
import { createFileChatSessionRepository, } from './repository/file-chat-session-repository.js';
|
|
19
|
+
import { createChatSession, isGenericSessionName, summarizeSession, touchSession, } from './session-record.js';
|
|
2
20
|
export function createConversationSessionService(args) {
|
|
3
|
-
const
|
|
21
|
+
const config = normalizeConversationSessionServiceConfig(args.config);
|
|
22
|
+
const repository = createFileChatSessionRepository({
|
|
23
|
+
sessionStoragePath: config.sessionStoragePath,
|
|
24
|
+
});
|
|
4
25
|
function loadSessions(apiKeyPresent = config.apiKeyPresent) {
|
|
5
|
-
|
|
26
|
+
const sessions = repository.list(apiKeyPresent);
|
|
27
|
+
if (repository.readCatalog().length === 0) {
|
|
28
|
+
repository.save(sessions);
|
|
29
|
+
}
|
|
30
|
+
return sessions;
|
|
6
31
|
}
|
|
7
32
|
return {
|
|
8
33
|
list() {
|
|
9
34
|
return loadSessions();
|
|
10
35
|
},
|
|
11
36
|
read(id) {
|
|
12
|
-
return
|
|
37
|
+
return repository.read(id, config.apiKeyPresent);
|
|
13
38
|
},
|
|
14
39
|
create(input) {
|
|
15
40
|
const existing = loadSessions(input?.apiKeyPresent ?? config.apiKeyPresent);
|
|
16
|
-
const nextNumber = existing.length + 1;
|
|
17
41
|
const session = createChatSession({
|
|
18
42
|
id: input?.id?.trim() || `session-${Date.now()}`,
|
|
19
|
-
name: input?.name?.trim() || `Session ${
|
|
43
|
+
name: input?.name?.trim() || `Session ${getNextSessionNumber(existing)}`,
|
|
20
44
|
apiKeyPresent: input?.apiKeyPresent ?? config.apiKeyPresent,
|
|
21
45
|
model: input?.model ?? config.model,
|
|
22
46
|
reasoningEffort: input?.reasoningEffort ?? config.reasoningEffort,
|
|
23
47
|
workspaceId: input?.workspaceId ?? config.workspaceId,
|
|
24
48
|
});
|
|
25
|
-
|
|
49
|
+
repository.save([session, ...existing]);
|
|
26
50
|
return session;
|
|
27
51
|
},
|
|
28
|
-
|
|
52
|
+
update(id, updater) {
|
|
29
53
|
const sessions = loadSessions();
|
|
30
54
|
const session = sessions.find((candidate) => candidate.id === id);
|
|
31
55
|
if (!session) {
|
|
32
|
-
|
|
56
|
+
return undefined;
|
|
33
57
|
}
|
|
34
|
-
const
|
|
58
|
+
const nextSession = updater(session);
|
|
59
|
+
if (nextSession === session) {
|
|
60
|
+
return session;
|
|
61
|
+
}
|
|
62
|
+
const touched = touchSession(nextSession);
|
|
63
|
+
repository.save(sessions.map((candidate) => (candidate.id === id ? touched : candidate)));
|
|
64
|
+
return touched;
|
|
65
|
+
},
|
|
66
|
+
rename(id, name) {
|
|
67
|
+
const renamed = this.update(id, (session) => ({
|
|
35
68
|
...session,
|
|
36
69
|
name,
|
|
37
|
-
});
|
|
38
|
-
|
|
70
|
+
}));
|
|
71
|
+
if (!renamed) {
|
|
72
|
+
throw new Error(`Chat session not found: ${id}`);
|
|
73
|
+
}
|
|
39
74
|
return renamed;
|
|
40
75
|
},
|
|
41
76
|
delete(id) {
|
|
@@ -43,9 +78,56 @@ export function createConversationSessionService(args) {
|
|
|
43
78
|
if (!sessions.some((candidate) => candidate.id === id)) {
|
|
44
79
|
return false;
|
|
45
80
|
}
|
|
46
|
-
|
|
81
|
+
const remaining = sessions.filter((candidate) => candidate.id !== id);
|
|
82
|
+
if (remaining.length > 0) {
|
|
83
|
+
repository.save(remaining);
|
|
84
|
+
return true;
|
|
85
|
+
}
|
|
86
|
+
repository.save([createFallbackSession(config)]);
|
|
47
87
|
return true;
|
|
48
88
|
},
|
|
49
89
|
};
|
|
50
90
|
}
|
|
91
|
+
function normalizeConversationSessionServiceConfig(config) {
|
|
92
|
+
if ('memoryDir' in config && 'traceDir' in config && 'memoryMaintenanceMode' in config) {
|
|
93
|
+
return config;
|
|
94
|
+
}
|
|
95
|
+
const workspaceRoot = resolve(config.workspaceRoot);
|
|
96
|
+
const stateRoot = resolve(config.stateRoot);
|
|
97
|
+
return {
|
|
98
|
+
workspaceRoot,
|
|
99
|
+
stateRoot,
|
|
100
|
+
model: config.model,
|
|
101
|
+
reasoningEffort: config.reasoningEffort,
|
|
102
|
+
sessionStoragePath: resolve(config.sessionStoragePath ?? join(stateRoot, 'chat-sessions.catalog.json')),
|
|
103
|
+
workspaceId: config.workspaceId,
|
|
104
|
+
apiKeyPresent: config.apiKeyPresent ?? false,
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
function createFallbackSession(config) {
|
|
108
|
+
return createChatSession({
|
|
109
|
+
id: 'session-1',
|
|
110
|
+
name: 'Session 1',
|
|
111
|
+
apiKeyPresent: config.apiKeyPresent,
|
|
112
|
+
model: config.model,
|
|
113
|
+
reasoningEffort: config.reasoningEffort,
|
|
114
|
+
workspaceId: config.workspaceId,
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
function getNextSessionNumber(sessions) {
|
|
118
|
+
const highestGenericNumber = sessions.reduce((highest, session) => {
|
|
119
|
+
if (!isGenericSessionName(session.name)) {
|
|
120
|
+
return highest;
|
|
121
|
+
}
|
|
122
|
+
const parsed = Number.parseInt(session.name.replace(/^Session\s+/, ''), 10);
|
|
123
|
+
if (!Number.isFinite(parsed)) {
|
|
124
|
+
return highest;
|
|
125
|
+
}
|
|
126
|
+
return Math.max(highest, parsed);
|
|
127
|
+
}, 0);
|
|
128
|
+
return highestGenericNumber + 1;
|
|
129
|
+
}
|
|
130
|
+
export function summarizeConversationSession(session) {
|
|
131
|
+
return summarizeSession(session);
|
|
132
|
+
}
|
|
51
133
|
//# sourceMappingURL=service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/sessions/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/sessions/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { ReasoningEffort } from '../../../llm/types.js';
|
|
2
|
+
import type { ChatSession, ConversationLine } from '../../types.js';
|
|
3
|
+
export declare function createInitialMessages(apiKeyPresent: boolean): ConversationLine[];
|
|
4
|
+
export declare function createChatSession(options: {
|
|
5
|
+
id: string;
|
|
6
|
+
name: string;
|
|
7
|
+
apiKeyPresent: boolean;
|
|
8
|
+
model?: string;
|
|
9
|
+
reasoningEffort?: ReasoningEffort;
|
|
10
|
+
workspaceId?: string;
|
|
11
|
+
}): ChatSession;
|
|
12
|
+
export declare function touchSession(session: ChatSession): ChatSession;
|
|
13
|
+
export declare function summarizeSession(session: ChatSession): string;
|
|
14
|
+
export declare function isGenericSessionName(name: string): boolean;
|
|
15
|
+
//# sourceMappingURL=session-record.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-record.d.ts","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/sessions/session-record.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEpE,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,OAAO,GAAG,gBAAgB,EAAE,CAiBhF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IACzC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,WAAW,CAmBd;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,CAE9D;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAI7D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Session record domain helpers.
|
|
3
|
+
*
|
|
4
|
+
* Owns in-memory session record behavior that should not know about file
|
|
5
|
+
* storage: default messages, record creation, touched timestamps, and
|
|
6
|
+
* lightweight naming/summary helpers.
|
|
7
|
+
*
|
|
8
|
+
* File I/O belongs in the session repository. Hosts should consume services,
|
|
9
|
+
* not call these helpers as a substitute for storage behavior.
|
|
10
|
+
*/
|
|
11
|
+
import { truncate } from '../../../utils/text.js';
|
|
12
|
+
export function createInitialMessages(apiKeyPresent) {
|
|
13
|
+
return [
|
|
14
|
+
{
|
|
15
|
+
id: 'intro',
|
|
16
|
+
role: 'assistant',
|
|
17
|
+
text: 'Heddle conversational mode.\n\nAsk a question about this workspace.\nEach turn runs the current agent loop and carries the transcript into the next turn.\nUse !<command> to run a shell command directly in chat.',
|
|
18
|
+
},
|
|
19
|
+
...(!apiKeyPresent ?
|
|
20
|
+
[{
|
|
21
|
+
id: 'missing-key',
|
|
22
|
+
role: 'assistant',
|
|
23
|
+
text: 'No provider credential detected. For OpenAI, run `heddle auth login openai` or set OPENAI_API_KEY. For Anthropic, set ANTHROPIC_API_KEY. Dev fallback conventions also work: PERSONAL_OPENAI_API_KEY and PERSONAL_ANTHROPIC_API_KEY.',
|
|
24
|
+
}]
|
|
25
|
+
: []),
|
|
26
|
+
];
|
|
27
|
+
}
|
|
28
|
+
export function createChatSession(options) {
|
|
29
|
+
const now = new Date().toISOString();
|
|
30
|
+
return {
|
|
31
|
+
id: options.id,
|
|
32
|
+
name: options.name,
|
|
33
|
+
workspaceId: options.workspaceId,
|
|
34
|
+
history: [],
|
|
35
|
+
messages: createInitialMessages(options.apiKeyPresent),
|
|
36
|
+
turns: [],
|
|
37
|
+
createdAt: now,
|
|
38
|
+
updatedAt: now,
|
|
39
|
+
model: options.model,
|
|
40
|
+
reasoningEffort: options.reasoningEffort,
|
|
41
|
+
driftEnabled: false,
|
|
42
|
+
lastContinuePrompt: undefined,
|
|
43
|
+
context: undefined,
|
|
44
|
+
archives: [],
|
|
45
|
+
lease: undefined,
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
export function touchSession(session) {
|
|
49
|
+
return { ...session, updatedAt: new Date().toISOString() };
|
|
50
|
+
}
|
|
51
|
+
export function summarizeSession(session) {
|
|
52
|
+
const latestTurn = session.turns[session.turns.length - 1];
|
|
53
|
+
const latestPrompt = latestTurn ? truncate(latestTurn.prompt, 44) : 'no turns yet';
|
|
54
|
+
return `${session.turns.length} turns • ${latestPrompt}`;
|
|
55
|
+
}
|
|
56
|
+
export function isGenericSessionName(name) {
|
|
57
|
+
return /^Session \d+$/.test(name.trim());
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=session-record.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-record.js","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/sessions/session-record.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAIlD,MAAM,UAAU,qBAAqB,CAAC,aAAsB;IAC1D,OAAO;QACL;YACE,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,WAAW;YACjB,IAAI,EACF,oNAAoN;SACvN;QACD,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC;YAClB,CAAC;oBACC,EAAE,EAAE,aAAa;oBACjB,IAAI,EAAE,WAAoB;oBAC1B,IAAI,EACF,sOAAsO;iBACzO,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC;KACN,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAOjC;IACC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,OAAO;QACL,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,OAAO,EAAE,EAAE;QACX,QAAQ,EAAE,qBAAqB,CAAC,OAAO,CAAC,aAAa,CAAC;QACtD,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,GAAG;QACd,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,YAAY,EAAE,KAAK;QACnB,kBAAkB,EAAE,SAAS;QAC7B,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,EAAE;QACZ,KAAK,EAAE,SAAS;KACjB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAoB;IAC/C,OAAO,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAoB;IACnD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3D,MAAM,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;IACnF,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,YAAY,YAAY,EAAE,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;AAC3C,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createDefaultAgentTools } from '../../../runtime/default-tools.js';
|
|
2
|
-
import { loadChatSessions } from '../sessions/
|
|
2
|
+
import { loadChatSessions } from '../sessions/repository/file-chat-session-repository.js';
|
|
3
3
|
import { resolveConversationTurnRuntime } from './runtime.js';
|
|
4
4
|
export function prepareConversationTurnContext(args) {
|
|
5
5
|
const sessions = loadChatSessions(args.sessionStoragePath, true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAG5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAG5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wDAAwD,CAAC;AAE1F,OAAO,EAAE,8BAA8B,EAAwB,MAAM,cAAc,CAAC;AAuBpF,MAAM,UAAU,8BAA8B,CAAC,IAAwC;IACrF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;IACjE,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9E,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,OAAO,GAAG,8BAA8B,CAAC;QAC7C,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,YAAY,EAAE,OAAO,CAAC,KAAK;QAC3B,sBAAsB,EAAE,OAAO,CAAC,eAAe;QAC/C,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;QAC7C,aAAa,EAAE,IAAI,CAAC,aAAa;KAClC,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,uBAAuB,CAAC;QACpC,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,wBAAwB,EAAE,OAAO,CAAC,wBAAwB;QAC1D,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;QAC7C,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,gBAAgB,EAAE,EAAE;QACpB,eAAe,EAAE,IAAI;KACtB,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ;QACR,OAAO;QACP,OAAO;QACP,KAAK;QACL,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;QACzC,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI;YAC7B,SAAS,EAAE,KAAK;YAChB,OAAO,EAAE,UAAU,OAAO,CAAC,GAAG,EAAE;YAChC,WAAW,EAAE,uBAAuB;SACrC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-maintenance.d.ts","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/memory-maintenance.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"memory-maintenance.d.ts","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/memory-maintenance.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAMpD,MAAM,MAAM,kCAAkC,GAAG;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,UAAU,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,kCAAkC,GACvC,OAAO,CAAC,eAAe,CAAC,CAiB1B;AAED,MAAM,MAAM,2CAA2C,GAAG;IACxD,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,UAAU,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,wBAAgB,uCAAuC,CAAC,IAAI,EAAE,2CAA2C,QAYxG;AAED,wBAAsB,kCAAkC,CAAC,IAAI,EAAE,2CAA2C,iBAyBzG;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE;IACtD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;CACnB,QAuBA;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,eAAe,CAoBnG"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { readFileSync, writeFileSync } from 'node:fs';
|
|
2
2
|
import { runMaintenanceForRecordedCandidates } from '../../../memory/maintenance-integration.js';
|
|
3
3
|
import { summarizeTrace } from '../../../observability/trace-summarizers.js';
|
|
4
|
-
import {
|
|
4
|
+
import { touchSession } from '../sessions/session-record.js';
|
|
5
|
+
import { loadChatSessions, saveChatSessions } from '../sessions/repository/file-chat-session-repository.js';
|
|
5
6
|
export async function runInlineTurnMemoryMaintenance(args) {
|
|
6
7
|
const maintenance = await runMaintenanceForRecordedCandidates({
|
|
7
8
|
memoryRoot: args.memoryRoot,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-maintenance.js","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/memory-maintenance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAKtD,OAAO,EAAE,mCAAmC,EAAE,MAAM,4CAA4C,CAAC;AACjG,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"memory-maintenance.js","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/memory-maintenance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persistence.d.ts","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/persistence.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,OAAO,EAAyB,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"persistence.d.ts","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/persistence.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,OAAO,EAAyB,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAGhF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,MAAM,4BAA4B,GAAG;IACzC,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,WAAW,CAAC;IACrB,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,uBAAuB,EAAE,WAAW,EAAE,CAAC;IACvC,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAClD,UAAU,EAAE,IAAI,CAAC,kBAAkB,EAAE,6BAA6B,CAAC,CAAC;CACrE,CAAC;AAEF,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,4BAA4B,GAAG,OAAO,CAAC,qBAAqB,CAAC,CA8BjH"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { buildCompactionRunningContext } from '../history/compaction.js';
|
|
2
2
|
import { persistChatTurnResult } from './result.js';
|
|
3
|
-
import {
|
|
3
|
+
import { touchSession } from '../sessions/session-record.js';
|
|
4
|
+
import { saveChatSessions } from '../sessions/repository/file-chat-session-repository.js';
|
|
4
5
|
export async function persistCompletedChatTurn(args) {
|
|
5
6
|
const persisted = await persistChatTurnResult({
|
|
6
7
|
result: args.result,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persistence.js","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/persistence.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAA8B,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"persistence.js","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/persistence.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAA8B,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wDAAwD,CAAC;AAqB1F,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,IAAkC;IAC/E,MAAM,SAAS,GAAG,MAAM,qBAAqB,CAAC;QAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;QACrD,UAAU,EAAE,EAAE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE;QACvD,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;QACrD,YAAY,EAAE,GAAG,EAAE,CAAC,eAAe,IAAI,CAAC,GAAG,EAAE,EAAE;QAC/C,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE;YAC5B,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC/B,iCAAiC,CAAC;oBAChC,GAAG,IAAI;oBACP,WAAW,EAAE,KAAK,CAAC,WAAW;iBAC/B,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,gBAAgB,CACd,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CACrG,CAAC;IACF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,iCAAiC,CACxC,IAEC;IAED,MAAM,cAAc,GAAG,YAAY,CAAC;QAClC,GAAG,IAAI,CAAC,OAAO;QACf,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;QAC/B,OAAO,EAAE,6BAA6B,CAAC;YACrC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;YAC/B,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;YAC9B,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM;YAC3C,kBAAkB,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,kBAAkB;YAC5D,eAAe,EAAE,IAAI,CAAC,WAAW;SAClC,CAAC;KACH,CAAC,CAAC;IACH,gBAAgB,CACd,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAClG,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preflight.d.ts","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/preflight.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAiC,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACxG,OAAO,EAAgD,KAAK,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"preflight.d.ts","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/preflight.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAiC,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACxG,OAAO,EAAgD,KAAK,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAGhH,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,MAAM,iCAAiC,GAAG;IAC9C,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,QAAQ,CAAC;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,WAAW,EAAE,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC,OAAO,6BAA6B,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IAC9E,UAAU,EAAE,qBAAqB,CAAC;IAClC,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,UAAU,EAAE,IAAI,CAAC,kBAAkB,EAAE,iCAAiC,CAAC,CAAC;CACzE,CAAC;AAEF,MAAM,MAAM,4BAA4B,GACpC;IACE,EAAE,EAAE,IAAI,CAAC;IACT,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,OAAO,EAAE,gBAAgB,CAAC;IAC1B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B,GACD;IACE,EAAE,EAAE,KAAK,CAAC;IACV,MAAM,EAAE,gBAAgB,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEN,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAyDpH;AAED,wBAAgB,qCAAqC,CAAC,IAAI,EAAE;IAC1D,kBAAkB,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,WAAW,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,QAeA;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE;IACnD,kBAAkB,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,OAAO,EAAE,WAAW,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC,4BAA4B,EAAE;QAAE,EAAE,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;CAC/D,GAAG,OAAO,CAAC,4BAA4B,EAAE;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,CAAC,CAoBtD"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { buildConversationMessages } from '../sessions/conversation-lines.js';
|
|
2
2
|
import { buildCompactionRunningContext, compactChatHistoryWithArchive } from '../history/compaction.js';
|
|
3
3
|
import { acquireSessionLease, getSessionLeaseConflict } from '../sessions/lease.js';
|
|
4
|
-
import {
|
|
4
|
+
import { touchSession } from '../sessions/session-record.js';
|
|
5
|
+
import { readChatSession, saveChatSessions } from '../sessions/repository/file-chat-session-repository.js';
|
|
5
6
|
export async function prepareChatSessionTurn(args) {
|
|
6
7
|
const persistedSession = readChatSession(args.sessionStoragePath, args.sessionId, true);
|
|
7
8
|
const leaseConflict = persistedSession ? getSessionLeaseConflict(persistedSession, args.leaseOwner) : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preflight.js","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/preflight.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,6BAA6B,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACxG,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAA8B,MAAM,sBAAsB,CAAC;AAChH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"preflight.js","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/preflight.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { compactChatHistoryWithArchive, estimateChatHistoryTokens } from '../his
|
|
|
2
2
|
import { buildConversationMessages } from '../sessions/conversation-lines.js';
|
|
3
3
|
import { formatChatFailureMessage } from '../../failure-messages.js';
|
|
4
4
|
import { countAssistantSteps, summarizeTrace } from '../../../observability/trace-summarizers.js';
|
|
5
|
-
import { touchSession } from '../sessions/
|
|
5
|
+
import { touchSession } from '../sessions/session-record.js';
|
|
6
6
|
import { saveTrace } from './trace.js';
|
|
7
7
|
export async function createChatTurnPersistenceArtifacts(args) {
|
|
8
8
|
const compacted = await compactChatHistoryWithArchive({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"result.js","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/result.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,6BAA6B,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACpG,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAgC,MAAM,6CAA6C,CAAC;AAChI,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"result.js","sourceRoot":"","sources":["../../../../../../src/core/chat/engine/turns/result.ts"],"names":[],"mappings":"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"}
|