Merge main

Author: cte

.changeset/ready-guests-hide.md

@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Convert bootstrap script to esm

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -71,16 +71,18 @@ body:
   - type: textarea
     id: what-happened
     attributes:
-      label: 💥 Outcome Summary (Optional)
+      label: 💥 Outcome Summary
       description: |
-        Recap what went wrong in one or two lines. Use this if the bug is weird, unexpected, or needs extra context.
+        Recap what went wrong in one or two lines.
 
         Example: "Expected code to run, but got an empty response and no error."
       placeholder: Expected ___, but got ___.
+    validations:
+      required: true
 
   - type: textarea
     id: logs
     attributes:
-      label: 📄 Relevant Logs or Errors
+      label: 📄 Relevant Logs or Errors (Optional)
       description: Paste API logs, terminal output, or errors here. Use triple backticks (```) for code formatting.
       render: shell

.github/pull_request_template.md

@@ -61,7 +61,7 @@ Detail the steps to test your changes. This helps reviewers verify your work.
 - [ ] **Branch Hygiene**: My branch is up-to-date (rebased) with the `main` branch.
 - [ ] **Documentation Impact**: I have considered if my changes require documentation updates (see "Documentation Updates" section below).
 - [ ] **Changeset**: A changeset has been created using `npm run changeset` if this PR includes user-facing changes or dependency updates.
-- [ ] **Contribution Guidelines**: I have read and agree to the [Contributor Guidelines](../CONTRIBUTING.md).
+- [ ] **Contribution Guidelines**: I have read and agree to the [Contributor Guidelines](/CONTRIBUTING.md).
 
 ### Screenshots / Videos
 

.husky/pre-commit

@@ -9,7 +9,11 @@ fi
 if [ "$OS" = "Windows_NT" ]; then
   pnpm_cmd="pnpm.cmd"
 else
-  pnpm_cmd="pnpm"
+  if command -v pnpm >/dev/null 2>&1; then
+    pnpm_cmd="pnpm"
+  else
+    pnpm_cmd="npx pnpm"
+  fi
 fi
 
 # Detect if running on Windows and use npx.cmd, otherwise use npx.
@@ -19,5 +23,5 @@ else
   npx_cmd="npx"
 fi
 
-"$npx_cmd" lint-staged
-"$pnpm_cmd" lint
+$npx_cmd lint-staged
+$pnpm_cmd lint

.husky/pre-push

@@ -9,10 +9,14 @@ fi
 if [ "$OS" = "Windows_NT" ]; then
   pnpm_cmd="pnpm.cmd"
 else
-  pnpm_cmd="pnpm"
+  if command -v pnpm >/dev/null 2>&1; then
+    pnpm_cmd="pnpm"
+  else
+    pnpm_cmd="npx pnpm"
+  fi
 fi
 
-"$pnpm_cmd" run check-types
+$pnpm_cmd run check-types
 
 # Check for new changesets.
 NEW_CHANGESETS=$(find .changeset -name "*.md" ! -name "README.md" | wc -l | tr -d ' ')

package.json

@@ -5,8 +5,10 @@
 		"node": "20.18.1"
 	},
 	"scripts": {
-		"preinstall": "npx only-allow pnpm",
+		"preinstall": "node scripts/bootstrap.mjs",
 		"prepare": "husky",
+		"install": "node scripts/bootstrap.mjs",
+		"install:all": "node scripts/bootstrap.mjs",
 		"lint": "turbo lint --log-order grouped --output-logs new-only",
 		"check-types": "turbo check-types --log-order grouped --output-logs new-only",
 		"test": "turbo test --log-order grouped --output-logs new-only",

packages/types/src/types.ts

@@ -209,6 +209,31 @@ export const modelInfoSchema = z.object({
 
 export type ModelInfo = z.infer<typeof modelInfoSchema>
 
+/**
+ * Codebase Index Config
+ */
+export const codebaseIndexConfigSchema = z.object({
+	codebaseIndexEnabled: z.boolean().optional(),
+	codebaseIndexQdrantUrl: z.string().optional(),
+	codebaseIndexEmbedderProvider: z.enum(["openai", "ollama"]).optional(),
+	codebaseIndexEmbedderBaseUrl: z.string().optional(),
+	codebaseIndexEmbedderModelId: z.string().optional(),
+})
+
+export type CodebaseIndexConfig = z.infer<typeof codebaseIndexConfigSchema>
+
+export const codebaseIndexModelsSchema = z.object({
+	openai: z.record(z.string(), z.object({ dimension: z.number() })).optional(),
+	ollama: z.record(z.string(), z.object({ dimension: z.number() })).optional(),
+})
+
+export type CodebaseIndexModels = z.infer<typeof codebaseIndexModelsSchema>
+
+export const codebaseIndexProviderSchema = z.object({
+	codeIndexOpenAiKey: z.string().optional(),
+	codeIndexQdrantApiKey: z.string().optional(),
+})
+
 /**
  * HistoryItem
  */
@@ -622,6 +647,7 @@ export const providerSettingsSchema = z.object({
 	...groqSchema.shape,
 	...chutesSchema.shape,
 	...litellmSchema.shape,
+	...codebaseIndexProviderSchema.shape,
 })
 
 export type ProviderSettings = z.infer<typeof providerSettingsSchema>
@@ -698,6 +724,9 @@ const providerSettingsRecord: ProviderSettingsRecord = {
 	// Requesty
 	requestyApiKey: undefined,
 	requestyModelId: undefined,
+	// Code Index
+	codeIndexOpenAiKey: undefined,
+	codeIndexQdrantApiKey: undefined,
 	// Reasoning
 	enableReasoningEffort: undefined,
 	reasoningEffort: undefined,
@@ -744,6 +773,8 @@ export const globalSettingsSchema = z.object({
 	autoApprovalEnabled: z.boolean().optional(),
 	alwaysAllowReadOnly: z.boolean().optional(),
 	alwaysAllowReadOnlyOutsideWorkspace: z.boolean().optional(),
+	codebaseIndexModels: codebaseIndexModelsSchema.optional(),
+	codebaseIndexConfig: codebaseIndexConfigSchema.optional(),
 	alwaysAllowWrite: z.boolean().optional(),
 	alwaysAllowWriteOutsideWorkspace: z.boolean().optional(),
 	writeDelayMs: z.number().optional(),
@@ -814,6 +845,8 @@ export type GlobalSettings = z.infer<typeof globalSettingsSchema>
 type GlobalSettingsRecord = Record<Keys<GlobalSettings>, undefined>
 
 const globalSettingsRecord: GlobalSettingsRecord = {
+	codebaseIndexModels: undefined,
+	codebaseIndexConfig: undefined,
 	currentApiConfigName: undefined,
 	listApiConfigMeta: undefined,
 	pinnedApiConfigs: undefined,
@@ -926,8 +959,12 @@ export type SecretState = Pick<
 	| "groqApiKey"
 	| "chutesApiKey"
 	| "litellmApiKey"
+	| "codeIndexOpenAiKey"
+	| "codeIndexQdrantApiKey"
 >
 
+export type CodeIndexSecrets = "codeIndexOpenAiKey" | "codeIndexQdrantApiKey"
+
 type SecretStateRecord = Record<Keys<SecretState>, undefined>
 
 const secretStateRecord: SecretStateRecord = {
@@ -948,6 +985,8 @@ const secretStateRecord: SecretStateRecord = {
 	groqApiKey: undefined,
 	chutesApiKey: undefined,
 	litellmApiKey: undefined,
+	codeIndexOpenAiKey: undefined,
+	codeIndexQdrantApiKey: undefined,
 }
 
 export const SECRET_STATE_KEYS = Object.keys(secretStateRecord) as Keys<SecretState>[]
@@ -1016,6 +1055,7 @@ export const clineSays = [
 	"rooignore_error",
 	"diff_error",
 	"condense_context",
+	"codebase_search_result",
 ] as const
 
 export const clineSaySchema = z.enum(clineSays)
@@ -1104,6 +1144,7 @@ export const toolNames = [
 	"switch_mode",
 	"new_task",
 	"fetch_instructions",
+	"codebase_search",
 ] as const
 
 export const toolNamesSchema = z.enum(toolNames)