vrr/goose
2
0
Fork 0
mirror of https://github.com/block/goose.git synced 2026-04-28 03:29:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 32

feat: associate threads with projects (#8745)

Browse source 
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Matt Toohey 2026-04-22 19:08:55 +12:00 • committed by GitHub
parent a7ccdd780d
commit c8b339e559
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 160 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/goose-sdk/src/custom_requests.rs
View file

@ -181,6 +181,15 @@ pub struct RemoveSecretRequest {
pub key: String,
}
/// Update the project association for a session.
#[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcRequest)]
#[request(method = "_goose/session/update_project", response = EmptyResponse)]
#[serde(rename_all = "camelCase")]
pub struct UpdateSessionProjectRequest {
pub session_id: String,
pub project_id: Option<String>,
}
/// Archive a session (soft delete).
#[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcRequest)]
#[request(method = "_goose/session/archive", response = EmptyResponse)]

5
crates/goose/acp-meta.json
View file

@ -90,6 +90,11 @@
"requestType": "ImportSessionRequest",
"responseType": "ImportSessionResponse"
},
{
"method": "_goose/session/update_project",
"requestType": "UpdateSessionProjectRequest",
"responseType": "EmptyResponse"
},
{
"method": "_goose/session/archive",
"requestType": "ArchiveSessionRequest",

29
crates/goose/acp-schema.json
View file

@ -669,6 +669,26 @@
"x-side": "agent",
"x-method": "_goose/session/import"
},
"UpdateSessionProjectRequest": {
"type": "object",
"properties": {
"sessionId": {
"type": "string"
},
"projectId": {
"type": [
"string",
"null"
]
}
},
"required": [
"sessionId"
],
"description": "Update the project association for a session.",
"x-side": "agent",
"x-method": "_goose/session/update_project"
},
"ArchiveSessionRequest": {
"type": "object",
"properties": {
@ -1487,6 +1507,15 @@
"description": "Params for _goose/session/import",
"title": "ImportSessionRequest"
},
{
"allOf": [
{
"$ref": "#/$defs/UpdateSessionProjectRequest"
}
],
"description": "Params for _goose/session/update_project",
"title": "UpdateSessionProjectRequest"
},
{
"allOf": [
{

53
crates/goose/src/acp/server.rs
View file

@ -153,6 +153,24 @@ fn sid_short(id: &str) -> String {
id.chars().take(8).collect()
}
fn thread_session_meta(
message_count: i64,
metadata: &crate::session::ThreadMetadata,
) -> serde_json::Map<String, serde_json::Value> {
let mut meta = serde_json::Map::new();
meta.insert(
"messageCount".to_string(),
serde_json::Value::Number(message_count.into()),
);
if let Some(ref pid) = metadata.project_id {
meta.insert(
"projectId".to_string(),
serde_json::Value::String(pid.clone()),
);
}
meta
}
fn extract_timeout_from_meta(meta: &Option<Meta>) -> Option<u64> {
meta.as_ref()
.and_then(|m| m.get("timeout"))
@ -1539,9 +1557,17 @@ impl GooseAcpAgent {
.and_then(|v| v.as_str())
.map(|s| s.to_string());
let project_id = args
.meta
.as_ref()
.and_then(|m| m.get("projectId"))
.and_then(|v| v.as_str())
.map(|s| s.to_string());
// Create the Thread — this IS the ACP session from the client's perspective.
let thread_metadata = crate::session::ThreadMetadata {
provider_id: requested_provider.clone(),
project_id,
mode: Some(self.goose_mode.to_string()),
..Default::default()
};
@ -2544,11 +2570,7 @@ impl GooseAcpAgent {
.as_deref()
.map(std::path::PathBuf::from)
.unwrap_or_default();
let mut meta = serde_json::Map::new();
meta.insert(
"messageCount".to_string(),
serde_json::Value::Number(t.message_count.into()),
);
let meta = thread_session_meta(t.message_count, &t.metadata);
SessionInfo::new(SessionId::new(t.id), cwd)
.title(t.name)
.updated_at(t.updated_at.to_rfc3339())
@ -2613,11 +2635,7 @@ impl GooseAcpAgent {
},
);
let mut meta = serde_json::Map::new();
meta.insert(
"messageCount".to_string(),
serde_json::Value::Number(new_thread.message_count.into()),
);
let meta = thread_session_meta(new_thread.message_count, &new_thread.metadata);
let mut response = ForkSessionResponse::new(SessionId::new(new_thread_id))
.modes(mode_state)
@ -3047,6 +3065,19 @@ impl GooseAcpAgent {
})
}
#[custom_method(UpdateSessionProjectRequest)]
async fn on_update_session_project(
&self,
req: UpdateSessionProjectRequest,
) -> Result<EmptyResponse, sacp::Error> {
let project_id = req.project_id;
self.update_thread_metadata(&req.session_id, move |meta| {
meta.project_id = project_id;
})
.await?;
Ok(EmptyResponse {})
}
#[custom_method(ArchiveSessionRequest)]
async fn on_archive_session(
&self,
@ -3189,7 +3220,7 @@ impl GooseAcpAgent {
other => {
return Err(
sacp::Error::invalid_params().data(format!("Unsupported format: {other}"))
)
);
}
};

4
ui/goose2/src/features/chat/lib/sessionMetadataOverlay.ts
View file

@ -5,8 +5,8 @@ const LEGACY_SESSION_CACHE_STORAGE_KEY = "goose:chat-sessions";
export interface SessionMetadataOverlayRecord {
sessionId: string;
projectId?: string | null;
userSetTitle?: string | null;
projectId?: string | null;
providerId?: string | null;
personaId?: string | null;
modelId?: string | null;
@ -74,8 +74,8 @@ function recordFromLegacySession(
): SessionMetadataOverlayRecord {
return {
sessionId: session.acpSessionId ?? session.id,
projectId: session.projectId,
userSetTitle: session.userSetName ? session.title : null,
projectId: session.projectId ?? null,
providerId: session.providerId,
personaId: session.personaId,
modelId: session.modelId,

1
ui/goose2/src/features/chat/stores/__tests__/chatSessionStore.test.ts
View file

@ -142,6 +142,7 @@ describe("chatSessionStore", () => {
title: null,
updatedAt: "2026-04-02",
messageCount: 7,
projectId: "project-123",
},
]);

18
ui/goose2/src/features/chat/stores/chatSessionStore.ts
View file

@ -12,6 +12,7 @@ import {
upsertSessionMetadataOverlayRecord,
type SessionMetadataOverlayRecord,
} from "@/features/chat/lib/sessionMetadataOverlay";
import { updateSessionProject } from "@/shared/api/acpApi";
export interface ChatSession {
id: string;
@ -114,8 +115,8 @@ function buildOverlayRecord(
): SessionMetadataOverlayRecord {
return {
sessionId: overlayKeyForSession(session),
projectId: session.projectId ?? null,
userSetTitle: session.userSetName ? session.title : null,
projectId: session.projectId ?? null,
providerId: session.providerId ?? null,
personaId: session.personaId ?? null,
modelId: session.modelId ?? null,
@ -139,7 +140,7 @@ function overlayToFallbackSession(
id: overlay.sessionId,
acpSessionId: overlay.sessionId,
title: overlay.userSetTitle ?? overlay.lastKnownTitle ?? "Untitled",
projectId: overlay.projectId,
projectId: overlay.projectId ?? undefined,
agentId: overlay.agentId ?? undefined,
providerId: overlay.providerId ?? undefined,
personaId: overlay.personaId ?? undefined,
@ -166,7 +167,7 @@ function mergeAcpSessionWithOverlay(
session.title ??
overlay?.lastKnownTitle ??
"Untitled",
projectId: overlay?.projectId,
projectId: session.projectId ?? undefined,
agentId: overlay?.agentId ?? undefined,
providerId: overlay?.providerId ?? undefined,
personaId: overlay?.personaId ?? undefined,
@ -239,6 +240,7 @@ export const useChatSessionStore = create<ChatSessionStore>((set, get) => ({
const { sessionId } = await acpCreateSession(providerId, opts.workingDir, {
personaId: opts.personaId,
modelId: opts.modelId,
projectId: opts.projectId,
});
const chatSession: ChatSession = {
id: sessionId,
@ -318,7 +320,15 @@ export const useChatSessionStore = create<ChatSessionStore>((set, get) => ({
buildOverlayRecord(updatedSession, existing),
);
}
// TODO: wire session updates to ACP when supported
// Persist projectId change to ACP backend
const acpSessionId = updatedSession?.acpSessionId;
if ("projectId" in patch && acpSessionId) {
updateSessionProject(acpSessionId, patch.projectId ?? null).catch(
(err: unknown) =>
console.error("Failed to update session project in backend:", err),
);
}
},
addSession: (session) => {

11
ui/goose2/src/shared/api/acp.ts
View file

@ -1,5 +1,6 @@
import type { ContentBlock } from "@agentclientprotocol/sdk";
import * as directAcp from "./acpApi";
import type { AcpSessionInfo } from "./acpApi";
import * as sessionTracker from "./acpSessionTracker";
import {
getCatalogEntry,
@ -27,6 +28,7 @@ export interface AcpSendMessageOptions {
export interface AcpPrepareSessionOptions {
personaId?: string;
projectId?: string;
}
export interface AcpCreateSessionOptions extends AcpPrepareSessionOptions {
@ -116,6 +118,7 @@ export async function acpPrepareSession(
providerId,
workingDir,
options.personaId,
options.projectId,
);
perfLog(
`[perf:prepare] ${sid} acpPrepareSession done in ${(performance.now() - t0).toFixed(1)}ms`,
@ -155,13 +158,7 @@ export async function acpSetModel(
return directAcp.setModel(gooseSessionId ?? sessionId, modelId);
}
/** Session info returned by the goose binary's list_sessions. */
export interface AcpSessionInfo {
sessionId: string;
title: string | null;
updatedAt: string | null;
messageCount: number;
}
export type { AcpSessionInfo };
export interface AcpSessionSearchResult {
sessionId: string;

21
ui/goose2/src/shared/api/acpApi.ts
View file

@ -18,6 +18,7 @@ export interface AcpSessionInfo {
title: string | null;
updatedAt: string | null;
messageCount: number;
projectId?: string | null;
}
const DEPRECATED_PROVIDER_IDS = new Set(["claude-code", "codex", "gemini-cli"]);
@ -50,6 +51,7 @@ export async function listSessions(): Promise<AcpSessionInfo[]> {
title: info.title ?? null,
updatedAt: info.updatedAt ?? null,
messageCount: (info._meta?.messageCount as number) ?? 0,
projectId: (info._meta?.projectId as string) ?? null,
}));
}
@ -124,6 +126,17 @@ export async function updateWorkingDir(
await client.extMethod("goose/working_dir/update", { sessionId, workingDir });
}
export async function updateSessionProject(
sessionId: string,
projectId: string | null,
): Promise<void> {
const client = await getClient();
await client.extMethod("_goose/session/update_project", {
sessionId,
projectId,
});
}
export async function cancelSession(sessionId: string): Promise<void> {
const client = await getClient();
await client.cancel({ sessionId });
@ -132,6 +145,7 @@ export async function cancelSession(sessionId: string): Promise<void> {
export async function newSession(
workingDir: string,
providerId?: string,
projectId?: string,
): Promise<NewSessionResponse> {
const tClient = performance.now();
const client = await getClient();
@ -142,9 +156,10 @@ export async function newSession(
mcpServers: [],
};
if (providerId) {
request.meta = { provider: providerId };
}
const meta: Record<string, string> = {};
if (providerId) meta.provider = providerId;
if (projectId) meta.projectId = projectId;
if (Object.keys(meta).length > 0) request.meta = meta;
const tCall = performance.now();
const response = await client.newSession(request);

3
ui/goose2/src/shared/api/acpSessionTracker.ts
View file

@ -56,6 +56,7 @@ export async function prepareSession(
providerId: string,
workingDir: string,
personaId?: string,
projectId?: string,
): Promise<string> {
const sid = sessionId.slice(0, 8);
const key = makeKey(sessionId, personaId);
@ -101,7 +102,7 @@ export async function prepareSession(
if (!gooseSessionId) {
const tNew = performance.now();
const response = await acpApi.newSession(workingDir, providerId);
const response = await acpApi.newSession(workingDir, providerId, projectId);
gooseSessionId = response.sessionId;
perfLog(
`[perf:prepare] ${sid} tracker newSession done in ${(performance.now() - tNew).toFixed(1)}ms (goose_sid=${gooseSessionId.slice(0, 8)})`,

7
ui/sdk/src/generated/client.gen.ts
View file

@ -56,6 +56,7 @@ import type {
RemoveExtensionRequest,
RemoveSecretRequest,
UnarchiveSessionRequest,
UpdateSessionProjectRequest,
UpdateSourceRequest,
UpdateSourceResponse,
UpdateWorkingDirRequest,
@ -194,6 +195,12 @@ export class GooseExtClient {
return zImportSessionResponse.parse(raw) as ImportSessionResponse;
}
async GooseSessionUpdateProject(
params: UpdateSessionProjectRequest,
): Promise<void> {
await this.conn.extMethod("_goose/session/update_project", params);
}
async GooseSessionArchive(params: ArchiveSessionRequest): Promise<void> {
await this.conn.extMethod("_goose/session/archive", params);
}

7
ui/sdk/src/generated/index.ts
View file

@ -1,6 +1,6 @@
// This file is auto-generated by @hey-api/openapi-ts
export type { AddExtensionRequest, ArchiveSessionRequest, CheckSecretRequest, CheckSecretResponse, CreateSourceRequest, CreateSourceResponse, DeleteSessionRequest, DeleteSourceRequest, DictationConfigRequest, DictationConfigResponse, DictationDownloadProgress, DictationLocalModelStatus, DictationModelCancelRequest, DictationModelDeleteRequest, DictationModelDownloadProgressRequest, DictationModelDownloadProgressResponse, DictationModelDownloadRequest, DictationModelOption, DictationModelSelectRequest, DictationModelsListRequest, DictationModelsListResponse, DictationProviderStatusEntry, DictationTranscribeRequest, DictationTranscribeResponse, EmptyResponse, ExportSessionRequest, ExportSessionResponse, ExportSourceRequest, ExportSourceResponse, ExtRequest, ExtResponse, GetExtensionsRequest, GetExtensionsResponse, GetSessionExtensionsRequest, GetSessionExtensionsResponse, GetToolsRequest, GetToolsResponse, ImportSessionRequest, ImportSessionResponse, ImportSourcesRequest, ImportSourcesResponse, ListProvidersRequest, ListProvidersResponse, ListSourcesRequest, ListSourcesResponse, ProviderConfigKey, ProviderInventoryEntryDto, ProviderInventoryModelDto, ReadConfigRequest, ReadConfigResponse, ReadResourceRequest, ReadResourceResponse, RefreshProviderInventoryRequest, RefreshProviderInventoryResponse, RefreshProviderInventorySkipDto, RefreshProviderInventorySkipReasonDto, RemoveConfigRequest, RemoveExtensionRequest, RemoveSecretRequest, SourceEntry, SourceType, UnarchiveSessionRequest, UpdateSourceRequest, UpdateSourceResponse, UpdateWorkingDirRequest, UpsertConfigRequest, UpsertSecretRequest } from './types.gen.js';
export type { AddExtensionRequest, ArchiveSessionRequest, CheckSecretRequest, CheckSecretResponse, CreateSourceRequest, CreateSourceResponse, DeleteSessionRequest, DeleteSourceRequest, DictationConfigRequest, DictationConfigResponse, DictationDownloadProgress, DictationLocalModelStatus, DictationModelCancelRequest, DictationModelDeleteRequest, DictationModelDownloadProgressRequest, DictationModelDownloadProgressResponse, DictationModelDownloadRequest, DictationModelOption, DictationModelSelectRequest, DictationModelsListRequest, DictationModelsListResponse, DictationProviderStatusEntry, DictationTranscribeRequest, DictationTranscribeResponse, EmptyResponse, ExportSessionRequest, ExportSessionResponse, ExportSourceRequest, ExportSourceResponse, ExtRequest, ExtResponse, GetExtensionsRequest, GetExtensionsResponse, GetSessionExtensionsRequest, GetSessionExtensionsResponse, GetToolsRequest, GetToolsResponse, ImportSessionRequest, ImportSessionResponse, ImportSourcesRequest, ImportSourcesResponse, ListProvidersRequest, ListProvidersResponse, ListSourcesRequest, ListSourcesResponse, ProviderConfigKey, ProviderInventoryEntryDto, ProviderInventoryModelDto, ReadConfigRequest, ReadConfigResponse, ReadResourceRequest, ReadResourceResponse, RefreshProviderInventoryRequest, RefreshProviderInventoryResponse, RefreshProviderInventorySkipDto, RefreshProviderInventorySkipReasonDto, RemoveConfigRequest, RemoveExtensionRequest, RemoveSecretRequest, SourceEntry, SourceType, UnarchiveSessionRequest, UpdateSessionProjectRequest, UpdateSourceRequest, UpdateSourceResponse, UpdateWorkingDirRequest, UpsertConfigRequest, UpsertSecretRequest } from './types.gen.js';
export const GOOSE_EXT_METHODS = [
{
@ -93,6 +93,11 @@ export const GOOSE_EXT_METHODS = [
requestType: "ImportSessionRequest",
responseType: "ImportSessionResponse",
},
{
method: "_goose/session/update_project",
requestType: "UpdateSessionProjectRequest",
responseType: "EmptyResponse",
},
{
method: "_goose/session/archive",
requestType: "ArchiveSessionRequest",

10
ui/sdk/src/generated/types.gen.ts
View file

@ -351,6 +351,14 @@ export type ImportSessionResponse = {
messageCount: number;
};
/**
* Update the project association for a session.
*/
export type UpdateSessionProjectRequest = {
sessionId: string;
projectId?: string | null;
};
/**
* Archive a session (soft delete).
*/
@ -618,7 +626,7 @@ export type DictationModelSelectRequest = {
export type ExtRequest = {
id: string;
method: string;
params?: AddExtensionRequest | RemoveExtensionRequest | GetToolsRequest | ReadResourceRequest | UpdateWorkingDirRequest | DeleteSessionRequest | GetExtensionsRequest | GetSessionExtensionsRequest | ListProvidersRequest | RefreshProviderInventoryRequest | ReadConfigRequest | UpsertConfigRequest | RemoveConfigRequest | CheckSecretRequest | UpsertSecretRequest | RemoveSecretRequest | ExportSessionRequest | ImportSessionRequest | ArchiveSessionRequest | UnarchiveSessionRequest | CreateSourceRequest | ListSourcesRequest | UpdateSourceRequest | DeleteSourceRequest | ExportSourceRequest | ImportSourcesRequest | DictationTranscribeRequest | DictationConfigRequest | DictationModelsListRequest | DictationModelDownloadRequest | DictationModelDownloadProgressRequest | DictationModelCancelRequest | DictationModelDeleteRequest | DictationModelSelectRequest | {
params?: AddExtensionRequest | RemoveExtensionRequest | GetToolsRequest | ReadResourceRequest | UpdateWorkingDirRequest | DeleteSessionRequest | GetExtensionsRequest | GetSessionExtensionsRequest | ListProvidersRequest | RefreshProviderInventoryRequest | ReadConfigRequest | UpsertConfigRequest | RemoveConfigRequest | CheckSecretRequest | UpsertSecretRequest | RemoveSecretRequest | ExportSessionRequest | ImportSessionRequest | UpdateSessionProjectRequest | ArchiveSessionRequest | UnarchiveSessionRequest | CreateSourceRequest | ListSourcesRequest | UpdateSourceRequest | DeleteSourceRequest | ExportSourceRequest | ImportSourcesRequest | DictationTranscribeRequest | DictationConfigRequest | DictationModelsListRequest | DictationModelDownloadRequest | DictationModelDownloadProgressRequest | DictationModelCancelRequest | DictationModelDeleteRequest | DictationModelSelectRequest | {
[key: string]: unknown;
} | null;
};

12
ui/sdk/src/generated/zod.gen.ts
View file

@ -293,6 +293,17 @@ export const zImportSessionResponse = z.object({
messageCount: z.number().int().gte(0)
});
/**
* Update the project association for a session.
*/
export const zUpdateSessionProjectRequest = z.object({
sessionId: z.string(),
projectId: z.union([
z.string(),
z.null()
]).optional()
});
/**
* Archive a session (soft delete).
*/
@ -594,6 +605,7 @@ export const zExtRequest = z.object({
zRemoveSecretRequest,
zExportSessionRequest,
zImportSessionRequest,
zUpdateSessionProjectRequest,
zArchiveSessionRequest,
zUnarchiveSessionRequest,
zCreateSourceRequest,