@accomplish_ai/agent-core 0.3.1 → 0.3.3
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/common/constants/model-display.d.ts.map +1 -1
- package/dist/common/constants/model-display.js +2 -0
- package/dist/common/constants/model-display.js.map +1 -1
- package/dist/common/index.d.ts +3 -3
- package/dist/common/index.d.ts.map +1 -1
- package/dist/common/index.js.map +1 -1
- package/dist/common/types/auth.d.ts +13 -1
- package/dist/common/types/auth.d.ts.map +1 -1
- package/dist/common/types/connector.d.ts +32 -0
- package/dist/common/types/connector.d.ts.map +1 -0
- package/dist/common/types/connector.js +2 -0
- package/dist/common/types/connector.js.map +1 -0
- package/dist/common/types/index.d.ts +4 -3
- package/dist/common/types/index.d.ts.map +1 -1
- package/dist/common/types/index.js.map +1 -1
- package/dist/common/types/provider.d.ts +21 -2
- package/dist/common/types/provider.d.ts.map +1 -1
- package/dist/common/types/provider.js +67 -180
- package/dist/common/types/provider.js.map +1 -1
- package/dist/common/types/providerSettings.d.ts +15 -3
- package/dist/common/types/providerSettings.d.ts.map +1 -1
- package/dist/common/types/providerSettings.js +12 -2
- package/dist/common/types/providerSettings.js.map +1 -1
- package/dist/common.d.ts +5 -3
- package/dist/common.d.ts.map +1 -1
- package/dist/common.js +2 -0
- package/dist/common.js.map +1 -1
- package/dist/connectors/mcp-oauth.d.ts +53 -0
- package/dist/connectors/mcp-oauth.d.ts.map +1 -0
- package/dist/connectors/mcp-oauth.js +176 -0
- package/dist/connectors/mcp-oauth.js.map +1 -0
- package/dist/factories/storage.d.ts.map +1 -1
- package/dist/factories/storage.js +27 -1
- package/dist/factories/storage.js.map +1 -1
- package/dist/index.d.ts +10 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/opencode/completion/completion-enforcer.d.ts.map +1 -1
- package/dist/opencode/completion/completion-enforcer.js +3 -3
- package/dist/opencode/completion/completion-enforcer.js.map +1 -1
- package/dist/opencode/completion/completion-state.js +1 -1
- package/dist/opencode/completion/index.d.ts +1 -1
- package/dist/opencode/completion/index.d.ts.map +1 -1
- package/dist/opencode/completion/index.js +1 -1
- package/dist/opencode/completion/index.js.map +1 -1
- package/dist/opencode/completion/prompts.d.ts +1 -2
- package/dist/opencode/completion/prompts.d.ts.map +1 -1
- package/dist/opencode/completion/prompts.js +10 -8
- package/dist/opencode/completion/prompts.js.map +1 -1
- package/dist/opencode/config-builder.d.ts.map +1 -1
- package/dist/opencode/config-builder.js +61 -9
- package/dist/opencode/config-builder.js.map +1 -1
- package/dist/opencode/config-generator.d.ts +8 -0
- package/dist/opencode/config-generator.d.ts.map +1 -1
- package/dist/opencode/config-generator.js +36 -2
- package/dist/opencode/config-generator.js.map +1 -1
- package/dist/opencode/environment.d.ts +5 -1
- package/dist/opencode/environment.d.ts.map +1 -1
- package/dist/opencode/environment.js +14 -0
- package/dist/opencode/environment.js.map +1 -1
- package/dist/opencode/index.d.ts +1 -1
- package/dist/opencode/index.d.ts.map +1 -1
- package/dist/opencode/index.js +1 -1
- package/dist/opencode/index.js.map +1 -1
- package/dist/opencode/task-manager.d.ts.map +1 -1
- package/dist/opencode/task-manager.js +7 -0
- package/dist/opencode/task-manager.js.map +1 -1
- package/dist/providers/fetch-models.d.ts +27 -0
- package/dist/providers/fetch-models.d.ts.map +1 -0
- package/dist/providers/fetch-models.js +128 -0
- package/dist/providers/fetch-models.js.map +1 -0
- package/dist/providers/index.d.ts +1 -0
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js +1 -0
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/ollama.d.ts.map +1 -1
- package/dist/providers/ollama.js +8 -8
- package/dist/providers/ollama.js.map +1 -1
- package/dist/providers/tool-support-testing.d.ts +2 -1
- package/dist/providers/tool-support-testing.d.ts.map +1 -1
- package/dist/providers/tool-support-testing.js +29 -6
- package/dist/providers/tool-support-testing.js.map +1 -1
- package/dist/providers/validation.d.ts.map +1 -1
- package/dist/providers/validation.js +1 -0
- package/dist/providers/validation.js.map +1 -1
- package/dist/providers/vertex.d.ts +38 -0
- package/dist/providers/vertex.d.ts.map +1 -0
- package/dist/providers/vertex.js +209 -0
- package/dist/providers/vertex.js.map +1 -0
- package/dist/storage/index.d.ts +2 -1
- package/dist/storage/index.d.ts.map +1 -1
- package/dist/storage/index.js +2 -1
- package/dist/storage/index.js.map +1 -1
- package/dist/storage/migrations/index.d.ts +1 -1
- package/dist/storage/migrations/index.d.ts.map +1 -1
- package/dist/storage/migrations/index.js +5 -1
- package/dist/storage/migrations/index.js.map +1 -1
- package/dist/storage/migrations/v007-connectors.d.ts +3 -0
- package/dist/storage/migrations/v007-connectors.d.ts.map +1 -0
- package/dist/storage/migrations/v007-connectors.js +23 -0
- package/dist/storage/migrations/v007-connectors.js.map +1 -0
- package/dist/storage/migrations/v008-theme.d.ts +3 -0
- package/dist/storage/migrations/v008-theme.d.ts.map +1 -0
- package/dist/storage/migrations/v008-theme.js +7 -0
- package/dist/storage/migrations/v008-theme.js.map +1 -0
- package/dist/storage/repositories/appSettings.d.ts +4 -0
- package/dist/storage/repositories/appSettings.d.ts.map +1 -1
- package/dist/storage/repositories/appSettings.js +19 -1
- package/dist/storage/repositories/appSettings.js.map +1 -1
- package/dist/storage/repositories/connectors.d.ts +10 -0
- package/dist/storage/repositories/connectors.d.ts.map +1 -0
- package/dist/storage/repositories/connectors.js +78 -0
- package/dist/storage/repositories/connectors.js.map +1 -0
- package/dist/storage/repositories/index.d.ts +2 -1
- package/dist/storage/repositories/index.d.ts.map +1 -1
- package/dist/storage/repositories/index.js +2 -1
- package/dist/storage/repositories/index.js.map +1 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/storage.d.ts +35 -3
- package/dist/types/storage.d.ts.map +1 -1
- package/dist/utils/sanitize.d.ts +1 -0
- package/dist/utils/sanitize.d.ts.map +1 -1
- package/dist/utils/sanitize.js +3 -3
- package/dist/utils/sanitize.js.map +1 -1
- package/mcp-tools/ask-user-question/dist/index.mjs +7 -14
- package/mcp-tools/complete-task/dist/index.mjs +7 -14
- package/mcp-tools/dev-browser/dist/start-relay.mjs +39 -39
- package/mcp-tools/dev-browser/dist/start-server.mjs +34 -138
- package/mcp-tools/dev-browser-mcp/dist/index.mjs +208 -50
- package/mcp-tools/file-permission/dist/index.mjs +7 -14
- package/mcp-tools/start-task/dist/index.mjs +7 -14
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -39,12 +39,14 @@ export { FutureSchemaError } from './storage/migrations/errors.js';
|
|
|
39
39
|
// Validation functions
|
|
40
40
|
export { validateApiKey } from './providers/validation.js';
|
|
41
41
|
export { validateBedrockCredentials, fetchBedrockModels, } from './providers/bedrock.js';
|
|
42
|
+
export { validateVertexCredentials, fetchVertexModels, VertexClient, } from './providers/vertex.js';
|
|
42
43
|
export { validateAzureFoundry, testAzureFoundryConnection, } from './providers/azure-foundry.js';
|
|
43
44
|
export { fetchOpenRouterModels } from './providers/openrouter.js';
|
|
44
45
|
export { testLiteLLMConnection, fetchLiteLLMModels } from './providers/litellm.js';
|
|
45
46
|
export { testOllamaConnection } from './providers/ollama.js';
|
|
46
47
|
export { testOllamaModelToolSupport } from './providers/tool-support-testing.js';
|
|
47
48
|
export { testLMStudioConnection, fetchLMStudioModels, validateLMStudioConfig, } from './providers/lmstudio.js';
|
|
49
|
+
export { fetchProviderModels } from './providers/fetch-models.js';
|
|
48
50
|
// -----------------------------------------------------------------------------
|
|
49
51
|
// Utils Module (from ./utils/)
|
|
50
52
|
// -----------------------------------------------------------------------------
|
|
@@ -53,7 +55,7 @@ export { getBundledNodePaths, isBundledNodeAvailable, getNodePath, getNpmPath, g
|
|
|
53
55
|
// System PATH resolution
|
|
54
56
|
export { getExtendedNodePath, findCommandInPath } from './utils/system-path.js';
|
|
55
57
|
// Sanitization functions
|
|
56
|
-
export { sanitizeString } from './utils/sanitize.js';
|
|
58
|
+
export { sanitizeString, PROMPT_DEFAULT_MAX_LENGTH } from './utils/sanitize.js';
|
|
57
59
|
// URL validation functions
|
|
58
60
|
export { validateHttpUrl } from './utils/url.js';
|
|
59
61
|
// Task validation functions
|
|
@@ -78,6 +80,8 @@ export { STARTUP_STAGES } from './common/types/task.js';
|
|
|
78
80
|
export { FILE_OPERATIONS, FILE_PERMISSION_REQUEST_PREFIX, QUESTION_REQUEST_PREFIX, } from './common/types/permission.js';
|
|
79
81
|
export { DEFAULT_PROVIDERS, DEFAULT_MODEL, ALLOWED_API_KEY_PROVIDERS, STANDARD_VALIDATION_PROVIDERS, ZAI_ENDPOINTS, } from './common/types/provider.js';
|
|
80
82
|
export { PROVIDER_META, DEFAULT_MODELS, PROVIDER_ID_TO_OPENCODE, isProviderReady, hasAnyReadyProvider, getActiveProvider, getDefaultModelForProvider, } from './common/types/providerSettings.js';
|
|
83
|
+
// MCP OAuth
|
|
84
|
+
export { discoverOAuthMetadata, registerOAuthClient, generatePkceChallenge, buildAuthorizationUrl, exchangeCodeForTokens, refreshAccessToken, isTokenExpired, } from './connectors/mcp-oauth.js';
|
|
81
85
|
// Constants
|
|
82
86
|
export { DEV_BROWSER_PORT, DEV_BROWSER_CDP_PORT, THOUGHT_STREAM_PORT, PERMISSION_API_PORT, QUESTION_API_PORT, PERMISSION_REQUEST_TIMEOUT_MS, LOG_MAX_FILE_SIZE_BYTES, LOG_RETENTION_DAYS, LOG_BUFFER_FLUSH_INTERVAL_MS, LOG_BUFFER_MAX_ENTRIES, } from './common/constants.js';
|
|
83
87
|
export { MODEL_DISPLAY_NAMES, PROVIDER_PREFIXES, getModelDisplayName, } from './common/constants/model-display.js';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,gCAAgC;AAChC,gFAAgF;AAChF,gFAAgF;AAChF,8EAA8E;AAC9E,gFAAgF;AAEhF,gFAAgF;AAChF,0CAA0C;AAC1C,gFAAgF;AAChF,yEAAyE;AACzE,uEAAuE;AAEvE,2CAA2C;AAC3C,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,uBAAuB,EACvB,0BAA0B,EAC1B,eAAe,EACf,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion-enforcer.d.ts","sourceRoot":"","sources":["../../../src/opencode/completion/completion-enforcer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,mBAAmB,EAAoB,MAAM,uBAAuB,CAAC;AAE/F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAE3D,MAAM,WAAW,2BAA2B;IAC1C,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CAClE;AAED,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,SAAS,GAAG,UAAU,CAAC;AAEnE,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,SAAS,CAA8B;IAC/C,OAAO,CAAC,YAAY,CAAkB;IACtC,OAAO,CAAC,aAAa,CAAkB;gBAE3B,SAAS,EAAE,2BAA2B,EAAE,uBAAuB,
|
|
1
|
+
{"version":3,"file":"completion-enforcer.d.ts","sourceRoot":"","sources":["../../../src/opencode/completion/completion-enforcer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,mBAAmB,EAAoB,MAAM,uBAAuB,CAAC;AAE/F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAE3D,MAAM,WAAW,2BAA2B;IAC1C,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CAClE;AAED,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,SAAS,GAAG,UAAU,CAAC;AAEnE,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,SAAS,CAA8B;IAC/C,OAAO,CAAC,YAAY,CAAkB;IACtC,OAAO,CAAC,aAAa,CAAkB;gBAE3B,SAAS,EAAE,2BAA2B,EAAE,uBAAuB,CAAC,EAAE,MAAM;IAKpF,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI;IASpC,aAAa,IAAI,IAAI;IAIrB,2BAA2B,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO;IAwCxD,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB;IAqC5C,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgDxD,cAAc,IAAI,OAAO;IAMzB,KAAK,IAAI,IAAI;IAMb,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,yBAAyB;IAOjC,QAAQ,IAAI,mBAAmB;IAI/B,uBAAuB,IAAI,MAAM;CAGlC"}
|
|
@@ -5,7 +5,7 @@ export class CompletionEnforcer {
|
|
|
5
5
|
callbacks;
|
|
6
6
|
currentTodos = [];
|
|
7
7
|
toolsWereUsed = false;
|
|
8
|
-
constructor(callbacks, maxContinuationAttempts
|
|
8
|
+
constructor(callbacks, maxContinuationAttempts) {
|
|
9
9
|
this.callbacks = callbacks;
|
|
10
10
|
this.state = new CompletionState(maxContinuationAttempts);
|
|
11
11
|
}
|
|
@@ -60,14 +60,14 @@ export class CompletionEnforcer {
|
|
|
60
60
|
async handleProcessExit(exitCode) {
|
|
61
61
|
if (this.state.isPendingPartialContinuation() && exitCode === 0) {
|
|
62
62
|
const args = this.state.getCompleteTaskArgs();
|
|
63
|
-
const prompt = getPartialContinuationPrompt(args?.remaining_work || 'No remaining work specified', args?.original_request_summary || 'Unknown request', args?.summary || 'No summary provided');
|
|
63
|
+
const prompt = getPartialContinuationPrompt(args?.remaining_work || 'No remaining work specified', args?.original_request_summary || 'Unknown request', args?.summary || 'No summary provided', this.hasIncompleteTodos() ? this.getIncompleteTodosSummary() : undefined);
|
|
64
64
|
const canContinue = this.state.startPartialContinuation();
|
|
65
65
|
if (!canContinue) {
|
|
66
66
|
console.warn('[CompletionEnforcer] Max partial continuation attempts reached');
|
|
67
67
|
this.callbacks.onComplete();
|
|
68
68
|
return;
|
|
69
69
|
}
|
|
70
|
-
this.callbacks.onDebug('partial_continuation', `Starting partial continuation (attempt ${this.state.getContinuationAttempts()})`, { remainingWork: args?.remaining_work, summary: args?.summary });
|
|
70
|
+
this.callbacks.onDebug('partial_continuation', `Starting partial continuation (attempt ${this.state.getContinuationAttempts()})`, { remainingWork: args?.remaining_work, summary: args?.summary, continuationPrompt: prompt });
|
|
71
71
|
this.toolsWereUsed = false;
|
|
72
72
|
await this.callbacks.onStartContinuation(prompt);
|
|
73
73
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion-enforcer.js","sourceRoot":"","sources":["../../../src/opencode/completion/completion-enforcer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAoB,MAAM,uBAAuB,CAAC;AAC/F,OAAO,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAC;AAWnF,MAAM,OAAO,kBAAkB;IACrB,KAAK,CAAkB;IACvB,SAAS,CAA8B;IACvC,YAAY,GAAe,EAAE,CAAC;IAC9B,aAAa,GAAY,KAAK,CAAC;IAEvC,YAAY,SAAsC,EAAE,
|
|
1
|
+
{"version":3,"file":"completion-enforcer.js","sourceRoot":"","sources":["../../../src/opencode/completion/completion-enforcer.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export class CompletionState {
|
|
|
12
12
|
continuationAttempts = 0;
|
|
13
13
|
completeTaskArgs = null;
|
|
14
14
|
maxContinuationAttempts;
|
|
15
|
-
constructor(maxContinuationAttempts =
|
|
15
|
+
constructor(maxContinuationAttempts = 10) {
|
|
16
16
|
this.maxContinuationAttempts = maxContinuationAttempts;
|
|
17
17
|
}
|
|
18
18
|
getState() {
|
|
@@ -2,5 +2,5 @@ export { CompletionEnforcer } from './completion-enforcer.js';
|
|
|
2
2
|
export type { CompletionEnforcerCallbacks, StepFinishAction } from './completion-enforcer.js';
|
|
3
3
|
export { CompletionState, CompletionFlowState } from './completion-state.js';
|
|
4
4
|
export type { CompleteTaskArgs } from './completion-state.js';
|
|
5
|
-
export { getContinuationPrompt, getPartialContinuationPrompt
|
|
5
|
+
export { getContinuationPrompt, getPartialContinuationPrompt } from './prompts.js';
|
|
6
6
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/opencode/completion/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,YAAY,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC9F,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC7E,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/opencode/completion/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,YAAY,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC9F,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC7E,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { CompletionEnforcer } from './completion-enforcer.js';
|
|
2
2
|
export { CompletionState, CompletionFlowState } from './completion-state.js';
|
|
3
|
-
export { getContinuationPrompt, getPartialContinuationPrompt
|
|
3
|
+
export { getContinuationPrompt, getPartialContinuationPrompt } from './prompts.js';
|
|
4
4
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/opencode/completion/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE7E,OAAO,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/opencode/completion/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE7E,OAAO,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
1
|
export declare function getContinuationPrompt(): string;
|
|
2
|
-
export declare function getPartialContinuationPrompt(remainingWork: string, originalRequest: string, completedSummary: string): string;
|
|
3
|
-
export declare function getIncompleteTodosPrompt(incompleteTodos: string): string;
|
|
2
|
+
export declare function getPartialContinuationPrompt(remainingWork: string, originalRequest: string, completedSummary: string, incompleteTodos?: string): string;
|
|
4
3
|
//# sourceMappingURL=prompts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../../src/opencode/completion/prompts.ts"],"names":[],"mappings":"AAAA,wBAAgB,qBAAqB,IAAI,MAAM,CAY9C;AAED,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../../src/opencode/completion/prompts.ts"],"names":[],"mappings":"AAAA,wBAAgB,qBAAqB,IAAI,MAAM,CAY9C;AAED,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,EACxB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CA8CR"}
|
|
@@ -11,7 +11,16 @@ Before proceeding, ask yourself: "Have I actually finished everything the user a
|
|
|
11
11
|
Do NOT call complete_task until you have actually completed the user's request.
|
|
12
12
|
Keep working if there's more to do.`;
|
|
13
13
|
}
|
|
14
|
-
export function getPartialContinuationPrompt(remainingWork, originalRequest, completedSummary) {
|
|
14
|
+
export function getPartialContinuationPrompt(remainingWork, originalRequest, completedSummary, incompleteTodos) {
|
|
15
|
+
if (incompleteTodos) {
|
|
16
|
+
return `Your complete_task call was rejected because these todo items are still marked incomplete:
|
|
17
|
+
|
|
18
|
+
${incompleteTodos}
|
|
19
|
+
|
|
20
|
+
Call todowrite to mark each item as "completed" or "cancelled", then call complete_task with status="success".
|
|
21
|
+
|
|
22
|
+
If any items are not done yet, complete them first.`;
|
|
23
|
+
}
|
|
15
24
|
return `You called complete_task with status="partial" but the task is not done yet.
|
|
16
25
|
|
|
17
26
|
## Original Request
|
|
@@ -48,11 +57,4 @@ Before continuing, you MUST:
|
|
|
48
57
|
|
|
49
58
|
Now create your continuation plan and resume working on the remaining items.`;
|
|
50
59
|
}
|
|
51
|
-
export function getIncompleteTodosPrompt(incompleteTodos) {
|
|
52
|
-
return `You marked the task complete but have incomplete todos:
|
|
53
|
-
|
|
54
|
-
${incompleteTodos}
|
|
55
|
-
|
|
56
|
-
Either complete these items or update the todo list to mark them as cancelled if no longer needed. Then call complete_task again.`;
|
|
57
|
-
}
|
|
58
60
|
//# sourceMappingURL=prompts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/opencode/completion/prompts.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,qBAAqB;IACnC,OAAO;;;;;;;;;;oCAU2B,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,aAAqB,EACrB,eAAuB,EACvB,gBAAwB;IAExB,OAAO;;;GAGN,eAAe;;;EAGhB,gBAAgB;;;EAGhB,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;6EAyB8D,CAAC;AAC9E,CAAC
|
|
1
|
+
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/opencode/completion/prompts.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,qBAAqB;IACnC,OAAO;;;;;;;;;;oCAU2B,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,aAAqB,EACrB,eAAuB,EACvB,gBAAwB,EACxB,eAAwB;IAExB,IAAI,eAAe,EAAE,CAAC;QACpB,OAAO;;EAET,eAAe;;;;oDAImC,CAAC;IACnD,CAAC;IAED,OAAO;;;GAGN,eAAe;;;EAGhB,gBAAgB;;;EAGhB,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;6EAyB8D,CAAC;AAC9E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-builder.d.ts","sourceRoot":"","sources":["../../src/opencode/config-builder.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAM5E,OAAO,KAAK,EAAE,cAAc,EAAuB,MAAM,uBAAuB,CAAC;AAYjF;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;CACvD;AAED;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C;;;OAGG;IACH,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IAC3D;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AA+CD;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAAC,oBAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"config-builder.d.ts","sourceRoot":"","sources":["../../src/opencode/config-builder.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAM5E,OAAO,KAAK,EAAE,cAAc,EAAuB,MAAM,uBAAuB,CAAC;AAYjF;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;CACvD;AAED;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C;;;OAGG;IACH,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IAC3D;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AA+CD;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAAC,oBAAoB,CAAC,CA8W/B;AAYD;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,GACjD,OAAO,CAAC,IAAI,CAAC,CA+Cf"}
|
|
@@ -55,7 +55,7 @@ export async function buildProviderConfigs(options) {
|
|
|
55
55
|
const connectedIds = getConnectedProviderIds();
|
|
56
56
|
const activeModel = getActiveProviderModel();
|
|
57
57
|
const providerConfigs = [];
|
|
58
|
-
const baseProviders = ['anthropic', 'openai', 'openrouter', 'google', 'xai', 'deepseek', 'moonshot', 'zai-coding-plan', 'amazon-bedrock', 'minimax'];
|
|
58
|
+
const baseProviders = ['anthropic', 'openai', 'openrouter', 'google', 'xai', 'deepseek', 'moonshot', 'zai-coding-plan', 'amazon-bedrock', 'vertex', 'minimax'];
|
|
59
59
|
let enabledProviders = baseProviders;
|
|
60
60
|
if (connectedIds.length > 0) {
|
|
61
61
|
const mappedProviders = connectedIds.map(id => PROVIDER_ID_TO_OPENCODE[id]);
|
|
@@ -73,6 +73,10 @@ export async function buildProviderConfigs(options) {
|
|
|
73
73
|
if (ollamaProvider?.connectionStatus === 'connected' && ollamaProvider.credentials.type === 'ollama') {
|
|
74
74
|
if (ollamaProvider.selectedModelId) {
|
|
75
75
|
const modelId = ollamaProvider.selectedModelId.replace(/^ollama\//, '');
|
|
76
|
+
const ollamaModelInfo = ollamaProvider.availableModels?.find(m => m.id === ollamaProvider.selectedModelId || m.id === modelId);
|
|
77
|
+
const ollamaSupportsTools = ollamaModelInfo?.toolSupport === 'supported';
|
|
78
|
+
// Register model with both formats for compatibility
|
|
79
|
+
// Some code paths use "modelId" while others use "ollama/modelId"
|
|
76
80
|
providerConfigs.push({
|
|
77
81
|
id: 'ollama',
|
|
78
82
|
npm: '@ai-sdk/openai-compatible',
|
|
@@ -81,10 +85,11 @@ export async function buildProviderConfigs(options) {
|
|
|
81
85
|
baseURL: `${ollamaProvider.credentials.serverUrl}/v1`,
|
|
82
86
|
},
|
|
83
87
|
models: {
|
|
84
|
-
[modelId]: { name: modelId, tools:
|
|
88
|
+
[modelId]: { name: modelId, tools: ollamaSupportsTools },
|
|
89
|
+
[`ollama/${modelId}`]: { name: modelId, tools: ollamaSupportsTools },
|
|
85
90
|
},
|
|
86
91
|
});
|
|
87
|
-
console.log(
|
|
92
|
+
console.log(`[OpenCode Config Builder] Ollama configured: ${modelId} (tools: ${ollamaSupportsTools})`);
|
|
88
93
|
}
|
|
89
94
|
}
|
|
90
95
|
else {
|
|
@@ -93,7 +98,10 @@ export async function buildProviderConfigs(options) {
|
|
|
93
98
|
if (ollamaConfig?.enabled && ollamaModels && ollamaModels.length > 0) {
|
|
94
99
|
const models = {};
|
|
95
100
|
for (const model of ollamaModels) {
|
|
96
|
-
|
|
101
|
+
const legacyToolSupport = model.toolSupport === 'supported' || model.toolSupport === undefined;
|
|
102
|
+
// Register both formats for compatibility
|
|
103
|
+
models[model.id] = { name: model.displayName, tools: legacyToolSupport };
|
|
104
|
+
models[`ollama/${model.id}`] = { name: model.displayName, tools: legacyToolSupport };
|
|
97
105
|
}
|
|
98
106
|
providerConfigs.push({
|
|
99
107
|
id: 'ollama',
|
|
@@ -221,6 +229,39 @@ export async function buildProviderConfigs(options) {
|
|
|
221
229
|
};
|
|
222
230
|
console.log('[OpenCode Config Builder] Bedrock model override:', modelOverride);
|
|
223
231
|
}
|
|
232
|
+
// Vertex AI provider
|
|
233
|
+
const vertexProvider = providerSettings.connectedProviders.vertex;
|
|
234
|
+
if (vertexProvider?.connectionStatus === 'connected' && vertexProvider.credentials.type === 'vertex') {
|
|
235
|
+
const creds = vertexProvider.credentials;
|
|
236
|
+
const vertexOptions = {
|
|
237
|
+
project: creds.projectId,
|
|
238
|
+
location: creds.location,
|
|
239
|
+
};
|
|
240
|
+
const vertexModels = {};
|
|
241
|
+
if (activeModel?.provider === 'vertex' && activeModel.model) {
|
|
242
|
+
// Model IDs are stored as "vertex/{publisher}/{model}" (e.g. "vertex/google/gemini-2.5-flash")
|
|
243
|
+
// but @ai-sdk/google-vertex expects just the model name (e.g. "gemini-2.5-flash")
|
|
244
|
+
const modelId = activeModel.model.replace(/^vertex\/[^/]+\//, '');
|
|
245
|
+
vertexModels[modelId] = { name: modelId, tools: true };
|
|
246
|
+
}
|
|
247
|
+
providerConfigs.push({
|
|
248
|
+
id: 'vertex',
|
|
249
|
+
npm: '@ai-sdk/google-vertex',
|
|
250
|
+
name: 'Google Vertex AI',
|
|
251
|
+
options: vertexOptions,
|
|
252
|
+
...(Object.keys(vertexModels).length > 0 ? { models: vertexModels } : {}),
|
|
253
|
+
});
|
|
254
|
+
console.log('[OpenCode Config Builder] Vertex AI configured:', vertexOptions, 'models:', Object.keys(vertexModels));
|
|
255
|
+
}
|
|
256
|
+
if (activeModel?.provider === 'vertex' && activeModel.model) {
|
|
257
|
+
// Strip publisher from "vertex/{publisher}/{model}" → "vertex/{model}"
|
|
258
|
+
const vertexModelId = activeModel.model.replace(/^vertex\/[^/]+\//, '');
|
|
259
|
+
modelOverride = {
|
|
260
|
+
model: `vertex/${vertexModelId}`,
|
|
261
|
+
smallModel: `vertex/${vertexModelId}`,
|
|
262
|
+
};
|
|
263
|
+
console.log('[OpenCode Config Builder] Vertex model override:', modelOverride);
|
|
264
|
+
}
|
|
224
265
|
// LiteLLM provider
|
|
225
266
|
const litellmProvider = providerSettings.connectedProviders.litellm;
|
|
226
267
|
if (litellmProvider?.connectionStatus === 'connected' && litellmProvider.credentials.type === 'litellm' && litellmProvider.selectedModelId) {
|
|
@@ -311,14 +352,25 @@ export async function buildProviderConfigs(options) {
|
|
|
311
352
|
// Z.AI provider
|
|
312
353
|
const zaiKey = getApiKey('zai');
|
|
313
354
|
if (zaiKey) {
|
|
314
|
-
const
|
|
355
|
+
const zaiProvider = providerSettings.connectedProviders.zai;
|
|
356
|
+
const zaiCredentials = zaiProvider?.credentials;
|
|
315
357
|
const zaiRegion = zaiCredentials?.region || 'international';
|
|
316
358
|
const zaiEndpoint = ZAI_ENDPOINTS[zaiRegion];
|
|
317
|
-
const zaiProviderConfig = DEFAULT_PROVIDERS.find(p => p.id === 'zai');
|
|
318
359
|
const zaiModels = {};
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
360
|
+
// Prefer dynamically fetched models from connected provider
|
|
361
|
+
if (zaiProvider?.availableModels && zaiProvider.availableModels.length > 0) {
|
|
362
|
+
for (const model of zaiProvider.availableModels) {
|
|
363
|
+
const modelId = model.id.replace(/^zai\//, '');
|
|
364
|
+
zaiModels[modelId] = { name: model.name, tools: true };
|
|
365
|
+
}
|
|
366
|
+
}
|
|
367
|
+
else {
|
|
368
|
+
// Fall back to static models from DEFAULT_PROVIDERS
|
|
369
|
+
const zaiProviderConfig = DEFAULT_PROVIDERS.find(p => p.id === 'zai');
|
|
370
|
+
if (zaiProviderConfig) {
|
|
371
|
+
for (const model of zaiProviderConfig.models) {
|
|
372
|
+
zaiModels[model.id] = { name: model.displayName, tools: true };
|
|
373
|
+
}
|
|
322
374
|
}
|
|
323
375
|
}
|
|
324
376
|
providerConfigs.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-builder.js","sourceRoot":"","sources":["../../src/opencode/config-builder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"config-builder.js","sourceRoot":"","sources":["../../src/opencode/config-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,13 @@ export interface ConfigGeneratorOptions {
|
|
|
34
34
|
enabledProviders?: string[];
|
|
35
35
|
/** Browser configuration. Defaults to { mode: 'builtin' } */
|
|
36
36
|
browser?: BrowserConfig;
|
|
37
|
+
/** Connected MCP remote servers with OAuth access tokens */
|
|
38
|
+
connectors?: Array<{
|
|
39
|
+
id: string;
|
|
40
|
+
name: string;
|
|
41
|
+
url: string;
|
|
42
|
+
accessToken: string;
|
|
43
|
+
}>;
|
|
37
44
|
}
|
|
38
45
|
export interface ProviderConfig {
|
|
39
46
|
id: string;
|
|
@@ -62,6 +69,7 @@ interface McpServerConfig {
|
|
|
62
69
|
type?: 'local' | 'remote';
|
|
63
70
|
command?: string[];
|
|
64
71
|
url?: string;
|
|
72
|
+
headers?: Record<string, string>;
|
|
65
73
|
enabled?: boolean;
|
|
66
74
|
environment?: Record<string, string>;
|
|
67
75
|
timeout?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-generator.d.ts","sourceRoot":"","sources":["../../src/opencode/config-generator.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAEvD,eAAO,MAAM,qBAAqB,eAAe,CAAC;AAElD,MAAM,WAAW,aAAa;IAC5B,6GAA6G;IAC7G,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAC;IACpC,yCAAyC;IACzC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,kCAAkC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE;QACT,EAAE,EAAE,UAAU,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;IACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,6DAA6D;IAC7D,OAAO,CAAC,EAAE,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"config-generator.d.ts","sourceRoot":"","sources":["../../src/opencode/config-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -300,6 +300,34 @@ Use empty array [] if no skills apply to your task.
|
|
|
300
300
|
timeout: 30000,
|
|
301
301
|
};
|
|
302
302
|
}
|
|
303
|
+
// Add connected MCP connectors as remote servers
|
|
304
|
+
if (options.connectors) {
|
|
305
|
+
for (const connector of options.connectors) {
|
|
306
|
+
// Use short sanitized name + ID suffix as key to prevent collisions
|
|
307
|
+
const sanitized = connector.name
|
|
308
|
+
.toLowerCase()
|
|
309
|
+
.replace(/[^a-z0-9]/g, '-')
|
|
310
|
+
.replace(/-+/g, '-')
|
|
311
|
+
.replace(/^-|-$/g, '')
|
|
312
|
+
.slice(0, 20);
|
|
313
|
+
const baseName = sanitized || 'mcp-remote';
|
|
314
|
+
const idSuffix = connector.id.slice(0, 6);
|
|
315
|
+
let key = `connector-${baseName}-${idSuffix}`;
|
|
316
|
+
// Guard against unlikely collision with existing keys
|
|
317
|
+
if (mcpServers[key]) {
|
|
318
|
+
let i = 1;
|
|
319
|
+
while (mcpServers[`${key}-${i}`])
|
|
320
|
+
i += 1;
|
|
321
|
+
key = `${key}-${i}`;
|
|
322
|
+
}
|
|
323
|
+
mcpServers[key] = {
|
|
324
|
+
type: 'remote',
|
|
325
|
+
url: connector.url,
|
|
326
|
+
headers: { Authorization: `Bearer ${connector.accessToken}` },
|
|
327
|
+
enabled: true,
|
|
328
|
+
};
|
|
329
|
+
}
|
|
330
|
+
}
|
|
303
331
|
// Fill browser-specific template sections based on mode
|
|
304
332
|
const hasBrowser = browserConfig.mode !== 'none';
|
|
305
333
|
systemPrompt = systemPrompt
|
|
@@ -411,8 +439,9 @@ export function buildCliArgs(options) {
|
|
|
411
439
|
args.push('--model', selectedModel.model);
|
|
412
440
|
}
|
|
413
441
|
else if (selectedModel.provider === 'ollama') {
|
|
414
|
-
|
|
415
|
-
|
|
442
|
+
// Accept both "qwen3:4b" and "ollama/qwen3:4b" inputs consistently
|
|
443
|
+
const normalizedModelId = selectedModel.model.replace(/^ollama\//, '');
|
|
444
|
+
args.push('--model', `ollama/${normalizedModelId}`);
|
|
416
445
|
}
|
|
417
446
|
else if (selectedModel.provider === 'litellm') {
|
|
418
447
|
const modelId = selectedModel.model.replace(/^litellm\//, '');
|
|
@@ -422,6 +451,11 @@ export function buildCliArgs(options) {
|
|
|
422
451
|
const modelId = selectedModel.model.replace(/^lmstudio\//, '');
|
|
423
452
|
args.push('--model', `lmstudio/${modelId}`);
|
|
424
453
|
}
|
|
454
|
+
else if (selectedModel.provider === 'vertex') {
|
|
455
|
+
// Model IDs stored as "vertex/{publisher}/{model}" — strip publisher for @ai-sdk/google-vertex
|
|
456
|
+
const modelId = selectedModel.model.replace(/^vertex\/[^/]+\//, '');
|
|
457
|
+
args.push('--model', `vertex/${modelId}`);
|
|
458
|
+
}
|
|
425
459
|
else {
|
|
426
460
|
args.push('--model', selectedModel.model);
|
|
427
461
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-generator.js","sourceRoot":"","sources":["../../src/opencode/config-generator.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AAIpB,MAAM,CAAC,MAAM,qBAAqB,GAAG,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"config-generator.js","sourceRoot":"","sources":["../../src/opencode/config-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BedrockCredentials } from '../common/types/auth.js';
|
|
1
|
+
import type { BedrockCredentials, VertexCredentials } from '../common/types/auth.js';
|
|
2
2
|
/**
|
|
3
3
|
* API keys for various providers.
|
|
4
4
|
* Keys are provider names (lowercase), values are the API key strings or null.
|
|
@@ -12,6 +12,10 @@ export interface EnvironmentConfig {
|
|
|
12
12
|
apiKeys: ApiKeys;
|
|
13
13
|
/** AWS Bedrock credentials (optional) */
|
|
14
14
|
bedrockCredentials?: BedrockCredentials;
|
|
15
|
+
/** Vertex AI credentials (optional) */
|
|
16
|
+
vertexCredentials?: VertexCredentials;
|
|
17
|
+
/** Path to service account key file for Vertex AI (optional) */
|
|
18
|
+
vertexServiceAccountKeyPath?: string;
|
|
15
19
|
/** Path to bundled Node.js bin directory (optional) */
|
|
16
20
|
bundledNodeBinPath?: string;
|
|
17
21
|
/** Task ID to set in ACCOMPLISH_TASK_ID (optional) */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/opencode/environment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/opencode/environment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAErF;;;GAGG;AACH,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,uEAAuE;IACvE,OAAO,EAAE,OAAO,CAAC;IACjB,yCAAyC;IACzC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,uCAAuC;IACvC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gEAAgE;IAChE,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,uDAAuD;IACvD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,sDAAsD;IACtD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0CAA0C;IAC1C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iCAAiC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAuED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,CAAC,UAAU,EAC1B,MAAM,EAAE,iBAAiB,GACxB,MAAM,CAAC,UAAU,CAqCnB"}
|
|
@@ -46,6 +46,16 @@ function setBedrockEnvironment(env, credentials) {
|
|
|
46
46
|
env.AWS_REGION = credentials.region;
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
|
+
/**
|
|
50
|
+
* Sets Vertex AI credential environment variables.
|
|
51
|
+
*/
|
|
52
|
+
function setVertexEnvironment(env, credentials, serviceAccountKeyPath) {
|
|
53
|
+
env.GOOGLE_CLOUD_PROJECT = credentials.projectId;
|
|
54
|
+
env.GOOGLE_CLOUD_LOCATION = credentials.location;
|
|
55
|
+
if (credentials.authType === 'serviceAccount' && serviceAccountKeyPath) {
|
|
56
|
+
env.GOOGLE_APPLICATION_CREDENTIALS = serviceAccountKeyPath;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
49
59
|
/**
|
|
50
60
|
* Sets the bundled Node.js bin path in environment.
|
|
51
61
|
*/
|
|
@@ -89,6 +99,10 @@ export function buildOpenCodeEnvironment(baseEnv, config) {
|
|
|
89
99
|
if (config.bedrockCredentials) {
|
|
90
100
|
setBedrockEnvironment(env, config.bedrockCredentials);
|
|
91
101
|
}
|
|
102
|
+
// Set Vertex AI credentials if provided
|
|
103
|
+
if (config.vertexCredentials) {
|
|
104
|
+
setVertexEnvironment(env, config.vertexCredentials, config.vertexServiceAccountKeyPath);
|
|
105
|
+
}
|
|
92
106
|
// Set bundled Node.js path if provided
|
|
93
107
|
if (config.bundledNodeBinPath) {
|
|
94
108
|
setBundledNodeEnvironment(env, config.bundledNodeBinPath);
|