@codemieai/code 0.15.0 ā 0.15.2
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/CHANGELOG.md +75 -0
- package/bin/codemie.js +52 -0
- package/dist/agents/core/AgentCLI.d.ts.map +1 -1
- package/dist/agents/core/AgentCLI.js +6 -0
- package/dist/agents/core/AgentCLI.js.map +1 -1
- package/dist/agents/core/BaseAgentAdapter.d.ts +25 -0
- package/dist/agents/core/BaseAgentAdapter.d.ts.map +1 -1
- package/dist/agents/core/BaseAgentAdapter.js +137 -127
- package/dist/agents/core/BaseAgentAdapter.js.map +1 -1
- package/dist/agents/core/session/BaseProcessor.d.ts +10 -0
- package/dist/agents/core/session/BaseProcessor.d.ts.map +1 -1
- package/dist/agents/core/session/BaseProcessor.js +11 -1
- package/dist/agents/core/session/BaseProcessor.js.map +1 -1
- package/dist/agents/core/session/BaseSessionAdapter.d.ts +4 -0
- package/dist/agents/core/session/BaseSessionAdapter.d.ts.map +1 -1
- package/dist/agents/core/types.d.ts +11 -5
- package/dist/agents/core/types.d.ts.map +1 -1
- package/dist/agents/plugins/claude/claude.models.d.ts.map +1 -1
- package/dist/agents/plugins/claude/claude.models.js +12 -11
- package/dist/agents/plugins/claude/claude.models.js.map +1 -1
- package/dist/agents/plugins/claude/claude.plugin.d.ts +3 -3
- package/dist/agents/plugins/claude/claude.plugin.d.ts.map +1 -1
- package/dist/agents/plugins/claude/claude.plugin.js +26 -13
- package/dist/agents/plugins/claude/claude.plugin.js.map +1 -1
- package/dist/agents/plugins/claude/claude.session.d.ts.map +1 -1
- package/dist/agents/plugins/claude/claude.session.js +27 -1
- package/dist/agents/plugins/claude/claude.session.js.map +1 -1
- package/dist/agents/plugins/claude/plugin/.claude-plugin/plugin.json +1 -1
- package/dist/agents/plugins/claude/plugin/hooks/hooks.json +7 -7
- package/dist/agents/plugins/codex/codex.plugin.d.ts.map +1 -1
- package/dist/agents/plugins/codex/codex.plugin.js +7 -6
- package/dist/agents/plugins/codex/codex.plugin.js.map +1 -1
- package/dist/agents/plugins/copilot-cli/copilot-cli.plugin.d.ts.map +1 -1
- package/dist/agents/plugins/copilot-cli/copilot-cli.plugin.js +5 -2
- package/dist/agents/plugins/copilot-cli/copilot-cli.plugin.js.map +1 -1
- package/dist/agents/plugins/gemini/extension/gemini-extension.json +1 -1
- package/dist/agents/plugins/gemini/extension/hooks/hooks.json +7 -7
- package/dist/agents/plugins/gemini/gemini.plugin.d.ts.map +1 -1
- package/dist/agents/plugins/gemini/gemini.plugin.js +7 -6
- package/dist/agents/plugins/gemini/gemini.plugin.js.map +1 -1
- package/dist/agents/plugins/gemini/gemini.session-adapter.d.ts +1 -1
- package/dist/agents/plugins/gemini/gemini.session-adapter.d.ts.map +1 -1
- package/dist/agents/plugins/gemini/gemini.session-adapter.js +155 -16
- package/dist/agents/plugins/gemini/gemini.session-adapter.js.map +1 -1
- package/dist/agents/plugins/gemini/session/processors/gemini.metrics-processor.d.ts.map +1 -1
- package/dist/agents/plugins/gemini/session/processors/gemini.metrics-processor.js +77 -31
- package/dist/agents/plugins/gemini/session/processors/gemini.metrics-processor.js.map +1 -1
- package/dist/agents/plugins/gemini/session/utils/turn-detector.d.ts +1 -1
- package/dist/agents/plugins/gemini/session/utils/turn-detector.d.ts.map +1 -1
- package/dist/agents/plugins/gemini/session/utils/turn-detector.js +7 -1
- package/dist/agents/plugins/gemini/session/utils/turn-detector.js.map +1 -1
- package/dist/agents/plugins/kimi/kimi.hook-config-injector.d.ts.map +1 -1
- package/dist/agents/plugins/kimi/kimi.hook-config-injector.js +26 -5
- package/dist/agents/plugins/kimi/kimi.hook-config-injector.js.map +1 -1
- package/dist/agents/plugins/kimi/kimi.plugin.d.ts.map +1 -1
- package/dist/agents/plugins/kimi/kimi.plugin.js +5 -2
- package/dist/agents/plugins/kimi/kimi.plugin.js.map +1 -1
- package/dist/cli/commands/analytics/cost/claude-dispatch-allocation.d.ts +6 -0
- package/dist/cli/commands/analytics/cost/claude-dispatch-allocation.d.ts.map +1 -0
- package/dist/cli/commands/analytics/cost/claude-dispatch-allocation.js +115 -0
- package/dist/cli/commands/analytics/cost/claude-dispatch-allocation.js.map +1 -0
- package/dist/cli/commands/analytics/cost/claude-lifecycle.d.ts +6 -0
- package/dist/cli/commands/analytics/cost/claude-lifecycle.d.ts.map +1 -0
- package/dist/cli/commands/analytics/cost/claude-lifecycle.js +107 -0
- package/dist/cli/commands/analytics/cost/claude-lifecycle.js.map +1 -0
- package/dist/cli/commands/analytics/cost/claude-native.d.ts +54 -0
- package/dist/cli/commands/analytics/cost/claude-native.d.ts.map +1 -0
- package/dist/cli/commands/analytics/cost/claude-native.js +14 -0
- package/dist/cli/commands/analytics/cost/claude-native.js.map +1 -0
- package/dist/cli/commands/analytics/cost/claude-ownership.d.ts +23 -0
- package/dist/cli/commands/analytics/cost/claude-ownership.d.ts.map +1 -0
- package/dist/cli/commands/analytics/cost/claude-ownership.js +99 -0
- package/dist/cli/commands/analytics/cost/claude-ownership.js.map +1 -0
- package/dist/cli/commands/analytics/cost/claude-trace.d.ts +28 -0
- package/dist/cli/commands/analytics/cost/claude-trace.d.ts.map +1 -0
- package/dist/cli/commands/analytics/cost/claude-trace.js +120 -0
- package/dist/cli/commands/analytics/cost/claude-trace.js.map +1 -0
- package/dist/cli/commands/analytics/cost/cost-enricher.d.ts +1 -1
- package/dist/cli/commands/analytics/cost/cost-enricher.d.ts.map +1 -1
- package/dist/cli/commands/analytics/cost/cost-enricher.js +34 -43
- package/dist/cli/commands/analytics/cost/cost-enricher.js.map +1 -1
- package/dist/cli/commands/analytics/cost/dispatch-allocation.d.ts +18 -0
- package/dist/cli/commands/analytics/cost/dispatch-allocation.d.ts.map +1 -0
- package/dist/cli/commands/analytics/cost/dispatch-allocation.js +53 -0
- package/dist/cli/commands/analytics/cost/dispatch-allocation.js.map +1 -0
- package/dist/cli/commands/analytics/cost/dispatch-extractor.d.ts +8 -13
- package/dist/cli/commands/analytics/cost/dispatch-extractor.d.ts.map +1 -1
- package/dist/cli/commands/analytics/cost/dispatch-extractor.js +131 -69
- package/dist/cli/commands/analytics/cost/dispatch-extractor.js.map +1 -1
- package/dist/cli/commands/analytics/cost/types.d.ts +39 -0
- package/dist/cli/commands/analytics/cost/types.d.ts.map +1 -1
- package/dist/cli/commands/analytics/cost/types.js.map +1 -1
- package/dist/cli/commands/analytics/cost/usage-readers.d.ts +2 -0
- package/dist/cli/commands/analytics/cost/usage-readers.d.ts.map +1 -1
- package/dist/cli/commands/analytics/cost/usage-readers.js +14 -3
- package/dist/cli/commands/analytics/cost/usage-readers.js.map +1 -1
- package/dist/cli/commands/analytics/data-loader.d.ts +13 -0
- package/dist/cli/commands/analytics/data-loader.d.ts.map +1 -1
- package/dist/cli/commands/analytics/data-loader.js +6 -0
- package/dist/cli/commands/analytics/data-loader.js.map +1 -1
- package/dist/cli/commands/analytics/native-loader.d.ts +1 -1
- package/dist/cli/commands/analytics/native-loader.d.ts.map +1 -1
- package/dist/cli/commands/analytics/native-loader.js +25 -3
- package/dist/cli/commands/analytics/native-loader.js.map +1 -1
- package/dist/cli/commands/analytics/otel-loader.d.ts.map +1 -1
- package/dist/cli/commands/analytics/otel-loader.js +5 -0
- package/dist/cli/commands/analytics/otel-loader.js.map +1 -1
- package/dist/cli/commands/analytics/report/client/app.js +302 -125
- package/dist/cli/commands/analytics/report/payload-builder.d.ts.map +1 -1
- package/dist/cli/commands/analytics/report/payload-builder.js +64 -13
- package/dist/cli/commands/analytics/report/payload-builder.js.map +1 -1
- package/dist/cli/commands/analytics/report/template.html +50 -2
- package/dist/cli/commands/analytics/report/types.d.ts +16 -0
- package/dist/cli/commands/analytics/report/types.d.ts.map +1 -1
- package/dist/cli/commands/doctor/checks/AgentsCheck.d.ts +6 -0
- package/dist/cli/commands/doctor/checks/AgentsCheck.d.ts.map +1 -1
- package/dist/cli/commands/doctor/checks/AgentsCheck.js +37 -33
- package/dist/cli/commands/doctor/checks/AgentsCheck.js.map +1 -1
- package/dist/cli/commands/doctor/index.d.ts.map +1 -1
- package/dist/cli/commands/doctor/index.js +11 -0
- package/dist/cli/commands/doctor/index.js.map +1 -1
- package/dist/cli/commands/hook.d.ts.map +1 -1
- package/dist/cli/commands/hook.js +72 -12
- package/dist/cli/commands/hook.js.map +1 -1
- package/dist/cli/commands/install.d.ts.map +1 -1
- package/dist/cli/commands/install.js +5 -9
- package/dist/cli/commands/install.js.map +1 -1
- package/dist/cli/commands/mcp/index.d.ts.map +1 -1
- package/dist/cli/commands/mcp/index.js +68 -17
- package/dist/cli/commands/mcp/index.js.map +1 -1
- package/dist/cli/commands/proxy/connectors/desktop.d.ts +13 -9
- package/dist/cli/commands/proxy/connectors/desktop.d.ts.map +1 -1
- package/dist/cli/commands/proxy/connectors/desktop.js +27 -13
- package/dist/cli/commands/proxy/connectors/desktop.js.map +1 -1
- package/dist/cli/commands/setup.d.ts +0 -16
- package/dist/cli/commands/setup.d.ts.map +1 -1
- package/dist/cli/commands/setup.js +79 -149
- package/dist/cli/commands/setup.js.map +1 -1
- package/dist/cli/commands/tips.d.ts +10 -0
- package/dist/cli/commands/tips.d.ts.map +1 -0
- package/dist/cli/commands/tips.js +142 -0
- package/dist/cli/commands/tips.js.map +1 -0
- package/dist/cli/commands/update.d.ts.map +1 -1
- package/dist/cli/commands/update.js +12 -10
- package/dist/cli/commands/update.js.map +1 -1
- package/dist/cli/commands/whatsnew.d.ts +6 -0
- package/dist/cli/commands/whatsnew.d.ts.map +1 -0
- package/dist/cli/commands/whatsnew.js +37 -0
- package/dist/cli/commands/whatsnew.js.map +1 -0
- package/dist/cli/first-time.d.ts.map +1 -1
- package/dist/cli/first-time.js +4 -0
- package/dist/cli/first-time.js.map +1 -1
- package/dist/cli/index.js +4 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/providers/core/codemie-auth-helpers.d.ts +1 -1
- package/dist/providers/core/codemie-auth-helpers.d.ts.map +1 -1
- package/dist/providers/core/codemie-auth-helpers.js +3 -3
- package/dist/providers/core/codemie-auth-helpers.js.map +1 -1
- package/dist/providers/core/types.d.ts +16 -28
- package/dist/providers/core/types.d.ts.map +1 -1
- package/dist/providers/core/types.js.map +1 -1
- package/dist/providers/integration/setup-ui.d.ts +5 -3
- package/dist/providers/integration/setup-ui.d.ts.map +1 -1
- package/dist/providers/integration/setup-ui.js +6 -4
- package/dist/providers/integration/setup-ui.js.map +1 -1
- package/dist/providers/plugins/litellm/litellm.setup-steps.d.ts.map +1 -1
- package/dist/providers/plugins/litellm/litellm.setup-steps.js +4 -23
- package/dist/providers/plugins/litellm/litellm.setup-steps.js.map +1 -1
- package/dist/providers/plugins/ollama/ollama.library.d.ts +37 -0
- package/dist/providers/plugins/ollama/ollama.library.d.ts.map +1 -0
- package/dist/providers/plugins/ollama/ollama.library.js +105 -0
- package/dist/providers/plugins/ollama/ollama.library.js.map +1 -0
- package/dist/providers/plugins/ollama/ollama.models.d.ts +3 -1
- package/dist/providers/plugins/ollama/ollama.models.d.ts.map +1 -1
- package/dist/providers/plugins/ollama/ollama.models.js +5 -39
- package/dist/providers/plugins/ollama/ollama.models.js.map +1 -1
- package/dist/providers/plugins/ollama/ollama.setup-steps.d.ts.map +1 -1
- package/dist/providers/plugins/ollama/ollama.setup-steps.js +196 -6
- package/dist/providers/plugins/ollama/ollama.setup-steps.js.map +1 -1
- package/dist/providers/plugins/ollama/ollama.template.d.ts.map +1 -1
- package/dist/providers/plugins/ollama/ollama.template.js +12 -32
- package/dist/providers/plugins/ollama/ollama.template.js.map +1 -1
- package/dist/providers/plugins/sso/session/BaseProcessor.d.ts +4 -0
- package/dist/providers/plugins/sso/session/BaseProcessor.d.ts.map +1 -1
- package/dist/providers/plugins/sso/session/SessionSyncer.d.ts +12 -0
- package/dist/providers/plugins/sso/session/SessionSyncer.d.ts.map +1 -1
- package/dist/providers/plugins/sso/session/SessionSyncer.js +89 -0
- package/dist/providers/plugins/sso/session/SessionSyncer.js.map +1 -1
- package/dist/providers/plugins/sso/session/processors/conversations/syncProcessor.d.ts.map +1 -1
- package/dist/providers/plugins/sso/session/processors/conversations/syncProcessor.js +75 -41
- package/dist/providers/plugins/sso/session/processors/conversations/syncProcessor.js.map +1 -1
- package/dist/providers/plugins/sso/session/processors/metrics/metrics-sync-processor.d.ts.map +1 -1
- package/dist/providers/plugins/sso/session/processors/metrics/metrics-sync-processor.js +23 -4
- package/dist/providers/plugins/sso/session/processors/metrics/metrics-sync-processor.js.map +1 -1
- package/dist/providers/plugins/sso/sso.auth.d.ts.map +1 -1
- package/dist/providers/plugins/sso/sso.auth.js +6 -2
- package/dist/providers/plugins/sso/sso.auth.js.map +1 -1
- package/dist/providers/plugins/sso/sso.setup-steps.d.ts.map +1 -1
- package/dist/providers/plugins/sso/sso.setup-steps.js +22 -39
- package/dist/providers/plugins/sso/sso.setup-steps.js.map +1 -1
- package/dist/utils/cli-updater.d.ts.map +1 -1
- package/dist/utils/cli-updater.js +2 -8
- package/dist/utils/cli-updater.js.map +1 -1
- package/dist/utils/env.d.ts +12 -0
- package/dist/utils/env.d.ts.map +1 -0
- package/dist/utils/env.js +18 -0
- package/dist/utils/env.js.map +1 -0
- package/dist/utils/hook-command.d.ts +6 -0
- package/dist/utils/hook-command.d.ts.map +1 -1
- package/dist/utils/hook-command.js +52 -6
- package/dist/utils/hook-command.js.map +1 -1
- package/dist/utils/pricing.json +38 -6
- package/dist/utils/security.d.ts +28 -2
- package/dist/utils/security.d.ts.map +1 -1
- package/dist/utils/security.js +84 -24
- package/dist/utils/security.js.map +1 -1
- package/dist/utils/tips.d.ts +103 -0
- package/dist/utils/tips.d.ts.map +1 -0
- package/dist/utils/tips.js +221 -0
- package/dist/utils/tips.js.map +1 -0
- package/dist/utils/version-warnings.d.ts +41 -0
- package/dist/utils/version-warnings.d.ts.map +1 -0
- package/dist/utils/version-warnings.js +93 -0
- package/dist/utils/version-warnings.js.map +1 -0
- package/dist/utils/whatsnew.d.ts +83 -0
- package/dist/utils/whatsnew.d.ts.map +1 -0
- package/dist/utils/whatsnew.js +200 -0
- package/dist/utils/whatsnew.js.map +1 -0
- package/package.json +5 -10
- package/scripts/release.sh +9 -3
- package/src/utils/tips.json +806 -0
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
*
|
|
11
11
|
* Note: Message transformation is handled by agent adapters (e.g., Claude's ConversationsProcessor)
|
|
12
12
|
*/
|
|
13
|
+
import { shouldStopSync } from '../../../../../../agents/core/session/BaseProcessor.js';
|
|
13
14
|
import { CONVERSATION_SYNC_STATUS } from './types.js';
|
|
14
15
|
import { logger } from '../../../../../../utils/logger.js';
|
|
15
16
|
import { createApiClient as createConversationApiClient } from './apiClient.js';
|
|
@@ -63,9 +64,17 @@ export function createSyncProcessor() {
|
|
|
63
64
|
// Send each pending payload to API
|
|
64
65
|
let successCount = 0;
|
|
65
66
|
let totalMessages = 0;
|
|
67
|
+
let deferred = false;
|
|
66
68
|
const successfulPayloadIds = new Set();
|
|
67
69
|
const failedByPayloadId = new Map();
|
|
68
70
|
for (const pendingPayload of pendingPayloads) {
|
|
71
|
+
// Stop BEFORE sending the next payload when the caller's sync deadline
|
|
72
|
+
// expired or an abort was signaled (the SessionEnd hook can be killed at
|
|
73
|
+
// any moment; leftovers stay pending for the next run).
|
|
74
|
+
if (shouldStopSync(context)) {
|
|
75
|
+
deferred = true;
|
|
76
|
+
break;
|
|
77
|
+
}
|
|
69
78
|
const payloadId = getPayloadId(pendingPayload);
|
|
70
79
|
const { conversationId, history, assistantId, folder, llmModel } = pendingPayload.payload;
|
|
71
80
|
const resolvedAssistantId = assistantId || CODEMIE_ASSISTANT_ID;
|
|
@@ -73,54 +82,51 @@ export function createSyncProcessor() {
|
|
|
73
82
|
logger.debug(`[${CONVERSATION_PROCESSOR_NAME}] Sending payload: conversationId=${conversationId}, ` +
|
|
74
83
|
`messages=${history.length}, folder=${resolvedFolder}, llmModel=${llmModel || 'unknown'}, ` +
|
|
75
84
|
`isTurnContinuation=${pendingPayload.isTurnContinuation}`);
|
|
85
|
+
let syncError;
|
|
76
86
|
try {
|
|
77
87
|
// Send to API
|
|
78
88
|
const response = await apiClient.upsertConversation(conversationId, history, resolvedAssistantId, resolvedFolder, llmModel);
|
|
79
89
|
if (!response.success) {
|
|
80
90
|
logger.error(`[${CONVERSATION_PROCESSOR_NAME}] Failed to sync conversation ${conversationId}: ${response.message}`);
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
91
|
+
syncError = response.message;
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
logger.info(`[${CONVERSATION_PROCESSOR_NAME}] Successfully synced conversation ${conversationId} (${response.new_messages} new, ${response.total_messages} total)`);
|
|
95
|
+
successCount++;
|
|
96
|
+
totalMessages += history.length;
|
|
97
|
+
successfulPayloadIds.add(payloadId);
|
|
84
98
|
}
|
|
85
|
-
logger.info(`[${CONVERSATION_PROCESSOR_NAME}] Successfully synced conversation ${conversationId} (${response.new_messages} new, ${response.total_messages} total)`);
|
|
86
|
-
successCount++;
|
|
87
|
-
totalMessages += history.length;
|
|
88
|
-
successfulPayloadIds.add(payloadId);
|
|
89
99
|
}
|
|
90
100
|
catch (error) {
|
|
91
101
|
logger.error(`[${CONVERSATION_PROCESSOR_NAME}] Error syncing conversation ${conversationId}:`, error.message);
|
|
92
|
-
|
|
93
|
-
// Continue with other payloads
|
|
102
|
+
syncError = error.message || 'Unknown error';
|
|
94
103
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
const syncedAt = Date.now();
|
|
98
|
-
const updatedPayloads = allPayloads.map((p) => {
|
|
99
|
-
const payloadId = getPayloadId(p);
|
|
100
|
-
if (successfulPayloadIds.has(payloadId)) {
|
|
101
|
-
return {
|
|
102
|
-
...p,
|
|
103
|
-
status: CONVERSATION_SYNC_STATUS.SUCCESS,
|
|
104
|
-
syncAttempts: (p.syncAttempts ?? 0) + 1,
|
|
105
|
-
error: undefined,
|
|
106
|
-
response: {
|
|
107
|
-
syncedCount: p.payload.history.length
|
|
108
|
-
}
|
|
109
|
-
};
|
|
104
|
+
if (syncError) {
|
|
105
|
+
failedByPayloadId.set(payloadId, syncError);
|
|
110
106
|
}
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
syncAttempts: (p.syncAttempts ?? 0) + 1,
|
|
117
|
-
error,
|
|
118
|
-
};
|
|
107
|
+
// Persist THIS payload's outcome immediately (atomic full-file rewrite).
|
|
108
|
+
// A kill mid-loop must never lose progress made so far.
|
|
109
|
+
applyPayloadOutcome(allPayloads, payloadId, syncError);
|
|
110
|
+
try {
|
|
111
|
+
await writeJSONLAtomic(conversationsFile, allPayloads);
|
|
119
112
|
}
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
113
|
+
catch (writeError) {
|
|
114
|
+
// Keep going: in-memory state is ahead of disk, a later iteration may persist it
|
|
115
|
+
logger.error(`[${CONVERSATION_PROCESSOR_NAME}] Failed to persist payload outcome:`, writeError);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
const syncedAt = Date.now();
|
|
119
|
+
const attemptedCount = successfulPayloadIds.size + failedByPayloadId.size;
|
|
120
|
+
const remainingCount = pendingPayloads.length - attemptedCount;
|
|
121
|
+
const message = deferred
|
|
122
|
+
? `Sync deferred: ${remainingCount} items remaining (deadline/abort)`
|
|
123
|
+
: `Synced ${successCount}/${pendingPayloads.length} conversations`;
|
|
124
|
+
if (deferred) {
|
|
125
|
+
logger.info(`[${CONVERSATION_PROCESSOR_NAME}] ${message} (${successCount} synced before stop)`);
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
logger.info(`[${CONVERSATION_PROCESSOR_NAME}] Successfully synced ${successCount}/${pendingPayloads.length} conversations (${totalMessages} messages)`);
|
|
129
|
+
}
|
|
124
130
|
// Calculate sync updates for the adapter to persist
|
|
125
131
|
let maxHistoryIndex = -1;
|
|
126
132
|
let conversationId;
|
|
@@ -155,14 +161,14 @@ export function createSyncProcessor() {
|
|
|
155
161
|
syncedAt: new Date(syncedAt).toISOString(),
|
|
156
162
|
payloadIds: Array.from(successfulPayloadIds),
|
|
157
163
|
failedPayloadIds: Array.from(failedByPayloadId.keys()),
|
|
158
|
-
totalPayloadsInFile:
|
|
159
|
-
syncedCount:
|
|
160
|
-
failedCount:
|
|
161
|
-
pendingCount:
|
|
164
|
+
totalPayloadsInFile: allPayloads.length,
|
|
165
|
+
syncedCount: allPayloads.filter(p => p.status === CONVERSATION_SYNC_STATUS.SUCCESS).length,
|
|
166
|
+
failedCount: allPayloads.filter(p => p.status === CONVERSATION_SYNC_STATUS.FAILED).length,
|
|
167
|
+
pendingCount: allPayloads.filter(p => p.status === CONVERSATION_SYNC_STATUS.PENDING).length
|
|
162
168
|
});
|
|
163
169
|
return {
|
|
164
170
|
success: true,
|
|
165
|
-
message
|
|
171
|
+
message,
|
|
166
172
|
metadata: {
|
|
167
173
|
conversationId: session.sessionId,
|
|
168
174
|
messagesProcessed: totalMessages,
|
|
@@ -230,6 +236,34 @@ function getPayloadId(payload) {
|
|
|
230
236
|
payload.lastProcessedMessageUuid ||
|
|
231
237
|
`${payload.payload.conversationId}:${payload.timestamp}`;
|
|
232
238
|
}
|
|
239
|
+
/**
|
|
240
|
+
* Apply a single payload's sync outcome to the in-memory records (in place).
|
|
241
|
+
* Mirrors the per-payload success/failure mapping so the file can be rewritten
|
|
242
|
+
* after every payload instead of only at the end of the loop.
|
|
243
|
+
*/
|
|
244
|
+
function applyPayloadOutcome(allPayloads, payloadId, syncError) {
|
|
245
|
+
const index = allPayloads.findIndex(p => getPayloadId(p) === payloadId);
|
|
246
|
+
if (index === -1) {
|
|
247
|
+
return;
|
|
248
|
+
}
|
|
249
|
+
const p = allPayloads[index];
|
|
250
|
+
allPayloads[index] = syncError
|
|
251
|
+
? {
|
|
252
|
+
...p,
|
|
253
|
+
status: CONVERSATION_SYNC_STATUS.FAILED,
|
|
254
|
+
syncAttempts: (p.syncAttempts ?? 0) + 1,
|
|
255
|
+
error: syncError,
|
|
256
|
+
}
|
|
257
|
+
: {
|
|
258
|
+
...p,
|
|
259
|
+
status: CONVERSATION_SYNC_STATUS.SUCCESS,
|
|
260
|
+
syncAttempts: (p.syncAttempts ?? 0) + 1,
|
|
261
|
+
error: undefined,
|
|
262
|
+
response: {
|
|
263
|
+
syncedCount: p.payload.history.length
|
|
264
|
+
}
|
|
265
|
+
};
|
|
266
|
+
}
|
|
233
267
|
function parseSourceIndex(value) {
|
|
234
268
|
if (typeof value !== 'string') {
|
|
235
269
|
return -1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncProcessor.js","sourceRoot":"","sources":["../../../../../../../src/providers/plugins/sso/session/processors/conversations/syncProcessor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;
|
|
1
|
+
{"version":3,"file":"syncProcessor.js","sourceRoot":"","sources":["../../../../../../../src/providers/plugins/sso/session/processors/conversations/syncProcessor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAGxE,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,eAAe,IAAI,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,oBAAoB,EACpB,2BAA2B,EAC3B,+BAA+B,EAC/B,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AAExB,MAAM,8BAA8B,GAAG,CAAC,CAAC;AAEzC;;;GAGG;AACH,MAAM,UAAU,mBAAmB;IACjC,0BAA0B;IAC1B,IAAI,SAAS,GAAG,KAAK,CAAC,CAAC,oBAAoB;IAE3C;;OAEG;IACH,KAAK,UAAU,oBAAoB,CAAC,OAAsB,EAAE,OAA0B;QACpF,IAAI,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,GAAG,EAAE,CAAC;YACnD,MAAM,CAAC,KAAK,CAAC,wFAAwF,CAAC,CAAC;YACvG,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,wDAAwD,EAAE,CAAC;QAC9F,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC;QACxD,CAAC;QACD,SAAS,GAAG,IAAI,CAAC;QAEjB,IAAI,CAAC;YACH,wCAAwC;YACxC,MAAM,iBAAiB,GAAG,0BAA0B,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACxE,MAAM,WAAW,GAAG,MAAM,SAAS,CAA4B,iBAAiB,CAAC,CAAC;YAElF,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAC7C,CAAC,CAAC,MAAM,KAAK,wBAAwB,CAAC,OAAO;gBAC7C,CAAC,CAAC,CAAC,MAAM,KAAK,wBAAwB,CAAC,MAAM;oBAC3C,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,8BAA8B,CAAC,CAC1D,CAAC;YAEF,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjC,MAAM,CAAC,KAAK,CAAC,IAAI,2BAA2B,kDAAkD,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;gBACnH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,qBAAqB,EAAE,CAAC;YAC3D,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,IAAI,2BAA2B,aAAa,eAAe,CAAC,MAAM,wBAAwB,eAAe,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAEjJ,wBAAwB;YACxB,MAAM,SAAS,GAAG,2BAA2B,CAAC;gBAC5C,OAAO,EAAE,OAAO,CAAC,UAAU;gBAC3B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,sBAAsB;gBAC/B,aAAa,EAAE,sBAAsB;gBACrC,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC,CAAC;YAEH,mCAAmC;YACnC,IAAI,YAAY,GAAG,CAAC,CAAC;YACrB,IAAI,aAAa,GAAG,CAAC,CAAC;YACtB,IAAI,QAAQ,GAAG,KAAK,CAAC;YACrB,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;YAC/C,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;YAEpD,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;gBAC7C,uEAAuE;gBACvE,yEAAyE;gBACzE,wDAAwD;gBACxD,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC5B,QAAQ,GAAG,IAAI,CAAC;oBAChB,MAAM;gBACR,CAAC;gBAED,MAAM,SAAS,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;gBAC/C,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC;gBAC1F,MAAM,mBAAmB,GAAG,WAAW,IAAI,oBAAoB,CAAC;gBAChE,MAAM,cAAc,GAAG,MAAM,IAAI,yBAAyB,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;gBAElG,MAAM,CAAC,KAAK,CACV,IAAI,2BAA2B,qCAAqC,cAAc,IAAI;oBACtF,YAAY,OAAO,CAAC,MAAM,YAAY,cAAc,cAAc,QAAQ,IAAI,SAAS,IAAI;oBAC3F,sBAAsB,cAAc,CAAC,kBAAkB,EAAE,CAC1D,CAAC;gBAEF,IAAI,SAA6B,CAAC;gBAClC,IAAI,CAAC;oBAEH,cAAc;oBACd,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,kBAAkB,CACjD,cAAc,EACd,OAAO,EACP,mBAAmB,EACnB,cAAc,EACd,QAAQ,CACT,CAAC;oBAEF,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;wBACtB,MAAM,CAAC,KAAK,CAAC,IAAI,2BAA2B,iCAAiC,cAAc,KAAK,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;wBACpH,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC;oBAC/B,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,IAAI,CAAC,IAAI,2BAA2B,sCAAsC,cAAc,KAAK,QAAQ,CAAC,YAAY,SAAS,QAAQ,CAAC,cAAc,SAAS,CAAC,CAAC;wBACpK,YAAY,EAAE,CAAC;wBACf,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;wBAChC,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBACtC,CAAC;gBAEH,CAAC;gBAAC,OAAO,KAAU,EAAE,CAAC;oBACpB,MAAM,CAAC,KAAK,CAAC,IAAI,2BAA2B,gCAAgC,cAAc,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC9G,SAAS,GAAG,KAAK,CAAC,OAAO,IAAI,eAAe,CAAC;gBAC/C,CAAC;gBAED,IAAI,SAAS,EAAE,CAAC;oBACd,iBAAiB,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;gBAC9C,CAAC;gBAED,yEAAyE;gBACzE,wDAAwD;gBACxD,mBAAmB,CAAC,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;gBACvD,IAAI,CAAC;oBACH,MAAM,gBAAgB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;gBACzD,CAAC;gBAAC,OAAO,UAAU,EAAE,CAAC;oBACpB,iFAAiF;oBACjF,MAAM,CAAC,KAAK,CAAC,IAAI,2BAA2B,sCAAsC,EAAE,UAAU,CAAC,CAAC;gBAClG,CAAC;YACH,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC5B,MAAM,cAAc,GAAG,oBAAoB,CAAC,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC;YAC1E,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,GAAG,cAAc,CAAC;YAE/D,MAAM,OAAO,GAAG,QAAQ;gBACtB,CAAC,CAAC,kBAAkB,cAAc,mCAAmC;gBACrE,CAAC,CAAC,UAAU,YAAY,IAAI,eAAe,CAAC,MAAM,gBAAgB,CAAC;YAErE,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,CAAC,IAAI,CAAC,IAAI,2BAA2B,KAAK,OAAO,KAAK,YAAY,sBAAsB,CAAC,CAAC;YAClG,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CACT,IAAI,2BAA2B,yBAAyB,YAAY,IAAI,eAAe,CAAC,MAAM,mBAAmB,aAAa,YAAY,CAC3I,CAAC;YACJ,CAAC;YAED,oDAAoD;YACpD,IAAI,eAAe,GAAG,CAAC,CAAC,CAAC;YACzB,IAAI,cAAkC,CAAC;YACvC,IAAI,qBAAyC,CAAC;YAE9C,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;gBACrB,IAAI,aAAoD,CAAC;gBACzD,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE,CAAC;oBACtC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;wBAAE,SAAS;oBAC/D,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC;oBACpD,MAAM,eAAe,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC;wBAC/C,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC;wBAC7B,CAAC,CAAC,CAAC,CAAC,CAAC;oBACP,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAC1B,eAAe,EACf,gBAAgB,CAAC,OAAO,CAAC,wBAAwB,CAAC,CACnD,CAAC;oBACF,MAAM,UAAU,GAAG,aAAa;wBAC9B,CAAC,CAAC,IAAI,CAAC,GAAG,CACR,aAAa,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACxF,gBAAgB,CAAC,aAAa,CAAC,wBAAwB,CAAC,CACzD;wBACD,CAAC,CAAC,CAAC,CAAC,CAAC;oBAEP,IAAI,CAAC,aAAa,IAAI,WAAW,GAAG,UAAU,EAAE,CAAC;wBAC/C,aAAa,GAAG,OAAO,CAAC;oBAC1B,CAAC;oBAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC9B,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;oBAC/D,CAAC;gBACH,CAAC;gBAED,IAAI,aAAa,EAAE,CAAC;oBAClB,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC;oBACtD,qBAAqB,GAAG,aAAa,CAAC,wBAAwB,CAAC;gBACjE,CAAC;YACH,CAAC;YAED,kDAAkD;YAClD,MAAM,CAAC,KAAK,CAAC,IAAI,2BAA2B,8BAA8B,EAAE;gBAC1E,QAAQ,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE;gBAC1C,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC;gBAC5C,gBAAgB,EAAE,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;gBACtD,mBAAmB,EAAE,WAAW,CAAC,MAAM;gBACvC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,wBAAwB,CAAC,OAAO,CAAC,CAAC,MAAM;gBAC1F,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,wBAAwB,CAAC,MAAM,CAAC,CAAC,MAAM;gBACzF,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,wBAAwB,CAAC,OAAO,CAAC,CAAC,MAAM;aAC5F,CAAC,CAAC;YAEH,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO;gBACP,QAAQ,EAAE;oBACR,cAAc,EAAE,OAAO,CAAC,SAAS;oBACjC,iBAAiB,EAAE,aAAa;oBAChC,cAAc,EAAE,YAAY;oBAC5B,WAAW,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC;wBAC9B,aAAa,EAAE;4BACb,qBAAqB;4BACrB,sBAAsB,EAAE,eAAe;4BACvC,cAAc;4BACd,mBAAmB,EAAE,aAAa;4BAClC,iBAAiB,EAAE,CAAC;4BACpB,UAAU,EAAE,QAAQ;yBACrB;qBACF,CAAC,CAAC,CAAC,SAAS;iBACd;aACF,CAAC;QAEJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,IAAI,2BAA2B,sBAAsB,EAAE,KAAK,CAAC,CAAC;YAC3E,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;aAClE,CAAC;QACJ,CAAC;gBAAS,CAAC;YACT,SAAS,GAAG,KAAK,CAAC;QACpB,CAAC;IACH,CAAC;IAED,sCAAsC;IACtC,OAAO;QACL,IAAI,EAAE,2BAA2B;QACjC,QAAQ,EAAE,+BAA+B;QACzC,aAAa,CAAC,QAAuB;YACnC,iEAAiE;YACjE,OAAO,IAAI,CAAC;QACd,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,OAAsB,EAAE,OAA0B;YAC9D,OAAO,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAChD,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,UAAmB,EAAE,SAAkB;IACxE,IAAI,UAAU,KAAK,eAAe,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;QAC5D,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,IAAI,UAAU,KAAK,iBAAiB,IAAI,SAAS,KAAK,aAAa,EAAE,CAAC;QACpE,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,IAAI,UAAU,KAAK,gBAAgB,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;QAC9D,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IAAI,UAAU,KAAK,gBAAgB,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;QAC9D,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IAAI,UAAU,KAAK,kBAAkB,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;QAClE,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,IAAI,UAAU,KAAK,YAAY,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACtD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,2BAA2B,CAAC;AACrC,CAAC;AAED,SAAS,YAAY,CAAC,OAAkC;IACtD,OAAO,OAAO,CAAC,SAAS;QACtB,OAAO,CAAC,wBAAwB;QAChC,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;AAC7D,CAAC;AAED;;;;GAIG;AACH,SAAS,mBAAmB,CAC1B,WAAwC,EACxC,SAAiB,EACjB,SAA6B;IAE7B,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;IACxE,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,OAAO;IACT,CAAC;IAED,MAAM,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAC7B,WAAW,CAAC,KAAK,CAAC,GAAG,SAAS;QAC5B,CAAC,CAAC;YACA,GAAG,CAAC;YACJ,MAAM,EAAE,wBAAwB,CAAC,MAAM;YACvC,YAAY,EAAE,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC;YACvC,KAAK,EAAE,SAAS;SACjB;QACD,CAAC,CAAC;YACA,GAAG,CAAC;YACJ,MAAM,EAAE,wBAAwB,CAAC,OAAO;YACxC,YAAY,EAAE,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC;YACvC,KAAK,EAAE,SAAS;YAChB,QAAQ,EAAE;gBACR,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM;aACtC;SACF,CAAC;AACN,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACtC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3E,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7C,CAAC"}
|
package/dist/providers/plugins/sso/session/processors/metrics/metrics-sync-processor.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics-sync-processor.d.ts","sourceRoot":"","sources":["../../../../../../../src/providers/plugins/sso/session/processors/metrics/metrics-sync-processor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"metrics-sync-processor.d.ts","sourceRoot":"","sources":["../../../../../../../src/providers/plugins/sso/session/processors/metrics/metrics-sync-processor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAEpG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAYjE,qBAAa,oBAAqB,YAAW,gBAAgB;IAC3D,QAAQ,CAAC,IAAI,kBAAkB;IAC/B,QAAQ,CAAC,QAAQ,KAAK;IAEtB,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,SAAS,CAAS;IAE1B,aAAa,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO;IAKzC,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CA6Q7F"}
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
*
|
|
12
12
|
* Note: Delta extraction is handled by agent adapters (e.g., Claude's MetricsProcessor)
|
|
13
13
|
*/
|
|
14
|
+
import { shouldStopSync } from '../../../../../../agents/core/session/BaseProcessor.js';
|
|
14
15
|
import { logger } from '../../../../../../utils/logger.js';
|
|
15
16
|
import { MetricsSender } from './metrics-api-client.js';
|
|
16
17
|
import { aggregateDeltas } from './metrics-aggregator.js';
|
|
@@ -153,7 +154,17 @@ export class MetricsSyncProcessor {
|
|
|
153
154
|
// 7. Send each branch metric to API (dry-run handled by MetricsSender)
|
|
154
155
|
const successfulRecordIds = new Set();
|
|
155
156
|
const failedByRecordId = new Map();
|
|
157
|
+
let deferred = false;
|
|
158
|
+
let processedBranches = 0;
|
|
156
159
|
for (const metric of metrics) {
|
|
160
|
+
// Stop BEFORE sending the next branch metric when the caller's sync
|
|
161
|
+
// deadline expired or an abort was signaled (leftover deltas stay
|
|
162
|
+
// pending for the next run).
|
|
163
|
+
if (shouldStopSync(context)) {
|
|
164
|
+
deferred = true;
|
|
165
|
+
break;
|
|
166
|
+
}
|
|
167
|
+
processedBranches++;
|
|
157
168
|
const branchDeltas = pendingDeltas.filter((delta) => (delta.gitBranch || '') === metric.attributes.branch);
|
|
158
169
|
try {
|
|
159
170
|
const response = await metricsSender.sendSessionMetric(metric);
|
|
@@ -177,7 +188,9 @@ export class MetricsSyncProcessor {
|
|
|
177
188
|
}
|
|
178
189
|
}
|
|
179
190
|
}
|
|
180
|
-
// 8. Mark deltas as synced/failed in JSONL (atomic rewrite)
|
|
191
|
+
// 8. Mark deltas as synced/failed in JSONL (atomic rewrite).
|
|
192
|
+
// Runs even when the loop stopped early: per-branch outcomes collected so
|
|
193
|
+
// far are persisted, unprocessed branches keep their deltas pending.
|
|
181
194
|
const syncedAt = Date.now();
|
|
182
195
|
const updatedDeltas = allDeltas.map((d) => {
|
|
183
196
|
if (successfulRecordIds.has(d.recordId)) {
|
|
@@ -203,8 +216,14 @@ export class MetricsSyncProcessor {
|
|
|
203
216
|
await writeJSONLAtomic(metricsFile, updatedDeltas);
|
|
204
217
|
const successCount = successfulRecordIds.size;
|
|
205
218
|
const failedCount = failedByRecordId.size;
|
|
206
|
-
|
|
207
|
-
|
|
219
|
+
// Deferral is not a failure: remaining branch metrics stay pending for the next run
|
|
220
|
+
const message = deferred
|
|
221
|
+
? `Sync deferred: ${metrics.length - processedBranches} items remaining (deadline/abort)`
|
|
222
|
+
: `Synced ${successCount}/${pendingDeltas.length} deltas across ${metrics.length} branches`;
|
|
223
|
+
if (deferred) {
|
|
224
|
+
logger.info(`[${this.name}] ${message} (${successCount} deltas synced before stop)`);
|
|
225
|
+
}
|
|
226
|
+
else if (failedCount > 0) {
|
|
208
227
|
logger.warn(`[${this.name}] ${message}; ${failedCount} failed`);
|
|
209
228
|
}
|
|
210
229
|
else {
|
|
@@ -221,7 +240,7 @@ export class MetricsSyncProcessor {
|
|
|
221
240
|
pendingCount: updatedDeltas.filter(d => d.syncStatus === 'pending').length
|
|
222
241
|
});
|
|
223
242
|
return {
|
|
224
|
-
success: failedCount === 0,
|
|
243
|
+
success: deferred ? true : failedCount === 0,
|
|
225
244
|
message,
|
|
226
245
|
metadata: {
|
|
227
246
|
deltasProcessed: successCount,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics-sync-processor.js","sourceRoot":"","sources":["../../../../../../../src/providers/plugins/sso/session/processors/metrics/metrics-sync-processor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;
|
|
1
|
+
{"version":3,"file":"metrics-sync-processor.js","sourceRoot":"","sources":["../../../../../../../src/providers/plugins/sso/session/processors/metrics/metrics-sync-processor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,wDAAwD,CAAC;AAExF,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,uDAAuD,CAAC;AACrF,OAAO,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;AAChG,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAG/D,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,MAAM,OAAO,oBAAoB;IACtB,IAAI,GAAG,cAAc,CAAC;IACtB,QAAQ,GAAG,CAAC,CAAC,CAAC,gDAAgD;IAE/D,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;IAClC,SAAS,GAAG,KAAK,CAAC,CAAC,oBAAoB;IAE/C,aAAa,CAAC,QAAuB;QACnC,+DAA+D;QAC/D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAsB,EAAE,OAA0B;QAC9D,qDAAqD;QACrD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,sCAAsC,CAAC,CAAC;YAClE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC;QACxD,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QAEtB,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,qBAAqB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAE7D,gCAAgC;YAChC,MAAM,SAAS,GAAG,MAAM,SAAS,CAAc,WAAW,CAAC,CAAC;YAE5D,8EAA8E;YAC9E,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CACzC,CAAC,CAAC,UAAU,KAAK,SAAS;gBAC1B,CAAC,CAAC,CAAC,UAAU,KAAK,QAAQ,IAAI,CAAC,CAAC,YAAY,GAAG,iBAAiB,CAAC,CAClE,CAAC;YAEF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/B,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,2CAA2C,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;gBAC1F,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC;YACzD,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,yBAAyB,aAAa,CAAC,MAAM,eAAe,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YAE/H,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;gBACzB,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,6BAA6B,EAAE;oBACvD,KAAK,EAAE,aAAa,CAAC,MAAM;oBAC3B,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;wBAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,KAAa,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;wBACvG,IAAI,YAAY,GAAG,CAAC,CAAC;wBACrB,IAAI,YAAY,GAAG,CAAC,CAAC;wBACrB,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;4BACjB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;gCACjD,YAAY,IAAI,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;gCACpC,YAAY,IAAI,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;4BACtC,CAAC;wBACH,CAAC;wBAED,MAAM,OAAO,GAAG,CAAC,CAAC,cAAc,IAAI,EAAE,CAAC;wBACvC,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC,UAAU,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBAC9E,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC,YAAY,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBAClF,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,MAAM,CAAC;wBAClE,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC;wBAChE,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,MAAM,CAAC;wBAEpE,OAAO;4BACL,QAAQ,EAAE,CAAC,CAAC,QAAQ;4BACpB,SAAS,EAAE,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ;gCACxC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE;gCACrC,CAAC,CAAC,CAAC,CAAC,SAAS;4BACf,KAAK,EAAE;gCACL,KAAK,EAAE,UAAU;gCACjB,OAAO,EAAE,YAAY;gCACrB,OAAO,EAAE,YAAY;gCACrB,SAAS,EAAE,CAAC,CAAC,KAAK;6BACnB;4BACD,cAAc,EAAE;gCACd,OAAO,EAAE,QAAQ;gCACjB,QAAQ,EAAE,OAAO;gCACjB,OAAO,EAAE,SAAS;gCAClB,UAAU;gCACV,YAAY;6BACb;yBACF,CAAC;oBACJ,CAAC,CAAC;iBACH,CAAC,CAAC;YACL,CAAC;YAED,2BAA2B;YAC3B,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAE/E,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,wBAAwB,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;gBACvE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC;YACnE,CAAC;YAED,2FAA2F;YAC3F,IAAI,WAAW,CAAC;YAChB,IAAI,CAAC;gBACH,MAAM,EAAC,aAAa,EAAC,GAAG,MAAM,MAAM,CAAC,sCAAsC,CAAC,CAAC;gBAC7E,MAAM,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;gBAChE,WAAW,GAAG,KAAK,EAAE,gBAAgB,EAAE,CAAC;YAC1C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,mCAAmC,KAAK,EAAE,CAAC,CAAC;gBACtE,WAAW,GAAG,SAAS,CAAC;YAC1B,CAAC;YAED,6DAA6D;YAC7D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,aAAa,CAAC;YACvD,MAAM,OAAO,GAAG,eAAe,CAAC,aAAa,EAAE,eAAe,EAAE,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;YAE1G,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,gBAAgB,OAAO,CAAC,MAAM,iCAAiC,aAAa,CAAC,MAAM,SAAS,CAAC,CAAC;YAEvH,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;gBACzB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;oBAC7B,IAAI,CAAC,CAAC,oBAAoB,IAAI,MAAM,CAAC,UAAU,CAAC;wBAAE,SAAS;oBAE3D,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,mCAAmC,MAAM,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE;wBACzF,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,UAAU,EAAE;4BACV,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;4BAC9B,aAAa,EAAE,MAAM,CAAC,UAAU,CAAC,aAAa;4BAC9C,cAAc,EAAE,MAAM,CAAC,UAAU,CAAC,cAAc;4BAChD,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS;4BACtC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU;4BACxC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU;4BACxC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM;4BAChC,kBAAkB,EAAE,MAAM,CAAC,UAAU,CAAC,kBAAkB;4BACxD,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU;4BACxC,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,gBAAgB;4BACpD,qBAAqB,EAAE,MAAM,CAAC,UAAU,CAAC,qBAAqB;4BAC9D,iBAAiB,EAAE,MAAM,CAAC,UAAU,CAAC,iBAAiB;4BACtD,aAAa,EAAE,MAAM,CAAC,UAAU,CAAC,aAAa;4BAC9C,cAAc,EAAE,MAAM,CAAC,UAAU,CAAC,cAAc;4BAChD,aAAa,EAAE,MAAM,CAAC,UAAU,CAAC,aAAa;4BAC9C,iBAAiB,EAAE,MAAM,CAAC,UAAU,CAAC,iBAAiB;4BACtD,mBAAmB,EAAE,MAAM,CAAC,UAAU,CAAC,mBAAmB;4BAC1D,mBAAmB,EAAE,MAAM,CAAC,UAAU,CAAC,mBAAmB;4BAC1D,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;yBAC/B;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,+BAA+B;YAC/B,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC;gBACtC,OAAO,EAAE,OAAO,CAAC,UAAU;gBAC3B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,KAAK;gBACd,aAAa,EAAE,CAAC;gBAChB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,UAAU;gBACV,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC,CAAC;YAEH,uEAAuE;YACvE,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;YAC9C,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAkB,CAAC;YACnD,IAAI,QAAQ,GAAG,KAAK,CAAC;YACrB,IAAI,iBAAiB,GAAG,CAAC,CAAC;YAE1B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,oEAAoE;gBACpE,kEAAkE;gBAClE,6BAA6B;gBAC7B,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC5B,QAAQ,GAAG,IAAI,CAAC;oBAChB,MAAM;gBACR,CAAC;gBACD,iBAAiB,EAAE,CAAC;gBAEpB,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAClD,CAAC,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC,KAAK,MAAM,CAAC,UAAU,CAAC,MAAM,CACrD,CAAC;gBAEF,IAAI,CAAC;oBACH,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;oBAE/D,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;wBACtB,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,6BAA6B,MAAM,CAAC,UAAU,CAAC,MAAM,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;wBACzG,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;4BACjC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;wBACzD,CAAC;wBACD,SAAS;oBACX,CAAC;oBAED,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;wBACjC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;oBAC1C,CAAC;oBACD,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,4CAA4C,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;gBACpG,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBACvE,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,4BAA4B,MAAM,CAAC,UAAU,CAAC,MAAM,MAAM,OAAO,EAAE,CAAC,CAAC;oBAC/F,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;wBACjC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;oBAChD,CAAC;gBACH,CAAC;YACH,CAAC;YAED,6DAA6D;YAC7D,0EAA0E;YAC1E,qEAAqE;YACrE,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE5B,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAe,EAAE;gBACrD,IAAI,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACxC,OAAO;wBACL,GAAG,CAAC;wBACJ,UAAU,EAAE,QAAQ;wBACpB,YAAY,EAAE,CAAC,CAAC,YAAY,GAAG,CAAC;wBAChC,QAAQ;wBACR,SAAS,EAAE,SAAS;qBACrB,CAAC;gBACJ,CAAC;gBAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACnD,IAAI,SAAS,EAAE,CAAC;oBACd,OAAO;wBACL,GAAG,CAAC;wBACJ,UAAU,EAAE,QAAQ;wBACpB,YAAY,EAAE,CAAC,CAAC,YAAY,GAAG,CAAC;wBAChC,SAAS;qBACV,CAAC;gBACJ,CAAC;gBAED,OAAO,CAAC,CAAC;YACX,CAAC,CAAC,CAAC;YAEH,MAAM,gBAAgB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;YAEnD,MAAM,YAAY,GAAG,mBAAmB,CAAC,IAAI,CAAC;YAC9C,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,CAAC;YAC1C,oFAAoF;YACpF,MAAM,OAAO,GAAG,QAAQ;gBACtB,CAAC,CAAC,kBAAkB,OAAO,CAAC,MAAM,GAAG,iBAAiB,mCAAmC;gBACzF,CAAC,CAAC,UAAU,YAAY,IAAI,aAAa,CAAC,MAAM,kBAAkB,OAAO,CAAC,MAAM,WAAW,CAAC;YAC9F,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,KAAK,YAAY,6BAA6B,CAAC,CAAC;YACvF,CAAC;iBAAM,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;gBAC3B,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,KAAK,WAAW,SAAS,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,kBAAkB,OAAO,EAAE,CAAC,CAAC;YACxD,CAAC;YAED,gDAAgD;YAChD,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,4BAA4B,EAAE;gBACtD,QAAQ,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE;gBAC1C,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC;gBAC1C,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;gBACpD,iBAAiB,EAAE,aAAa,CAAC,MAAM;gBACvC,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,MAAM;gBACxE,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,MAAM;gBACxE,YAAY,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,MAAM;aAC3E,CAAC,CAAC;YAEH,OAAO;gBACL,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,KAAK,CAAC;gBAC5C,OAAO;gBACP,QAAQ,EAAE;oBACR,eAAe,EAAE,YAAY;oBAC7B,YAAY,EAAE,WAAW;oBACzB,WAAW,EAAE,OAAO,CAAC,MAAM;oBAC3B,WAAW,EAAE;wBACX,OAAO,EAAE;4BACP,kBAAkB,EAAE,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC;4BACnD,WAAW,EAAE,YAAY;4BACzB,WAAW,EAAE,WAAW;4BACxB,WAAW,EAAE,aAAa,CAAC,MAAM;yBAClC;qBACF;iBACF;aACF,CAAC;QAEJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,gBAAgB,EAAE,KAAK,CAAC,CAAC;YACnD,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;aAClE,CAAC;QAEJ,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACzB,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.auth.d.ts","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.auth.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA2BxF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAkBvE;AAED;;;;GAIG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,UAAU,CAAU;IAC5B,OAAO,CAAC,eAAe,CAAC,CAAkB;IAC1C,OAAO,CAAC,gBAAgB,CAAS;IAEjC;;OAEG;IACG,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"sso.auth.d.ts","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.auth.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA2BxF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAkBvE;AAED;;;;GAIG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,UAAU,CAAU;IAC5B,OAAO,CAAC,eAAe,CAAC,CAAkB;IAC1C,OAAO,CAAC,gBAAgB,CAAS;IAEjC;;OAEG;IACG,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAyFjE;;;;;;OAMG;IACG,oBAAoB,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,aAAa,UAAO,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAoC9F;;OAEG;IACG,sBAAsB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7D;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAyGxB;;OAEG;YACW,cAAc;IA2D5B;;OAEG;YACW,eAAe;IA0C7B;;OAEG;IACH,OAAO,CAAC,OAAO;CAiBhB"}
|
|
@@ -115,6 +115,7 @@ export class CodeMieSSO {
|
|
|
115
115
|
expiresAt: deriveExpiresAt(result.cookies),
|
|
116
116
|
};
|
|
117
117
|
const store = CredentialStore.getInstance();
|
|
118
|
+
// Key must match getStoredCredentials() lookup, which normalizes to protocol+host
|
|
118
119
|
await store.storeSSOCredentials(credentials, this.codeMieUrl);
|
|
119
120
|
// Fresh credentials ā analytics auth is healthy again
|
|
120
121
|
await clearAnalyticsAuthStatus();
|
|
@@ -156,7 +157,10 @@ export class CodeMieSSO {
|
|
|
156
157
|
}
|
|
157
158
|
const store = CredentialStore.getInstance();
|
|
158
159
|
const baseUrl = normalizeToBase(url);
|
|
159
|
-
|
|
160
|
+
// Pass the caller's URL through unnormalized: CredentialStore derives the key
|
|
161
|
+
// itself, and it needs the original form to find credentials an older version
|
|
162
|
+
// stored under the raw-URL key. Pre-normalizing here would hide them.
|
|
163
|
+
let credentials = await store.retrieveSSOCredentials(url);
|
|
160
164
|
// Fallback to global credentials for backward compatibility
|
|
161
165
|
if (!credentials && allowFallback) {
|
|
162
166
|
credentials = await store.retrieveSSOCredentials();
|
|
@@ -170,7 +174,7 @@ export class CodeMieSSO {
|
|
|
170
174
|
}
|
|
171
175
|
// Check if credentials are expired
|
|
172
176
|
if (credentials && credentials.expiresAt && Date.now() > credentials.expiresAt) {
|
|
173
|
-
await store.clearSSOCredentials(
|
|
177
|
+
await store.clearSSOCredentials(url);
|
|
174
178
|
return null;
|
|
175
179
|
}
|
|
176
180
|
return credentials;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.auth.js","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sso.auth.js","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.setup-steps.d.ts","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.setup-steps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EACV,kBAAkB,
|
|
1
|
+
{"version":3,"file":"sso.setup-steps.d.ts","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.setup-steps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EACV,kBAAkB,EAInB,MAAM,qBAAqB,CAAC;AAc7B;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,kBAyR3B,CAAC"}
|
|
@@ -25,50 +25,33 @@ export const SSOSetupSteps = {
|
|
|
25
25
|
/**
|
|
26
26
|
* Step 1: Gather credentials/configuration
|
|
27
27
|
*
|
|
28
|
-
* Prompts for CodeMie URL and performs browser-based authentication
|
|
29
|
-
*
|
|
30
|
-
* When the setup wizard already completed a CodeMie handshake (its
|
|
31
|
-
* mandatory-integration gate authenticates before provider selection), that
|
|
32
|
-
* session is reused so the user is not prompted for the portal URL and sent
|
|
33
|
-
* through the browser a second time in one `codemie setup` run.
|
|
28
|
+
* Prompts for CodeMie URL and performs browser-based authentication
|
|
34
29
|
*/
|
|
35
|
-
async getCredentials(
|
|
36
|
-
const
|
|
37
|
-
|
|
38
|
-
|
|
30
|
+
async getCredentials() {
|
|
31
|
+
const codeMieUrl = await promptForCodeMieUrl(DEFAULT_CODEMIE_BASE_URL);
|
|
32
|
+
// Authenticate via browser
|
|
33
|
+
console.log(chalk.cyan('\nš Authenticating via browser...\n'));
|
|
34
|
+
const authResult = await authenticateWithCodeMie(codeMieUrl, 120000);
|
|
35
|
+
if (!authResult.success) {
|
|
36
|
+
throw new Error(`SSO authentication failed: ${authResult.error || 'Unknown error'}`);
|
|
37
|
+
}
|
|
38
|
+
console.log(chalk.green('ā Authentication successful!\n'));
|
|
39
|
+
// === NEW STEP: Fetch applications and select project ===
|
|
39
40
|
let selectedProject;
|
|
40
41
|
let selectedUserEmail;
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
console.log(chalk.green(`ā Using existing authenticated session for ${codeMieUrl}`));
|
|
47
|
-
console.log(chalk.dim(` Project: ${selectedProject}\n`));
|
|
48
|
-
}
|
|
49
|
-
else {
|
|
50
|
-
codeMieUrl = await promptForCodeMieUrl(DEFAULT_CODEMIE_BASE_URL);
|
|
51
|
-
// Authenticate via browser
|
|
52
|
-
console.log(chalk.cyan('\nš Authenticating via browser...\n'));
|
|
53
|
-
authResult = await authenticateWithCodeMie(codeMieUrl, 120000);
|
|
54
|
-
if (!authResult.success) {
|
|
55
|
-
throw new Error(`SSO authentication failed: ${authResult.error || 'Unknown error'}`);
|
|
56
|
-
}
|
|
57
|
-
console.log(chalk.green('ā Authentication successful!\n'));
|
|
58
|
-
// === NEW STEP: Fetch applications and select project ===
|
|
59
|
-
try {
|
|
60
|
-
console.log(chalk.cyan('š Fetching available projects...\n'));
|
|
61
|
-
({ project: selectedProject, userEmail: selectedUserEmail } = await selectCodeMieProject(authResult));
|
|
62
|
-
}
|
|
63
|
-
catch (error) {
|
|
64
|
-
const errorMsg = error instanceof Error ? error.message : String(error);
|
|
65
|
-
console.log(chalk.red(`ā Project selection failed: ${errorMsg}\n`));
|
|
66
|
-
// Fail fast - project selection is required
|
|
67
|
-
throw new Error(`Project selection required: ${errorMsg}`);
|
|
42
|
+
try {
|
|
43
|
+
console.log(chalk.cyan('š Fetching available projects...\n'));
|
|
44
|
+
// Ensure API URL and cookies are available
|
|
45
|
+
if (!authResult.apiUrl || !authResult.cookies) {
|
|
46
|
+
throw new Error('API URL or cookies not found in authentication result');
|
|
68
47
|
}
|
|
48
|
+
({ project: selectedProject, userEmail: selectedUserEmail } = await selectCodeMieProject(authResult));
|
|
69
49
|
}
|
|
70
|
-
|
|
71
|
-
|
|
50
|
+
catch (error) {
|
|
51
|
+
const errorMsg = error instanceof Error ? error.message : String(error);
|
|
52
|
+
console.log(chalk.red(`ā Project selection failed: ${errorMsg}\n`));
|
|
53
|
+
// Fail fast - project selection is required
|
|
54
|
+
throw new Error(`Project selection required: ${errorMsg}`);
|
|
72
55
|
}
|
|
73
56
|
// Check for LiteLLM integrations
|
|
74
57
|
let integrations;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.setup-steps.js","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.setup-steps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"sso.setup-steps.js","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.setup-steps.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-updater.d.ts","sourceRoot":"","sources":["../../src/utils/cli-updater.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"cli-updater.d.ts","sourceRoot":"","sources":["../../src/utils/cli-updater.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAuBH;;GAEG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAcnE;AAkED;;;;;GAKG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,0BAA0B;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,wCAAwC;IACxC,aAAa,EAAE,MAAM,CAAC;IACtB,+BAA+B;IAC/B,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAyC9E;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,CAmCvF;AAED;;;;;GAKG;AACH,wBAAsB,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA4CpF;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC,CAkF7D"}
|
|
@@ -18,6 +18,7 @@ import { logger } from './logger.js';
|
|
|
18
18
|
import { getLatestVersion, installGlobal } from './processes.js';
|
|
19
19
|
import { compareVersions, isValidSemanticVersion } from './version-utils.js';
|
|
20
20
|
import { getCodemiePath } from './paths.js';
|
|
21
|
+
import { parseBooleanEnv } from './env.js';
|
|
21
22
|
const CLI_PACKAGE_NAME = '@codemieai/code';
|
|
22
23
|
// Rate limiting: Check for updates at most once per interval (default: 24 hours)
|
|
23
24
|
const UPDATE_CHECK_INTERVAL = parseInt(process.env.CODEMIE_UPDATE_CHECK_INTERVAL || '86400000', 10);
|
|
@@ -110,14 +111,7 @@ async function releaseUpdateLock() {
|
|
|
110
111
|
* @returns true if auto-update should happen silently, false if prompt required
|
|
111
112
|
*/
|
|
112
113
|
export function isAutoUpdateEnabled() {
|
|
113
|
-
|
|
114
|
-
// If not set, default to true (silent auto-update)
|
|
115
|
-
if (envValue === undefined || envValue === null || envValue === '') {
|
|
116
|
-
return true;
|
|
117
|
-
}
|
|
118
|
-
// Parse as boolean
|
|
119
|
-
const normalized = envValue.toLowerCase().trim();
|
|
120
|
-
return normalized === 'true' || normalized === '1' || normalized === 'yes';
|
|
114
|
+
return parseBooleanEnv(process.env.CODEMIE_AUTO_UPDATE, true);
|
|
121
115
|
}
|
|
122
116
|
/**
|
|
123
117
|
* Check if a CLI update is available
|