Merge origin/main into dev (second round)
Resolve 21 conflicts from latest main (provider profiles, Windows fixes, 0.1.55-rc.1). Fix all type errors and syntax issues from merge artifacts.
This commit is contained in:
@@ -29,7 +29,7 @@ import { captureTerminalLines } from "../../terminal/terminal.js";
|
||||
import { createAgentWorktree, runAsyncWorktreeBootstrap } from "../worktree-bootstrap.js";
|
||||
import type { ScheduleService } from "../schedule/service.js";
|
||||
import { ScheduleSummarySchema, StoredScheduleSchema } from "../schedule/types.js";
|
||||
import { AGENT_PROVIDER_DEFINITIONS, type ProviderDefinition } from "./provider-registry.js";
|
||||
import type { ProviderDefinition } from "./provider-registry.js";
|
||||
import { deletePaseoWorktree, listPaseoWorktrees } from "../../utils/worktree.js";
|
||||
import {
|
||||
AgentModelSchema,
|
||||
@@ -1366,7 +1366,7 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
|
||||
async () => ({
|
||||
content: [],
|
||||
structuredContent: ensureValidJson({
|
||||
providers: AGENT_PROVIDER_DEFINITIONS.map((provider) => ({
|
||||
providers: Object.values(providerRegistry ?? {}).map((provider) => ({
|
||||
id: provider.id,
|
||||
label: provider.label,
|
||||
modes: provider.modes.map((mode) => ({
|
||||
@@ -1473,7 +1473,7 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
|
||||
content: [],
|
||||
structuredContent: ensureValidJson({
|
||||
branchName,
|
||||
worktreePath: worktree.worktreePath,
|
||||
worktreePath: worktree.worktree.worktreePath,
|
||||
}),
|
||||
};
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user