jiva-core 0.3.44 → 0.3.46-dev.478c47b
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/Dockerfile +7 -3
- package/cloud-run-deploy.yaml +1 -1
- package/cloud-run.yaml +5 -8
- package/dist/code/tools/bash.d.ts.map +1 -1
- package/dist/code/tools/bash.js +2 -0
- package/dist/code/tools/bash.js.map +1 -1
- package/dist/code/tools/grep.js +1 -1
- package/dist/code/tools/grep.js.map +1 -1
- package/dist/code/tools/read.js +2 -2
- package/dist/core/agent-spawner.js +1 -1
- package/dist/core/client-agent.d.ts +3 -1
- package/dist/core/client-agent.d.ts.map +1 -1
- package/dist/core/client-agent.js +6 -4
- package/dist/core/client-agent.js.map +1 -1
- package/dist/core/config.d.ts +174 -86
- package/dist/core/config.d.ts.map +1 -1
- package/dist/core/config.js +25 -9
- package/dist/core/config.js.map +1 -1
- package/dist/core/dual-agent.d.ts +8 -0
- package/dist/core/dual-agent.d.ts.map +1 -1
- package/dist/core/dual-agent.js +14 -10
- package/dist/core/dual-agent.js.map +1 -1
- package/dist/core/manager-agent.d.ts +3 -1
- package/dist/core/manager-agent.d.ts.map +1 -1
- package/dist/core/manager-agent.js +37 -17
- package/dist/core/manager-agent.js.map +1 -1
- package/dist/core/worker-agent.d.ts +3 -1
- package/dist/core/worker-agent.d.ts.map +1 -1
- package/dist/core/worker-agent.js +23 -9
- package/dist/core/worker-agent.js.map +1 -1
- package/dist/interfaces/cli/index.js +2 -2
- package/dist/interfaces/cli/index.js.map +1 -1
- package/dist/interfaces/http/session-manager.d.ts +7 -1
- package/dist/interfaces/http/session-manager.d.ts.map +1 -1
- package/dist/interfaces/http/session-manager.js +83 -47
- package/dist/interfaces/http/session-manager.js.map +1 -1
- package/dist/models/base.d.ts +8 -0
- package/dist/models/base.d.ts.map +1 -1
- package/dist/models/google-adc.d.ts +26 -0
- package/dist/models/google-adc.d.ts.map +1 -0
- package/dist/models/google-adc.js +118 -0
- package/dist/models/google-adc.js.map +1 -0
- package/dist/models/harmony.d.ts.map +1 -1
- package/dist/models/harmony.js +39 -3
- package/dist/models/harmony.js.map +1 -1
- package/dist/models/model-client.d.ts +19 -2
- package/dist/models/model-client.d.ts.map +1 -1
- package/dist/models/model-client.js +48 -17
- package/dist/models/model-client.js.map +1 -1
- package/dist/storage/factory.d.ts.map +1 -1
- package/dist/storage/factory.js +5 -0
- package/dist/storage/factory.js.map +1 -1
- package/dist/storage/gcp-bucket-provider.d.ts +10 -0
- package/dist/storage/gcp-bucket-provider.d.ts.map +1 -1
- package/dist/storage/gcp-bucket-provider.js +61 -6
- package/dist/storage/gcp-bucket-provider.js.map +1 -1
- package/dist/storage/local-provider.d.ts +7 -0
- package/dist/storage/local-provider.d.ts.map +1 -1
- package/dist/storage/local-provider.js +12 -0
- package/dist/storage/local-provider.js.map +1 -1
- package/dist/storage/provider.d.ts +15 -0
- package/dist/storage/provider.d.ts.map +1 -1
- package/dist/storage/provider.js +19 -0
- package/dist/storage/provider.js.map +1 -1
- package/dist/utils/orchestration-logger.d.ts +16 -4
- package/dist/utils/orchestration-logger.d.ts.map +1 -1
- package/dist/utils/orchestration-logger.js +24 -4
- package/dist/utils/orchestration-logger.js.map +1 -1
- package/package.json +1 -1
- package/scripts/generate-image.js +130 -0
- package/scripts/package.json +7 -0
- package/scripts/post-to-gritsa.js +212 -0
package/dist/core/config.d.ts
CHANGED
|
@@ -10,15 +10,15 @@ declare const MCPServerConfigSchema: z.ZodEffects<z.ZodObject<{
|
|
|
10
10
|
codeMode: z.ZodOptional<z.ZodBoolean>;
|
|
11
11
|
}, "strip", z.ZodTypeAny, {
|
|
12
12
|
enabled: boolean;
|
|
13
|
-
url?: string | undefined;
|
|
14
13
|
headers?: Record<string, string> | undefined;
|
|
14
|
+
url?: string | undefined;
|
|
15
15
|
command?: string | undefined;
|
|
16
16
|
args?: string[] | undefined;
|
|
17
17
|
env?: Record<string, string> | undefined;
|
|
18
18
|
codeMode?: boolean | undefined;
|
|
19
19
|
}, {
|
|
20
|
-
url?: string | undefined;
|
|
21
20
|
headers?: Record<string, string> | undefined;
|
|
21
|
+
url?: string | undefined;
|
|
22
22
|
command?: string | undefined;
|
|
23
23
|
args?: string[] | undefined;
|
|
24
24
|
env?: Record<string, string> | undefined;
|
|
@@ -26,15 +26,15 @@ declare const MCPServerConfigSchema: z.ZodEffects<z.ZodObject<{
|
|
|
26
26
|
codeMode?: boolean | undefined;
|
|
27
27
|
}>, {
|
|
28
28
|
enabled: boolean;
|
|
29
|
-
url?: string | undefined;
|
|
30
29
|
headers?: Record<string, string> | undefined;
|
|
30
|
+
url?: string | undefined;
|
|
31
31
|
command?: string | undefined;
|
|
32
32
|
args?: string[] | undefined;
|
|
33
33
|
env?: Record<string, string> | undefined;
|
|
34
34
|
codeMode?: boolean | undefined;
|
|
35
35
|
}, {
|
|
36
|
-
url?: string | undefined;
|
|
37
36
|
headers?: Record<string, string> | undefined;
|
|
37
|
+
url?: string | undefined;
|
|
38
38
|
command?: string | undefined;
|
|
39
39
|
args?: string[] | undefined;
|
|
40
40
|
env?: Record<string, string> | undefined;
|
|
@@ -42,34 +42,50 @@ declare const MCPServerConfigSchema: z.ZodEffects<z.ZodObject<{
|
|
|
42
42
|
codeMode?: boolean | undefined;
|
|
43
43
|
}>;
|
|
44
44
|
declare const ModelConfigSchema: z.ZodObject<{
|
|
45
|
-
name: z.ZodString
|
|
45
|
+
name: z.ZodOptional<z.ZodString>;
|
|
46
46
|
endpoint: z.ZodString;
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
47
|
+
/**
|
|
48
|
+
* Static API key. Not required (may be empty string) when useGoogleADC is true,
|
|
49
|
+
* in which case short-lived GCP OAuth2 tokens are fetched automatically.
|
|
50
|
+
*/
|
|
51
|
+
apiKey: z.ZodDefault<z.ZodString>;
|
|
52
|
+
type: z.ZodDefault<z.ZodEnum<["reasoning", "multimodal", "tool-calling"]>>;
|
|
53
|
+
model: z.ZodOptional<z.ZodString>;
|
|
54
|
+
defaultModel: z.ZodOptional<z.ZodString>;
|
|
50
55
|
useHarmonyFormat: z.ZodOptional<z.ZodBoolean>;
|
|
51
56
|
/** How to send reasoning effort: 'api_param' | 'system_prompt' | 'both' */
|
|
52
57
|
reasoningEffortStrategy: z.ZodOptional<z.ZodEnum<["api_param", "system_prompt", "both"]>>;
|
|
53
58
|
/** Default max tokens — required for reasoning models like Sarvam-105B */
|
|
54
59
|
defaultMaxTokens: z.ZodOptional<z.ZodNumber>;
|
|
60
|
+
/**
|
|
61
|
+
* Use Google Application Default Credentials instead of a static apiKey.
|
|
62
|
+
* Required for Vertex AI MaaS endpoints (aiplatform.googleapis.com).
|
|
63
|
+
* On Cloud Run the service account token is fetched automatically;
|
|
64
|
+
* locally falls back to google-auth-library / `gcloud auth application-default`.
|
|
65
|
+
*/
|
|
66
|
+
useGoogleADC: z.ZodOptional<z.ZodBoolean>;
|
|
55
67
|
}, "strip", z.ZodTypeAny, {
|
|
56
|
-
name: string;
|
|
57
68
|
type: "reasoning" | "multimodal" | "tool-calling";
|
|
58
69
|
endpoint: string;
|
|
59
70
|
apiKey: string;
|
|
60
|
-
|
|
71
|
+
name?: string | undefined;
|
|
72
|
+
model?: string | undefined;
|
|
73
|
+
defaultModel?: string | undefined;
|
|
61
74
|
useHarmonyFormat?: boolean | undefined;
|
|
62
75
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
63
76
|
defaultMaxTokens?: number | undefined;
|
|
77
|
+
useGoogleADC?: boolean | undefined;
|
|
64
78
|
}, {
|
|
65
|
-
name: string;
|
|
66
|
-
type: "reasoning" | "multimodal" | "tool-calling";
|
|
67
79
|
endpoint: string;
|
|
68
|
-
|
|
69
|
-
|
|
80
|
+
name?: string | undefined;
|
|
81
|
+
type?: "reasoning" | "multimodal" | "tool-calling" | undefined;
|
|
82
|
+
model?: string | undefined;
|
|
83
|
+
apiKey?: string | undefined;
|
|
84
|
+
defaultModel?: string | undefined;
|
|
70
85
|
useHarmonyFormat?: boolean | undefined;
|
|
71
86
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
72
87
|
defaultMaxTokens?: number | undefined;
|
|
88
|
+
useGoogleADC?: boolean | undefined;
|
|
73
89
|
}>;
|
|
74
90
|
declare const CodeModeConfigSchema: z.ZodObject<{
|
|
75
91
|
enabled: z.ZodDefault<z.ZodBoolean>;
|
|
@@ -100,156 +116,216 @@ declare const CodeModeConfigSchema: z.ZodObject<{
|
|
|
100
116
|
declare const JivaConfigSchema: z.ZodObject<{
|
|
101
117
|
models: z.ZodObject<{
|
|
102
118
|
reasoning: z.ZodOptional<z.ZodObject<{
|
|
103
|
-
name: z.ZodString
|
|
119
|
+
name: z.ZodOptional<z.ZodString>;
|
|
104
120
|
endpoint: z.ZodString;
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
121
|
+
/**
|
|
122
|
+
* Static API key. Not required (may be empty string) when useGoogleADC is true,
|
|
123
|
+
* in which case short-lived GCP OAuth2 tokens are fetched automatically.
|
|
124
|
+
*/
|
|
125
|
+
apiKey: z.ZodDefault<z.ZodString>;
|
|
126
|
+
type: z.ZodDefault<z.ZodEnum<["reasoning", "multimodal", "tool-calling"]>>;
|
|
127
|
+
model: z.ZodOptional<z.ZodString>;
|
|
128
|
+
defaultModel: z.ZodOptional<z.ZodString>;
|
|
108
129
|
useHarmonyFormat: z.ZodOptional<z.ZodBoolean>;
|
|
109
130
|
/** How to send reasoning effort: 'api_param' | 'system_prompt' | 'both' */
|
|
110
131
|
reasoningEffortStrategy: z.ZodOptional<z.ZodEnum<["api_param", "system_prompt", "both"]>>;
|
|
111
132
|
/** Default max tokens — required for reasoning models like Sarvam-105B */
|
|
112
133
|
defaultMaxTokens: z.ZodOptional<z.ZodNumber>;
|
|
134
|
+
/**
|
|
135
|
+
* Use Google Application Default Credentials instead of a static apiKey.
|
|
136
|
+
* Required for Vertex AI MaaS endpoints (aiplatform.googleapis.com).
|
|
137
|
+
* On Cloud Run the service account token is fetched automatically;
|
|
138
|
+
* locally falls back to google-auth-library / `gcloud auth application-default`.
|
|
139
|
+
*/
|
|
140
|
+
useGoogleADC: z.ZodOptional<z.ZodBoolean>;
|
|
113
141
|
}, "strip", z.ZodTypeAny, {
|
|
114
|
-
name: string;
|
|
115
142
|
type: "reasoning" | "multimodal" | "tool-calling";
|
|
116
143
|
endpoint: string;
|
|
117
144
|
apiKey: string;
|
|
118
|
-
|
|
145
|
+
name?: string | undefined;
|
|
146
|
+
model?: string | undefined;
|
|
147
|
+
defaultModel?: string | undefined;
|
|
119
148
|
useHarmonyFormat?: boolean | undefined;
|
|
120
149
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
121
150
|
defaultMaxTokens?: number | undefined;
|
|
151
|
+
useGoogleADC?: boolean | undefined;
|
|
122
152
|
}, {
|
|
123
|
-
name: string;
|
|
124
|
-
type: "reasoning" | "multimodal" | "tool-calling";
|
|
125
153
|
endpoint: string;
|
|
126
|
-
|
|
127
|
-
|
|
154
|
+
name?: string | undefined;
|
|
155
|
+
type?: "reasoning" | "multimodal" | "tool-calling" | undefined;
|
|
156
|
+
model?: string | undefined;
|
|
157
|
+
apiKey?: string | undefined;
|
|
158
|
+
defaultModel?: string | undefined;
|
|
128
159
|
useHarmonyFormat?: boolean | undefined;
|
|
129
160
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
130
161
|
defaultMaxTokens?: number | undefined;
|
|
162
|
+
useGoogleADC?: boolean | undefined;
|
|
131
163
|
}>>;
|
|
132
164
|
multimodal: z.ZodOptional<z.ZodObject<{
|
|
133
|
-
name: z.ZodString
|
|
165
|
+
name: z.ZodOptional<z.ZodString>;
|
|
134
166
|
endpoint: z.ZodString;
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
167
|
+
/**
|
|
168
|
+
* Static API key. Not required (may be empty string) when useGoogleADC is true,
|
|
169
|
+
* in which case short-lived GCP OAuth2 tokens are fetched automatically.
|
|
170
|
+
*/
|
|
171
|
+
apiKey: z.ZodDefault<z.ZodString>;
|
|
172
|
+
type: z.ZodDefault<z.ZodEnum<["reasoning", "multimodal", "tool-calling"]>>;
|
|
173
|
+
model: z.ZodOptional<z.ZodString>;
|
|
174
|
+
defaultModel: z.ZodOptional<z.ZodString>;
|
|
138
175
|
useHarmonyFormat: z.ZodOptional<z.ZodBoolean>;
|
|
139
176
|
/** How to send reasoning effort: 'api_param' | 'system_prompt' | 'both' */
|
|
140
177
|
reasoningEffortStrategy: z.ZodOptional<z.ZodEnum<["api_param", "system_prompt", "both"]>>;
|
|
141
178
|
/** Default max tokens — required for reasoning models like Sarvam-105B */
|
|
142
179
|
defaultMaxTokens: z.ZodOptional<z.ZodNumber>;
|
|
180
|
+
/**
|
|
181
|
+
* Use Google Application Default Credentials instead of a static apiKey.
|
|
182
|
+
* Required for Vertex AI MaaS endpoints (aiplatform.googleapis.com).
|
|
183
|
+
* On Cloud Run the service account token is fetched automatically;
|
|
184
|
+
* locally falls back to google-auth-library / `gcloud auth application-default`.
|
|
185
|
+
*/
|
|
186
|
+
useGoogleADC: z.ZodOptional<z.ZodBoolean>;
|
|
143
187
|
}, "strip", z.ZodTypeAny, {
|
|
144
|
-
name: string;
|
|
145
188
|
type: "reasoning" | "multimodal" | "tool-calling";
|
|
146
189
|
endpoint: string;
|
|
147
190
|
apiKey: string;
|
|
148
|
-
|
|
191
|
+
name?: string | undefined;
|
|
192
|
+
model?: string | undefined;
|
|
193
|
+
defaultModel?: string | undefined;
|
|
149
194
|
useHarmonyFormat?: boolean | undefined;
|
|
150
195
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
151
196
|
defaultMaxTokens?: number | undefined;
|
|
197
|
+
useGoogleADC?: boolean | undefined;
|
|
152
198
|
}, {
|
|
153
|
-
name: string;
|
|
154
|
-
type: "reasoning" | "multimodal" | "tool-calling";
|
|
155
199
|
endpoint: string;
|
|
156
|
-
|
|
157
|
-
|
|
200
|
+
name?: string | undefined;
|
|
201
|
+
type?: "reasoning" | "multimodal" | "tool-calling" | undefined;
|
|
202
|
+
model?: string | undefined;
|
|
203
|
+
apiKey?: string | undefined;
|
|
204
|
+
defaultModel?: string | undefined;
|
|
158
205
|
useHarmonyFormat?: boolean | undefined;
|
|
159
206
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
160
207
|
defaultMaxTokens?: number | undefined;
|
|
208
|
+
useGoogleADC?: boolean | undefined;
|
|
161
209
|
}>>;
|
|
162
210
|
toolCalling: z.ZodOptional<z.ZodObject<{
|
|
163
|
-
name: z.ZodString
|
|
211
|
+
name: z.ZodOptional<z.ZodString>;
|
|
164
212
|
endpoint: z.ZodString;
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
213
|
+
/**
|
|
214
|
+
* Static API key. Not required (may be empty string) when useGoogleADC is true,
|
|
215
|
+
* in which case short-lived GCP OAuth2 tokens are fetched automatically.
|
|
216
|
+
*/
|
|
217
|
+
apiKey: z.ZodDefault<z.ZodString>;
|
|
218
|
+
type: z.ZodDefault<z.ZodEnum<["reasoning", "multimodal", "tool-calling"]>>;
|
|
219
|
+
model: z.ZodOptional<z.ZodString>;
|
|
220
|
+
defaultModel: z.ZodOptional<z.ZodString>;
|
|
168
221
|
useHarmonyFormat: z.ZodOptional<z.ZodBoolean>;
|
|
169
222
|
/** How to send reasoning effort: 'api_param' | 'system_prompt' | 'both' */
|
|
170
223
|
reasoningEffortStrategy: z.ZodOptional<z.ZodEnum<["api_param", "system_prompt", "both"]>>;
|
|
171
224
|
/** Default max tokens — required for reasoning models like Sarvam-105B */
|
|
172
225
|
defaultMaxTokens: z.ZodOptional<z.ZodNumber>;
|
|
226
|
+
/**
|
|
227
|
+
* Use Google Application Default Credentials instead of a static apiKey.
|
|
228
|
+
* Required for Vertex AI MaaS endpoints (aiplatform.googleapis.com).
|
|
229
|
+
* On Cloud Run the service account token is fetched automatically;
|
|
230
|
+
* locally falls back to google-auth-library / `gcloud auth application-default`.
|
|
231
|
+
*/
|
|
232
|
+
useGoogleADC: z.ZodOptional<z.ZodBoolean>;
|
|
173
233
|
}, "strip", z.ZodTypeAny, {
|
|
174
|
-
name: string;
|
|
175
234
|
type: "reasoning" | "multimodal" | "tool-calling";
|
|
176
235
|
endpoint: string;
|
|
177
236
|
apiKey: string;
|
|
178
|
-
|
|
237
|
+
name?: string | undefined;
|
|
238
|
+
model?: string | undefined;
|
|
239
|
+
defaultModel?: string | undefined;
|
|
179
240
|
useHarmonyFormat?: boolean | undefined;
|
|
180
241
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
181
242
|
defaultMaxTokens?: number | undefined;
|
|
243
|
+
useGoogleADC?: boolean | undefined;
|
|
182
244
|
}, {
|
|
183
|
-
name: string;
|
|
184
|
-
type: "reasoning" | "multimodal" | "tool-calling";
|
|
185
245
|
endpoint: string;
|
|
186
|
-
|
|
187
|
-
|
|
246
|
+
name?: string | undefined;
|
|
247
|
+
type?: "reasoning" | "multimodal" | "tool-calling" | undefined;
|
|
248
|
+
model?: string | undefined;
|
|
249
|
+
apiKey?: string | undefined;
|
|
250
|
+
defaultModel?: string | undefined;
|
|
188
251
|
useHarmonyFormat?: boolean | undefined;
|
|
189
252
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
190
253
|
defaultMaxTokens?: number | undefined;
|
|
254
|
+
useGoogleADC?: boolean | undefined;
|
|
191
255
|
}>>;
|
|
192
256
|
}, "strip", z.ZodTypeAny, {
|
|
193
257
|
reasoning?: {
|
|
194
|
-
name: string;
|
|
195
258
|
type: "reasoning" | "multimodal" | "tool-calling";
|
|
196
259
|
endpoint: string;
|
|
197
260
|
apiKey: string;
|
|
198
|
-
|
|
261
|
+
name?: string | undefined;
|
|
262
|
+
model?: string | undefined;
|
|
263
|
+
defaultModel?: string | undefined;
|
|
199
264
|
useHarmonyFormat?: boolean | undefined;
|
|
200
265
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
201
266
|
defaultMaxTokens?: number | undefined;
|
|
267
|
+
useGoogleADC?: boolean | undefined;
|
|
202
268
|
} | undefined;
|
|
203
269
|
multimodal?: {
|
|
204
|
-
name: string;
|
|
205
270
|
type: "reasoning" | "multimodal" | "tool-calling";
|
|
206
271
|
endpoint: string;
|
|
207
272
|
apiKey: string;
|
|
208
|
-
|
|
273
|
+
name?: string | undefined;
|
|
274
|
+
model?: string | undefined;
|
|
275
|
+
defaultModel?: string | undefined;
|
|
209
276
|
useHarmonyFormat?: boolean | undefined;
|
|
210
277
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
211
278
|
defaultMaxTokens?: number | undefined;
|
|
279
|
+
useGoogleADC?: boolean | undefined;
|
|
212
280
|
} | undefined;
|
|
213
281
|
toolCalling?: {
|
|
214
|
-
name: string;
|
|
215
282
|
type: "reasoning" | "multimodal" | "tool-calling";
|
|
216
283
|
endpoint: string;
|
|
217
284
|
apiKey: string;
|
|
218
|
-
|
|
285
|
+
name?: string | undefined;
|
|
286
|
+
model?: string | undefined;
|
|
287
|
+
defaultModel?: string | undefined;
|
|
219
288
|
useHarmonyFormat?: boolean | undefined;
|
|
220
289
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
221
290
|
defaultMaxTokens?: number | undefined;
|
|
291
|
+
useGoogleADC?: boolean | undefined;
|
|
222
292
|
} | undefined;
|
|
223
293
|
}, {
|
|
224
294
|
reasoning?: {
|
|
225
|
-
name: string;
|
|
226
|
-
type: "reasoning" | "multimodal" | "tool-calling";
|
|
227
295
|
endpoint: string;
|
|
228
|
-
|
|
229
|
-
|
|
296
|
+
name?: string | undefined;
|
|
297
|
+
type?: "reasoning" | "multimodal" | "tool-calling" | undefined;
|
|
298
|
+
model?: string | undefined;
|
|
299
|
+
apiKey?: string | undefined;
|
|
300
|
+
defaultModel?: string | undefined;
|
|
230
301
|
useHarmonyFormat?: boolean | undefined;
|
|
231
302
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
232
303
|
defaultMaxTokens?: number | undefined;
|
|
304
|
+
useGoogleADC?: boolean | undefined;
|
|
233
305
|
} | undefined;
|
|
234
306
|
multimodal?: {
|
|
235
|
-
name: string;
|
|
236
|
-
type: "reasoning" | "multimodal" | "tool-calling";
|
|
237
307
|
endpoint: string;
|
|
238
|
-
|
|
239
|
-
|
|
308
|
+
name?: string | undefined;
|
|
309
|
+
type?: "reasoning" | "multimodal" | "tool-calling" | undefined;
|
|
310
|
+
model?: string | undefined;
|
|
311
|
+
apiKey?: string | undefined;
|
|
312
|
+
defaultModel?: string | undefined;
|
|
240
313
|
useHarmonyFormat?: boolean | undefined;
|
|
241
314
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
242
315
|
defaultMaxTokens?: number | undefined;
|
|
316
|
+
useGoogleADC?: boolean | undefined;
|
|
243
317
|
} | undefined;
|
|
244
318
|
toolCalling?: {
|
|
245
|
-
name: string;
|
|
246
|
-
type: "reasoning" | "multimodal" | "tool-calling";
|
|
247
319
|
endpoint: string;
|
|
248
|
-
|
|
249
|
-
|
|
320
|
+
name?: string | undefined;
|
|
321
|
+
type?: "reasoning" | "multimodal" | "tool-calling" | undefined;
|
|
322
|
+
model?: string | undefined;
|
|
323
|
+
apiKey?: string | undefined;
|
|
324
|
+
defaultModel?: string | undefined;
|
|
250
325
|
useHarmonyFormat?: boolean | undefined;
|
|
251
326
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
252
327
|
defaultMaxTokens?: number | undefined;
|
|
328
|
+
useGoogleADC?: boolean | undefined;
|
|
253
329
|
} | undefined;
|
|
254
330
|
}>;
|
|
255
331
|
mcpServers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodObject<{
|
|
@@ -263,15 +339,15 @@ declare const JivaConfigSchema: z.ZodObject<{
|
|
|
263
339
|
codeMode: z.ZodOptional<z.ZodBoolean>;
|
|
264
340
|
}, "strip", z.ZodTypeAny, {
|
|
265
341
|
enabled: boolean;
|
|
266
|
-
url?: string | undefined;
|
|
267
342
|
headers?: Record<string, string> | undefined;
|
|
343
|
+
url?: string | undefined;
|
|
268
344
|
command?: string | undefined;
|
|
269
345
|
args?: string[] | undefined;
|
|
270
346
|
env?: Record<string, string> | undefined;
|
|
271
347
|
codeMode?: boolean | undefined;
|
|
272
348
|
}, {
|
|
273
|
-
url?: string | undefined;
|
|
274
349
|
headers?: Record<string, string> | undefined;
|
|
350
|
+
url?: string | undefined;
|
|
275
351
|
command?: string | undefined;
|
|
276
352
|
args?: string[] | undefined;
|
|
277
353
|
env?: Record<string, string> | undefined;
|
|
@@ -279,15 +355,15 @@ declare const JivaConfigSchema: z.ZodObject<{
|
|
|
279
355
|
codeMode?: boolean | undefined;
|
|
280
356
|
}>, {
|
|
281
357
|
enabled: boolean;
|
|
282
|
-
url?: string | undefined;
|
|
283
358
|
headers?: Record<string, string> | undefined;
|
|
359
|
+
url?: string | undefined;
|
|
284
360
|
command?: string | undefined;
|
|
285
361
|
args?: string[] | undefined;
|
|
286
362
|
env?: Record<string, string> | undefined;
|
|
287
363
|
codeMode?: boolean | undefined;
|
|
288
364
|
}, {
|
|
289
|
-
url?: string | undefined;
|
|
290
365
|
headers?: Record<string, string> | undefined;
|
|
366
|
+
url?: string | undefined;
|
|
291
367
|
command?: string | undefined;
|
|
292
368
|
args?: string[] | undefined;
|
|
293
369
|
env?: Record<string, string> | undefined;
|
|
@@ -332,34 +408,40 @@ declare const JivaConfigSchema: z.ZodObject<{
|
|
|
332
408
|
}, "strip", z.ZodTypeAny, {
|
|
333
409
|
models: {
|
|
334
410
|
reasoning?: {
|
|
335
|
-
name: string;
|
|
336
411
|
type: "reasoning" | "multimodal" | "tool-calling";
|
|
337
412
|
endpoint: string;
|
|
338
413
|
apiKey: string;
|
|
339
|
-
|
|
414
|
+
name?: string | undefined;
|
|
415
|
+
model?: string | undefined;
|
|
416
|
+
defaultModel?: string | undefined;
|
|
340
417
|
useHarmonyFormat?: boolean | undefined;
|
|
341
418
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
342
419
|
defaultMaxTokens?: number | undefined;
|
|
420
|
+
useGoogleADC?: boolean | undefined;
|
|
343
421
|
} | undefined;
|
|
344
422
|
multimodal?: {
|
|
345
|
-
name: string;
|
|
346
423
|
type: "reasoning" | "multimodal" | "tool-calling";
|
|
347
424
|
endpoint: string;
|
|
348
425
|
apiKey: string;
|
|
349
|
-
|
|
426
|
+
name?: string | undefined;
|
|
427
|
+
model?: string | undefined;
|
|
428
|
+
defaultModel?: string | undefined;
|
|
350
429
|
useHarmonyFormat?: boolean | undefined;
|
|
351
430
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
352
431
|
defaultMaxTokens?: number | undefined;
|
|
432
|
+
useGoogleADC?: boolean | undefined;
|
|
353
433
|
} | undefined;
|
|
354
434
|
toolCalling?: {
|
|
355
|
-
name: string;
|
|
356
435
|
type: "reasoning" | "multimodal" | "tool-calling";
|
|
357
436
|
endpoint: string;
|
|
358
437
|
apiKey: string;
|
|
359
|
-
|
|
438
|
+
name?: string | undefined;
|
|
439
|
+
model?: string | undefined;
|
|
440
|
+
defaultModel?: string | undefined;
|
|
360
441
|
useHarmonyFormat?: boolean | undefined;
|
|
361
442
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
362
443
|
defaultMaxTokens?: number | undefined;
|
|
444
|
+
useGoogleADC?: boolean | undefined;
|
|
363
445
|
} | undefined;
|
|
364
446
|
};
|
|
365
447
|
debug: boolean;
|
|
@@ -373,8 +455,8 @@ declare const JivaConfigSchema: z.ZodObject<{
|
|
|
373
455
|
} | undefined;
|
|
374
456
|
mcpServers?: Record<string, {
|
|
375
457
|
enabled: boolean;
|
|
376
|
-
url?: string | undefined;
|
|
377
458
|
headers?: Record<string, string> | undefined;
|
|
459
|
+
url?: string | undefined;
|
|
378
460
|
command?: string | undefined;
|
|
379
461
|
args?: string[] | undefined;
|
|
380
462
|
env?: Record<string, string> | undefined;
|
|
@@ -387,34 +469,40 @@ declare const JivaConfigSchema: z.ZodObject<{
|
|
|
387
469
|
}, {
|
|
388
470
|
models: {
|
|
389
471
|
reasoning?: {
|
|
390
|
-
name: string;
|
|
391
|
-
type: "reasoning" | "multimodal" | "tool-calling";
|
|
392
472
|
endpoint: string;
|
|
393
|
-
|
|
394
|
-
|
|
473
|
+
name?: string | undefined;
|
|
474
|
+
type?: "reasoning" | "multimodal" | "tool-calling" | undefined;
|
|
475
|
+
model?: string | undefined;
|
|
476
|
+
apiKey?: string | undefined;
|
|
477
|
+
defaultModel?: string | undefined;
|
|
395
478
|
useHarmonyFormat?: boolean | undefined;
|
|
396
479
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
397
480
|
defaultMaxTokens?: number | undefined;
|
|
481
|
+
useGoogleADC?: boolean | undefined;
|
|
398
482
|
} | undefined;
|
|
399
483
|
multimodal?: {
|
|
400
|
-
name: string;
|
|
401
|
-
type: "reasoning" | "multimodal" | "tool-calling";
|
|
402
484
|
endpoint: string;
|
|
403
|
-
|
|
404
|
-
|
|
485
|
+
name?: string | undefined;
|
|
486
|
+
type?: "reasoning" | "multimodal" | "tool-calling" | undefined;
|
|
487
|
+
model?: string | undefined;
|
|
488
|
+
apiKey?: string | undefined;
|
|
489
|
+
defaultModel?: string | undefined;
|
|
405
490
|
useHarmonyFormat?: boolean | undefined;
|
|
406
491
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
407
492
|
defaultMaxTokens?: number | undefined;
|
|
493
|
+
useGoogleADC?: boolean | undefined;
|
|
408
494
|
} | undefined;
|
|
409
495
|
toolCalling?: {
|
|
410
|
-
name: string;
|
|
411
|
-
type: "reasoning" | "multimodal" | "tool-calling";
|
|
412
496
|
endpoint: string;
|
|
413
|
-
|
|
414
|
-
|
|
497
|
+
name?: string | undefined;
|
|
498
|
+
type?: "reasoning" | "multimodal" | "tool-calling" | undefined;
|
|
499
|
+
model?: string | undefined;
|
|
500
|
+
apiKey?: string | undefined;
|
|
501
|
+
defaultModel?: string | undefined;
|
|
415
502
|
useHarmonyFormat?: boolean | undefined;
|
|
416
503
|
reasoningEffortStrategy?: "api_param" | "system_prompt" | "both" | undefined;
|
|
417
504
|
defaultMaxTokens?: number | undefined;
|
|
505
|
+
useGoogleADC?: boolean | undefined;
|
|
418
506
|
} | undefined;
|
|
419
507
|
};
|
|
420
508
|
codeMode?: {
|
|
@@ -426,8 +514,8 @@ declare const JivaConfigSchema: z.ZodObject<{
|
|
|
426
514
|
includeMcp?: boolean | undefined;
|
|
427
515
|
} | undefined;
|
|
428
516
|
mcpServers?: Record<string, {
|
|
429
|
-
url?: string | undefined;
|
|
430
517
|
headers?: Record<string, string> | undefined;
|
|
518
|
+
url?: string | undefined;
|
|
431
519
|
command?: string | undefined;
|
|
432
520
|
args?: string[] | undefined;
|
|
433
521
|
env?: Record<string, string> | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/core/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,QAAA,MAAM,qBAAqB;;;;;;;IAWzB,0FAA0F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAK3F,CAAC;AAEF,QAAA,MAAM,iBAAiB
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/core/config.ts"],"names":[],"mappings":"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"}
|
package/dist/core/config.js
CHANGED
|
@@ -17,16 +17,28 @@ const MCPServerConfigSchema = z.object({
|
|
|
17
17
|
codeMode: z.boolean().optional(),
|
|
18
18
|
}).refine((data) => (data.command !== undefined) || (data.url !== undefined), { message: "Must specify either 'command' (for stdio) or 'url' (for HTTP/SSE)" });
|
|
19
19
|
const ModelConfigSchema = z.object({
|
|
20
|
-
name: z.string(),
|
|
20
|
+
name: z.string().optional(),
|
|
21
21
|
endpoint: z.string().url(),
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
22
|
+
/**
|
|
23
|
+
* Static API key. Not required (may be empty string) when useGoogleADC is true,
|
|
24
|
+
* in which case short-lived GCP OAuth2 tokens are fetched automatically.
|
|
25
|
+
*/
|
|
26
|
+
apiKey: z.string().default(''),
|
|
27
|
+
type: z.enum(['reasoning', 'multimodal', 'tool-calling']).default('reasoning'),
|
|
28
|
+
model: z.string().optional(),
|
|
29
|
+
defaultModel: z.string().optional(),
|
|
25
30
|
useHarmonyFormat: z.boolean().optional(),
|
|
26
31
|
/** How to send reasoning effort: 'api_param' | 'system_prompt' | 'both' */
|
|
27
32
|
reasoningEffortStrategy: z.enum(['api_param', 'system_prompt', 'both']).optional(),
|
|
28
33
|
/** Default max tokens — required for reasoning models like Sarvam-105B */
|
|
29
34
|
defaultMaxTokens: z.number().optional(),
|
|
35
|
+
/**
|
|
36
|
+
* Use Google Application Default Credentials instead of a static apiKey.
|
|
37
|
+
* Required for Vertex AI MaaS endpoints (aiplatform.googleapis.com).
|
|
38
|
+
* On Cloud Run the service account token is fetched automatically;
|
|
39
|
+
* locally falls back to google-auth-library / `gcloud auth application-default`.
|
|
40
|
+
*/
|
|
41
|
+
useGoogleADC: z.boolean().optional(),
|
|
30
42
|
});
|
|
31
43
|
const CodeModeConfigSchema = z.object({
|
|
32
44
|
enabled: z.boolean().default(false),
|
|
@@ -66,7 +78,9 @@ export class ConfigManager {
|
|
|
66
78
|
}
|
|
67
79
|
isConfigured() {
|
|
68
80
|
const config = this.store.store;
|
|
69
|
-
|
|
81
|
+
const r = config.models?.reasoning;
|
|
82
|
+
const m = config.models?.multimodal;
|
|
83
|
+
return !!(r?.apiKey || r?.useGoogleADC || m?.apiKey || m?.useGoogleADC);
|
|
70
84
|
}
|
|
71
85
|
getConfig() {
|
|
72
86
|
return this.store.store;
|
|
@@ -174,12 +188,14 @@ export class ConfigManager {
|
|
|
174
188
|
if (!config.models?.reasoning) {
|
|
175
189
|
throw new ConfigurationError('Reasoning model not configured. Please run setup wizard.');
|
|
176
190
|
}
|
|
177
|
-
if (!config.models.reasoning.apiKey) {
|
|
178
|
-
throw new ConfigurationError('API key for reasoning model not configured.'
|
|
191
|
+
if (!config.models.reasoning.apiKey && !config.models.reasoning.useGoogleADC) {
|
|
192
|
+
throw new ConfigurationError('API key for reasoning model not configured. ' +
|
|
193
|
+
'Either set apiKey or enable useGoogleADC for Vertex AI MaaS.');
|
|
179
194
|
}
|
|
180
195
|
// Multimodal model is optional
|
|
181
|
-
if (config.models.multimodal && !config.models.multimodal.apiKey) {
|
|
182
|
-
throw new ConfigurationError('API key for multimodal model not configured.'
|
|
196
|
+
if (config.models.multimodal && !config.models.multimodal.apiKey && !config.models.multimodal.useGoogleADC) {
|
|
197
|
+
throw new ConfigurationError('API key for multimodal model not configured. ' +
|
|
198
|
+
'Either set apiKey or enable useGoogleADC for Vertex AI MaaS.');
|
|
183
199
|
}
|
|
184
200
|
}
|
|
185
201
|
}
|
package/dist/core/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/core/config.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;AAEvE,6BAA6B;AAC7B,0DAA0D;AAC1D,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,kCAAkC;IAClC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACpC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAEpC,iCAAiC;IACjC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IAChC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAExC,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IAClC,0FAA0F;IAC1F,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC,MAAM,CACP,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,EAClE,EAAE,OAAO,EAAE,mEAAmE,EAAE,CACjF,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/core/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ import { WorkspaceManager } from './workspace.js';
|
|
|
11
11
|
import { ConversationManager } from './conversation-manager.js';
|
|
12
12
|
import { PersonaManager } from '../personas/persona-manager.js';
|
|
13
13
|
import { AgentSpawner } from './agent-spawner.js';
|
|
14
|
+
import { OrchestrationLogger } from '../utils/orchestration-logger.js';
|
|
14
15
|
import { Message } from '../models/base.js';
|
|
15
16
|
export interface DualAgentConfig {
|
|
16
17
|
orchestrator: ModelOrchestrator;
|
|
@@ -35,6 +36,12 @@ export interface DualAgentConfig {
|
|
|
35
36
|
*/
|
|
36
37
|
maxMessagesBeforeCondense?: number;
|
|
37
38
|
maxToolCalls?: number;
|
|
39
|
+
/**
|
|
40
|
+
* Per-session OrchestrationLogger instance. When provided (HTTP mode) each
|
|
41
|
+
* session owns its own logger so events never cross-contaminate between
|
|
42
|
+
* tenants. Omit to use the module-level singleton (CLI mode).
|
|
43
|
+
*/
|
|
44
|
+
orchestrationLogger?: OrchestrationLogger;
|
|
38
45
|
}
|
|
39
46
|
export interface DualAgentResponse {
|
|
40
47
|
content: string;
|
|
@@ -62,6 +69,7 @@ export declare class DualAgent {
|
|
|
62
69
|
private condensingThreshold;
|
|
63
70
|
private compactionThreshold;
|
|
64
71
|
private maxMessagesBeforeCondense;
|
|
72
|
+
private readonly orchLogger;
|
|
65
73
|
private userConversationHistory;
|
|
66
74
|
private _stopped;
|
|
67
75
|
constructor(config: DualAgentConfig);
|