Skip to content

fix(cli): agent injected blocks ignored #8361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 21, 2025
Merged

fix(cli): agent injected blocks ignored #8361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 17 additions & 21 deletions extensions/cli/src/configLoader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,12 @@ async function loadFromSource(
);

case "no-config":
return {
name: "No Config Specified",
version: "1.0.0",
};

return await unrollPackageIdentifiersAsConfigYaml(
injectBlocks,
accessToken,
organizationId,
apiClient,
);
default:
throw new Error(`Unknown config source type: ${(source as any).type}`);
}
Expand Down Expand Up @@ -324,9 +325,7 @@ async function loadUserAssistantWithFallback(
organizationId,
apiClient,
);
if (injectedConfig?.block) {
apiConfig = mergeUnrolledAssistants(apiConfig, injectedConfig.block);
}
apiConfig = mergeUnrolledAssistants(apiConfig, injectedConfig);
}

return apiConfig;
Expand Down Expand Up @@ -386,9 +385,7 @@ async function loadDefaultAgent(
organizationId,
apiClient,
);
if (injectedConfig?.block) {
apiConfig = mergeUnrolledAssistants(apiConfig, injectedConfig.block);
}
apiConfig = mergeUnrolledAssistants(apiConfig, injectedConfig);
}

return apiConfig;
Expand All @@ -399,13 +396,13 @@ export async function unrollPackageIdentifiersAsConfigYaml(
accessToken: string | null,
organizationId: string | null,
apiClient: DefaultApiInterface,
): Promise<{ block: AssistantUnrolled | undefined } | null> {
): Promise<AssistantUnrolled> {
const unrollResult = await unrollAssistantFromContent(
{
uriType: "file",
fileUri: "",
},
"name: FILLER\nschema: v1\nversion: 0.0.1",
"name: Agent\nschema: v1\nversion: 0.0.1",
new RegistryClient({
accessToken: accessToken ?? undefined,
apiBase: env.apiBase,
Expand All @@ -420,16 +417,17 @@ export async function unrollPackageIdentifiersAsConfigYaml(
injectBlocks: packageIdentifiers,
},
);
if (!unrollResult?.config) {
if (unrollResult.errors) {
const fatalError = unrollResult.errors?.find((e) => e.fatal);
if (fatalError) {
throw new Error(`Error(s) unrolling package: ${fatalError.message}`);
throw new Error(`Failed to load config: ${fatalError.message}`);
}
}
if (!unrollResult?.config) {
throw new Error(`Failed to load config`);
}

return {
block: unrollResult?.config,
};
return unrollResult.config;
}

async function unrollAssistantWithConfig(
Expand Down Expand Up @@ -546,9 +544,7 @@ async function loadAssistantSlug(
organizationId,
apiClient,
);
if (injectedConfig?.block) {
apiConfig = mergeUnrolledAssistants(apiConfig, injectedConfig.block);
}
apiConfig = mergeUnrolledAssistants(apiConfig, injectedConfig);
}

return apiConfig;
Expand Down
48 changes: 18 additions & 30 deletions extensions/cli/src/services/ConfigService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,9 @@ describe("ConfigService", () => {
vi.mocked(
configLoader.unrollPackageIdentifiersAsConfigYaml,
).mockResolvedValue({
block: {
name: "default-chat-model",
version: "1.0.0",
models: [defaultModel],
},
name: "default-chat-model",
version: "1.0.0",
models: [defaultModel],
});
});

Expand Down Expand Up @@ -520,11 +518,9 @@ describe("ConfigService", () => {
vi.mocked(
configLoader.unrollPackageIdentifiersAsConfigYaml,
).mockResolvedValue({
block: {
name: "default",
version: "1.0.0",
models: [defaultModel],
},
name: "default",
version: "1.0.0",
models: [defaultModel],
});

const result = await service.addDefaultChatModelIfNone(
Expand Down Expand Up @@ -616,11 +612,9 @@ describe("ConfigService", () => {
vi.mocked(
configLoader.unrollPackageIdentifiersAsConfigYaml,
).mockResolvedValue({
block: {
name: "default",
version: "1.0.0",
models: [defaultModel],
},
name: "default",
version: "1.0.0",
models: [defaultModel],
});

const result = await service.addDefaultChatModelIfNone(
Expand All @@ -643,11 +637,9 @@ describe("ConfigService", () => {
vi.mocked(
configLoader.unrollPackageIdentifiersAsConfigYaml,
).mockResolvedValue({
block: {
name: "default",
version: "1.0.0",
models: [defaultModel],
},
name: "default",
version: "1.0.0",
models: [defaultModel],
});

const result = await service.addDefaultChatModelIfNone(
Expand Down Expand Up @@ -695,11 +687,9 @@ describe("ConfigService", () => {
vi.mocked(
configLoader.unrollPackageIdentifiersAsConfigYaml,
).mockResolvedValue({
block: {
name: "default",
version: "1.0.0",
models: [], // Empty models array
},
name: "default",
version: "1.0.0",
models: [], // Empty models array
});

await expect(
Expand All @@ -724,11 +714,9 @@ describe("ConfigService", () => {
vi.mocked(
configLoader.unrollPackageIdentifiersAsConfigYaml,
).mockResolvedValue({
block: {
name: "default",
version: "1.0.0",
models: [defaultModel],
},
name: "default",
version: "1.0.0",
models: [defaultModel],
});

const result = await service.addDefaultChatModelIfNone(
Expand Down
2 changes: 1 addition & 1 deletion extensions/cli/src/services/ConfigService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ export class ConfigService
authConfig?.organizationId ?? null,
apiClient,
);
const defaultModel = modelConfig?.block?.models?.[0];
const defaultModel = modelConfig?.models?.[0];
if (!defaultModel) {
throw new Error("Loaded default model contained no model block");
}
Expand Down
Loading