Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(desktop): bind Learn start to session instance

xd-boboef84d8454547
diff --git a/apps/desktop/src/main/mcp-integrations/__tests__/collabSendOutcome.test.ts b/apps/desktop/src/main/mcp-integrations/__tests__/collabSendOutcome.test.ts
index 28771fa22b..38f99526e7 100644
--- a/apps/desktop/src/main/mcp-integrations/__tests__/collabSendOutcome.test.ts
+++ b/apps/desktop/src/main/mcp-integrations/__tests__/collabSendOutcome.test.ts
@@ -286,10 +286,72 @@ describe('collab send outcome semantics', () => {
expect(mockState.consumeLearnInvocationGrant).not.toHaveBeenCalled();
isCurrentLocalSessionInstance.mockReturnValue(true);
- await expect(xdtHelper.authorizeSkillLearning(request, context)).resolves.toEqual({ ok: true });
+ await expect(xdtHelper.authorizeSkillLearning(request, context)).resolves.toEqual({
+ ok: true,
+ sessionInstanceId: 'instance-1',
+ });
expect(mockState.consumeLearnInvocationGrant).toHaveBeenCalledWith(request, 'instance-1');
});
+ it('revalidates the authorized Session instance immediately before Learn starts', async () => {
+ const startLearn = vi.fn(async () => ({ runId: 'run-1' }));
+ mockState.learnController = { startLearn };
+ const isCurrentLocalSessionInstance = vi.fn()
+ .mockReturnValueOnce(true)
+ .mockReturnValueOnce(false);
+ createDesktopMcpProviders({
+ botCapabilities,
+ getMakerMemoryManager: vi.fn(),
+ lspPool: {} as never,
+ pluginRegistry: { isEnabled: () => true } as never,
+ resolveIOSSimulatorAccess: () => ({ allowed: true }),
+ invokeRemote: vi.fn(),
+ isCurrentLocalSessionInstance,
+ });
+ const xdtHelper = mockState.capturedProvidersConfig?.xdtHelper as {
+ authorizeSkillLearning: (
+ input: {
+ callerSessionId: string;
+ input: string;
+ sourceKind: 'session';
+ },
+ context: { sessionInstanceId: string },
+ ) => Promise<Record<string, unknown>>;
+ skillLearning: (
+ input: {
+ callerSessionId: string;
+ input: string;
+ sourceKind: 'session';
+ },
+ authorization: { sessionInstanceId: string },
+ ) => Promise<Record<string, unknown>>;
+ };
+ const request = {
+ callerSessionId: 'session-1',
+ input: '',
+ sourceKind: 'session' as const,
+ };
+
+ const authorization = await xdtHelper.authorizeSkillLearning(request, {
+ sessionInstanceId: 'instance-1',
+ });
+ expect(authorization).toEqual({ ok: true, sessionInstanceId: 'instance-1' });
+
+ await expect(xdtHelper.skillLearning(request, {
+ sessionInstanceId: 'instance-1',
+ })).resolves.toEqual({
+ ok: false,
+ errorCode: 'USER_REQUEST_REQUIRED',
+ message: 'Cindy Learn is not authorized for this task instance.',
+ });
+ expect(isCurrentLocalSessionInstance).toHaveBeenNthCalledWith(
+ 2,
+ 'session-1',
+ 'instance-1',
+ );
+ expect(startLearn).not.toHaveBeenCalled();
+ });
+
it('reports enable_collab_mode delegate_task created-and-dispatched distinctly', async () => {
const result = await resolveCollabDispatchResult(
() => Promise.resolve({ accepted: true } satisfies SessionSendResult),
diff --git a/apps/desktop/src/main/mcp-integrations/mcp-providers.ts b/apps/desktop/src/main/mcp-integrations/mcp-providers.ts
index 912c9668d4..f92aaf3286 100644
--- a/apps/desktop/src/main/mcp-integrations/mcp-providers.ts
+++ b/apps/desktop/src/main/mcp-integrations/mcp-providers.ts
@@ -398,17 +398,21 @@ export function createDesktopMcpProviders(deps: DesktopMcpProvidersDeps): LiziMc
message: 'Cindy Learn is not ready yet.',
};
}
- if (!deps.isCurrentLocalSessionInstance?.(
- request.callerSessionId,
- context.sessionInstanceId,
- )) {
+ const sessionInstanceId = context.sessionInstanceId;
+ if (
+ !sessionInstanceId
+ || !deps.isCurrentLocalSessionInstance?.(request.callerSessionId, sessionInstanceId)
+ ) {
return {
ok: false,
errorCode: 'USER_REQUEST_REQUIRED',
message: 'Cindy Learn is not authorized for this task instance.',
};
}
- return consumeLearnInvocationGrant(request, context.sessionInstanceId);
+ const authorization = await consumeLearnInvocationGrant(request, sessionInstanceId);
+ return authorization.ok
+ ? { ok: true, sessionInstanceId }
+ : authorization;
},
skillLearning: async ({
callerSessionId,
@@ -416,7 +420,7 @@ export function createDesktopMcpProviders(deps: DesktopMcpProvidersDeps): LiziMc
sourceKind,
hubSlug,
hubCatalogScope,
- }) => {
+ }, authorization) => {
try {
if (!isCindyLearnSkillEnabled()) {
return {
@@ -433,6 +437,16 @@ export function createDesktopMcpProviders(deps: DesktopMcpProvidersDeps): LiziMc
message: 'Cindy Learn is not ready yet.',
};
}
+ if (!deps.isCurrentLocalSessionInstance?.(
+ callerSessionId,
+ authorization.sessionInstanceId,
+ )) {
+ return {
+ ok: false,
+ errorCode: 'USER_REQUEST_REQUIRED',
+ message: 'Cindy Learn is not authorized for this task instance.',
+ };
+ }
const { runId } = await controller.startLearn({
input,
sourceKind,
diff --git a/packages/lizi-mcps/src/__tests__/startSkillLearning.test.ts b/packages/lizi-mcps/src/__tests__/startSkillLearning.test.ts
index 66c358c973..342aed4d40 100644
--- a/packages/lizi-mcps/src/__tests__/startSkillLearning.test.ts
+++ b/packages/lizi-mcps/src/__tests__/startSkillLearning.test.ts
@@ -12,7 +12,10 @@ function payload(result: { content: Array<{ type: string; text?: string }> }): R
describe('start_skill_learning', () => {
it('binds the current task and starts a session Learn run', async () => {
const registry = new XdtHelperToolRegistry();
- const authorizeSkillLearning = vi.fn(async () => ({ ok: true as const }));
+ const authorizeSkillLearning = vi.fn(async () => ({
+ ok: true as const,
+ sessionInstanceId: 'instance-1',
+ }));
const startSkillLearning = vi.fn(async () => ({ ok: true as const, runId: 'run-1' }));
registerStartSkillLearningTool(registry, {
getSessionContext: () => ({
@@ -38,13 +41,18 @@ describe('start_skill_learning', () => {
sessionId: 'session-1',
agentKind: 'codex',
}));
- expect(startSkillLearning).toHaveBeenCalledWith(request);
+ expect(startSkillLearning).toHaveBeenCalledWith(request, {
+ sessionInstanceId: 'instance-1',
+ });
expect(payload(result)).toMatchObject({ ok: true, run_id: 'run-1', status: 'collecting' });
});
it('normalizes SkillHub input and defaults its catalog scope', async () => {
const registry = new XdtHelperToolRegistry();
- const authorizeSkillLearning = vi.fn(async () => ({ ok: true as const }));
+ const authorizeSkillLearning = vi.fn(async () => ({
+ ok: true as const,
+ sessionInstanceId: 'instance-2',
+ }));
const startSkillLearning = vi.fn(async () => ({ ok: true as const, runId: 'run-2' }));
registerStartSkillLearningTool(registry, {
getSessionContext: () => ({
@@ -62,13 +70,16 @@ describe('start_skill_learning', () => {
input: ' keep the checks ',
});
- expect(startSkillLearning).toHaveBeenCalledWith({
- callerSessionId: 'session-2',
- input: 'keep the checks',
- sourceKind: 'hub',
- hubSlug: 'release-notes',
- hubCatalogScope: 'market',
- });
+ expect(startSkillLearning).toHaveBeenCalledWith(
+ {
+ callerSessionId: 'session-2',
+ input: 'keep the checks',
+ sourceKind: 'hub',
+ hubSlug: 'release-notes',
+ hubCatalogScope: 'market',
+ },
+ { sessionInstanceId: 'instance-2' },
+ );
});
it.each([
@@ -77,7 +88,10 @@ describe('start_skill_learning', () => {
[{ source_kind: 'session', input: '', hub_slug: 'extra' }, 'INVALID_ARGS'],
])('rejects inconsistent arguments %#', async (args, expectedErrorCode) => {
const registry = new XdtHelperToolRegistry();
- const authorizeSkillLearning = vi.fn(async () => ({ ok: true as const }));
+ const authorizeSkillLearning = vi.fn(async () => ({
+ ok: true as const,
+ sessionInstanceId: 'instance-3',
+ }));
const startSkillLearning = vi.fn();
registerStartSkillLearningTool(registry, {
getSessionContext: () => ({
@@ -126,7 +140,10 @@ describe('start_skill_learning', () => {
it('fails closed without a bound Cindy task', async () => {
const registry = new XdtHelperToolRegistry();
- const authorizeSkillLearning = vi.fn(async () => ({ ok: true as const }));
+ const authorizeSkillLearning = vi.fn(async () => ({
+ ok: true as const,
+ sessionInstanceId: 'instance-5',
+ }));
const startSkillLearning = vi.fn();
registerStartSkillLearningTool(registry, {
getSessionContext: () => ({ agentKind: 'codex', workingDir: '/repo' }),
diff --git a/packages/lizi-mcps/src/xdt-helper/index.ts b/packages/lizi-mcps/src/xdt-helper/index.ts
index e0c31735c8..5474a21219 100644
--- a/packages/lizi-mcps/src/xdt-helper/index.ts
+++ b/packages/lizi-mcps/src/xdt-helper/index.ts
@@ -158,6 +158,7 @@ export {
} from './submit_github_issue.js';
export {
registerStartSkillLearningTool,
+ type AuthorizedSkillLearningContext,
type AuthorizeSkillLearningCallback,
type StartSkillLearningCallback,
type StartSkillLearningParams,
diff --git a/packages/lizi-mcps/src/xdt-helper/start_skill_learning.ts b/packages/lizi-mcps/src/xdt-helper/start_skill_learning.ts
index 6356d4d37b..3e3225e106 100644
--- a/packages/lizi-mcps/src/xdt-helper/start_skill_learning.ts
+++ b/packages/lizi-mcps/src/xdt-helper/start_skill_learning.ts
@@ -12,13 +12,19 @@ export interface StartSkillLearningParams {
hubCatalogScope?: 'market' | 'team';
}
+export interface AuthorizedSkillLearningContext {
+ /** Host-attested runtime identity; never sourced from model tool arguments. */
+ sessionInstanceId: string;
+}
+
export type AuthorizeSkillLearningCallback = (
params: StartSkillLearningParams,
context: LiziMcpSessionContext,
-) => Promise<ControlResult<object, string>>;
+) => Promise<ControlResult<AuthorizedSkillLearningContext, string>>;
export type StartSkillLearningCallback = (
params: StartSkillLearningParams,
+ authorization: AuthorizedSkillLearningContext,
) => Promise<ControlResult<{ runId: string }, string>>;
export function registerStartSkillLearningTool(
@@ -74,7 +80,9 @@ export function registerStartSkillLearningTool(
return errorPayload(authorization.errorCode, authorization.message);
}
- const result = await deps.startSkillLearning(request);
+ const result = await deps.startSkillLearning(request, {
+ sessionInstanceId: authorization.sessionInstanceId,
+ });
return result.ok
? okPayload({
run_id: result.runId,