Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d6d7343
feat(daemon): support scoped workspace memory tasks
qqqys Aug 24, 2026
712ec7d
Merge branch 'main' into feat/workspace-remember-project-scope
qwen-code-dev-bot Aug 24, 2026
79248c1
Merge branch 'main' into feat/workspace-remember-project-scope
qwen-code-dev-bot Aug 24, 2026
a37b60f
Merge branch 'main' into feat/workspace-remember-project-scope
qwen-code-dev-bot Aug 24, 2026
a6dfe90
fix(workspace): repair scoped remember/forget review findings (#9895)
qwen-code-dev-bot Aug 24, 2026
fbf2f5b
fix(workspace): hide project tier from user-scoped remember prompt (#…
qwen-code-dev-bot Aug 25, 2026
aa1ef0e
fix(workspace): rebuild indexes for every remember write, incl. MEMOR…
qwen-code-dev-bot Aug 25, 2026
3bd321a
fix(workspace): repair indexes on failed remember runs, pre-flight SD…
qwen-code-dev-bot Aug 25, 2026
0ce7b1a
Merge branch 'main' into feat/workspace-remember-project-scope
qqqys Aug 26, 2026
e7e7dfd
Merge branch 'main' into feat/workspace-remember-project-scope
qqqys Aug 26, 2026
be17c48
Merge branch 'main' into feat/workspace-remember-project-scope
qwen-code-dev-bot Aug 26, 2026
970dc43
Merge branch 'main' into feat/workspace-remember-project-scope
qwen-code-dev-bot Aug 26, 2026
edefa8d
fix(core): defer early-completion abort until batch emission complete…
qwen-code-dev-bot Aug 26, 2026
4676f94
fix(core): complete self-aborted remember runs and repair indexes on …
qwen-code-dev-bot Aug 26, 2026
983489a
Merge branch 'main' into feat/workspace-remember-project-scope
qwen-code-dev-bot Aug 27, 2026
9e01d07
fix(core): close the round-13 review findings on scoped remember
qqqys Aug 28, 2026
46c242c
Merge remote-tracking branch 'upstream/main' into feat/workspace-reme…
qqqys Aug 28, 2026
b0a1149
fix(core): report an external abort that resolves after the early write
qqqys Aug 28, 2026
1203087
Merge remote-tracking branch 'upstream/main' into feat/workspace-reme…
qqqys Aug 28, 2026
ac8ab16
Merge branch 'main' into feat/workspace-remember-project-scope
qwen-code-dev-bot Aug 28, 2026
47387cd
test(memory): pin the scoped remember/forget branches the review kept…
qqqys Aug 28, 2026
a81cf78
test(memory): make the fork abort probes real and pin the remaining s…
qqqys Aug 28, 2026
e36d3ad
Merge branch 'main' into feat/workspace-remember-project-scope
qwen-code-dev-bot Aug 29, 2026
b632f51
Merge branch 'main' into feat/workspace-remember-project-scope
qwen-code-dev-bot Aug 29, 2026
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
3 changes: 3 additions & 0 deletions packages/acp-bridge/src/bridgeTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,7 @@ export interface ChangeSessionCwdResult {
}

export type BridgeWorkspaceMemoryRememberContextMode = 'workspace' | 'clean';
export type BridgeWorkspaceMemoryRememberTargetScope = 'project' | 'user';
export type BridgeAutoMemoryTopic =
| 'user'
| 'feedback'
Expand All @@ -563,6 +564,7 @@ export type BridgeAutoMemoryTopic =
export interface BridgeWorkspaceMemoryRememberRequest {
content: string;
contextMode: BridgeWorkspaceMemoryRememberContextMode;
scope?: BridgeWorkspaceMemoryRememberTargetScope;
}

export interface BridgeWorkspaceMemoryRememberResult {
Expand All @@ -573,6 +575,7 @@ export interface BridgeWorkspaceMemoryRememberResult {

export interface BridgeWorkspaceMemoryForgetRequest {
query: string;
scope?: BridgeWorkspaceMemoryRememberTargetScope;
}

export interface BridgeWorkspaceMemoryForgetMatch {
Expand Down
2 changes: 2 additions & 0 deletions packages/cli/src/acp-integration/acpAgent.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8324,6 +8324,7 @@ describe('QwenAgent MCP SSE/HTTP support', () => {
agent.extMethod(SERVE_CONTROL_EXT_METHODS.workspaceMemoryRemember, {
content: ' Remember the workspace uses vitest. ',
contextMode: 'clean',
scope: 'project',
}),
).resolves.toEqual({
summary: 'saved',
Expand All @@ -8336,6 +8337,7 @@ describe('QwenAgent MCP SSE/HTTP support', () => {
projectRoot: '/workspace',
content: 'Remember the workspace uses vitest.',
contextMode: 'clean',
scope: 'project',
abortSignal: expect.any(AbortSignal),
}),
);
Expand Down
18 changes: 18 additions & 0 deletions packages/cli/src/acp-integration/acpAgent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8257,6 +8257,14 @@ class QwenAgent implements Agent {
throw RequestError.invalidParams(undefined, 'Invalid contextMode');
}
const contextMode: WorkspaceRememberContextMode = rawContextMode;
const rawScope = params['scope'];
if (
rawScope !== undefined &&
rawScope !== 'project' &&
rawScope !== 'user'
) {
throw RequestError.invalidParams(undefined, 'Invalid scope');
}
if (!this.config.isManagedMemoryAvailable()) {
throw new RequestError(
-32009,
Expand All @@ -8276,6 +8284,7 @@ class QwenAgent implements Agent {
projectRoot,
content: content.trim(),
contextMode,
...(rawScope ? { scope: rawScope } : {}),
abortSignal: childSignal,
});
if (result.filesTouched.length > 0) {
Expand Down Expand Up @@ -8348,6 +8357,14 @@ class QwenAgent implements Agent {
'Query exceeds maximum size',
);
}
const rawScope = params['scope'];
if (
rawScope !== undefined &&
rawScope !== 'project' &&
rawScope !== 'user'
) {
throw RequestError.invalidParams(undefined, 'Invalid scope');
}
if (!this.config.isManagedMemoryAvailable()) {
throw new RequestError(
-32009,
Expand All @@ -8368,6 +8385,7 @@ class QwenAgent implements Agent {
.forget(projectRoot, trimmedQuery, {
config: hiddenConfig,
abortSignal: childSignal,
...(rawScope ? { scope: rawScope } : {}),
});
return {
summary:
Expand Down
36 changes: 36 additions & 0 deletions packages/cli/src/serve/acp-http/dispatch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3790,6 +3790,23 @@ export class AcpDispatcher {
}
return;
}
const rawScope = params['scope'];
if (
rawScope !== undefined &&
rawScope !== 'project' &&
rawScope !== 'user'
) {
if (id !== undefined) {
conn.sendConn(
error(
id,
RPC.INVALID_PARAMS,
'`scope` must be "project", "user", or omitted',
),
);
}
return;
}
try {
const available =
await this.bridge.isWorkspaceMemoryRememberAvailable();
Expand All @@ -3813,6 +3830,7 @@ export class AcpDispatcher {
const task = this.workspaceRememberLane.enqueue({
content: content.trim(),
contextMode: rawContextMode,
...(rawScope ? { scope: rawScope } : {}),
...(conn.clientId ? { originatorClientId: conn.clientId } : {}),
...(assertGenerationOpen ? { assertGenerationOpen } : {}),
});
Expand Down Expand Up @@ -3893,6 +3911,23 @@ export class AcpDispatcher {
}
return;
}
const rawScope = params['scope'];
if (
rawScope !== undefined &&
rawScope !== 'project' &&
rawScope !== 'user'
) {
if (id !== undefined) {
conn.sendConn(
error(
id,
RPC.INVALID_PARAMS,
'`scope` must be "project", "user", or omitted',
),
);
}
return;
}
try {
const available =
await this.bridge.isWorkspaceMemoryRememberAvailable();
Expand All @@ -3915,6 +3950,7 @@ export class AcpDispatcher {
}
const task = this.workspaceRememberLane.enqueueForget({
query: trimmedQuery,
...(rawScope ? { scope: rawScope } : {}),
...(conn.clientId ? { originatorClientId: conn.clientId } : {}),
...(assertGenerationOpen ? { assertGenerationOpen } : {}),
});
Expand Down
22 changes: 20 additions & 2 deletions packages/cli/src/serve/acp-http/workspace-qualified-acp.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1886,18 +1886,36 @@ describe('workspace-qualified ACP (/workspaces/:workspace/acp)', () => {
jsonrpc: '2.0',
id: 2,
method: '_qwen/workspace/memory/remember',
params: { content: 'secondary-only memory' },
params: { content: 'shared memory', scope: 'user' },
});

await vi.waitFor(() => {
expect(secondaryBridge.runWorkspaceMemoryRemember).toHaveBeenCalledWith({
content: 'secondary-only memory',
content: 'shared memory',
contextMode: 'workspace',
scope: 'user',
});
});
expect(primaryBridge.runWorkspaceMemoryRemember).not.toHaveBeenCalled();
});

it('rejects an unsupported workspace remember scope before the bridge', async () => {
const reply = await sendWsRequest('/workspaces/secondary-id/acp', {
jsonrpc: '2.0',
id: 3,
method: '_qwen/workspace/memory/remember',
params: { content: 'wrong scope', scope: 'global' },
});

expect(reply).toMatchObject({
error: {
code: -32602,
message: '`scope` must be "project", "user", or omitted',
},
});
expect(secondaryBridge.runWorkspaceMemoryRemember).not.toHaveBeenCalled();
});

it('rejects a WS upgrade to an unknown workspace selector', async () => {
const status = await new Promise<number>((resolve, reject) => {
const ws = new WebSocket(
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/serve/acp-session-bridge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ export type {
BridgeHeartbeatResult,
BridgeHeartbeatState,
BridgeWorkspaceMemoryRememberContextMode,
BridgeWorkspaceMemoryRememberTargetScope,
BridgeWorkspaceMemoryRememberRequest,
BridgeWorkspaceMemoryRememberResult,
BridgeAutoMemoryTopic,
Expand Down
3 changes: 3 additions & 0 deletions packages/cli/src/serve/capabilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,10 @@ export const SERVE_CAPABILITY_REGISTRY = {
since: 'v1',
modes: ['workspace', 'clean'],
},
workspace_memory_remember_project_scope: { since: 'v1' },
workspace_memory_remember_user_scope: { since: 'v1' },
Comment thread
qqqys marked this conversation as resolved.
Resolved
Comment thread
qqqys marked this conversation as resolved.
Resolved
workspace_memory_forget: { since: 'v1' },
workspace_memory_forget_scope: { since: 'v1' },
workspace_memory_dream: { since: 'v1' },
// Workspace agents CRUD (`GET/POST /workspace/agents` +
// `GET/POST/DELETE /workspace/agents/:agentType`). Wraps
Expand Down
3 changes: 3 additions & 0 deletions packages/cli/src/serve/server.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,10 @@ const EXPECTED_STAGE1_FEATURES = [
'auth_provider_install',
'workspace_memory',
'workspace_memory_remember',
'workspace_memory_remember_project_scope',
'workspace_memory_remember_user_scope',
'workspace_memory_forget',
'workspace_memory_forget_scope',
'workspace_memory_dream',
'workspace_agents',
'workspace_agent_generate',
Expand Down
38 changes: 35 additions & 3 deletions packages/cli/src/serve/workspace-qualified-rest.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1539,7 +1539,7 @@ describe('workspace-qualified core REST', () => {
)
.set('Authorization', 'Bearer secret')
.set('Host', host())
.send({ content: 'Secondary only' });
.send({ content: 'Secondary only', scope: 'project' });
expect(queued.status).toBe(202);

await vi.waitFor(() => {
Expand All @@ -1548,6 +1548,7 @@ describe('workspace-qualified core REST', () => {
).toHaveBeenCalledWith({
content: 'Secondary only',
contextMode: 'workspace',
scope: 'project',
});
});
expect(h.primaryBridge.runWorkspaceMemoryRemember).not.toHaveBeenCalled();
Expand All @@ -1564,15 +1565,46 @@ describe('workspace-qualified core REST', () => {
result: { touchedScopes: ['project'] },
});

const userScope = await request(h.app)
.post(
`/workspaces/${encodeURIComponent(h.secondaryId)}/memory/remember`,
)
.set('Authorization', 'Bearer secret')
.set('Host', host())
.send({ content: 'Shared preference', scope: 'user' });
expect(userScope.status).toBe(202);
await vi.waitFor(() => {
expect(
h.secondaryBridge.runWorkspaceMemoryRemember,
).toHaveBeenNthCalledWith(2, {
content: 'Shared preference',
contextMode: 'workspace',
scope: 'user',
});
});

const invalidScope = await request(h.app)
.post(
`/workspaces/${encodeURIComponent(h.secondaryId)}/memory/remember`,
)
.set('Authorization', 'Bearer secret')
.set('Host', host())
.send({ content: 'Wrong scope', scope: 'global' });
expect(invalidScope.status).toBe(400);
expect(invalidScope.body).toMatchObject({ code: 'invalid_scope' });
expect(
h.secondaryBridge.runWorkspaceMemoryRemember,
).toHaveBeenCalledTimes(2);

const forget = await request(h.app)
.post(`/workspaces/${encodeURIComponent(h.secondaryId)}/memory/forget`)
.set('Authorization', 'Bearer secret')
.set('Host', host())
.send({ query: 'Secondary only' });
.send({ query: 'Secondary only', scope: 'user' });
expect(forget.status).toBe(202);
await vi.waitFor(() => {
expect(h.secondaryBridge.runWorkspaceMemoryForget).toHaveBeenCalledWith(
{ query: 'Secondary only' },
{ query: 'Secondary only', scope: 'user' },
);
});
expect(h.primaryBridge.runWorkspaceMemoryForget).not.toHaveBeenCalled();
Expand Down
30 changes: 21 additions & 9 deletions packages/cli/src/serve/workspace-remember.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ describe('workspace memory remember routes', () => {
const post = await request(app)
.post('/workspace/memory/forget')
.set('X-Qwen-Client-Id', 'client-1')
.send({ query: 'old preference' })
.send({ query: 'old preference', scope: 'user' })
.expect(202);

const taskId = post.body.taskId as string;
Expand All @@ -397,6 +397,7 @@ describe('workspace memory remember routes', () => {
expect(get.body).toMatchObject({
taskId,
status: 'completed',
scope: 'user',
result: {
summary: 'forgot',
touchedTopics: ['user', 'reference'],
Expand All @@ -410,7 +411,10 @@ describe('workspace memory remember routes', () => {
],
},
});
expect(bridge.forgetCalls[0]).toEqual({ query: 'old preference' });
expect(bridge.forgetCalls[0]).toEqual({
query: 'old preference',
scope: 'user',
});
expect(bridge.events[0]).toMatchObject({
type: 'memory_changed',
originatorClientId: 'client-1',
Expand Down Expand Up @@ -830,16 +834,16 @@ describe('workspace memory remember routes', () => {

first.resolve({
summary: 'first',
filesTouched: [],
touchedScopes: [],
filesTouched: ['/mem/project/first.md'],
touchedScopes: ['project'],
});
await waitFor(() => starts.length === 2);
expect(starts).toEqual(['one', 'two']);

second.resolve({
summary: 'second',
filesTouched: [],
touchedScopes: [],
filesTouched: ['/mem/project/second.md'],
touchedScopes: ['project'],
});

await request(app)
Expand All @@ -850,7 +854,7 @@ describe('workspace memory remember routes', () => {
.get(`/workspace/memory/remember/${postTwo.body.taskId}`)
.expect(200)
.expect((res) => expect(res.body.status).toBe('completed'));
expect(bridge.events).toHaveLength(0);
expect(bridge.events).toHaveLength(2);
});

it('serializes remember, forget, and dream tasks in one lane', async () => {
Expand Down Expand Up @@ -899,7 +903,7 @@ describe('workspace memory remember routes', () => {
dream.resolve({ touchedTopics: [], dedupedEntries: 0 });
});

it('does not publish memory_changed for no-op remember results', async () => {
it('fails no-op remember results without publishing memory_changed', async () => {
const bridge = buildBridgeStub({
rememberImpl: vi.fn(async () => ({
summary: 'nothing to save',
Expand All @@ -918,7 +922,15 @@ describe('workspace memory remember routes', () => {
await request(app)
.get(`/workspace/memory/remember/${post.body.taskId}`)
.expect(200)
.expect((res) => expect(res.body.status).toBe('completed'));
.expect((res) =>
expect(res.body).toMatchObject({
status: 'failed',
error: {
code: 'remember_no_update',
message: 'Remember agent did not update any memory.',
},
}),
);
expect(bridge.events).toHaveLength(0);
});

Expand Down
Loading
Loading