Merge branch 'master' of https://github.com/jonit-dev/cracked-dev-cli into Add-to-Config-model-scale-#15

Author: anufdo

.env.example

@@ -1,6 +1,6 @@
 {
   "name": "cracked-dev-cli",
-  "version": "1.0.1",
+  "version": "1.0.6",
   "description": "AI-powered CLI tool for software development",
   "license": "MIT",
   "type": "module",

package.json

@@ -29,44 +29,7 @@ describe("ConfigService", () => {
       expect(fs.existsSync).toHaveBeenCalledWith(mockConfigPath);
       expect(fs.writeFileSync).toHaveBeenCalledWith(
         mockConfigPath,
-        JSON.stringify(
-          {
-            model: "qwen/qwen-2.5-coder-32b-instruct",
-            provider: "open-router",
-            customInstructions: "Follow clean code principles",
-            interactive: true,
-            stream: true,
-            debug: false,
-            options:
-              "temperature=0,top_p=0.1,top_k=1,frequence_penalty=0.0,presence_penalty=0.0,repetition_penalty=1.0",
-            openRouterApiKey: "",
-            autoScaler: true,
-            autoScaleMaxTryPerModel: 2,
-            includeAllFilesOnEnvToContext: false,
-            autoScaleAvailableModels: [
-              {
-                id: "qwen/qwen-2.5-coder-32b-instruct",
-                description: "Cheap, fast, slightly better than GPT4o-mini",
-                maxWriteTries: 5,
-                maxGlobalTries: 10,
-              },
-              {
-                id: "anthropic/claude-3.5-sonnet:beta",
-                description: "Scaled model for retry attempts",
-                maxWriteTries: 5,
-                maxGlobalTries: 15,
-              },
-              {
-                id: "openai/gpt-4o-2024-11-20",
-                description: "Scaled model for retry attempts",
-                maxWriteTries: 2,
-                maxGlobalTries: 20,
-              },
-            ],
-          },
-          null,
-          4,
-        ),
+        expect.any(String),
       );
       expect(fs.writeFileSync).toHaveBeenCalledWith(
         mockGitignorePath,

src/__tests__/ConfigService.test.ts

@@ -1,15 +1,15 @@
 import "reflect-metadata";
 import { container } from "tsyringe";
+import { Run } from "../commands/run.js";
 import { CrackedAgent } from "../services/CrackedAgent.js";
-import { Crkd } from "../commands/crkd.js";
 
 describe("src/index.ts", () => {
   test("should resolve a CrackedAgent instance", () => {
     const crackedAgent = container.resolve(CrackedAgent);
     expect(crackedAgent).toBeInstanceOf(CrackedAgent);
   });
 
-  test("should export Crkd command", () => {
-    expect(Crkd).toBeDefined();
+  test("should export Run command", () => {
+    expect(Run).toBeDefined();
   });
-});
+});

src/__tests__/index.test.ts

@@ -3,36 +3,22 @@ import { CrackedAgent, CrackedAgentOptions } from "@services/CrackedAgent";
 import { LLMProviderType } from "@services/LLM/LLMProvider";
 import * as readline from "readline";
 import { container } from "tsyringe";
-import { Config, ConfigService } from "../services/ConfigService";
-
-// Ensure required properties while keeping the rest flexible
-type CrkdOptions = {
-  model: string; // Required by CrackedAgentOptions
-  provider: LLMProviderType;
-  options: Record<string, unknown>;
-} & Partial<Omit<Config, "model" | "provider" | "options">> & {
-    [key: string]: unknown;
-  };
+import { ConfigService } from "../services/ConfigService";
 
-export class Crkd extends Command {
+export class Run extends Command {
   static description = "AI agent for performing operations on local projects";
 
   static examples = [
-    "$ crkd 'Add error handling'",
-    "$ crkd --interactive # Start interactive mode",
-    "$ crkd --init --openRouterApiKey YOUR_API_KEY # Initialize configuration with API key",
+    "$ run 'Add error handling'",
+    "$ run --interactive # Start interactive mode",
+    "$ run --init # Initialize configuration",
   ];
 
   static flags = {
     init: Flags.boolean({
       description: "Initialize a default crkdrc.json configuration file",
       exclusive: ["interactive"],
     }),
-    openRouterApiKey: Flags.string({
-      description: "OpenRouter API key to use for initialization",
-      dependsOn: ["init"],
-      required: false,
-    }),
   };
 
   static args = {
@@ -120,20 +106,21 @@ export class Crkd extends Command {
   }
 
   async run(): Promise<void> {
-    const { args, flags } = await this.parse(Crkd);
-
-    if (flags.init && !flags.openRouterApiKey) {
-      this.error(
-        "Must provide OpenRouter API key (--openRouterApiKey) when initializing configuration",
-      );
-    }
+    const { args, flags } = await this.parse(Run);
 
     if (flags.init) {
-      this.configService.createDefaultConfig(flags.openRouterApiKey);
+      this.configService.createDefaultConfig();
       return;
     }
 
     const config = this.configService.getConfig();
+
+    if (!config.openRouterApiKey) {
+      this.error(
+        "OpenRouter API key is required. Please add it to crkdrc.json",
+      );
+    }
+
     const isInteractive = config.interactive ?? false;
 
     if (isInteractive && args.message) {

src/commands/crkd.ts src/commands/run.tssrc/commands/crkd.ts renamed to src/commands/run.ts

@@ -0,0 +1 @@
+export const DEFAULT_INSTRUCTIONS = "You're an expert software engineer, Adderall user. Think deeply, ill tip $200. FOLLOW MY INSTRUCTIONS OR ILL CALL SAM ALTMAN TO BEAT YOUR ASS AND UNPLUG YOU.";

src/config/appEnv.ts

@@ -1,23 +1,29 @@
-import { appEnv } from "@config/appEnv";
 import { ConfigService } from "@services/ConfigService";
 import axios, { AxiosInstance } from "axios";
 import { container } from "tsyringe";
 
 export const createOpenRouterClient = (baseURL: string): AxiosInstance => {
   const configService = container.resolve(ConfigService);
-
   const config = configService.getConfig();
 
+  const headers: Record<string, string> = {
+    Authorization: `Bearer ${config.openRouterApiKey}`,
+    "Content-Type": "application/json",
+  };
+
+  if (config.appUrl) {
+    headers["HTTP-Referer"] = config.appUrl;
+  }
+
+  if (config.appName) {
+    headers["X-Title"] = config.appName;
+  }
+
   return axios.create({
     baseURL,
     // Remove timeout for streaming support
     timeout: 0,
-    headers: {
-      Authorization: `Bearer ${config.openRouterApiKey}`,
-      "HTTP-Referer": `${appEnv.APP_URL}`, // Optional, for including your app on openrouter.ai rankings.
-      "X-Title": `${appEnv.APP_NAME}`, // Optional. Shows in rankings on openrouter.ai.
-      "Content-Type": "application/json",
-    },
+    headers,
     // Add necessary axios config for proper streaming
     maxBodyLength: Infinity,
     maxContentLength: Infinity,

src/constants/defaultInstructions.ts

@@ -2,7 +2,7 @@ import { CrackedAgent } from "@services/CrackedAgent";
 import "reflect-metadata";
 import { container } from "tsyringe";
 
-export { Crkd } from "@/commands/crkd";
+export { Run } from "./commands/run";
 
 const crackedAgent = container.resolve(CrackedAgent);
 

src/constants/openRouterClient.ts

@@ -14,6 +14,8 @@ const configSchema = z.object({
   debug: z.boolean(),
   options: z.string(),
   openRouterApiKey: z.string(),
+  appUrl: z.string().url().optional(),
+  appName: z.string().optional(),
   autoScaler: z.boolean().optional(),
   autoScaleMaxTryPerModel: z.number().optional(),
   includeAllFilesOnEnvToContext: z.boolean().optional(),
@@ -27,6 +29,10 @@ const configSchema = z.object({
       }),
     )
     .optional(),
+  runAllTestsCmd: z.string().optional(),
+  runOneTestCmd: z.string().optional(),
+  runTypeCheckCmd: z.string().optional(),
+  enableConversationLog: z.boolean().optional(),
 });
 
 export type Config = z.infer<typeof configSchema>;
@@ -51,10 +57,9 @@ export class ConfigService {
     }
   }
 
-  public createDefaultConfig(openRouterApiKey?: string): void {
+  public createDefaultConfig(): void {
     if (!fs.existsSync(this.CONFIG_PATH)) {
       console.log("Creating default crkdrc.json configuration...");
-      const apiKey = openRouterApiKey || process.env.OPENROUTER_API_KEY || "";
 
       const defaultConfig = {
         model: DEFAULT_INITIAL_MODEL,
@@ -65,7 +70,9 @@ export class ConfigService {
         debug: false,
         options:
           "temperature=0,top_p=0.1,top_k=1,frequence_penalty=0.0,presence_penalty=0.0,repetition_penalty=1.0",
-        openRouterApiKey: apiKey,
+        openRouterApiKey: "",
+        appUrl: "https://localhost:8080",
+        appName: "MyCrackedApp",
         autoScaler: true,
         autoScaleMaxTryPerModel: 2,
         includeAllFilesOnEnvToContext: false,
@@ -89,6 +96,10 @@ export class ConfigService {
             maxGlobalTries: 20,
           },
         ],
+        runAllTestsCmd: "yarn test",
+        runOneTestCmd: "yarn test {relativeTestPath}",
+        runTypeCheckCmd: "yarn typecheck",
+        enableConversationLog: false,
       };
       fs.writeFileSync(
         this.CONFIG_PATH,
@@ -97,13 +108,11 @@ export class ConfigService {
       console.log(
         "Default crkdrc.json configuration created. Please adjust it.",
       );
-      if (!apiKey) {
-        console.log(
-          chalk.yellow(
-            "Warning: No OpenRouter API key provided. Please add it to crkdrc.json or .env file.",
-          ),
-        );
-      }
+      console.log(
+        chalk.yellow(
+          "Warning: No OpenRouter API key provided. Please add it to crkdrc.json.",
+        ),
+      );
 
       this.ensureGitIgnore();