Merge main into will/mode-plumbing - Use createTask naming and CreateTaskOptions

Author: liwilliam2021

packages/types/npm/package.metadata.json

@@ -1,6 +1,6 @@
 {
 	"name": "@roo-code/types",
-	"version": "1.48.0",
+	"version": "1.49.0",
 	"description": "TypeScript type definitions for Roo Code.",
 	"publishConfig": {
 		"access": "public",

packages/types/src/task.ts

@@ -4,6 +4,7 @@ import { RooCodeEventName } from "./events.js"
 import { type ClineMessage, type BlockingAsk, type TokenUsage } from "./message.js"
 import { type ToolUsage, type ToolName } from "./tool.js"
 import { type Experiments } from "./experiment.js"
+import type { StaticAppProperties, GitProperties, TelemetryProperties } from "./telemetry.js"
 
 /**
  * TaskProviderLike
@@ -13,7 +14,7 @@ export interface TaskProviderState {
 	mode?: string
 }
 
-export interface InitTaskOptions {
+export interface CreateTaskOptions {
 	modeSlug?: string
 	enableDiff?: boolean
 	enableCheckpoints?: boolean
@@ -23,24 +24,23 @@ export interface InitTaskOptions {
 }
 export interface TaskProviderLike {
 	readonly cwd: string
+	readonly appProperties: StaticAppProperties
+	readonly gitProperties: GitProperties | undefined
 
-	getCurrentCline(): TaskLike | undefined
+	getCurrentTask(): TaskLike | undefined
 	getCurrentTaskStack(): string[]
+	getRecentTasks(): string[]
 
-	initClineWithTask(
-		text?: string,
-		images?: string[],
-		parentTask?: TaskLike,
-		options?: InitTaskOptions,
-	): Promise<TaskLike>
+	createTask(text?: string, images?: string[], parentTask?: TaskLike, options?: CreateTaskOptions): Promise<TaskLike>
 	cancelTask(): Promise<void>
 	clearTask(): Promise<void>
-	postStateToWebview(): Promise<void>
 
 	getState(): Promise<TaskProviderState>
-
+	postStateToWebview(): Promise<void>
 	postMessageToWebview(message: unknown): Promise<void>
 
+	getTelemetryProperties(): Promise<TelemetryProperties>
+
 	on<K extends keyof TaskProviderEvents>(
 		event: K,
 		listener: (...args: TaskProviderEvents[K]) => void | Promise<void>,
@@ -50,14 +50,6 @@ export interface TaskProviderLike {
 		event: K,
 		listener: (...args: TaskProviderEvents[K]) => void | Promise<void>,
 	): this
-
-	context: {
-		extension?: {
-			packageJSON?: {
-				version?: string
-			}
-		}
-	}
 }
 
 export type TaskProviderEvents = {

packages/types/src/telemetry.ts

@@ -72,17 +72,37 @@ export enum TelemetryEventName {
  * TelemetryProperties
  */
 
-export const appPropertiesSchema = z.object({
+export const staticAppPropertiesSchema = z.object({
 	appName: z.string(),
 	appVersion: z.string(),
 	vscodeVersion: z.string(),
 	platform: z.string(),
 	editorName: z.string(),
+})
+
+export type StaticAppProperties = z.infer<typeof staticAppPropertiesSchema>
+
+export const dynamicAppPropertiesSchema = z.object({
 	language: z.string(),
 	mode: z.string(),
+})
+
+export type DynamicAppProperties = z.infer<typeof dynamicAppPropertiesSchema>
+
+export const cloudAppPropertiesSchema = z.object({
 	cloudIsAuthenticated: z.boolean().optional(),
 })
 
+export type CloudAppProperties = z.infer<typeof cloudAppPropertiesSchema>
+
+export const appPropertiesSchema = z.object({
+	...staticAppPropertiesSchema.shape,
+	...dynamicAppPropertiesSchema.shape,
+	...cloudAppPropertiesSchema.shape,
+})
+
+export type AppProperties = z.infer<typeof appPropertiesSchema>
+
 export const taskPropertiesSchema = z.object({
 	taskId: z.string().optional(),
 	apiProvider: z.enum(providerNames).optional(),
@@ -99,20 +119,23 @@ export const taskPropertiesSchema = z.object({
 		.optional(),
 })
 
+export type TaskProperties = z.infer<typeof taskPropertiesSchema>
+
 export const gitPropertiesSchema = z.object({
 	repositoryUrl: z.string().optional(),
 	repositoryName: z.string().optional(),
 	defaultBranch: z.string().optional(),
 })
 
+export type GitProperties = z.infer<typeof gitPropertiesSchema>
+
 export const telemetryPropertiesSchema = z.object({
 	...appPropertiesSchema.shape,
 	...taskPropertiesSchema.shape,
 	...gitPropertiesSchema.shape,
 })
 
 export type TelemetryProperties = z.infer<typeof telemetryPropertiesSchema>
-export type GitProperties = z.infer<typeof gitPropertiesSchema>
 
 /**
  * TelemetryEvent

pnpm-lock.yaml

@@ -212,7 +212,7 @@ function startWatch(pkg: PackageConfig): WatcherResult {
 		throw new Error(`Invalid watch command for ${pkg.name}`)
 	}
 
-	console.log(`Watching for changes to ${pkg.sourcePath} with ${cmd} ${args.join(" ")}`)
+	console.log(`👀 Watching for changes to ${pkg.sourcePath} with ${cmd} ${args.join(" ")}`)
 
 	const child = spawn(cmd, args, {
 		cwd: path.resolve(__dirname, "..", pkg.sourcePath),
@@ -251,7 +251,7 @@ function startWatch(pkg: PackageConfig): WatcherResult {
 				debounceTimer = setTimeout(() => {
 					linkPackage(pkg)
 
-					console.log(`📋 Copied ${pkg.name} to ${pkg.targetPaths.length} paths\n`)
+					console.log(`♻️ Copied ${pkg.name} to ${pkg.targetPaths.length} paths\n`)
 
 					debounceTimer = null
 				}, DEBOUNCE_DELAY)

scripts/link-packages.ts

@@ -1987,7 +1987,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 						const history = await provider?.getTaskWithId(this.taskId)
 
 						if (history) {
-							await provider?.initClineWithHistoryItem(history.historyItem)
+							await provider?.createTaskWithHistoryItem(history.historyItem)
 						}
 					}
 				} finally {

src/core/task/Task.ts

@@ -22,7 +22,7 @@ const mockAskApproval = vi.fn<AskApproval>()
 const mockHandleError = vi.fn<HandleError>()
 const mockPushToolResult = vi.fn()
 const mockRemoveClosingTag = vi.fn((_name: string, value: string | undefined) => value ?? "")
-const mockInitClineWithTask = vi.fn<() => Promise<MockClineInstance>>().mockResolvedValue({ taskId: "mock-subtask-id" })
+const mockCreateTask = vi.fn<() => Promise<MockClineInstance>>().mockResolvedValue({ taskId: "mock-subtask-id" })
 const mockEmit = vi.fn()
 const mockRecordToolError = vi.fn()
 const mockSayAndCreateMissingParamError = vi.fn()
@@ -40,7 +40,7 @@ const mockCline = {
 		deref: vi.fn(() => ({
 			getState: vi.fn(() => ({ customModes: [], mode: "ask" })),
 			handleModeSwitch: vi.fn(),
-			initClineWithTask: mockInitClineWithTask,
+			createTask: mockCreateTask,
 		})),
 	},
 }
@@ -88,8 +88,8 @@ describe("newTaskTool", () => {
 		// Verify askApproval was called
 		expect(mockAskApproval).toHaveBeenCalled()
 
-		// Verify the message passed to initClineWithTask reflects the code's behavior in unit tests
-		expect(mockInitClineWithTask).toHaveBeenCalledWith(
+		// Verify the message passed to createTask reflects the code's behavior in unit tests
+		expect(mockCreateTask).toHaveBeenCalledWith(
 			"Review this: \\@file1.txt and also \\\\\\@file2.txt", // Unit Test Expectation: \\@ -> \@, \\\\@ -> \\\\@
 			undefined,
 			mockCline,
@@ -122,7 +122,7 @@ describe("newTaskTool", () => {
 			mockRemoveClosingTag,
 		)
 
-		expect(mockInitClineWithTask).toHaveBeenCalledWith(
+		expect(mockCreateTask).toHaveBeenCalledWith(
 			"This is already unescaped: \\@file1.txt", // Expected: \@ remains \@
 			undefined,
 			mockCline,
@@ -149,7 +149,7 @@ describe("newTaskTool", () => {
 			mockRemoveClosingTag,
 		)
 
-		expect(mockInitClineWithTask).toHaveBeenCalledWith(
+		expect(mockCreateTask).toHaveBeenCalledWith(
 			"A normal mention @file1.txt", // Expected: @ remains @
 			undefined,
 			mockCline,
@@ -176,7 +176,7 @@ describe("newTaskTool", () => {
 			mockRemoveClosingTag,
 		)
 
-		expect(mockInitClineWithTask).toHaveBeenCalledWith(
+		expect(mockCreateTask).toHaveBeenCalledWith(
 			"Mix: @file0.txt, \\@file1.txt, \\@file2.txt, \\\\\\@file3.txt", // Unit Test Expectation: @->@, \@->\@, \\@->\@, \\\\@->\\\\@
 			undefined,
 			mockCline,

src/core/tools/__tests__/newTaskTool.spec.ts

@@ -83,7 +83,8 @@ export async function newTaskTool(
 			cline.pausedModeSlug = (await provider.getState()).mode ?? defaultModeSlug
 
 			// Create new task instance first (this preserves parent's current mode in its history)
-			const newCline = await provider.initClineWithTask(unescapedMessage, undefined, cline)
+			const newCline = await provider.createTask(unescapedMessage, undefined, cline)
+
 			if (!newCline) {
 				pushToolResult(t("tools:newTask.errors.policy_restriction"))
 				return