@mohanscodex/spectra-code 0.4.5 → 0.4.7
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/package.json +1 -1
- package/dist/src/agents/definitions.d.ts +2 -2
- package/dist/src/agents/definitions.d.ts.map +1 -1
- package/dist/src/agents/definitions.js +18 -18
- package/dist/src/agents/definitions.js.map +1 -1
- package/dist/src/agents/registry.d.ts +1 -1
- package/dist/src/agents/registry.d.ts.map +1 -1
- package/dist/src/agents/registry.js.map +1 -1
- package/dist/src/cli.js +117 -115
- package/dist/src/cli.js.map +1 -1
- package/dist/src/commands/agent.d.ts +1 -1
- package/dist/src/commands/agent.d.ts.map +1 -1
- package/dist/src/commands/agent.js +14 -14
- package/dist/src/commands/agent.js.map +1 -1
- package/dist/src/commands/db.d.ts +1 -1
- package/dist/src/commands/db.d.ts.map +1 -1
- package/dist/src/commands/db.js +11 -11
- package/dist/src/commands/db.js.map +1 -1
- package/dist/src/commands/doctor.d.ts.map +1 -1
- package/dist/src/commands/doctor.js +33 -30
- package/dist/src/commands/doctor.js.map +1 -1
- package/dist/src/commands/mcp.d.ts +1 -1
- package/dist/src/commands/mcp.d.ts.map +1 -1
- package/dist/src/commands/mcp.js +39 -39
- package/dist/src/commands/mcp.js.map +1 -1
- package/dist/src/commands/plugin.d.ts +1 -1
- package/dist/src/commands/plugin.d.ts.map +1 -1
- package/dist/src/commands/plugin.js +13 -13
- package/dist/src/commands/plugin.js.map +1 -1
- package/dist/src/commands/session.d.ts +1 -1
- package/dist/src/commands/session.d.ts.map +1 -1
- package/dist/src/commands/session.js +12 -12
- package/dist/src/commands/session.js.map +1 -1
- package/dist/src/index.d.ts +18 -18
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +16 -16
- package/dist/src/index.js.map +1 -1
- package/dist/src/integrations/acp/index.d.ts +1 -1
- package/dist/src/integrations/acp/index.js +1 -1
- package/dist/src/integrations/acp/server.d.ts.map +1 -1
- package/dist/src/integrations/acp/server.js +89 -79
- package/dist/src/integrations/acp/server.js.map +1 -1
- package/dist/src/integrations/custom-tools/index.d.ts +2 -2
- package/dist/src/integrations/custom-tools/index.js +1 -1
- package/dist/src/integrations/custom-tools/loader.d.ts +2 -2
- package/dist/src/integrations/custom-tools/loader.d.ts.map +1 -1
- package/dist/src/integrations/custom-tools/loader.js +19 -18
- package/dist/src/integrations/custom-tools/loader.js.map +1 -1
- package/dist/src/integrations/mcp/client.d.ts +5 -5
- package/dist/src/integrations/mcp/client.d.ts.map +1 -1
- package/dist/src/integrations/mcp/client.js +7 -7
- package/dist/src/integrations/mcp/client.js.map +1 -1
- package/dist/src/integrations/mcp/index.d.ts +2 -2
- package/dist/src/integrations/mcp/index.d.ts.map +1 -1
- package/dist/src/integrations/mcp/index.js +1 -1
- package/dist/src/integrations/mcp/index.js.map +1 -1
- package/dist/src/security/doom-loop.d.ts +1 -1
- package/dist/src/security/doom-loop.d.ts.map +1 -1
- package/dist/src/security/doom-loop.js +4 -4
- package/dist/src/security/doom-loop.js.map +1 -1
- package/dist/src/security/index.d.ts +10 -10
- package/dist/src/security/index.d.ts.map +1 -1
- package/dist/src/security/index.js +116 -69
- package/dist/src/security/index.js.map +1 -1
- package/dist/src/security/path-safety.d.ts +1 -1
- package/dist/src/security/path-safety.d.ts.map +1 -1
- package/dist/src/security/path-safety.js +19 -19
- package/dist/src/security/path-safety.js.map +1 -1
- package/dist/src/security/permissions.d.ts +1 -1
- package/dist/src/security/permissions.d.ts.map +1 -1
- package/dist/src/security/permissions.js +12 -10
- package/dist/src/security/permissions.js.map +1 -1
- package/dist/src/security/read-tracker.d.ts +2 -2
- package/dist/src/security/read-tracker.d.ts.map +1 -1
- package/dist/src/security/read-tracker.js +15 -13
- package/dist/src/security/read-tracker.js.map +1 -1
- package/dist/src/security/ssrf-guard.d.ts +1 -1
- package/dist/src/security/ssrf-guard.d.ts.map +1 -1
- package/dist/src/security/ssrf-guard.js +11 -11
- package/dist/src/security/ssrf-guard.js.map +1 -1
- package/dist/src/security/types.d.ts +4 -4
- package/dist/src/security/types.d.ts.map +1 -1
- package/dist/src/security/wildcard.d.ts.map +1 -1
- package/dist/src/security/wildcard.js +14 -16
- package/dist/src/security/wildcard.js.map +1 -1
- package/dist/src/services/auth-store.d.ts +3 -3
- package/dist/src/services/auth-store.d.ts.map +1 -1
- package/dist/src/services/auth-store.js +7 -7
- package/dist/src/services/auth-store.js.map +1 -1
- package/dist/src/services/config.d.ts +3 -3
- package/dist/src/services/config.d.ts.map +1 -1
- package/dist/src/services/config.js +17 -21
- package/dist/src/services/config.js.map +1 -1
- package/dist/src/services/context.d.ts.map +1 -1
- package/dist/src/services/context.js +5 -8
- package/dist/src/services/context.js.map +1 -1
- package/dist/src/services/custom-providers.d.ts +2 -2
- package/dist/src/services/custom-providers.d.ts.map +1 -1
- package/dist/src/services/custom-providers.js +108 -49
- package/dist/src/services/custom-providers.js.map +1 -1
- package/dist/src/services/session-store.d.ts +1 -1
- package/dist/src/services/session-store.d.ts.map +1 -1
- package/dist/src/services/session-store.js +32 -24
- package/dist/src/services/session-store.js.map +1 -1
- package/dist/src/services/snapshot-manager.d.ts.map +1 -1
- package/dist/src/services/snapshot-manager.js +14 -15
- package/dist/src/services/snapshot-manager.js.map +1 -1
- package/dist/src/tools/edit.d.ts +1 -1
- package/dist/src/tools/edit.js +18 -16
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/glob.d.ts +1 -1
- package/dist/src/tools/glob.d.ts.map +1 -1
- package/dist/src/tools/glob.js +20 -16
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/grep.d.ts +1 -1
- package/dist/src/tools/grep.d.ts.map +1 -1
- package/dist/src/tools/grep.js +18 -18
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/index.d.ts +4 -4
- package/dist/src/tools/index.d.ts.map +1 -1
- package/dist/src/tools/index.js +40 -32
- package/dist/src/tools/index.js.map +1 -1
- package/dist/src/tools/mcp-tool.d.ts +2 -2
- package/dist/src/tools/mcp-tool.d.ts.map +1 -1
- package/dist/src/tools/mcp-tool.js +28 -25
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/read.d.ts +1 -1
- package/dist/src/tools/read.d.ts.map +1 -1
- package/dist/src/tools/read.js +15 -13
- package/dist/src/tools/read.js.map +1 -1
- package/dist/src/tools/shell.d.ts +1 -1
- package/dist/src/tools/shell.d.ts.map +1 -1
- package/dist/src/tools/shell.js +71 -62
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/task.d.ts +1 -1
- package/dist/src/tools/task.js +22 -22
- package/dist/src/tools/task.js.map +1 -1
- package/dist/src/tools/types.d.ts +3 -3
- package/dist/src/tools/types.d.ts.map +1 -1
- package/dist/src/tools/utils.d.ts +1 -1
- package/dist/src/tools/utils.js +2 -2
- package/dist/src/tools/utils.js.map +1 -1
- package/dist/src/tools/web-fetch.d.ts +1 -1
- package/dist/src/tools/web-fetch.js +31 -31
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/write.d.ts +1 -1
- package/dist/src/tools/write.js +9 -9
- package/dist/src/tools/write.js.map +1 -1
- package/dist/src/tui/app-constants.d.ts.map +1 -1
- package/dist/src/tui/app-constants.js +11 -2
- package/dist/src/tui/app-constants.js.map +1 -1
- package/dist/src/tui/app.d.ts +1 -1
- package/dist/src/tui/app.d.ts.map +1 -1
- package/dist/src/tui/app.js +293 -121
- package/dist/src/tui/app.js.map +1 -1
- package/dist/src/tui/commands.d.ts +14 -14
- package/dist/src/tui/commands.d.ts.map +1 -1
- package/dist/src/tui/commands.js +242 -49
- package/dist/src/tui/commands.js.map +1 -1
- package/dist/src/tui/components/chat-area.d.ts +2 -2
- package/dist/src/tui/components/chat-area.d.ts.map +1 -1
- package/dist/src/tui/components/chat-area.js +5 -5
- package/dist/src/tui/components/chat-area.js.map +1 -1
- package/dist/src/tui/components/command-palette.d.ts.map +1 -1
- package/dist/src/tui/components/command-palette.js +7 -5
- package/dist/src/tui/components/command-palette.js.map +1 -1
- package/dist/src/tui/components/message.d.ts +2 -2
- package/dist/src/tui/components/message.d.ts.map +1 -1
- package/dist/src/tui/components/message.js +63 -50
- package/dist/src/tui/components/message.js.map +1 -1
- package/dist/src/tui/components/slash-autocomplete.d.ts +2 -2
- package/dist/src/tui/components/slash-autocomplete.d.ts.map +1 -1
- package/dist/src/tui/components/slash-autocomplete.js +6 -8
- package/dist/src/tui/components/slash-autocomplete.js.map +1 -1
- package/dist/src/tui/components/toast.d.ts +2 -2
- package/dist/src/tui/components/toast.d.ts.map +1 -1
- package/dist/src/tui/components/toast.js +10 -5
- package/dist/src/tui/components/toast.js.map +1 -1
- package/dist/src/tui/hooks/use-agent.d.ts +3 -3
- package/dist/src/tui/hooks/use-agent.d.ts.map +1 -1
- package/dist/src/tui/hooks/use-agent.js +22 -29
- package/dist/src/tui/hooks/use-agent.js.map +1 -1
- package/dist/src/tui/hooks/use-app-keyboard.d.ts +3 -3
- package/dist/src/tui/hooks/use-app-keyboard.d.ts.map +1 -1
- package/dist/src/tui/hooks/use-app-keyboard.js +28 -29
- package/dist/src/tui/hooks/use-app-keyboard.js.map +1 -1
- package/dist/src/tui/hooks/use-chat-submit.d.ts +6 -6
- package/dist/src/tui/hooks/use-chat-submit.d.ts.map +1 -1
- package/dist/src/tui/hooks/use-chat-submit.js +115 -54
- package/dist/src/tui/hooks/use-chat-submit.js.map +1 -1
- package/dist/src/tui/hooks/use-permission-queue.d.ts +2 -2
- package/dist/src/tui/hooks/use-permission-queue.d.ts.map +1 -1
- package/dist/src/tui/hooks/use-permission-queue.js +1 -1
- package/dist/src/tui/hooks/use-permission-queue.js.map +1 -1
- package/dist/src/tui/hooks/use-revert.d.ts +4 -4
- package/dist/src/tui/hooks/use-revert.d.ts.map +1 -1
- package/dist/src/tui/hooks/use-revert.js +22 -13
- package/dist/src/tui/hooks/use-revert.js.map +1 -1
- package/dist/src/tui/index.d.ts.map +1 -1
- package/dist/src/tui/index.js +11 -11
- package/dist/src/tui/index.js.map +1 -1
- package/dist/src/tui/prompt-bar.d.ts +1 -1
- package/dist/src/tui/prompt-bar.d.ts.map +1 -1
- package/dist/src/tui/prompt-bar.js +14 -11
- package/dist/src/tui/prompt-bar.js.map +1 -1
- package/dist/src/tui/slash-commands.d.ts +2 -2
- package/dist/src/tui/slash-commands.d.ts.map +1 -1
- package/dist/src/tui/slash-commands.js +9 -9
- package/dist/src/tui/slash-commands.js.map +1 -1
- package/dist/src/tui/theme.d.ts +1 -1
- package/dist/src/tui/theme.d.ts.map +1 -1
- package/dist/src/tui/theme.js +46 -38
- package/dist/src/tui/theme.js.map +1 -1
- package/dist/src/tui/tips.d.ts.map +1 -1
- package/dist/src/tui/tips.js +14 -14
- package/dist/src/tui/tips.js.map +1 -1
- package/dist/src/tui/types.d.ts +5 -5
- package/dist/src/tui/types.d.ts.map +1 -1
- package/dist/src/tui/ui/about-dialog.d.ts.map +1 -1
- package/dist/src/tui/ui/about-dialog.js +5 -4
- package/dist/src/tui/ui/about-dialog.js.map +1 -1
- package/dist/src/tui/ui/agent-switcher.d.ts.map +1 -1
- package/dist/src/tui/ui/agent-switcher.js +16 -14
- package/dist/src/tui/ui/agent-switcher.js.map +1 -1
- package/dist/src/tui/ui/debug-dialog.d.ts +1 -1
- package/dist/src/tui/ui/debug-dialog.d.ts.map +1 -1
- package/dist/src/tui/ui/debug-dialog.js +26 -25
- package/dist/src/tui/ui/debug-dialog.js.map +1 -1
- package/dist/src/tui/ui/doctor-dialog.d.ts +2 -2
- package/dist/src/tui/ui/doctor-dialog.d.ts.map +1 -1
- package/dist/src/tui/ui/doctor-dialog.js +10 -8
- package/dist/src/tui/ui/doctor-dialog.js.map +1 -1
- package/dist/src/tui/ui/manage-providers-dialog.d.ts +1 -1
- package/dist/src/tui/ui/manage-providers-dialog.d.ts.map +1 -1
- package/dist/src/tui/ui/manage-providers-dialog.js +102 -86
- package/dist/src/tui/ui/manage-providers-dialog.js.map +1 -1
- package/dist/src/tui/ui/mcp-toggle-dialog.d.ts.map +1 -1
- package/dist/src/tui/ui/mcp-toggle-dialog.js +17 -14
- package/dist/src/tui/ui/mcp-toggle-dialog.js.map +1 -1
- package/dist/src/tui/ui/message-controls.d.ts +1 -1
- package/dist/src/tui/ui/message-controls.d.ts.map +1 -1
- package/dist/src/tui/ui/message-controls.js +40 -28
- package/dist/src/tui/ui/message-controls.js.map +1 -1
- package/dist/src/tui/ui/model-switcher.d.ts.map +1 -1
- package/dist/src/tui/ui/model-switcher.js +40 -25
- package/dist/src/tui/ui/model-switcher.js.map +1 -1
- package/dist/src/tui/ui/permission-dialog.d.ts +1 -1
- package/dist/src/tui/ui/permission-dialog.d.ts.map +1 -1
- package/dist/src/tui/ui/permission-dialog.js +11 -11
- package/dist/src/tui/ui/permission-dialog.js.map +1 -1
- package/dist/src/tui/ui/provider-dialog.d.ts.map +1 -1
- package/dist/src/tui/ui/provider-dialog.js +75 -64
- package/dist/src/tui/ui/provider-dialog.js.map +1 -1
- package/dist/src/tui/ui/session-list.d.ts +3 -3
- package/dist/src/tui/ui/session-list.d.ts.map +1 -1
- package/dist/src/tui/ui/session-list.js +44 -32
- package/dist/src/tui/ui/session-list.js.map +1 -1
- package/dist/src/tui/ui/thinking-effort-dialog.d.ts.map +1 -1
- package/dist/src/tui/ui/thinking-effort-dialog.js +19 -19
- package/dist/src/tui/ui/thinking-effort-dialog.js.map +1 -1
- package/dist/src/tui/utils/model-config.d.ts.map +1 -1
- package/dist/src/tui/utils/model-config.js +13 -13
- package/dist/src/tui/utils/model-config.js.map +1 -1
- package/dist/src/tui/utils/session-messages.d.ts +2 -2
- package/dist/src/tui/utils/session-messages.d.ts.map +1 -1
- package/dist/src/tui/utils/session-messages.js +35 -22
- package/dist/src/tui/utils/session-messages.js.map +1 -1
- package/dist/src/tui/utils/version.d.ts +2 -0
- package/dist/src/tui/utils/version.d.ts.map +1 -0
- package/dist/src/tui/utils/version.js +24 -0
- package/dist/src/tui/utils/version.js.map +1 -0
- package/dist/src/tui/utils.d.ts +2 -2
- package/dist/src/tui/utils.d.ts.map +1 -1
- package/dist/src/tui/utils.js +7 -7
- package/dist/src/tui/utils.js.map +1 -1
- package/dist/src/tui/variant-cycle.d.ts.map +1 -1
- package/dist/src/tui/variant-cycle.js +23 -23
- package/dist/src/tui/variant-cycle.js.map +1 -1
- package/dist/src/utils/paths.d.ts.map +1 -1
- package/dist/src/utils/paths.js +25 -25
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/platform.d.ts.map +1 -1
- package/dist/src/utils/platform.js +15 -17
- package/dist/src/utils/platform.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { registerProvider, AssistantMessageEventStream } from
|
|
2
|
-
import { read } from
|
|
1
|
+
import { registerProvider, AssistantMessageEventStream, } from '@mohanscodex/spectra-ai';
|
|
2
|
+
import { read } from './auth-store.js';
|
|
3
3
|
function resolveApiKey(providerId, configApiKey) {
|
|
4
4
|
if (configApiKey)
|
|
5
5
|
return configApiKey;
|
|
6
6
|
const stored = read(providerId);
|
|
7
|
-
if (stored?.type ===
|
|
7
|
+
if (stored?.type === 'api')
|
|
8
8
|
return stored.key;
|
|
9
9
|
return undefined;
|
|
10
10
|
}
|
|
@@ -18,14 +18,18 @@ function parseStreamingJson(raw) {
|
|
|
18
18
|
}
|
|
19
19
|
function mapStopReason(reason) {
|
|
20
20
|
if (reason === null)
|
|
21
|
-
return
|
|
21
|
+
return 'stop';
|
|
22
22
|
switch (reason) {
|
|
23
|
-
case
|
|
24
|
-
case
|
|
25
|
-
|
|
26
|
-
case
|
|
27
|
-
|
|
28
|
-
|
|
23
|
+
case 'stop':
|
|
24
|
+
case 'end':
|
|
25
|
+
return 'stop';
|
|
26
|
+
case 'length':
|
|
27
|
+
return 'length';
|
|
28
|
+
case 'function_call':
|
|
29
|
+
case 'tool_calls':
|
|
30
|
+
return 'toolUse';
|
|
31
|
+
default:
|
|
32
|
+
return reason === 'content_filter' || reason === 'network_error' ? 'error' : 'stop';
|
|
29
33
|
}
|
|
30
34
|
}
|
|
31
35
|
export function registerCustomProvider(id, config) {
|
|
@@ -44,28 +48,28 @@ export function registerCustomProvider(id, config) {
|
|
|
44
48
|
const stream = new AssistantMessageEventStream();
|
|
45
49
|
const run = async () => {
|
|
46
50
|
const output = {
|
|
47
|
-
role:
|
|
51
|
+
role: 'assistant',
|
|
48
52
|
content: [],
|
|
49
53
|
provider: model.provider,
|
|
50
54
|
model: model.id,
|
|
51
55
|
responseId: undefined,
|
|
52
56
|
usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, totalTokens: 0 },
|
|
53
|
-
stopReason:
|
|
57
|
+
stopReason: 'stop',
|
|
54
58
|
timestamp: Date.now(),
|
|
55
59
|
};
|
|
56
60
|
try {
|
|
57
61
|
const apiKey = options?.apiKey ?? resolveApiKey(id, config.apiKey);
|
|
58
62
|
if (!apiKey) {
|
|
59
|
-
output.stopReason =
|
|
63
|
+
output.stopReason = 'error';
|
|
60
64
|
output.errorMessage = `No API key for provider: ${id}`;
|
|
61
|
-
stream.push({ type:
|
|
62
|
-
stream.push({ type:
|
|
65
|
+
stream.push({ type: 'start', partial: output });
|
|
66
|
+
stream.push({ type: 'error', reason: 'error', error: output });
|
|
63
67
|
stream.end();
|
|
64
68
|
return;
|
|
65
69
|
}
|
|
66
70
|
// Use the openai package from @mohanscodex/spectra-ai's dependencies
|
|
67
71
|
// This avoids duplicating the openai dependency in packages/code
|
|
68
|
-
const { default: OpenAI } = await import(
|
|
72
|
+
const { default: OpenAI } = await import('@mohanscodex/spectra-ai').then(() => import('openai'));
|
|
69
73
|
const client = new OpenAI({
|
|
70
74
|
apiKey,
|
|
71
75
|
baseURL: config.baseUrl,
|
|
@@ -74,24 +78,43 @@ export function registerCustomProvider(id, config) {
|
|
|
74
78
|
});
|
|
75
79
|
const messages = [];
|
|
76
80
|
if (context.systemPrompt) {
|
|
77
|
-
messages.push({ role:
|
|
81
|
+
messages.push({ role: 'system', content: context.systemPrompt });
|
|
78
82
|
}
|
|
79
83
|
for (const msg of context.messages) {
|
|
80
|
-
if (msg.role ===
|
|
81
|
-
messages.push({
|
|
84
|
+
if (msg.role === 'user') {
|
|
85
|
+
messages.push({
|
|
86
|
+
role: 'user',
|
|
87
|
+
content: typeof msg.content === 'string'
|
|
88
|
+
? msg.content
|
|
89
|
+
: msg.content.map((c) => (c.type === 'text' ? { type: 'text', text: c.text } : c)),
|
|
90
|
+
});
|
|
82
91
|
}
|
|
83
|
-
else if (msg.role ===
|
|
84
|
-
const text = msg.content
|
|
85
|
-
|
|
86
|
-
|
|
92
|
+
else if (msg.role === 'assistant') {
|
|
93
|
+
const text = msg.content
|
|
94
|
+
.filter((b) => b.type === 'text')
|
|
95
|
+
.map((b) => b.text)
|
|
96
|
+
.join('');
|
|
97
|
+
const toolCalls = msg.content
|
|
98
|
+
.filter((b) => b.type === 'toolCall')
|
|
99
|
+
.map((tc) => ({
|
|
100
|
+
id: tc.id,
|
|
101
|
+
type: 'function',
|
|
102
|
+
function: { name: tc.name, arguments: JSON.stringify(tc.arguments) },
|
|
87
103
|
}));
|
|
88
104
|
if (text || toolCalls.length > 0) {
|
|
89
|
-
messages.push({
|
|
105
|
+
messages.push({
|
|
106
|
+
role: 'assistant',
|
|
107
|
+
content: text || undefined,
|
|
108
|
+
tool_calls: toolCalls.length > 0 ? toolCalls : undefined,
|
|
109
|
+
});
|
|
90
110
|
}
|
|
91
111
|
}
|
|
92
|
-
else if (msg.role ===
|
|
93
|
-
const text = msg.content
|
|
94
|
-
|
|
112
|
+
else if (msg.role === 'toolResult') {
|
|
113
|
+
const text = msg.content
|
|
114
|
+
.filter((c) => c.type === 'text')
|
|
115
|
+
.map((c) => c.text)
|
|
116
|
+
.join('\n');
|
|
117
|
+
messages.push({ role: 'tool', content: text || '(no result)', tool_call_id: msg.toolCallId });
|
|
95
118
|
}
|
|
96
119
|
}
|
|
97
120
|
const params = {
|
|
@@ -105,15 +128,20 @@ export function registerCustomProvider(id, config) {
|
|
|
105
128
|
if (options?.temperature !== undefined)
|
|
106
129
|
params.temperature = options.temperature;
|
|
107
130
|
if (context.tools) {
|
|
108
|
-
params.tools = context.tools.map((t) => ({
|
|
131
|
+
params.tools = context.tools.map((t) => ({
|
|
132
|
+
type: 'function',
|
|
133
|
+
function: { name: t.name, description: t.description, parameters: t.parameters },
|
|
134
|
+
}));
|
|
109
135
|
}
|
|
110
|
-
const openaiStream = await client.chat.completions.create(params, {
|
|
111
|
-
|
|
136
|
+
const openaiStream = (await client.chat.completions.create(params, {
|
|
137
|
+
signal: options?.signal,
|
|
138
|
+
}));
|
|
139
|
+
stream.push({ type: 'start', partial: output });
|
|
112
140
|
let currentBlock = null;
|
|
113
141
|
const blocks = output.content;
|
|
114
142
|
const blockIndex = () => blocks.length - 1;
|
|
115
143
|
for await (const chunk of openaiStream) {
|
|
116
|
-
if (!chunk || typeof chunk !==
|
|
144
|
+
if (!chunk || typeof chunk !== 'object')
|
|
117
145
|
continue;
|
|
118
146
|
output.responseId = output.responseId || chunk.id;
|
|
119
147
|
if (chunk.usage) {
|
|
@@ -135,34 +163,60 @@ export function registerCustomProvider(id, config) {
|
|
|
135
163
|
output.stopReason = mapStopReason(choice.finish_reason);
|
|
136
164
|
if (choice.delta) {
|
|
137
165
|
if (choice.delta.content && choice.delta.content.length > 0) {
|
|
138
|
-
if (!currentBlock || currentBlock.type !==
|
|
139
|
-
currentBlock = { type:
|
|
166
|
+
if (!currentBlock || currentBlock.type !== 'text') {
|
|
167
|
+
currentBlock = { type: 'text', text: '' };
|
|
140
168
|
blocks.push(currentBlock);
|
|
141
|
-
stream.push({ type:
|
|
169
|
+
stream.push({ type: 'text_start', contentIndex: blockIndex(), partial: output });
|
|
142
170
|
}
|
|
143
171
|
currentBlock.text += choice.delta.content;
|
|
144
|
-
stream.push({
|
|
172
|
+
stream.push({
|
|
173
|
+
type: 'text_delta',
|
|
174
|
+
contentIndex: blockIndex(),
|
|
175
|
+
delta: choice.delta.content,
|
|
176
|
+
partial: output,
|
|
177
|
+
});
|
|
145
178
|
}
|
|
146
|
-
const reasonFields = [
|
|
179
|
+
const reasonFields = ['reasoning_content', 'reasoning', 'reasoning_text'];
|
|
147
180
|
for (const f of reasonFields) {
|
|
148
181
|
const val = choice.delta[f];
|
|
149
182
|
if (val && String(val).length > 0) {
|
|
150
|
-
if (!currentBlock || currentBlock.type !==
|
|
151
|
-
currentBlock = { type:
|
|
183
|
+
if (!currentBlock || currentBlock.type !== 'thinking') {
|
|
184
|
+
currentBlock = { type: 'thinking', thinking: '' };
|
|
152
185
|
blocks.push(currentBlock);
|
|
153
|
-
stream.push({
|
|
186
|
+
stream.push({
|
|
187
|
+
type: 'thinking_start',
|
|
188
|
+
contentIndex: blockIndex(),
|
|
189
|
+
partial: output,
|
|
190
|
+
});
|
|
154
191
|
}
|
|
155
192
|
currentBlock.thinking += String(val);
|
|
156
|
-
stream.push({
|
|
193
|
+
stream.push({
|
|
194
|
+
type: 'thinking_delta',
|
|
195
|
+
contentIndex: blockIndex(),
|
|
196
|
+
delta: String(val),
|
|
197
|
+
partial: output,
|
|
198
|
+
});
|
|
157
199
|
break;
|
|
158
200
|
}
|
|
159
201
|
}
|
|
160
202
|
if (choice.delta.tool_calls) {
|
|
161
203
|
for (const tc of choice.delta.tool_calls) {
|
|
162
|
-
if (!currentBlock ||
|
|
163
|
-
currentBlock
|
|
204
|
+
if (!currentBlock ||
|
|
205
|
+
currentBlock.type !== 'toolCall' ||
|
|
206
|
+
(tc.id && currentBlock.id !== tc.id)) {
|
|
207
|
+
currentBlock = {
|
|
208
|
+
type: 'toolCall',
|
|
209
|
+
id: tc.id || '',
|
|
210
|
+
name: tc.function?.name || '',
|
|
211
|
+
arguments: {},
|
|
212
|
+
partialArgs: '',
|
|
213
|
+
};
|
|
164
214
|
blocks.push(currentBlock);
|
|
165
|
-
stream.push({
|
|
215
|
+
stream.push({
|
|
216
|
+
type: 'toolcall_start',
|
|
217
|
+
contentIndex: blockIndex(),
|
|
218
|
+
partial: output,
|
|
219
|
+
});
|
|
166
220
|
}
|
|
167
221
|
if (tc.id)
|
|
168
222
|
currentBlock.id = tc.id;
|
|
@@ -173,23 +227,28 @@ export function registerCustomProvider(id, config) {
|
|
|
173
227
|
currentBlock.arguments = parseStreamingJson(currentBlock.partialArgs);
|
|
174
228
|
}
|
|
175
229
|
if (tc.function?.arguments) {
|
|
176
|
-
stream.push({
|
|
230
|
+
stream.push({
|
|
231
|
+
type: 'toolcall_delta',
|
|
232
|
+
contentIndex: blockIndex(),
|
|
233
|
+
delta: tc.function.arguments,
|
|
234
|
+
partial: output,
|
|
235
|
+
});
|
|
177
236
|
}
|
|
178
237
|
}
|
|
179
238
|
}
|
|
180
239
|
}
|
|
181
240
|
}
|
|
182
|
-
if (currentBlock?.type ===
|
|
183
|
-
currentBlock.arguments = parseStreamingJson(currentBlock.partialArgs ||
|
|
241
|
+
if (currentBlock?.type === 'toolCall') {
|
|
242
|
+
currentBlock.arguments = parseStreamingJson(currentBlock.partialArgs || '');
|
|
184
243
|
delete currentBlock.partialArgs;
|
|
185
244
|
}
|
|
186
|
-
stream.push({ type:
|
|
245
|
+
stream.push({ type: 'done', reason: output.stopReason, message: output });
|
|
187
246
|
stream.end();
|
|
188
247
|
}
|
|
189
248
|
catch (error) {
|
|
190
|
-
output.stopReason = options?.signal?.aborted ?
|
|
249
|
+
output.stopReason = options?.signal?.aborted ? 'aborted' : 'error';
|
|
191
250
|
output.errorMessage = error instanceof Error ? error.message : JSON.stringify(error);
|
|
192
|
-
stream.push({ type:
|
|
251
|
+
stream.push({ type: 'error', reason: output.stopReason, error: output });
|
|
193
252
|
stream.end();
|
|
194
253
|
}
|
|
195
254
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-providers.js","sourceRoot":"","sources":["../../../src/services/custom-providers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"custom-providers.js","sourceRoot":"","sources":["../../../src/services/custom-providers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../../src/services/session-store.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,WAAW,WAAW;
|
|
1
|
+
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../../src/services/session-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { existsSync, mkdirSync, readFileSync, writeFileSync, readdirSync, unlinkSync } from
|
|
2
|
-
import { join } from
|
|
3
|
-
import { getGlobalDataDir } from
|
|
1
|
+
import { existsSync, mkdirSync, readFileSync, writeFileSync, readdirSync, unlinkSync } from 'fs';
|
|
2
|
+
import { join } from 'path';
|
|
3
|
+
import { getGlobalDataDir } from '../utils/paths.js';
|
|
4
4
|
export class SessionStore {
|
|
5
5
|
dataDir;
|
|
6
6
|
constructor(dataDir) {
|
|
7
|
-
this.dataDir = dataDir || join(getGlobalDataDir(),
|
|
7
|
+
this.dataDir = dataDir || join(getGlobalDataDir(), 'sessions');
|
|
8
8
|
if (!existsSync(this.dataDir)) {
|
|
9
9
|
mkdirSync(this.dataDir, { recursive: true });
|
|
10
10
|
}
|
|
@@ -13,24 +13,29 @@ export class SessionStore {
|
|
|
13
13
|
return join(this.dataDir, `${id}.json`);
|
|
14
14
|
}
|
|
15
15
|
generateId() {
|
|
16
|
-
return Date.now().toString(36) +
|
|
16
|
+
return Date.now().toString(36) + '-' + Math.random().toString(36).slice(2, 8);
|
|
17
17
|
}
|
|
18
18
|
list(dir) {
|
|
19
19
|
const files = readdirSync(this.dataDir);
|
|
20
20
|
const sessions = [];
|
|
21
21
|
for (const file of files) {
|
|
22
|
-
if (!file.endsWith(
|
|
22
|
+
if (!file.endsWith('.json'))
|
|
23
23
|
continue;
|
|
24
24
|
try {
|
|
25
|
-
const data = JSON.parse(readFileSync(join(this.dataDir, file),
|
|
25
|
+
const data = JSON.parse(readFileSync(join(this.dataDir, file), 'utf-8'));
|
|
26
26
|
if (dir && data.directory !== dir)
|
|
27
27
|
continue;
|
|
28
28
|
sessions.push({
|
|
29
|
-
id: data.id,
|
|
30
|
-
|
|
29
|
+
id: data.id,
|
|
30
|
+
title: data.title,
|
|
31
|
+
agent: data.agent,
|
|
32
|
+
model: data.model,
|
|
33
|
+
provider: data.provider || '',
|
|
31
34
|
thinkingEffort: data.thinkingEffort,
|
|
32
|
-
created: data.created,
|
|
33
|
-
|
|
35
|
+
created: data.created,
|
|
36
|
+
updated: data.updated,
|
|
37
|
+
messageCount: data.messages.length,
|
|
38
|
+
directory: data.directory,
|
|
34
39
|
parentId: data.parentId ?? null,
|
|
35
40
|
});
|
|
36
41
|
}
|
|
@@ -44,7 +49,7 @@ export class SessionStore {
|
|
|
44
49
|
if (!existsSync(path))
|
|
45
50
|
return null;
|
|
46
51
|
try {
|
|
47
|
-
return JSON.parse(readFileSync(path,
|
|
52
|
+
return JSON.parse(readFileSync(path, 'utf-8'));
|
|
48
53
|
}
|
|
49
54
|
catch {
|
|
50
55
|
return null;
|
|
@@ -53,10 +58,10 @@ export class SessionStore {
|
|
|
53
58
|
create(input) {
|
|
54
59
|
const session = {
|
|
55
60
|
id: this.generateId(),
|
|
56
|
-
title: input.title ||
|
|
57
|
-
agent: input.agent ||
|
|
58
|
-
model: input.model ||
|
|
59
|
-
provider: input.provider || input.model?.split(
|
|
61
|
+
title: input.title || 'New Session',
|
|
62
|
+
agent: input.agent || 'build',
|
|
63
|
+
model: input.model || '',
|
|
64
|
+
provider: input.provider || input.model?.split('/')[0] || '',
|
|
60
65
|
thinkingEffort: input.thinkingEffort,
|
|
61
66
|
created: Date.now(),
|
|
62
67
|
updated: Date.now(),
|
|
@@ -105,7 +110,7 @@ export class SessionStore {
|
|
|
105
110
|
if (!session)
|
|
106
111
|
return false;
|
|
107
112
|
const path = this.sessionPath(id);
|
|
108
|
-
const archiveDir = join(this.dataDir,
|
|
113
|
+
const archiveDir = join(this.dataDir, 'archived');
|
|
109
114
|
if (!existsSync(archiveDir))
|
|
110
115
|
mkdirSync(archiveDir, { recursive: true });
|
|
111
116
|
const archivePath = join(archiveDir, `${id}.json`);
|
|
@@ -120,9 +125,12 @@ export class SessionStore {
|
|
|
120
125
|
session.messages.push(message);
|
|
121
126
|
session.updated = Date.now();
|
|
122
127
|
if (session.messages.length === 1) {
|
|
123
|
-
session.title =
|
|
124
|
-
|
|
125
|
-
|
|
128
|
+
session.title =
|
|
129
|
+
message.role === 'user'
|
|
130
|
+
? typeof message.content === 'string'
|
|
131
|
+
? message.content.slice(0, 60)
|
|
132
|
+
: 'User message'
|
|
133
|
+
: session.title;
|
|
126
134
|
}
|
|
127
135
|
this.save(session);
|
|
128
136
|
return session;
|
|
@@ -181,10 +189,10 @@ export class SessionStore {
|
|
|
181
189
|
createChild(parentId, input) {
|
|
182
190
|
const session = {
|
|
183
191
|
id: this.generateId(),
|
|
184
|
-
title: input.title ||
|
|
185
|
-
agent: input.agent ||
|
|
186
|
-
model: input.model ||
|
|
187
|
-
provider: input.provider || input.model?.split(
|
|
192
|
+
title: input.title || 'Subagent Session',
|
|
193
|
+
agent: input.agent || 'build',
|
|
194
|
+
model: input.model || '',
|
|
195
|
+
provider: input.provider || input.model?.split('/')[0] || '',
|
|
188
196
|
thinkingEffort: input.thinkingEffort,
|
|
189
197
|
created: Date.now(),
|
|
190
198
|
updated: Date.now(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/services/session-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACjG,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AA6CrD,MAAM,OAAO,YAAY;
|
|
1
|
+
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/services/session-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot-manager.d.ts","sourceRoot":"","sources":["../../../src/services/snapshot-manager.ts"],"names":[],"mappings":"AAqBA,UAAU,cAAc;
|
|
1
|
+
{"version":3,"file":"snapshot-manager.d.ts","sourceRoot":"","sources":["../../../src/services/snapshot-manager.ts"],"names":[],"mappings":"AAqBA,UAAU,cAAc;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjD,MAAM,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,eAAe;IAC3B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAA2B;gBAE7B,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE;IAO1G,oDAAoD;IACpD,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAapC,4EAA4E;IAC5E,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAiC7C;;;;OAIG;IACH,QAAQ,CAAC,MAAM,SAAwB,GAAG,cAAc;IA2DxD,gEAAgE;IAChE,MAAM,IAAI,MAAM,GAAG,IAAI;IAQvB,QAAQ,IAAI,OAAO;IAInB,IAAI,IAAI,MAAM;IAId,KAAK,IAAI,IAAI;IAMb,OAAO,CAAC,QAAQ;CA0BhB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { existsSync, mkdirSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } from
|
|
2
|
-
import { dirname, join, relative, resolve } from
|
|
3
|
-
import { getGlobalDataDir } from
|
|
1
|
+
import { existsSync, mkdirSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } from 'fs';
|
|
2
|
+
import { dirname, join, relative, resolve } from 'path';
|
|
3
|
+
import { getGlobalDataDir } from '../utils/paths.js';
|
|
4
4
|
const FILE_MODE = 0o600;
|
|
5
5
|
const DIR_MODE = 0o700;
|
|
6
6
|
export class SnapshotManager {
|
|
@@ -11,8 +11,7 @@ export class SnapshotManager {
|
|
|
11
11
|
active = null;
|
|
12
12
|
constructor(options) {
|
|
13
13
|
this.workdir = options?.workdir || process.cwd();
|
|
14
|
-
this.snapshotDir =
|
|
15
|
-
options?.snapshotDir || join(getGlobalDataDir(), "snapshots");
|
|
14
|
+
this.snapshotDir = options?.snapshotDir || join(getGlobalDataDir(), 'snapshots');
|
|
16
15
|
this.disabled = options?.disabled || false;
|
|
17
16
|
this.maxFileSize = options?.maxFileSize || 5 * 1024 * 1024; // 5MB
|
|
18
17
|
}
|
|
@@ -25,7 +24,7 @@ export class SnapshotManager {
|
|
|
25
24
|
const id = Date.now().toString(36) + Math.random().toString(36).slice(2, 6);
|
|
26
25
|
this.active = {
|
|
27
26
|
id,
|
|
28
|
-
label: String(label ||
|
|
27
|
+
label: String(label || 'checkpoint').slice(0, 80),
|
|
29
28
|
startedAt: Date.now(),
|
|
30
29
|
files: new Map(),
|
|
31
30
|
};
|
|
@@ -38,7 +37,7 @@ export class SnapshotManager {
|
|
|
38
37
|
const abs = resolve(this.workdir, filePath);
|
|
39
38
|
// Containment — only snapshot files inside workspace root
|
|
40
39
|
const rel = relative(this.workdir, abs);
|
|
41
|
-
if (rel.startsWith(
|
|
40
|
+
if (rel.startsWith('..') || rel.startsWith('.'))
|
|
42
41
|
return;
|
|
43
42
|
if (this.active.files.has(abs))
|
|
44
43
|
return; // first-snapshot-wins
|
|
@@ -51,11 +50,11 @@ export class SnapshotManager {
|
|
|
51
50
|
this.active.files.set(abs, { tooLarge: true, existed: true });
|
|
52
51
|
return;
|
|
53
52
|
}
|
|
54
|
-
content = readFileSync(abs,
|
|
53
|
+
content = readFileSync(abs, 'utf-8');
|
|
55
54
|
existed = true;
|
|
56
55
|
}
|
|
57
56
|
catch (e) {
|
|
58
|
-
if (e.code ===
|
|
57
|
+
if (e.code === 'ENOENT') {
|
|
59
58
|
this.active.files.set(abs, { before: null, existed: false });
|
|
60
59
|
return;
|
|
61
60
|
}
|
|
@@ -73,11 +72,11 @@ export class SnapshotManager {
|
|
|
73
72
|
* Files snapshotted as nonexistent are deleted.
|
|
74
73
|
* Files with stored content are restored.
|
|
75
74
|
*/
|
|
76
|
-
rollback(reason =
|
|
75
|
+
rollback(reason = 'verification failed') {
|
|
77
76
|
if (this.disabled || !this.active) {
|
|
78
77
|
return {
|
|
79
|
-
checkpointId:
|
|
80
|
-
label:
|
|
78
|
+
checkpointId: '',
|
|
79
|
+
label: '',
|
|
81
80
|
restored: 0,
|
|
82
81
|
deleted: 0,
|
|
83
82
|
errors: [],
|
|
@@ -93,11 +92,11 @@ export class SnapshotManager {
|
|
|
93
92
|
for (const [abs, snap] of cp.files.entries()) {
|
|
94
93
|
try {
|
|
95
94
|
if (snap.tooLarge) {
|
|
96
|
-
skipped.push({ path: abs, reason:
|
|
95
|
+
skipped.push({ path: abs, reason: 'file too large to snapshot' });
|
|
97
96
|
continue;
|
|
98
97
|
}
|
|
99
98
|
if (snap.skipped) {
|
|
100
|
-
skipped.push({ path: abs, reason:
|
|
99
|
+
skipped.push({ path: abs, reason: 'snapshot read failed' });
|
|
101
100
|
continue;
|
|
102
101
|
}
|
|
103
102
|
if (!snap.existed) {
|
|
@@ -158,7 +157,7 @@ export class SnapshotManager {
|
|
|
158
157
|
if (!existsSync(this.snapshotDir)) {
|
|
159
158
|
mkdirSync(this.snapshotDir, { recursive: true, mode: DIR_MODE });
|
|
160
159
|
}
|
|
161
|
-
const id = String(cp.id ||
|
|
160
|
+
const id = String(cp.id || '').replace(/[^A-Za-z0-9_-]/g, '');
|
|
162
161
|
if (!id)
|
|
163
162
|
return;
|
|
164
163
|
const filePath = join(this.snapshotDir, `${id}.json`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot-manager.js","sourceRoot":"","sources":["../../../src/services/snapshot-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAC1G,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,SAAS,GAAG,KAAK,CAAC;AACxB,MAAM,QAAQ,GAAG,KAAK,CAAC;AA0BvB,MAAM,OAAO,eAAe;
|
|
1
|
+
{"version":3,"file":"snapshot-manager.js","sourceRoot":"","sources":["../../../src/services/snapshot-manager.ts"],"names":[],"mappings":"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"}
|