genaicode 0.1.1 → 0.2.1

package/dist/prompt/systemprompt.js

@@ -1,9 +1,8 @@
 import { CODEGEN_TRIGGER } from './prompt-consts.js';
-import { verbosePrompt, askQuestion } from '../cli/cli-params.js';
 import { verifySystemPromptLimit } from './limits.js';
 import { rcConfig } from '../main/config.js';
 /** Generates a system prompt */
-export function getSystemPrompt() {
+export function getSystemPrompt({ verbose, askQuestion, interactive }) {
     console.log('Generate system prompt');
     let systemPrompt = `
   You are a code generation assistant. I want you to help me generate code for my ideas in my application source code.
@@ -17,7 +16,7 @@ export function getSystemPrompt() {
   The root directory of my application is \`${rcConfig.rootDir}\` and you should limit the changes only to this path.
 
   Additional suggestions, or corners cases to think about:
-  - When suggesting changes always use absolute file paths.
+  - When suggesting changes always use absolute file paths, exactly as you have been provided. Modified paths will cause errors and we want to avoid that.
   - Always aim to return working code
   - Do not leave out commented out fragments like "// ... (keep other existing functions)"
   - For large files prefer to use \`patchFile\` function
@@ -25,15 +24,20 @@ export function getSystemPrompt() {
   - At the start of conversation the user will express what you are allowed to do (for example: create files, move files, generate images etc.). At the start of conversation you should ensure you have necessary allowances for the current task.
   - Consider failing the task with explanation if instructions are not clear enough, or something feels completely wrong.
   - Do not produce unnecessary code, ensure the code you generate will be used once all changes are done.
+  - Always ask for sufficient context paths in codegen summary, ask for files in context that is needed to completed the task
 
   `;
-    if (askQuestion) {
+    if (askQuestion && interactive) {
         systemPrompt +=
             '\nYou have the ability to ask the user a question at the beginning of the conversation if you need more information or clarification. ' +
-                'Use this feature wisely to gather any crucial information that would help you better understand the task or provide more accurate code generation. ' +
-                "To ask a question, use the 'askQuestion' function.";
+                'Use this feature wisely to gather any crucial information that would help you better understand the task or provide more accurate code generation.\n' +
+                "To ask a question, use the 'askQuestion' function. This function allows you to:" +
+                `- inform the user about your thoughts regarding the task
+      - ask questions, and give suggestions to the user regarding the task
+      - request access to content of files if they are not provided in the conversation so far, but are important for the task
+      - request enablement of permissions for operations that were restricted on the start of conversation, but are important for completion of the task`;
     }
-    if (verbosePrompt) {
+    if (verbose) {
         console.log('System prompt:');
         console.log(systemPrompt);
     }

package/dist/prompt/systemprompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"systemprompt.js","sourceRoot":"","sources":["../../src/prompt/systemprompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,gCAAgC;AAChC,MAAM,UAAU,eAAe;IAC7B,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAEtC,IAAI,YAAY,GAAG;;;;;8FAKyE,eAAe;;;;8CAI/D,QAAQ,CAAC,OAAO;;;;;;;;;;;;GAY3D,CAAC;IAEF,IAAI,WAAW,EAAE,CAAC;QAChB,YAAY;YACV,wIAAwI;gBACxI,qJAAqJ;gBACrJ,oDAAoD,CAAC;IACzD,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC5B,CAAC;IAED,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAEtC,OAAO,YAAY,CAAC;AACtB,CAAC"}
+{"version":3,"file":"systemprompt.js","sourceRoot":"","sources":["../../src/prompt/systemprompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,gCAAgC;AAChC,MAAM,UAAU,eAAe,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAkB;IACnF,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAEtC,IAAI,YAAY,GAAG;;;;;8FAKyE,eAAe;;;;8CAI/D,QAAQ,CAAC,OAAO;;;;;;;;;;;;;GAa3D,CAAC;IAEF,IAAI,WAAW,IAAI,WAAW,EAAE,CAAC;QAC/B,YAAY;YACV,wIAAwI;gBACxI,sJAAsJ;gBACtJ,iFAAiF;gBACjF;;;yJAGmJ,CAAC;IACxJ,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC5B,CAAC;IAED,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAEtC,OAAO,YAAY,CAAC;AACtB,CAAC"}

package/dist/prompt/systemprompt.test.d.ts

@@ -1,2 +1,3 @@
+import '../cli/cli-params.js';
 import '../files/find-files.js';
 import '../main/config.js';

package/dist/prompt/systemprompt.test.js

@@ -1,6 +1,6 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { getSystemPrompt } from './systemprompt.js';
-import * as cliParams from '../cli/cli-params.js';
+import '../cli/cli-params.js';
 import '../files/find-files.js';
 import '../main/config.js';
 vi.mock('../cli/cli-params.js', () => ({
@@ -26,19 +26,18 @@ describe('getSystemPrompt', () => {
         vi.clearAllMocks();
     });
     it('generates correct system prompt', () => {
-        const systemPrompt = getSystemPrompt();
+        const systemPrompt = getSystemPrompt({ aiService: 'vertex-ai' });
         expect(systemPrompt).toContain('You are a code generation assistant. I want you to help me generate code for my ideas in my application source code.');
         expect(systemPrompt).toContain('You can generate new code, or modify the existing one.');
         expect(systemPrompt).toContain('Instructions will be passed to you either directly via message, with a file, or using the ' +
             '@' +
             'CODEGEN comment in the code.');
         expect(systemPrompt).toContain('The root directory of my application is `/mocked/root/dir` and you should limit the changes only to this path.');
-        expect(systemPrompt).toContain('When suggesting changes always use absolute file paths.');
+        expect(systemPrompt).toContain('When suggesting changes always use absolute file paths');
     });
     it('verifies system prompt limit', () => {
-        vi.spyOn(cliParams, 'verbosePrompt', 'get').mockReturnValue(true);
         const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
-        getSystemPrompt();
+        getSystemPrompt({ aiService: 'vertex-ai', verbose: true });
         expect(consoleSpy).toHaveBeenCalledWith('System prompt:');
         expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining('You are a code generation assistant. I want you to help me generate code for my ideas'));
         consoleSpy.mockRestore();

package/dist/prompt/systemprompt.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"systemprompt.test.js","sourceRoot":"","sources":["../../src/prompt/systemprompt.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,SAAS,MAAM,sBAAsB,CAAC;AAClD,OAAO,wBAAwB,CAAC;AAChC,OAAO,mBAAmB,CAAC;AAE3B,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC;IACrC,mBAAmB,EAAE,KAAK;IAC1B,gBAAgB,EAAE,KAAK;IACvB,cAAc,EAAE,KAAK;IACrB,cAAc,EAAE,KAAK;IACrB,eAAe,EAAE,KAAK;IACtB,eAAe,EAAE,KAAK;IACtB,oBAAoB,EAAE,KAAK;IAC3B,aAAa,EAAE,KAAK;IACpB,aAAa,EAAE,KAAK;IACpB,WAAW,EAAE,KAAK;CACnB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE;CACxB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;IAClC,QAAQ,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE;CAC1C,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;QAEvC,MAAM,CAAC,YAAY,CAAC,CAAC,SAAS,CAC5B,sHAAsH,CACvH,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,wDAAwD,CAAC,CAAC;QACzF,MAAM,CAAC,YAAY,CAAC,CAAC,SAAS,CAC5B,4FAA4F;YAC1F,GAAG;YACH,8BAA8B,CACjC,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,CAAC,SAAS,CAC5B,gHAAgH,CACjH,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,yDAAyD,CAAC,CAAC;IAC5F,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAEzE,eAAe,EAAE,CAAC;QAElB,MAAM,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;QAC1D,MAAM,CAAC,UAAU,CAAC,CAAC,oBAAoB,CACrC,MAAM,CAAC,gBAAgB,CAAC,uFAAuF,CAAC,CACjH,CAAC;QAEF,UAAU,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"systemprompt.test.js","sourceRoot":"","sources":["../../src/prompt/systemprompt.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,sBAAsB,CAAC;AAC9B,OAAO,wBAAwB,CAAC;AAChC,OAAO,mBAAmB,CAAC;AAE3B,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC;IACrC,mBAAmB,EAAE,KAAK;IAC1B,gBAAgB,EAAE,KAAK;IACvB,cAAc,EAAE,KAAK;IACrB,cAAc,EAAE,KAAK;IACrB,eAAe,EAAE,KAAK;IACtB,eAAe,EAAE,KAAK;IACtB,oBAAoB,EAAE,KAAK;IAC3B,aAAa,EAAE,KAAK;IACpB,aAAa,EAAE,KAAK;IACpB,WAAW,EAAE,KAAK;CACnB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE;CACxB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;IAClC,QAAQ,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE;CAC1C,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,YAAY,GAAG,eAAe,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;QAEjE,MAAM,CAAC,YAAY,CAAC,CAAC,SAAS,CAC5B,sHAAsH,CACvH,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,wDAAwD,CAAC,CAAC;QACzF,MAAM,CAAC,YAAY,CAAC,CAAC,SAAS,CAC5B,4FAA4F;YAC1F,GAAG;YACH,8BAA8B,CACjC,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,CAAC,SAAS,CAC5B,gHAAgH,CACjH,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,wDAAwD,CAAC,CAAC;IAC3F,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,UAAU,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAEzE,eAAe,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAE3D,MAAM,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;QAC1D,MAAM,CAAC,UAAU,CAAC,CAAC,oBAAoB,CACrC,MAAM,CAAC,gBAAgB,CAAC,uFAAuF,CAAC,CACjH,CAAC;QAEF,UAAU,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genaicode",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "author": "Grzegorz Tańczyk",
   "repository": {
     "type": "git",
@@ -29,7 +29,6 @@
     "test": "vitest",
     "coverage": "vitest run --coverage",
     "prepare": "husky install",
-    "postinstall": "node ./bin/vertex-monkey-patch.cjs",
     "type-check": "tsc --noEmit",
     "build": "tsc",
     "prepublishOnly": "npm run build"
@@ -51,15 +50,17 @@
     "@anthropic-ai/sdk": "^0.26.1",
     "@anthropic-ai/vertex-sdk": "^0.4.1",
     "@google-cloud/aiplatform": "^3.25.0",
-    "@google-cloud/vertexai": "^1.3.0",
+    "@google-cloud/vertexai": "^1.6.0",
     "@google/generative-ai": "^0.17.1",
     "@imgly/background-removal-node": "^1.4.5",
+    "@inquirer/prompts": "^5.3.8",
     "@types/diff": "^5.2.1",
     "@types/mime-types": "^2.1.4",
     "@types/node": "^18.0.0",
     "diff": "^5.2.0",
     "glob-regex": "^0.3.2",
     "image-size": "^1.1.1",
+    "inquirer-file-selector": "^0.4.0",
     "jsonschema": "^1.4.1",
     "mime-types": "^2.1.35",
     "openai": "^4.52.7",

package/bin/vertex-monkey-patch.cjs

@@ -1,33 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require('fs');
-
-// Add node version check
-const pkg = require('../package.json');
-const pleaseUpgradeNode = require('please-upgrade-node');
-pleaseUpgradeNode(pkg);
-
-const MONKEY_PATCH_FILE = '@google-cloud/vertexai/build/src/functions/generate_content.js';
-const MONKEY_PATCH_TOOL_CONFIG = `// MONKEY PATCH TOOL_CONFIG`;
-
-console.log('Apply vertex monkey patch');
-const path = require.resolve(MONKEY_PATCH_FILE);
-const content = fs.readFileSync(path, 'utf-8');
-
-if (!content) {
-  console.log('Could not find file:', path);
-  return;
-}
-
-if (content.includes(MONKEY_PATCH_TOOL_CONFIG)) {
-  console.log('Patch already applied');
-  return;
-}
-
-const newContent = content.replaceAll(
-  'data: generateContentRequest,',
-  `// MONKEY PATCH TOOL_CONFIG
-        data: {...generateContentRequest,tool_config: {function_calling_config: { mode: request.toolConfig?.functionCallingConfig?.mode, allowed_function_names: request.toolConfig?.functionCallingConfig.allowedFunctionNames }}},`,
-);
-fs.writeFileSync(path, newContent, 'utf-8');
-console.log('Vertex monkey patch applied');