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
19 changes: 2 additions & 17 deletions packages/cli/src/acp-integration/acpAgent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ import {
loadCliConfig,
} from '../config/config.js';
import { extractRememberErrorCode } from '../serve/workspace-remember-errors.js';
import { mapSkillConfigToStatus } from '../serve/workspace-skills-mapping.js';
import { Session, buildAvailableCommandsSnapshot } from './session/Session.js';
import { buildSessionTasksStatus } from './session/tasksSnapshot.js';
import { HistoryReplayer } from './session/HistoryReplayer.js';
Expand Down Expand Up @@ -216,7 +217,6 @@ import {
type ServeWorkspaceProviderModel,
type ServeWorkspaceProviderStatus,
type ServeWorkspaceProvidersStatus,
type ServeWorkspaceSkillStatus,
type ServeWorkspaceSkillsStatus,
type ServeWorkspaceToolStatus,
type ServeWorkspaceToolsStatus,
Expand Down Expand Up @@ -3896,22 +3896,7 @@ class QwenAgent implements Agent {
v: STATUS_SCHEMA_VERSION,
workspaceCwd: this.workspaceCwd(config),
initialized: true,
skills: skills.map((skill): ServeWorkspaceSkillStatus => {
const modelInvocable = skill.disableModelInvocation !== true;
return {
kind: 'skill',
status: modelInvocable ? 'ok' : 'disabled',
name: skill.name,
description: skill.description,
level: skill.level,
modelInvocable,
...(skill.argumentHint ? { argumentHint: skill.argumentHint } : {}),
...(skill.model ? { model: skill.model } : {}),
...(skill.extensionName
? { extensionName: skill.extensionName }
: {}),
};
}),
skills: skills.map(mapSkillConfigToStatus),
};
} catch (error) {
return {
Expand Down
7 changes: 7 additions & 0 deletions packages/cli/src/serve/run-qwen-serve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,7 @@ async function loadServeRuntimeModules() {
workspaceTypesModule,
daemonStatusProviderModule,
workspaceProvidersStatusModule,
workspaceSkillsStatusModule,
] = await Promise.all([
import('./server.js'),
import('@qwen-code/acp-bridge/bridge'),
Expand All @@ -700,6 +701,7 @@ async function loadServeRuntimeModules() {
import('./workspace-service/types.js'),
import('./daemon-status-provider.js'),
import('./workspace-providers-status.js'),
import('./workspace-skills-status.js'),
]);
return {
createServeApp: serverModule.createServeApp,
Expand All @@ -714,6 +716,8 @@ async function loadServeRuntimeModules() {
daemonStatusProviderModule.createDaemonStatusProvider,
createWorkspaceProvidersStatusProvider:
workspaceProvidersStatusModule.createWorkspaceProvidersStatusProvider,
createWorkspaceSkillsStatusProvider:
workspaceSkillsStatusModule.createWorkspaceSkillsStatusProvider,
};
}

Expand Down Expand Up @@ -2031,6 +2035,8 @@ export async function runQwenServe(
const statusProvider = runtime.createDaemonStatusProvider();
const workspaceProvidersStatusProvider =
runtime.createWorkspaceProvidersStatusProvider();
const workspaceSkillsStatusProvider =
runtime.createWorkspaceSkillsStatusProvider();
// Reverse tool channel (issue #5626, Phase 2). ONE sender registry shared
// between the bridge (which answers the ACP child's `client_mcp/message`
// ext-method via `clientMcpSender`) and the WS provider in `createServeApp`
Expand Down Expand Up @@ -2161,6 +2167,7 @@ export async function runQwenServe(
contextFilename: contextFilenameForInit ?? 'QWEN.md',
statusProvider,
workspaceProvidersStatusProvider,
workspaceSkillsStatusProvider,
isChannelLive: () => bridge.isChannelLive(),
persistDisabledTools: persistDisabledToolsFn,
persistSetting: persistSettingFn,
Expand Down
2 changes: 2 additions & 0 deletions packages/cli/src/serve/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import type { DaemonStatusProvider } from '@qwen-code/acp-bridge';
import { createBridgeFileSystemAdapter } from './bridge-file-system-adapter.js';
import { createDaemonStatusProvider } from './daemon-status-provider.js';
import { createWorkspaceProvidersStatusProvider } from './workspace-providers-status.js';
import { createWorkspaceSkillsStatusProvider } from './workspace-skills-status.js';
import { mountAcpHttp, type AcpHttpHandle } from './acp-http/index.js';
import { createVoiceWsConnectionHandler } from './voice/voice-ws.js';
import {
Expand Down Expand Up @@ -411,6 +412,7 @@ export function createServeApp(
statusProvider,
workspaceProvidersStatusProvider:
createWorkspaceProvidersStatusProvider(),
workspaceSkillsStatusProvider: createWorkspaceSkillsStatusProvider(),
isChannelLive: () => bridge.isChannelLive(),
persistDisabledTools:
deps.persistDisabledTools ??
Expand Down
242 changes: 242 additions & 0 deletions packages/cli/src/serve/workspace-service/__tests__/facade.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,248 @@ describe('createDaemonWorkspaceService', () => {
expect(result.skills).toEqual([]);
});

it('getWorkspaceSkillsStatus replays the last live child status when the channel is idle', async () => {
const liveStatus = {
v: 1,
workspaceCwd: '/ws',
initialized: true,
skills: [
{
kind: 'skill',
status: 'ok',
name: 'review',
description: 'Review changed code',
level: 'bundled',
modelInvocable: true,
},
],
};
let channelLive = true;
const queryWorkspaceStatus = vi
.fn()
.mockImplementation((_m: string, idle: () => unknown) =>
Promise.resolve(channelLive ? liveStatus : idle()),
);
const svc = createDaemonWorkspaceService(
makeDeps({ queryWorkspaceStatus, boundWorkspace: '/ws' }),
);

// Channel live: authoritative skills from the ACP child, cached.
const first = await svc.getWorkspaceSkillsStatus(makeCtx());
expect(first.initialized).toBe(true);
expect(first.skills.map((s) => s.name)).toEqual(['review']);

// Channel reaped: queryWorkspaceStatus falls back to the empty idle
// placeholder, but the facade replays the last live status so
// skill-backed slash commands (e.g. /review) keep autocompleting.
channelLive = false;
const second = await svc.getWorkspaceSkillsStatus(makeCtx());
expect(second.initialized).toBe(true);
expect(second.skills.map((s) => s.name)).toEqual(['review']);
});

it('getWorkspaceSkillsStatus refreshes the cached status on a newer live answer', async () => {
const statuses = [
{
v: 1,
workspaceCwd: '/ws',
initialized: true,
skills: [{ kind: 'skill', status: 'ok', name: 'review' }],
},
{
v: 1,
workspaceCwd: '/ws',
initialized: true,
skills: [
{ kind: 'skill', status: 'ok', name: 'review' },
{ kind: 'skill', status: 'ok', name: 'plan' },
],
},
];
let call = 0;
const queryWorkspaceStatus = vi
.fn()
.mockImplementation(() => Promise.resolve(statuses[call++]));
const svc = createDaemonWorkspaceService(
makeDeps({ queryWorkspaceStatus, boundWorkspace: '/ws' }),
);

await svc.getWorkspaceSkillsStatus(makeCtx());
const refreshed = await svc.getWorkspaceSkillsStatus(makeCtx());
expect(refreshed.skills.map((s) => s.name)).toEqual(['review', 'plan']);
});

it('getWorkspaceSkillsStatus falls back to the daemon-local provider when the child never answered', async () => {
const queryWorkspaceStatus = vi
.fn()
.mockImplementation((_m: string, idle: () => unknown) =>
Promise.resolve(idle()),
);
const workspaceSkillsStatusProvider = vi.fn().mockResolvedValue({
v: 1,
workspaceCwd: '/ws',
initialized: true,
skills: [
{
kind: 'skill',
status: 'ok',
name: 'review',
description: 'Review changed code',
level: 'bundled',
modelInvocable: true,
},
],
});
const svc = createDaemonWorkspaceService(
makeDeps({
queryWorkspaceStatus,
workspaceSkillsStatusProvider,
boundWorkspace: '/ws',
}),
);

const result = await svc.getWorkspaceSkillsStatus(makeCtx());

expect(workspaceSkillsStatusProvider).toHaveBeenCalledWith('/ws');
expect(result.initialized).toBe(true);
expect(result.skills.map((s) => s.name)).toEqual(['review']);
});

it('getWorkspaceSkillsStatus prefers the cached child answer over the daemon-local provider', async () => {
const liveStatus = {
v: 1,
workspaceCwd: '/ws',
initialized: true,
skills: [{ kind: 'skill', status: 'ok', name: 'review' }],
};
let channelLive = true;
const queryWorkspaceStatus = vi
.fn()
.mockImplementation((_m: string, idle: () => unknown) =>
Promise.resolve(channelLive ? liveStatus : idle()),
);
const workspaceSkillsStatusProvider = vi.fn().mockResolvedValue({
v: 1,
workspaceCwd: '/ws',
initialized: true,
skills: [],
});
const svc = createDaemonWorkspaceService(
makeDeps({
queryWorkspaceStatus,
workspaceSkillsStatusProvider,
boundWorkspace: '/ws',
}),
);

await svc.getWorkspaceSkillsStatus(makeCtx()); // warms cache (child live)
channelLive = false;
const result = await svc.getWorkspaceSkillsStatus(makeCtx());

expect(result.skills.map((s) => s.name)).toEqual(['review']);
expect(workspaceSkillsStatusProvider).not.toHaveBeenCalled();
});

it('getWorkspaceSkillsStatus does not use the daemon-local provider while the child answers', async () => {
const liveStatus = {
v: 1,
workspaceCwd: '/ws',
initialized: true,
skills: [{ kind: 'skill', status: 'ok', name: 'review' }],
};
const queryWorkspaceStatus = vi.fn().mockResolvedValue(liveStatus);
const workspaceSkillsStatusProvider = vi.fn().mockResolvedValue({
v: 1,
workspaceCwd: '/ws',
initialized: true,
skills: [],
});
const svc = createDaemonWorkspaceService(
makeDeps({ queryWorkspaceStatus, workspaceSkillsStatusProvider }),
);

await svc.getWorkspaceSkillsStatus(makeCtx());

expect(workspaceSkillsStatusProvider).not.toHaveBeenCalled();
});

it('getWorkspaceSkillsStatus replays the cache when the query throws mid-flight', async () => {
const liveStatus = {
v: 1,
workspaceCwd: '/ws',
initialized: true,
skills: [{ kind: 'skill', status: 'ok', name: 'review' }],
};
let shouldThrow = false;
const queryWorkspaceStatus = vi
.fn()
.mockImplementation(() =>
shouldThrow
? Promise.reject(new Error('channel closed mid-request'))
: Promise.resolve(liveStatus),
);
const svc = createDaemonWorkspaceService(
makeDeps({ queryWorkspaceStatus, boundWorkspace: '/ws' }),
);

await svc.getWorkspaceSkillsStatus(makeCtx()); // warms cache (live)
shouldThrow = true;
const result = await svc.getWorkspaceSkillsStatus(makeCtx());

// Mid-flight failure resolves to the cached answer, not a rejection.
expect(result.skills.map((s) => s.name)).toEqual(['review']);
});

it('getWorkspaceSkillsStatus falls back to daemon-local when the query throws with no cache', async () => {
const queryWorkspaceStatus = vi
.fn()
.mockRejectedValue(new Error('channel closed mid-request'));
const workspaceSkillsStatusProvider = vi.fn().mockResolvedValue({
v: 1,
workspaceCwd: '/ws',
initialized: true,
skills: [{ kind: 'skill', status: 'ok', name: 'review' }],
});
const svc = createDaemonWorkspaceService(
makeDeps({
queryWorkspaceStatus,
workspaceSkillsStatusProvider,
boundWorkspace: '/ws',
}),
);

const result = await svc.getWorkspaceSkillsStatus(makeCtx());

expect(workspaceSkillsStatusProvider).toHaveBeenCalledWith('/ws');
expect(result.skills.map((s) => s.name)).toEqual(['review']);
});

it('getWorkspaceSkillsStatus degrades to the idle placeholder when the daemon-local provider throws', async () => {
const queryWorkspaceStatus = vi
.fn()
.mockImplementation((_m: string, idle: () => unknown) =>
Promise.resolve(idle()),
);
const workspaceSkillsStatusProvider = vi
.fn()
.mockRejectedValue(new Error('local enumeration blew up'));
const svc = createDaemonWorkspaceService(
makeDeps({
queryWorkspaceStatus,
workspaceSkillsStatusProvider,
boundWorkspace: '/ws',
}),
);

// A throwing injected provider must not fail the request.
const result = await svc.getWorkspaceSkillsStatus(makeCtx());

expect(workspaceSkillsStatusProvider).toHaveBeenCalledWith('/ws');
expect(result.initialized).toBe(false);
expect(result.skills).toEqual([]);
expect(mockWriteStderrLine).toHaveBeenCalled();
});

it('getWorkspaceProvidersStatus uses daemon-local provider when present', async () => {
const queryWorkspaceStatus = vi
.fn()
Expand Down
Loading
Loading