Merge branch 'main' into add-session-commands

Author: iscekic

CHANGELOG.md

@@ -1,5 +1,11 @@
 # kilo-code
 
+## 4.130.0
+
+### Minor Changes
+
+- [#4131](https://github.com/Kilo-Org/kilocode/pull/4131) [`9a2ef51`](https://github.com/Kilo-Org/kilocode/commit/9a2ef512bb50143b6cff690f912f7fd8dcfa65b7) Thanks [@mcowger](https://github.com/mcowger)! - Fix tool parsing failure in write_to_file with JSON contents
+
 ## 4.129.0
 
 ### Minor Changes

cli/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @kilocode/cli
 
+## 0.12.0
+
+### Minor Changes
+
+- [#4177](https://github.com/Kilo-Org/kilocode/pull/4177) [`8d44a94`](https://github.com/Kilo-Org/kilocode/commit/8d44a94a28f1cd84d1af9836c1822eb43fe41a1b) Thanks [@pandemicsyn](https://github.com/pandemicsyn)! - Fix: inject configuration before session restoration
+
 ## 0.11.0
 
 ### Minor Changes

cli/package.dist.json

@@ -1,6 +1,6 @@
 {
 	"name": "@kilocode/cli",
-	"version": "0.11.0",
+	"version": "0.12.0",
 	"description": "Terminal User Interface for Kilo Code",
 	"type": "module",
 	"main": "index.js",

cli/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@kilocode/cli",
-	"version": "0.11.0",
+	"version": "0.12.0",
 	"description": "Terminal User Interface for Kilo Code",
 	"type": "module",
 	"main": "dist/index.js",

cli/src/cli.ts

@@ -135,6 +135,11 @@ export class CLI {
 			const kiloToken = getKiloToken(config)
 
 			if (kiloToken) {
+				// Inject CLI configuration into ExtensionHost
+				// This must happen BEFORE session restoration to ensure org ID is set
+				await this.injectConfigurationToExtension()
+				logs.debug("CLI configuration injected into extension", "CLI")
+
 				const pathProvider = new KiloCodePathProvider()
 				const extensionMessenger = new ExtensionMessengerAdapter(this.service)
 
@@ -165,7 +170,6 @@ export class CLI {
 					await this.sessionService.restoreSession(this.options.session)
 				} else if (this.options.fork) {
 					logs.info("Forking session from share ID", "CLI", { shareId: this.options.fork })
-
 					await this.sessionService.forkSession(this.options.fork)
 				}
 			}
@@ -175,6 +179,8 @@ export class CLI {
 			logs.debug("Command history loaded", "CLI")
 
 			// Inject CLI configuration into ExtensionHost
+			// This happens after session restoration (if any) to ensure CLI config takes precedence
+			// Session restoration may have activated a saved profile that doesn't include org ID from env vars
 			await this.injectConfigurationToExtension()
 			logs.debug("CLI configuration injected into extension", "CLI")
 

packages/types/src/feature-flags.ts

@@ -6,4 +6,10 @@
  * Enable model selection for autocomplete in development mode.
  * This allows developers to test different models for autocomplete functionality.
  */
-export const MODEL_SELECTION_ENABLED = process.env.NODE_ENV === "development"
+export const MODEL_SELECTION_ENABLED = process.env.NODE_ENV === "development";
+
+/**
+ * Enable the Agent Manager feature in development mode.
+ * This allows developers to test the multi-agent orchestration functionality.
+ */
+export const AGENT_MANAGER_ENABLED = process.env.NODE_ENV === "development";

packages/types/src/vscode.ts

@@ -49,6 +49,7 @@ export const commandIds = [
 	"settingsButtonClicked",
 
 	"openInNewTab",
+	"agentManagerOpen", // kilocode_change
 
 	"showHumanRelayDialog",
 	"registerHumanRelayCallback",

pnpm-lock.yaml

@@ -16,8 +16,9 @@ import { CodeIndexManager } from "../services/code-index/manager"
 import { importSettingsWithFeedback } from "../core/config/importExport"
 import { MdmService } from "../services/mdm/MdmService"
 import { t } from "../i18n"
-import { getAppUrl } from "@roo-code/types" // kilocode_change
+import { getAppUrl, AGENT_MANAGER_ENABLED } from "@roo-code/types" // kilocode_change
 import { generateTerminalCommand } from "../utils/terminalCommandGenerator" // kilocode_change
+import { AgentManagerProvider } from "../core/kilocode/agent-manager/AgentManagerProvider" // kilocode_change
 
 /**
  * Helper to get the visible ClineProvider instance or log if not found.
@@ -65,8 +66,27 @@ export type RegisterCommandOptions = {
 	provider: ClineProvider
 }
 
+// kilocode_change start - Agent Manager provider
+let agentManagerProvider: AgentManagerProvider | undefined
+
+const registerAgentManager = (options: RegisterCommandOptions) => {
+	const { context, outputChannel } = options
+
+	vscode.commands.executeCommand("setContext", "kilo-code.agentManagerEnabled", AGENT_MANAGER_ENABLED)
+
+	if (AGENT_MANAGER_ENABLED) {
+		agentManagerProvider = new AgentManagerProvider(context, outputChannel)
+		context.subscriptions.push(agentManagerProvider)
+	}
+}
+// kilocode_change end
+
 export const registerCommands = (options: RegisterCommandOptions) => {
-	const { context } = options
+	const { context, outputChannel } = options
+
+	// kilocode_change start
+	registerAgentManager(options)
+	// kilocode_change end
 
 	for (const [id, callback] of Object.entries(getCommandsMap(options))) {
 		const command = getCommand(id as CommandId)
@@ -76,6 +96,11 @@ export const registerCommands = (options: RegisterCommandOptions) => {
 
 const getCommandsMap = ({ context, outputChannel }: RegisterCommandOptions): Record<CommandId, any> => ({
 	activationCompleted: () => {},
+	// kilocode_change start
+	agentManagerOpen: () => {
+		agentManagerProvider?.openPanel()
+	},
+	// kilocode_change end
 	cloudButtonClicked: () => {
 		const visibleProvider = getVisibleProviderOrLog(outputChannel)