genaicode 0.8.3 → 0.8.5
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/ai-service/anthropic.js +1 -1
- package/dist/ai-service/anthropic.js.map +1 -1
- package/dist/ai-service/common.d.ts +2 -1
- package/dist/ai-service/common.js +1 -2
- package/dist/ai-service/common.js.map +1 -1
- package/dist/ai-service/openai.d.ts +8 -0
- package/dist/ai-service/openai.js +182 -0
- package/dist/ai-service/openai.js.map +1 -0
- package/dist/ai-service/service-configurations.js +9 -3
- package/dist/ai-service/service-configurations.js.map +1 -1
- package/dist/cli/cli-options.js +1 -1
- package/dist/cli/cli-options.js.map +1 -1
- package/dist/cli/service-autodetect.js +1 -1
- package/dist/cli/service-autodetect.js.map +1 -1
- package/dist/cli/validate-cli-params.js +1 -1
- package/dist/cli/validate-cli-params.js.map +1 -1
- package/dist/files/find-files.js +5 -2
- package/dist/files/find-files.js.map +1 -1
- package/dist/files/read-files.d.ts +1 -0
- package/dist/files/read-files.js +13 -5
- package/dist/files/read-files.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/dist/main/codegen-types.d.ts +56 -4
- package/dist/main/codegen-utils.js +1 -1
- package/dist/main/codegen-utils.js.map +1 -1
- package/dist/main/codegen.js +5 -5
- package/dist/main/codegen.js.map +1 -1
- package/dist/main/common/content-bus-types.d.ts +1 -1
- package/dist/main/config-lib.d.ts +8 -5
- package/dist/main/config-lib.js +4 -1
- package/dist/main/config-lib.js.map +1 -1
- package/dist/main/config-schema.d.ts +14 -0
- package/dist/main/config-schema.js +145 -0
- package/dist/main/config-schema.js.map +1 -0
- package/dist/main/config.d.ts +1 -0
- package/dist/main/config.js +13 -5
- package/dist/main/config.js.map +1 -1
- package/dist/main/interactive/select-ai-service.js +1 -1
- package/dist/main/interactive/select-ai-service.js.map +1 -1
- package/dist/main/plugin-loader.d.ts +18 -3
- package/dist/main/plugin-loader.js +155 -48
- package/dist/main/plugin-loader.js.map +1 -1
- package/dist/main/ui/backend/api-handlers.d.ts +6 -0
- package/dist/main/ui/backend/api-handlers.js +5 -0
- package/dist/main/ui/backend/api-handlers.js.map +1 -0
- package/dist/main/ui/backend/api.d.ts +1 -0
- package/dist/main/ui/backend/api.js +6 -313
- package/dist/main/ui/backend/api.js.map +1 -1
- package/dist/main/ui/backend/endpoints/config-endpoint.d.ts +1 -0
- package/dist/main/ui/backend/endpoints/config-endpoint.js +39 -0
- package/dist/main/ui/backend/endpoints/config-endpoint.js.map +1 -0
- package/dist/main/ui/backend/endpoints/content-endpoint.d.ts +1 -0
- package/dist/main/ui/backend/endpoints/content-endpoint.js +14 -0
- package/dist/main/ui/backend/endpoints/content-endpoint.js.map +1 -0
- package/dist/main/ui/backend/endpoints/edit-message-endpoint.d.ts +1 -0
- package/dist/main/ui/backend/endpoints/edit-message-endpoint.js +34 -0
- package/dist/main/ui/backend/endpoints/edit-message-endpoint.js.map +1 -0
- package/dist/main/ui/backend/endpoints/execute-codegen-endpoint.d.ts +1 -0
- package/dist/main/ui/backend/endpoints/execute-codegen-endpoint.js +44 -0
- package/dist/main/ui/backend/endpoints/execute-codegen-endpoint.js.map +1 -0
- package/dist/main/ui/backend/endpoints/execution-status-endpoint.d.ts +1 -0
- package/dist/main/ui/backend/endpoints/execution-status-endpoint.js +37 -0
- package/dist/main/ui/backend/endpoints/execution-status-endpoint.js.map +1 -0
- package/dist/main/ui/backend/endpoints/generate-content-endpoint.d.ts +1 -0
- package/dist/main/ui/backend/endpoints/generate-content-endpoint.js +29 -0
- package/dist/main/ui/backend/endpoints/generate-content-endpoint.js.map +1 -0
- package/dist/main/ui/backend/endpoints/index.d.ts +11 -0
- package/dist/main/ui/backend/endpoints/index.js +12 -0
- package/dist/main/ui/backend/endpoints/index.js.map +1 -0
- package/dist/main/ui/backend/endpoints/interrupt-execution-endpoint.d.ts +1 -0
- package/dist/main/ui/backend/endpoints/interrupt-execution-endpoint.js +14 -0
- package/dist/main/ui/backend/endpoints/interrupt-execution-endpoint.js.map +1 -0
- package/dist/main/ui/backend/endpoints/iteration-endpoint.d.ts +1 -0
- package/dist/main/ui/backend/endpoints/iteration-endpoint.js +16 -0
- package/dist/main/ui/backend/endpoints/iteration-endpoint.js.map +1 -0
- package/dist/main/ui/backend/endpoints/question-endpoint.d.ts +1 -0
- package/dist/main/ui/backend/endpoints/question-endpoint.js +37 -0
- package/dist/main/ui/backend/endpoints/question-endpoint.js.map +1 -0
- package/dist/main/ui/backend/endpoints/service-configuration-endpoint.d.ts +1 -0
- package/dist/main/ui/backend/endpoints/service-configuration-endpoint.js +54 -0
- package/dist/main/ui/backend/endpoints/service-configuration-endpoint.js.map +1 -0
- package/dist/main/ui/backend/endpoints/usage-endpoint.d.ts +1 -0
- package/dist/main/ui/backend/endpoints/usage-endpoint.js +15 -0
- package/dist/main/ui/backend/endpoints/usage-endpoint.js.map +1 -0
- package/dist/main/ui/common/api-types.d.ts +5 -1
- package/dist/main/ui/frontend/assets/index-DY7-_JMu.js +1759 -0
- package/dist/main/ui/frontend/index.html +1 -1
- package/dist/prompt/ai-service-fallback.js +10 -3
- package/dist/prompt/ai-service-fallback.js.map +1 -1
- package/dist/prompt/function-calling-validate.d.ts +1 -1
- package/dist/prompt/function-calling-validate.js +13 -5
- package/dist/prompt/function-calling-validate.js.map +1 -1
- package/dist/prompt/function-defs/ask-question.js +80 -39
- package/dist/prompt/function-defs/ask-question.js.map +1 -1
- package/dist/prompt/limits.js +2 -2
- package/dist/prompt/prompt-service.js +2 -1
- package/dist/prompt/prompt-service.js.map +1 -1
- package/dist/prompt/prompt-service.test-utils.d.ts +1 -1
- package/dist/prompt/prompt-service.test-utils.js +1 -1
- package/dist/prompt/prompt-service.test-utils.js.map +1 -1
- package/dist/prompt/static-prompts.d.ts +2 -1
- package/dist/prompt/static-prompts.js +2 -1
- package/dist/prompt/static-prompts.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/cancel-code-generation.d.ts +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/cancel-code-generation.js +2 -2
- package/dist/prompt/steps/step-ask-question/handlers/cancel-code-generation.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/code-generation.js +15 -15
- package/dist/prompt/steps/step-ask-question/handlers/code-generation.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/confirm-code-generation.d.ts +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/confirm-code-generation.js +3 -3
- package/dist/prompt/steps/step-ask-question/handlers/confirm-code-generation.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/context-optimization.d.ts +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/context-optimization.js +2 -2
- package/dist/prompt/steps/step-ask-question/handlers/context-optimization.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/default-action.d.ts +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/default-action.js +2 -2
- package/dist/prompt/steps/step-ask-question/handlers/default-action.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-search-code.d.ts +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-search-code.js +5 -5
- package/dist/prompt/steps/step-ask-question/handlers/handle-search-code.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-send-message-with-image.d.ts +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-send-message-with-image.js +4 -4
- package/dist/prompt/steps/step-ask-question/handlers/handle-send-message-with-image.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-send-message.d.ts +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-send-message.js +3 -3
- package/dist/prompt/steps/step-ask-question/handlers/handle-send-message.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/lint.d.ts +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/lint.js +4 -4
- package/dist/prompt/steps/step-ask-question/handlers/lint.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/remove-files-from-context.d.ts +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/remove-files-from-context.js +3 -3
- package/dist/prompt/steps/step-ask-question/handlers/remove-files-from-context.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/request-files-content.d.ts +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/request-files-content.js +7 -7
- package/dist/prompt/steps/step-ask-question/handlers/request-files-content.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/request-permissions.d.ts +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/request-permissions.js +4 -4
- package/dist/prompt/steps/step-ask-question/handlers/request-permissions.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/step-ask-question-types.d.ts +15 -3
- package/dist/prompt/steps/step-ask-question/step-ask-question.js +12 -7
- package/dist/prompt/steps/step-ask-question/step-ask-question.js.map +1 -1
- package/dist/prompt/steps/step-codegen-planning.js +63 -3
- package/dist/prompt/steps/step-codegen-planning.js.map +1 -1
- package/dist/prompt/steps/step-context-optimization.js +11 -1
- package/dist/prompt/steps/step-context-optimization.js.map +1 -1
- package/dist/prompt/steps/step-generate-codegen-summary.js +3 -5
- package/dist/prompt/steps/step-generate-codegen-summary.js.map +1 -1
- package/dist/prompt/steps/step-process-file-updates.js +56 -10
- package/dist/prompt/steps/step-process-file-updates.js.map +1 -1
- package/dist/prompt/steps/step-summarization.js +2 -0
- package/dist/prompt/steps/step-summarization.js.map +1 -1
- package/dist/prompt/steps/step-validate-recover.js +5 -5
- package/dist/prompt/steps/step-validate-recover.js.map +1 -1
- package/dist/prompt/systemprompt.js +6 -3
- package/dist/prompt/systemprompt.js.map +1 -1
- package/dist/vite-genaicode/vite-genaicode-plugin.d.ts +4 -2
- package/dist/vite-genaicode/vite-genaicode-plugin.js +41 -24
- package/dist/vite-genaicode/vite-genaicode-plugin.js.map +1 -1
- package/package.json +7 -7
- package/dist/main/ui/frontend/assets/index-jwSqt8cG.js +0 -1337
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-optimization.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/context-optimization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,8BAA8B,EAAE,MAAM,oCAAoC,CAAC;AAGpF,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,EAC9C,
|
|
1
|
+
{"version":3,"file":"context-optimization.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/context-optimization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,8BAA8B,EAAE,MAAM,oCAAoC,CAAC;AAGpF,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,EAC9C,kBAAkB,EAClB,MAAM,EACN,OAAO,EACP,iBAAiB,GACE;IACnB,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CACnD,iHAAiH,EACjH,KAAK,CACN,CAAC;IAEF,IAAI,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;QACxC,OAAO,CAAC,SAAS,GAAG,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC;QACvD,OAAO,CAAC,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC;IACjD,CAAC;IAED,MAAM,IAAI,GAAa;QACrB,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,mCAAmC;KAC/F,CAAC;IAEF,MAAM,SAAS,GAAkB;QAC/B,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,kBAAkB,IAAI,EAAE;KAC/B,CAAC;IAEF,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAC/B,4EAA4E;QAC5E,YAAY,EAAE,CAAC;QAEf,oCAAoC;QACpC,gBAAgB,CAAC,sCAAsC,CAAC,CAAC;QACzD,MAAM,8BAA8B,CAAC,iBAAiB,EAAE,CAAC,GAAG,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IACjG,CAAC;IAED,OAAO;QACL,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE;YACL;gBACE,SAAS;gBACT,IAAI;aACL;SACF;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ActionHandlerProps, ActionResult } from '../step-ask-question-types.js';
|
|
2
|
-
export declare function handleDefaultAction({
|
|
2
|
+
export declare function handleDefaultAction({ askQuestionMessage }: ActionHandlerProps): Promise<ActionResult>;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
export async function handleDefaultAction({
|
|
1
|
+
export async function handleDefaultAction({ askQuestionMessage }) {
|
|
2
2
|
return {
|
|
3
3
|
breakLoop: false,
|
|
4
4
|
items: [
|
|
5
5
|
{
|
|
6
|
-
assistant: { type: 'assistant', text:
|
|
6
|
+
assistant: { type: 'assistant', text: askQuestionMessage ?? '' },
|
|
7
7
|
user: {
|
|
8
8
|
type: 'user',
|
|
9
9
|
text: "I don't want to start the code generation yet, let's talk a bit more.",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-action.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/default-action.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"default-action.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/default-action.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EAAE,kBAAkB,EAAsB;IAClF,OAAO;QACL,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE;YACL;gBACE,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,kBAAkB,IAAI,EAAE,EAAE;gBAChE,IAAI,EAAE;oBACJ,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,uEAAuE;iBAC9E;aACF;SACF;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -2,4 +2,4 @@ import { ActionHandlerProps, ActionResult } from '../step-ask-question-types.js'
|
|
|
2
2
|
/**
|
|
3
3
|
* Handler for the searchCode action
|
|
4
4
|
*/
|
|
5
|
-
export declare function handleSearchCode({
|
|
5
|
+
export declare function handleSearchCode({ askQuestionMessage, generateContentFn, prompt, options, }: ActionHandlerProps): Promise<ActionResult>;
|
|
@@ -4,9 +4,9 @@ import { putSystemMessage } from '../../../../main/common/content-bus.js';
|
|
|
4
4
|
/**
|
|
5
5
|
* Handler for the searchCode action
|
|
6
6
|
*/
|
|
7
|
-
export async function handleSearchCode({
|
|
7
|
+
export async function handleSearchCode({ askQuestionMessage, generateContentFn, prompt, options, }) {
|
|
8
8
|
try {
|
|
9
|
-
const searchCodeCall = await generateSearchCodeCall(generateContentFn, prompt,
|
|
9
|
+
const searchCodeCall = await generateSearchCodeCall(generateContentFn, prompt, askQuestionMessage, options, false);
|
|
10
10
|
// Extract search parameters from the call arguments
|
|
11
11
|
const args = searchCodeCall?.args;
|
|
12
12
|
if (!searchCodeCall || !args?.query) {
|
|
@@ -32,7 +32,7 @@ export async function handleSearchCode({ askQuestionCall, generateContentFn, pro
|
|
|
32
32
|
{
|
|
33
33
|
assistant: {
|
|
34
34
|
type: 'assistant',
|
|
35
|
-
text:
|
|
35
|
+
text: askQuestionMessage ?? '',
|
|
36
36
|
functionCalls: [searchCodeCall],
|
|
37
37
|
},
|
|
38
38
|
user: {
|
|
@@ -70,12 +70,12 @@ export async function handleSearchCode({ askQuestionCall, generateContentFn, pro
|
|
|
70
70
|
};
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
|
-
async function generateSearchCodeCall(generateContentFn, prompt,
|
|
73
|
+
async function generateSearchCodeCall(generateContentFn, prompt, askQuestionMessage, options, cheap) {
|
|
74
74
|
const [searchCodeCall] = await generateContentFn([
|
|
75
75
|
...prompt,
|
|
76
76
|
{
|
|
77
77
|
type: 'assistant',
|
|
78
|
-
text:
|
|
78
|
+
text: askQuestionMessage ?? '',
|
|
79
79
|
},
|
|
80
80
|
{
|
|
81
81
|
type: 'user',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-search-code.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-search-code.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGrE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAE1E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACrC,
|
|
1
|
+
{"version":3,"file":"handle-search-code.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-search-code.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGrE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAE1E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACrC,kBAAkB,EAClB,iBAAiB,EACjB,MAAM,EACN,OAAO,GACY;IACnB,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,MAAM,sBAAsB,CAAC,iBAAiB,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAEnH,oDAAoD;QACpD,MAAM,IAAI,GAAG,cAAc,EAAE,IAAI,CAAC;QAClC,IAAI,CAAC,cAAc,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAC7D,CAAC;QAED,6CAA6C;QAC7C,MAAM,YAAY,GAAmB;YACnC,eAAe,EAAE,IAAI;YACrB,iBAAiB,EAAE,IAAI;YACvB,aAAa,EAAE,KAAK;YACpB,UAAU,EAAE,EAAE;YACd,YAAY,EAAE,CAAC;YACf,GAAG,IAAI;SACR,CAAC;QAEF,gBAAgB,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;QAEjD,qBAAqB;QACrB,MAAM,aAAa,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAErD,gBAAgB,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;QAEpD,wCAAwC;QACxC,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE;gBACL;oBACE,SAAS,EAAE;wBACT,IAAI,EAAE,WAAW;wBACjB,IAAI,EAAE,kBAAkB,IAAI,EAAE;wBAC9B,aAAa,EAAE,CAAC,cAAc,CAAC;qBAChC;oBACD,IAAI,EAAE;wBACJ,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,mDAAmD;wBACzD,iBAAiB,EAAE;4BACjB;gCACE,IAAI,EAAE,YAAY;gCAClB,OAAO,EAAE,cAAc,CAAC,EAAE;gCAC1B,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;6BACvC;yBACF;qBACF;iBACF;aACF;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,+CAA+C;QAC/C,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,yCAAyC,CAAC;QAExG,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE;gBACL;oBACE,SAAS,EAAE;wBACT,IAAI,EAAE,WAAW;wBACjB,IAAI,EAAE,4BAA4B,YAAY,kDAAkD;qBACjG;oBACD,IAAI,EAAE;wBACJ,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,oDAAoD;qBAC3D;iBACF;aACF;SACF,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,iBAA0C,EAC1C,MAAoB,EACpB,kBAAsC,EACtC,OAAuB,EACvB,KAAc;IAEd,MAAM,CAAC,cAAc,CAAC,GAAG,MAAM,iBAAiB,CAC9C;QACE,GAAG,MAAM;QACT;YACE,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,kBAAkB,IAAI,EAAE;SAC/B;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,+BAA+B;SACtC;KACF,EACD,eAAe,EAAE,EACjB,YAAY,EACZ,GAAG,EACH,KAAK,EACL,OAAO,CACR,CAAC;IAEF,OAAO,cAA0D,CAAC;AACpE,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ActionHandlerProps, ActionResult } from '../step-ask-question-types.js';
|
|
2
|
-
export declare function handleSendMessageWithImage({
|
|
2
|
+
export declare function handleSendMessageWithImage({ askQuestionMessage, options, generateContentFn, prompt, generateImageFn, }: ActionHandlerProps): Promise<ActionResult>;
|
|
@@ -2,7 +2,7 @@ import { askUserForInput } from '../../../../main/common/user-actions.js';
|
|
|
2
2
|
import { putAssistantMessage, putSystemMessage } from '../../../../main/common/content-bus.js';
|
|
3
3
|
import { executeStepGenerateImage } from '../../step-generate-image.js';
|
|
4
4
|
import { getFunctionDefs } from '../../../function-calling.js';
|
|
5
|
-
export async function handleSendMessageWithImage({
|
|
5
|
+
export async function handleSendMessageWithImage({ askQuestionMessage, options, generateContentFn, prompt, generateImageFn, }) {
|
|
6
6
|
if (!options.imagen) {
|
|
7
7
|
putSystemMessage('Image generation is not enabled. Please enable it using --imagen parameter.');
|
|
8
8
|
return {
|
|
@@ -14,7 +14,7 @@ export async function handleSendMessageWithImage({ askQuestionCall, options, gen
|
|
|
14
14
|
...prompt,
|
|
15
15
|
{
|
|
16
16
|
type: 'assistant',
|
|
17
|
-
text:
|
|
17
|
+
text: askQuestionMessage ?? '',
|
|
18
18
|
},
|
|
19
19
|
{
|
|
20
20
|
type: 'user',
|
|
@@ -70,7 +70,7 @@ export async function handleSendMessageWithImage({ askQuestionCall, options, gen
|
|
|
70
70
|
};
|
|
71
71
|
putAssistantMessage('Here is the image to support the question:', generateImageCall.args, [], [imageData]);
|
|
72
72
|
// Get user's response with the image displayed
|
|
73
|
-
const inputResponse = await askUserForInput('Your answer',
|
|
73
|
+
const inputResponse = await askUserForInput('Your answer', askQuestionMessage ?? '');
|
|
74
74
|
if (inputResponse.options?.aiService) {
|
|
75
75
|
options.aiService = inputResponse.options.aiService;
|
|
76
76
|
}
|
|
@@ -81,7 +81,7 @@ export async function handleSendMessageWithImage({ askQuestionCall, options, gen
|
|
|
81
81
|
{
|
|
82
82
|
assistant: {
|
|
83
83
|
type: 'assistant',
|
|
84
|
-
text:
|
|
84
|
+
text: askQuestionMessage ?? '',
|
|
85
85
|
functionCalls: [generateImageCall],
|
|
86
86
|
},
|
|
87
87
|
user: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-send-message-with-image.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-send-message-with-image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAE/F,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAG/D,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,EAC/C,
|
|
1
|
+
{"version":3,"file":"handle-send-message-with-image.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-send-message-with-image.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ActionHandlerProps, ActionResult } from '../step-ask-question-types.js';
|
|
2
|
-
export declare function handleSendMessage({
|
|
2
|
+
export declare function handleSendMessage({ askQuestionMessage, options }: ActionHandlerProps): Promise<ActionResult>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { askUserForInput } from '../../../../main/common/user-actions.js';
|
|
2
|
-
export async function handleSendMessage({
|
|
3
|
-
const response = await askUserForInput('Your answer',
|
|
2
|
+
export async function handleSendMessage({ askQuestionMessage, options }) {
|
|
3
|
+
const response = await askUserForInput('Your answer', askQuestionMessage ?? '');
|
|
4
4
|
if (response.options?.aiService) {
|
|
5
5
|
options.aiService = response.options.aiService;
|
|
6
6
|
}
|
|
@@ -8,7 +8,7 @@ export async function handleSendMessage({ askQuestionCall, options }) {
|
|
|
8
8
|
breakLoop: false,
|
|
9
9
|
items: [
|
|
10
10
|
{
|
|
11
|
-
assistant: { type: 'assistant', text:
|
|
11
|
+
assistant: { type: 'assistant', text: askQuestionMessage ?? '' },
|
|
12
12
|
user: {
|
|
13
13
|
type: 'user',
|
|
14
14
|
text: response.answer,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-send-message.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-send-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAG1E,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"handle-send-message.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-send-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAG1E,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EAAE,kBAAkB,EAAE,OAAO,EAAsB;IACzF,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE,kBAAkB,IAAI,EAAE,CAAC,CAAC;IAChF,IAAI,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;QAChC,OAAO,CAAC,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC;IACjD,CAAC;IACD,OAAO;QACL,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE;YACL;gBACE,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,kBAAkB,IAAI,EAAE,EAAE;gBAChE,IAAI,EAAE;oBACJ,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,QAAQ,CAAC,MAAM;iBACtB;aACF;SACF;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -3,4 +3,4 @@ import { ActionHandlerProps, ActionResult } from '../step-ask-question-types.js'
|
|
|
3
3
|
* Handles the lint action by executing the lint command and processing its results.
|
|
4
4
|
* If the lint command fails, it will ask for user confirmation to continue with code generation.
|
|
5
5
|
*/
|
|
6
|
-
export declare function handleLint({ askQuestionCall }: ActionHandlerProps): Promise<ActionResult>;
|
|
6
|
+
export declare function handleLint({ askQuestionCall, askQuestionMessage }: ActionHandlerProps): Promise<ActionResult>;
|
|
@@ -7,7 +7,7 @@ const execPromise = promisify(exec);
|
|
|
7
7
|
* Handles the lint action by executing the lint command and processing its results.
|
|
8
8
|
* If the lint command fails, it will ask for user confirmation to continue with code generation.
|
|
9
9
|
*/
|
|
10
|
-
export async function handleLint({ askQuestionCall }) {
|
|
10
|
+
export async function handleLint({ askQuestionCall, askQuestionMessage }) {
|
|
11
11
|
if (!rcConfig.lintCommand) {
|
|
12
12
|
return {
|
|
13
13
|
breakLoop: false,
|
|
@@ -15,7 +15,7 @@ export async function handleLint({ askQuestionCall }) {
|
|
|
15
15
|
{
|
|
16
16
|
assistant: {
|
|
17
17
|
type: 'assistant',
|
|
18
|
-
text:
|
|
18
|
+
text: askQuestionMessage ?? '',
|
|
19
19
|
},
|
|
20
20
|
user: {
|
|
21
21
|
type: 'user',
|
|
@@ -39,7 +39,7 @@ export async function handleLint({ askQuestionCall }) {
|
|
|
39
39
|
{
|
|
40
40
|
assistant: {
|
|
41
41
|
type: 'assistant',
|
|
42
|
-
text:
|
|
42
|
+
text: askQuestionMessage ?? '',
|
|
43
43
|
},
|
|
44
44
|
user: {
|
|
45
45
|
type: 'user',
|
|
@@ -64,7 +64,7 @@ export async function handleLint({ askQuestionCall }) {
|
|
|
64
64
|
{
|
|
65
65
|
assistant: {
|
|
66
66
|
type: 'assistant',
|
|
67
|
-
text:
|
|
67
|
+
text: askQuestionMessage ?? '',
|
|
68
68
|
functionCalls: [askQuestionCall],
|
|
69
69
|
},
|
|
70
70
|
user: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/lint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAGtD,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAEpC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAAE,eAAe,EAAsB;
|
|
1
|
+
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/lint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAGtD,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAEpC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAAE,eAAe,EAAE,kBAAkB,EAAsB;IAC1F,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC1B,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE;gBACL;oBACE,SAAS,EAAE;wBACT,IAAI,EAAE,WAAW;wBACjB,IAAI,EAAE,kBAAkB,IAAI,EAAE;qBAC/B;oBACD,IAAI,EAAE;wBACJ,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,mDAAmD;qBAC1D;iBACF;aACF;SACF,CAAC;IACJ,CAAC;IAED,IAAI,UAAsB,CAAC;IAE3B,IAAI,CAAC;QACH,gBAAgB,CAAC,2BAA2B,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;QACpE,MAAM,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QAEnE,UAAU,GAAG;YACX,OAAO,EAAE,IAAI;SACd,CAAC;QAEF,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,UAAU;YACV,KAAK,EAAE;gBACL;oBACE,SAAS,EAAE;wBACT,IAAI,EAAE,WAAW;wBACjB,IAAI,EAAE,kBAAkB,IAAI,EAAE;qBAC/B;oBACD,IAAI,EAAE;wBACJ,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,sDAAsD;qBAC7D;iBACF;aACF;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAA2C,CAAC;QAEvE,UAAU,GAAG;YACX,OAAO,EAAE,KAAK;YACd,MAAM;YACN,MAAM;SACP,CAAC;QAEF,iDAAiD;QACjD,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,UAAU;YACV,KAAK,EAAE;gBACL;oBACE,SAAS,EAAE;wBACT,IAAI,EAAE,WAAW;wBACjB,IAAI,EAAE,kBAAkB,IAAI,EAAE;wBAC9B,aAAa,EAAE,CAAC,eAAe,CAAC;qBACjC;oBACD,IAAI,EAAE;wBACJ,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,qBAAqB;wBAC3B,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;wBACxB,iBAAiB,EAAE;4BACjB,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE;yBAClG;qBACF;iBACF;aACF;SACF,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ActionHandlerProps, ActionResult } from '../step-ask-question-types.js';
|
|
2
|
-
export declare function handleRemoveFilesFromContext({
|
|
2
|
+
export declare function handleRemoveFilesFromContext({ askQuestionMessage, generateContentFn, prompt, options, }: ActionHandlerProps): Promise<ActionResult>;
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { getSourceCodeTree, parseSourceCodeTree } from '../../../../files/source-code-tree.js';
|
|
2
2
|
import { putSystemMessage } from '../../../../main/common/content-bus.js';
|
|
3
3
|
import { getFunctionDefs } from '../../../function-calling.js';
|
|
4
|
-
export async function handleRemoveFilesFromContext({
|
|
4
|
+
export async function handleRemoveFilesFromContext({ askQuestionMessage, generateContentFn, prompt, options, }) {
|
|
5
5
|
const [removeFilesFromContextCall] = (await generateContentFn([
|
|
6
6
|
...prompt,
|
|
7
7
|
{
|
|
8
8
|
type: 'assistant',
|
|
9
|
-
text:
|
|
9
|
+
text: askQuestionMessage ?? '',
|
|
10
10
|
},
|
|
11
11
|
{
|
|
12
12
|
type: 'user',
|
|
@@ -35,7 +35,7 @@ export async function handleRemoveFilesFromContext({ askQuestionCall, generateCo
|
|
|
35
35
|
{
|
|
36
36
|
assistant: {
|
|
37
37
|
type: 'assistant',
|
|
38
|
-
text:
|
|
38
|
+
text: askQuestionMessage ?? '',
|
|
39
39
|
functionCalls: [removeFilesFromContextCall],
|
|
40
40
|
},
|
|
41
41
|
user: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-files-from-context.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/remove-files-from-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC/F,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAG/D,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,EACjD,
|
|
1
|
+
{"version":3,"file":"remove-files-from-context.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/remove-files-from-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ActionHandlerProps, ActionResult } from '../step-ask-question-types.js';
|
|
2
|
-
export declare function handleRequestFilesContent({ askQuestionCall, options, prompt, generateContentFn, }: ActionHandlerProps): Promise<ActionResult>;
|
|
2
|
+
export declare function handleRequestFilesContent({ askQuestionCall, askQuestionMessage, options, prompt, generateContentFn, }: ActionHandlerProps): Promise<ActionResult>;
|
|
@@ -34,8 +34,8 @@ function isFileContentAlreadyProvided(filePath, prompt) {
|
|
|
34
34
|
});
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
|
-
export async function handleRequestFilesContent({ askQuestionCall, options, prompt, generateContentFn, }) {
|
|
38
|
-
let requestFilesContentCall = await generateRequestFilesContentCall(generateContentFn, prompt,
|
|
37
|
+
export async function handleRequestFilesContent({ askQuestionCall, askQuestionMessage, options, prompt, generateContentFn, }) {
|
|
38
|
+
let requestFilesContentCall = await generateRequestFilesContentCall(generateContentFn, prompt, askQuestionMessage, options, true);
|
|
39
39
|
if (!requestFilesContentCall) {
|
|
40
40
|
return {
|
|
41
41
|
breakLoop: true,
|
|
@@ -50,7 +50,7 @@ export async function handleRequestFilesContent({ askQuestionCall, options, prom
|
|
|
50
50
|
// All requested files are already provided
|
|
51
51
|
const assistant = {
|
|
52
52
|
type: 'assistant',
|
|
53
|
-
text:
|
|
53
|
+
text: askQuestionMessage ?? '',
|
|
54
54
|
functionCalls: [requestFilesContentCall],
|
|
55
55
|
};
|
|
56
56
|
const user = {
|
|
@@ -74,7 +74,7 @@ export async function handleRequestFilesContent({ askQuestionCall, options, prom
|
|
|
74
74
|
refreshFiles();
|
|
75
75
|
let { legitimateFiles, illegitimateFiles } = categorizeLegitimateFiles(requestedFiles);
|
|
76
76
|
if (illegitimateFiles.length > 0) {
|
|
77
|
-
requestFilesContentCall = await generateRequestFilesContentCall(generateContentFn, prompt,
|
|
77
|
+
requestFilesContentCall = await generateRequestFilesContentCall(generateContentFn, prompt, askQuestionMessage, options,
|
|
78
78
|
// use non cheap mode, as maybe the cheap mode didn't provide correct files
|
|
79
79
|
false);
|
|
80
80
|
if (!requestFilesContentCall) {
|
|
@@ -91,7 +91,7 @@ export async function handleRequestFilesContent({ askQuestionCall, options, prom
|
|
|
91
91
|
const sourceCallId = (askQuestionCall.id ?? askQuestionCall.name) + '_source';
|
|
92
92
|
const assistant = {
|
|
93
93
|
type: 'assistant',
|
|
94
|
-
text:
|
|
94
|
+
text: askQuestionMessage ?? '',
|
|
95
95
|
functionCalls: [
|
|
96
96
|
requestFilesContentCall,
|
|
97
97
|
{ name: 'getSourceCode', id: sourceCallId, args: { filePaths: legitimateFiles } },
|
|
@@ -129,12 +129,12 @@ ${illegitimateFiles.map((path) => `- ${path}`).join('\n')}`
|
|
|
129
129
|
};
|
|
130
130
|
return { breakLoop: false, items: [{ assistant, user }] };
|
|
131
131
|
}
|
|
132
|
-
async function generateRequestFilesContentCall(generateContentFn, prompt,
|
|
132
|
+
async function generateRequestFilesContentCall(generateContentFn, prompt, askQuestionMessage, options, cheap) {
|
|
133
133
|
const [requestFilesContentCall] = (await generateContentFn([
|
|
134
134
|
...prompt,
|
|
135
135
|
{
|
|
136
136
|
type: 'assistant',
|
|
137
|
-
text:
|
|
137
|
+
text: askQuestionMessage ?? '',
|
|
138
138
|
},
|
|
139
139
|
{
|
|
140
140
|
type: 'user',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-files-content.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/request-files-content.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"request-files-content.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/request-files-content.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ActionHandlerProps, ActionResult } from '../step-ask-question-types.js';
|
|
2
|
-
export declare function handleRequestPermissions({
|
|
2
|
+
export declare function handleRequestPermissions({ askQuestionMessage, options, prompt, generateContentFn, }: ActionHandlerProps): Promise<ActionResult>;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { askUserForConfirmation } from '../../../../main/common/user-actions.js';
|
|
2
2
|
import { getFunctionDefs } from '../../../function-calling.js';
|
|
3
|
-
export async function handleRequestPermissions({
|
|
3
|
+
export async function handleRequestPermissions({ askQuestionMessage, options, prompt, generateContentFn, }) {
|
|
4
4
|
const [requestPermissionsCall] = (await generateContentFn([
|
|
5
5
|
...prompt,
|
|
6
6
|
{
|
|
7
7
|
type: 'assistant',
|
|
8
|
-
text:
|
|
8
|
+
text: askQuestionMessage ?? '',
|
|
9
9
|
},
|
|
10
10
|
{
|
|
11
11
|
type: 'user',
|
|
@@ -39,7 +39,7 @@ export async function handleRequestPermissions({ askQuestionCall, options, promp
|
|
|
39
39
|
{
|
|
40
40
|
assistant: {
|
|
41
41
|
type: 'assistant',
|
|
42
|
-
text:
|
|
42
|
+
text: askQuestionMessage ?? '',
|
|
43
43
|
functionCalls: [requestPermissionsCall],
|
|
44
44
|
},
|
|
45
45
|
user,
|
|
@@ -51,7 +51,7 @@ function updatePermissions(requestPermissionsCall, options) {
|
|
|
51
51
|
const permissions = requestPermissionsCall.args;
|
|
52
52
|
if (permissions) {
|
|
53
53
|
if ('enableImagen' in permissions && permissions.enableImagen) {
|
|
54
|
-
options.imagen = options.aiService === '
|
|
54
|
+
options.imagen = options.aiService === 'openai' ? 'dall-e' : 'vertex-ai';
|
|
55
55
|
}
|
|
56
56
|
if ('enableVision' in permissions && permissions.enableVision)
|
|
57
57
|
options.vision = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-permissions.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/request-permissions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAG/D,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,EAC7C,
|
|
1
|
+
{"version":3,"file":"request-permissions.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/request-permissions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAG/D,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,EAC7C,kBAAkB,EAClB,OAAO,EACP,MAAM,EACN,iBAAiB,GACE;IACnB,MAAM,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,iBAAiB,CACvD;QACE,GAAG,MAAM;QACT;YACE,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,kBAAkB,IAAI,EAAE;SAC/B;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,uCAAuC;SAC9C;KACF,EACD,eAAe,EAAE,EACjB,oBAAoB,EACpB,GAAG,EACH,IAAI,EACJ,OAAO,CACR,CAAuD,CAAC;IAEzD,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC5B,OAAO;YACL,SAAS,EAAE,IAAI;YACf,KAAK,EAAE,EAAE;SACV,CAAC;IACJ,CAAC;IAED,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CACnD,gFAAgF,EAChF,KAAK,CACN,CAAC;IAEF,MAAM,IAAI,GAAa;QACrB,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,4BAA4B;QAC9E,iBAAiB,EAAE;YACjB;gBACE,IAAI,EAAE,oBAAoB;gBAC1B,OAAO,EAAE,sBAAsB,CAAC,EAAE;gBAClC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,gBAAgB,CAAC,SAAS,EAAE,CAAC;aACnE;SACF;KACF,CAAC;IAEF,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAC/B,iBAAiB,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,OAAO;QACL,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE;YACL;gBACE,SAAS,EAAE;oBACT,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,kBAAkB,IAAI,EAAE;oBAC9B,aAAa,EAAE,CAAC,sBAAsB,CAAC;iBACxC;gBACD,IAAI;aACL;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,sBAA4D,EAAE,OAAuB;IAC9G,MAAM,WAAW,GAAG,sBAAsB,CAAC,IAAI,CAAC;IAChD,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,cAAc,IAAI,WAAW,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;YAC9D,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC;QAC3E,CAAC;QACD,IAAI,cAAc,IAAI,WAAW,IAAI,WAAW,CAAC,YAAY;YAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;QACrF,IAAI,sBAAsB,IAAI,WAAW,IAAI,WAAW,CAAC,oBAAoB;YAAE,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACnH,IAAI,iBAAiB,IAAI,WAAW,IAAI,WAAW,CAAC,eAAe;YAAE,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;QACpG,IAAI,iBAAiB,IAAI,WAAW,IAAI,WAAW,CAAC,eAAe;YAAE,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;QACpG,IAAI,eAAe,IAAI,WAAW,IAAI,WAAW,CAAC,aAAa;YAAE,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAChG,CAAC;AACH,CAAC"}
|
|
@@ -3,9 +3,20 @@ import { CodegenOptions } from '../../../main/codegen-types.js';
|
|
|
3
3
|
import { PluginActionType } from '../../../main/codegen-types.js';
|
|
4
4
|
export type ActionType = 'codeGeneration' | 'sendMessage' | 'sendMessageWithImage' | 'requestPermissions' | 'requestFilesContent' | 'removeFilesFromContext' | 'confirmCodeGeneration' | 'cancelCodeGeneration' | 'contextOptimization' | 'searchCode' | 'lint' | PluginActionType;
|
|
5
5
|
type AskQuestionArgs = {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
steps: [
|
|
7
|
+
{
|
|
8
|
+
type: 'decisionMakingProcess';
|
|
9
|
+
value: string;
|
|
10
|
+
},
|
|
11
|
+
{
|
|
12
|
+
type: 'actionType';
|
|
13
|
+
value: ActionType;
|
|
14
|
+
},
|
|
15
|
+
{
|
|
16
|
+
type: 'message';
|
|
17
|
+
value: string;
|
|
18
|
+
}
|
|
19
|
+
];
|
|
9
20
|
};
|
|
10
21
|
export type SendMessageWithImageArgs = {
|
|
11
22
|
prompt: string;
|
|
@@ -79,6 +90,7 @@ export interface ActionResult {
|
|
|
79
90
|
}
|
|
80
91
|
export type ActionHandlerProps = {
|
|
81
92
|
askQuestionCall: AskQuestionCall;
|
|
93
|
+
askQuestionMessage: string | undefined;
|
|
82
94
|
prompt: PromptItem[];
|
|
83
95
|
options: CodegenOptions;
|
|
84
96
|
generateContentFn: GenerateContentFunction;
|
|
@@ -19,19 +19,19 @@ export async function executeStepAskQuestion(generateContentFn, generateImageFn,
|
|
|
19
19
|
while (!abortController?.signal.aborted) {
|
|
20
20
|
try {
|
|
21
21
|
const askQuestionCall = await getAskQuestionCall(generateContentFn, prompt, functionDefs, temperature, options);
|
|
22
|
-
if (!askQuestionCall) {
|
|
22
|
+
if (!askQuestionCall?.args) {
|
|
23
23
|
break;
|
|
24
24
|
}
|
|
25
|
-
|
|
26
|
-
if (
|
|
25
|
+
const [, { value: actionType }, { value: message }] = askQuestionCall.args.steps;
|
|
26
|
+
if (message) {
|
|
27
27
|
// TODO: PromptItem should be included here, but a small refactor is needed to achieve this
|
|
28
|
-
putAssistantMessage(
|
|
28
|
+
putAssistantMessage(message, askQuestionCall.args);
|
|
29
29
|
}
|
|
30
|
-
const actionType = askQuestionCall.args?.actionType;
|
|
31
30
|
if (actionType) {
|
|
32
31
|
const actionHandler = getActionHandler(actionType);
|
|
33
32
|
let result = await actionHandler({
|
|
34
33
|
askQuestionCall,
|
|
34
|
+
askQuestionMessage: message,
|
|
35
35
|
prompt,
|
|
36
36
|
options,
|
|
37
37
|
generateContentFn,
|
|
@@ -40,11 +40,14 @@ export async function executeStepAskQuestion(generateContentFn, generateImageFn,
|
|
|
40
40
|
});
|
|
41
41
|
// This is important to display the content to the user interface (ui or interactive cli)
|
|
42
42
|
let lastItem = result.items.slice(-1)[0];
|
|
43
|
-
|
|
43
|
+
if (lastItem) {
|
|
44
|
+
putUserMessage(lastItem.user.text, lastItem.user.data, undefined, undefined, lastItem.user);
|
|
45
|
+
}
|
|
44
46
|
prompt.push(...result.items.map(({ assistant, user }) => [assistant, user]).flat());
|
|
45
47
|
if (result.executeCodegen) {
|
|
46
48
|
result = await getActionHandler('codeGeneration')({
|
|
47
49
|
askQuestionCall,
|
|
50
|
+
askQuestionMessage: message,
|
|
48
51
|
prompt,
|
|
49
52
|
options,
|
|
50
53
|
generateContentFn,
|
|
@@ -52,7 +55,9 @@ export async function executeStepAskQuestion(generateContentFn, generateImageFn,
|
|
|
52
55
|
waitIfPaused,
|
|
53
56
|
});
|
|
54
57
|
lastItem = result.items.slice(-1)[0];
|
|
55
|
-
|
|
58
|
+
if (lastItem) {
|
|
59
|
+
putUserMessage(lastItem.user.text, undefined, undefined, undefined, lastItem.user);
|
|
60
|
+
}
|
|
56
61
|
prompt.push(...result.items.map(({ assistant, user }) => [assistant, user]).flat());
|
|
57
62
|
}
|
|
58
63
|
if (result.breakLoop) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-ask-question.js","sourceRoot":"","sources":["../../../../src/prompt/steps/step-ask-question/step-ask-question.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAC;AAE7E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,EAAE,4BAA4B,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,2BAA2B,EAAE,MAAM,uCAAuC,CAAC;AACpF,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,iBAA0C,EAC1C,eAAsC,EACtC,MAAoB,EACpB,YAA2B,EAC3B,YAAiC,EACjC,WAAmB,EACnB,OAAuB;IAEvB,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;IAE3D,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAEhH,IAAI,CAAC,eAAe,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"step-ask-question.js","sourceRoot":"","sources":["../../../../src/prompt/steps/step-ask-question/step-ask-question.ts"],"names":[],"mappings":"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"}
|