Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion goose-backend.lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"repo": "https://github.com/aaif-goose/goose.git",
"ref": "main",
"commit": "1c1bd5299a243f309cb251d2bbe429c7f470793e",
"commit": "11deb564d09db782a17878af7cfafd299d9fa461",
"package": "goose-cli",
"bin": "goose"
}
5 changes: 5 additions & 0 deletions sdk/schema/acp-meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
"requestType": "RemoveSessionExtensionRequest_unstable",
"responseType": "EmptyResponse"
},
{
"method": "_goose/unstable/session/extensions/apply",
"requestType": "ApplySessionExtensionsRequest_unstable",
"responseType": "EmptyResponse"
},
{
"method": "_goose/unstable/tools/list",
"requestType": "GetToolsRequest_unstable",
Expand Down
110 changes: 81 additions & 29 deletions sdk/schema/acp-schema.json

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions sdk/src/generated/client.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export interface ExtMethodProvider {
import type {
AddConfigExtensionRequestUnstable,
AddSessionExtensionRequestUnstable,
ApplySessionExtensionsRequestUnstable,
AppsDeleteRequestUnstable,
AppsDeleteResponseUnstable,
AppsExportRequestUnstable,
Expand Down Expand Up @@ -291,6 +292,15 @@ export class GooseExtClient {
);
}

async GooseUnstableSessionExtensionsApply(
params: ApplySessionExtensionsRequestUnstable,
): Promise<void> {
await this.conn.extMethod(
"_goose/unstable/session/extensions/apply",
params,
);
}

async GooseUnstableToolsList(
params: GetToolsRequestUnstable,
): Promise<GetToolsResponseUnstable> {
Expand Down
7 changes: 6 additions & 1 deletion sdk/src/generated/index.ts

Large diffs are not rendered by default.

25 changes: 22 additions & 3 deletions sdk/src/generated/types.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export type McpServerAcp = {
* Providers MUST NOT reuse an ID for multiple ACP-transport MCP servers that are visible
* on the same ACP connection.
*/
id: McpServerAcpId;
serverId: McpServerAcpId;
/**
* The _meta property is reserved by ACP to allow clients and agents to attach additional
* metadata to their interactions. Implementations MUST NOT make assumptions about values at
Expand All @@ -192,7 +192,7 @@ export type McpServerStdio = {
*/
name: string;
/**
* Path to the MCP server executable.
* Absolute path to the MCP server executable.
*/
command: string;
/**
Expand Down Expand Up @@ -254,6 +254,24 @@ export type RemoveSessionExtensionRequestUnstable = {
name: string;
};

/**
* Recreate the session's provider, keeping its current provider and model,
* so that the session's current extension list takes effect.
*
* Useful after adding or removing session extensions when the provider
* forwards extensions to a downstream session (ACP harness providers such as
* claude-acp and codex-acp). Those providers snapshot the extension list when
* they are built, so extension changes only reach them on rebuild: the
* provider is replaced with a new instance whose downstream session is
* created with the updated extension list.
*
* Providers that don't forward extensions pick up extension changes
* immediately; for them this call is not required.
*/
export type ApplySessionExtensionsRequestUnstable = {
sessionId: string;
};

/**
* List all tools available in a session.
*/
Expand Down Expand Up @@ -2622,6 +2640,7 @@ export type MessageUsageUpdate = {
export type RequestRecipeParamsUnstable = {
sessionId: string;
parameters: Array<RecipeParameterDto>;
parameterScopeId?: string | null;
};

export type RecipeParamsResponseUnstable = {
Expand All @@ -2636,7 +2655,7 @@ export type RecipeParamsAction = 'submit' | 'cancel';
export type ExtRequest = {
id: string;
method: string;
params?: AddSessionExtensionRequestUnstable | RemoveSessionExtensionRequestUnstable | GetToolsRequestUnstable | SetToolPermissionsRequestUnstable | GooseToolCallRequestUnstable | ReadResourceRequestUnstable | AppsListRequestUnstable | AppsExportRequestUnstable | AppsImportRequestUnstable | AppsDeleteRequestUnstable | UpdateWorkingDirRequestUnstable | SetSessionSystemPromptRequestUnstable | SteerSessionRequestUnstable | DiagnosticsGetRequestUnstable | ListPromptsRequestUnstable | GetPromptRequestUnstable | SavePromptRequestUnstable | ResetPromptRequestUnstable | DeleteSessionRequest | GetConfigExtensionsRequestUnstable | GetAvailableExtensionsRequestUnstable | AddConfigExtensionRequestUnstable | RemoveConfigExtensionRequestUnstable | SetConfigExtensionEnabledRequestUnstable | GetSessionExtensionsRequestUnstable | ListProvidersRequestUnstable | ProviderSupportedModelsListRequestUnstable | ProviderCatalogListRequestUnstable | ProviderSetupCatalogListRequestUnstable | ProviderCatalogTemplateRequestUnstable | CustomProviderCreateRequestUnstable | CustomProviderReadRequestUnstable | CustomProviderUpdateRequestUnstable | CustomProviderDeleteRequestUnstable | RefreshProviderInventoryRequestUnstable | ProviderConfigReadRequestUnstable | ProviderConfigStatusRequestUnstable | ProviderConfigSaveRequestUnstable | ProviderConfigDeleteRequestUnstable | ProviderConfigAuthenticateRequestUnstable | ProviderSecretsListRequestUnstable | ProviderSecretDeleteRequestUnstable | CanonicalModelInfoRequestUnstable | PreferencesReadRequestUnstable | PreferencesSaveRequestUnstable | PreferencesRemoveRequestUnstable | ConfigReadRequestUnstable | ConfigUpsertRequestUnstable | ConfigRemoveRequestUnstable | ConfigReadAllRequestUnstable | DefaultsReadRequestUnstable | DefaultsSaveRequestUnstable | DefaultsClearRequestUnstable | OnboardingImportScanRequestUnstable | OnboardingImportApplyRequestUnstable | ExportSessionRequestUnstable | ImportSessionRequestUnstable | ShareSessionNostrRequestUnstable | EncodeRecipeRequestUnstable | DecodeRecipeRequestUnstable | ScanRecipeRequestUnstable | ListRecipesRequestUnstable | DeleteRecipeRequestUnstable | ScheduleRecipeRequestUnstable | SetRecipeSlashCommandRequestUnstable | SaveRecipeRequestUnstable | ParseRecipeRequestUnstable | RecipeToYamlRequestUnstable | ListSchedulesRequestUnstable | ListScheduleSessionsRequestUnstable | CreateScheduleRequestUnstable | DeleteScheduleRequestUnstable | PauseScheduleRequestUnstable | UnpauseScheduleRequestUnstable | UpdateScheduleRequestUnstable | RunScheduleNowRequestUnstable | KillRunningJobRequestUnstable | InspectRunningJobRequestUnstable | GetSessionInfoRequestUnstable | TruncateSessionConversationRequestUnstable | UpdateSessionProjectRequestUnstable | RenameSessionRequestUnstable | ArchiveSessionRequestUnstable | UnarchiveSessionRequestUnstable | CreateSourceRequestUnstable | ListSourcesRequestUnstable | ListAgentMentionsRequestUnstable | ListSlashCommandsRequestUnstable | UpdateSourceRequestUnstable | DeleteSourceRequestUnstable | ExportSourceRequestUnstable | ImportSourcesRequestUnstable | DictationTranscribeRequestUnstable | DictationConfigRequestUnstable | DictationSecretSaveRequestUnstable | DictationSecretDeleteRequestUnstable | DictationModelsListRequestUnstable | DictationModelDownloadRequestUnstable | DictationModelDownloadProgressRequestUnstable | DictationModelCancelRequestUnstable | DictationModelDeleteRequestUnstable | DictationModelSelectRequestUnstable | LocalInferenceModelsListRequestUnstable | LocalInferenceModelDownloadRequestUnstable | LocalInferenceModelDownloadProgressRequestUnstable | LocalInferenceModelDownloadCancelRequestUnstable | LocalInferenceModelDeleteRequestUnstable | LocalInferenceModelEvictRequestUnstable | LocalInferenceModelSettingsReadRequestUnstable | LocalInferenceModelSettingsUpdateRequestUnstable | LocalInferenceHuggingFaceSearchRequestUnstable | LocalInferenceHuggingFaceRepoVariantsRequestUnstable | LocalInferenceBuiltinChatTemplatesListRequestUnstable | {
params?: AddSessionExtensionRequestUnstable | RemoveSessionExtensionRequestUnstable | ApplySessionExtensionsRequestUnstable | GetToolsRequestUnstable | SetToolPermissionsRequestUnstable | GooseToolCallRequestUnstable | ReadResourceRequestUnstable | AppsListRequestUnstable | AppsExportRequestUnstable | AppsImportRequestUnstable | AppsDeleteRequestUnstable | UpdateWorkingDirRequestUnstable | SetSessionSystemPromptRequestUnstable | SteerSessionRequestUnstable | DiagnosticsGetRequestUnstable | ListPromptsRequestUnstable | GetPromptRequestUnstable | SavePromptRequestUnstable | ResetPromptRequestUnstable | DeleteSessionRequest | GetConfigExtensionsRequestUnstable | GetAvailableExtensionsRequestUnstable | AddConfigExtensionRequestUnstable | RemoveConfigExtensionRequestUnstable | SetConfigExtensionEnabledRequestUnstable | GetSessionExtensionsRequestUnstable | ListProvidersRequestUnstable | ProviderSupportedModelsListRequestUnstable | ProviderCatalogListRequestUnstable | ProviderSetupCatalogListRequestUnstable | ProviderCatalogTemplateRequestUnstable | CustomProviderCreateRequestUnstable | CustomProviderReadRequestUnstable | CustomProviderUpdateRequestUnstable | CustomProviderDeleteRequestUnstable | RefreshProviderInventoryRequestUnstable | ProviderConfigReadRequestUnstable | ProviderConfigStatusRequestUnstable | ProviderConfigSaveRequestUnstable | ProviderConfigDeleteRequestUnstable | ProviderConfigAuthenticateRequestUnstable | ProviderSecretsListRequestUnstable | ProviderSecretDeleteRequestUnstable | CanonicalModelInfoRequestUnstable | PreferencesReadRequestUnstable | PreferencesSaveRequestUnstable | PreferencesRemoveRequestUnstable | ConfigReadRequestUnstable | ConfigUpsertRequestUnstable | ConfigRemoveRequestUnstable | ConfigReadAllRequestUnstable | DefaultsReadRequestUnstable | DefaultsSaveRequestUnstable | DefaultsClearRequestUnstable | OnboardingImportScanRequestUnstable | OnboardingImportApplyRequestUnstable | ExportSessionRequestUnstable | ImportSessionRequestUnstable | ShareSessionNostrRequestUnstable | EncodeRecipeRequestUnstable | DecodeRecipeRequestUnstable | ScanRecipeRequestUnstable | ListRecipesRequestUnstable | DeleteRecipeRequestUnstable | ScheduleRecipeRequestUnstable | SetRecipeSlashCommandRequestUnstable | SaveRecipeRequestUnstable | ParseRecipeRequestUnstable | RecipeToYamlRequestUnstable | ListSchedulesRequestUnstable | ListScheduleSessionsRequestUnstable | CreateScheduleRequestUnstable | DeleteScheduleRequestUnstable | PauseScheduleRequestUnstable | UnpauseScheduleRequestUnstable | UpdateScheduleRequestUnstable | RunScheduleNowRequestUnstable | KillRunningJobRequestUnstable | InspectRunningJobRequestUnstable | GetSessionInfoRequestUnstable | TruncateSessionConversationRequestUnstable | UpdateSessionProjectRequestUnstable | RenameSessionRequestUnstable | ArchiveSessionRequestUnstable | UnarchiveSessionRequestUnstable | CreateSourceRequestUnstable | ListSourcesRequestUnstable | ListAgentMentionsRequestUnstable | ListSlashCommandsRequestUnstable | UpdateSourceRequestUnstable | DeleteSourceRequestUnstable | ExportSourceRequestUnstable | ImportSourcesRequestUnstable | DictationTranscribeRequestUnstable | DictationConfigRequestUnstable | DictationSecretSaveRequestUnstable | DictationSecretDeleteRequestUnstable | DictationModelsListRequestUnstable | DictationModelDownloadRequestUnstable | DictationModelDownloadProgressRequestUnstable | DictationModelCancelRequestUnstable | DictationModelDeleteRequestUnstable | DictationModelSelectRequestUnstable | LocalInferenceModelsListRequestUnstable | LocalInferenceModelDownloadRequestUnstable | LocalInferenceModelDownloadProgressRequestUnstable | LocalInferenceModelDownloadCancelRequestUnstable | LocalInferenceModelDeleteRequestUnstable | LocalInferenceModelEvictRequestUnstable | LocalInferenceModelSettingsReadRequestUnstable | LocalInferenceModelSettingsUpdateRequestUnstable | LocalInferenceHuggingFaceSearchRequestUnstable | LocalInferenceHuggingFaceRepoVariantsRequestUnstable | LocalInferenceBuiltinChatTemplatesListRequestUnstable | {
[key: string]: unknown;
} | null;
};
Expand Down
24 changes: 22 additions & 2 deletions sdk/src/generated/zod.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const zMcpServerAcpId = z.string();
*/
export const zMcpServerAcp = z.object({
name: z.string(),
id: zMcpServerAcpId,
serverId: zMcpServerAcpId,
_meta: z.record(z.string(), z.unknown()).nullish()
});

Expand Down Expand Up @@ -148,6 +148,24 @@ export const zRemoveSessionExtensionRequestUnstable = z.object({
name: z.string()
});

/**
* Recreate the session's provider, keeping its current provider and model,
* so that the session's current extension list takes effect.
*
* Useful after adding or removing session extensions when the provider
* forwards extensions to a downstream session (ACP harness providers such as
* claude-acp and codex-acp). Those providers snapshot the extension list when
* they are built, so extension changes only reach them on rebuild: the
* provider is replaced with a new instance whose downstream session is
* created with the updated extension list.
*
* Providers that don't forward extensions pick up extension changes
* immediately; for them this call is not required.
*/
export const zApplySessionExtensionsRequestUnstable = z.object({
sessionId: z.string()
});

/**
* List all tools available in a session.
*/
Expand Down Expand Up @@ -2177,7 +2195,8 @@ export const zGooseSessionNotificationUnstable = z.object({

export const zRequestRecipeParamsUnstable = z.object({
sessionId: z.string(),
parameters: z.array(zRecipeParameterDto)
parameters: z.array(zRecipeParameterDto),
parameterScopeId: z.string().nullish()
});

export const zRecipeParamsAction = z.enum(['submit', 'cancel']);
Expand All @@ -2194,6 +2213,7 @@ export const zExtRequest = z.object({
z.union([
zAddSessionExtensionRequestUnstable,
zRemoveSessionExtensionRequestUnstable,
zApplySessionExtensionsRequestUnstable,
zGetToolsRequestUnstable,
zSetToolPermissionsRequestUnstable,
zGooseToolCallRequestUnstable,
Expand Down
2 changes: 1 addition & 1 deletion src/features/extensions/api/extensions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe("extensions api", () => {
description: "ACP MCP",
server: {
name: "local-acp",
id: "acp-server-1",
serverId: "acp-server-1",
},
},
},
Expand Down
6 changes: 3 additions & 3 deletions src/features/extensions/api/extensions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function recordToArray(
}

function isAcpMcpServer(server: McpServer): server is McpServerAcp {
return "id" in server && typeof server.id === "string";
return "serverId" in server && typeof server.serverId === "string";
}

function toExtensionEntry(entry: GooseExtensionEntry): ExtensionEntry {
Expand Down Expand Up @@ -62,7 +62,7 @@ function toExtensionEntry(entry: GooseExtensionEntry): ExtensionEntry {
type: "acp",
name: extension.server.name,
description,
id: extension.server.id,
id: extension.server.serverId,
...(extension.bundled != null ? { bundled: extension.bundled } : {}),
config_key: configKey,
enabled: entry.enabled,
Expand Down Expand Up @@ -151,7 +151,7 @@ function toGooseExtension(extensionConfig: ExtensionConfig): GooseExtension {
if (extensionConfig.type === "acp") {
const server: McpServerAcp = {
name: extensionConfig.name,
id: extensionConfig.id,
serverId: extensionConfig.id,
};
return {
type: "mcp",
Expand Down