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(auto): verify coordinator route and preserve approval failure semantics

Dash3959eb284713
diff --git a/apps/desktop/src/main/__tests__/makerOrcaRoleMarking.test.ts b/apps/desktop/src/main/__tests__/makerOrcaRoleMarking.test.ts
index 705418d79e..26a984a1d0 100644
--- a/apps/desktop/src/main/__tests__/makerOrcaRoleMarking.test.ts
+++ b/apps/desktop/src/main/__tests__/makerOrcaRoleMarking.test.ts
@@ -108,3 +108,9 @@ function expectOrder(source: string, before: string, after: string): void {
expect(beforeIndex).toBeGreaterThanOrEqual(0);
expect(afterIndex).toBeGreaterThan(beforeIndex);
}
+
+it('ordinary sessions bypass plugin receipt storage before its first lookup', () => {
+ const loader = registerSource.slice(registerSource.indexOf('setAutoReviewContextResolver(createPluginTaskReviewResolver('));
+ expectOrder(loader, "session.source !== 'plugin' && session.orcaRole !== 'worker'", 'const store = createPluginTaskStore(epoch.client);');
+ expectOrder(loader, "lead.source !== 'plugin'", 'const receipt = await store.get(leadId);');
+});
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskReviewContext.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskReviewContext.test.ts
index 8cc5144f95..cd1d3b612a 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskReviewContext.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskReviewContext.test.ts
@@ -26,6 +26,7 @@ function fixture(): PluginReviewSnapshot {
pluginId: 'eval',
authorized: true,
revision: ['owner', 1, 'install-1'],
+ registeredRoute: route,
plan: {
concurrency: 4,
task: 'Coordinate the registered tests.',
@@ -166,3 +167,23 @@ it.each(['ask_user', 'plan_review'])('marks missing %s answer receipts as incomp
expect(result.userIntent).toMatchObject({ historyOmitted: true });
expect(JSON.stringify(result.userIntent)).not.toContain('Read only');
});
+
+it.each(['agentKind', 'providerId', 'model', 'effort', 'fastMode'])('rejects coordinator drift in %s', async key => {
+ const s = fixture(); delete s.worker;
+ s.session.route = { ...route, [key]: key === 'fastMode' ? true : 'other' } as typeof route;
+ const result = await createPluginTaskReviewResolver(async () => s)(request);
+ expect(result.authorizationError).toBeTruthy();
+ expect(result.delegatedTask).toBeUndefined();
+});
+it('does not infer a missing coordinator receipt route', async () => {
+ const s = fixture(); delete s.worker; delete s.registeredRoute;
+ expect((await createPluginTaskReviewResolver(async () => s)(request)).authorizationError).toBeTruthy();
+});
+it.each([false, true])('marks tied user grant/revocation as incomplete regardless of merge order (%s)', async reverse => {
+ const s = fixture();
+ s.history = ['Do not write', 'You may write'].map((text, i) => ({clientId: String(i), role: 'user', createdAt: 42, content: {}, agentMeta: {autoReviewUserText: text, delivery: 'turn'}}));
+ if (reverse) s.history.reverse();
+ const result = await createPluginTaskReviewResolver(async () => s)(request);
+ expect(result.userIntent).toMatchObject({historyOmitted: true});
+ expect(JSON.stringify(result.userIntent)).toContain('Do not write');
+});
diff --git a/apps/desktop/src/main/maker-ipc/pluginTaskReviewContext.ts b/apps/desktop/src/main/maker-ipc/pluginTaskReviewContext.ts
index c709db0c80..fe613deeed 100644
--- a/apps/desktop/src/main/maker-ipc/pluginTaskReviewContext.ts
+++ b/apps/desktop/src/main/maker-ipc/pluginTaskReviewContext.ts
@@ -11,6 +11,7 @@ export interface PluginReviewSnapshot {
pluginId: string;
authorized: boolean;
revision: unknown;
+ registeredRoute?: PluginTaskRoute;
plan?: PluginTeamPlan;
settledLabels?: string[];
session: { workingDir: string; permissionMode: string; status: string; route: PluginTaskRoute };
@@ -32,8 +33,16 @@ export function pluginReviewUserIntent(snapshot: PluginReviewSnapshot): AutoRevi
}
return m.createdAt ?? 0;
};
+ const times = new Set<number>();
for (const m of [...snapshot.history].sort((a, b) => eventTime(a) - eventTime(b))) {
const receipt = m.agentMeta?.autoReviewUserText;
+ const text = typeof receipt === 'string' ? receipt
+ : receipt && typeof receipt === 'object' && 'text' in receipt ? receipt.text : '';
+ if (text) {
+ const at = eventTime(m);
+ if (!Number.isFinite(at) || at <= 0 || times.has(at)) omitted = true;
+ times.add(at);
+ }
if (m.role === 'ask_user' || m.role === 'plan_review') {
// A card answer can constrain the task, but an unanswered card grants nothing.
if (
@@ -99,6 +108,10 @@ export function createPluginTaskReviewResolver(
? plan?.items.find((x) => x.label === snapshot.worker!.label)
: undefined;
const task = snapshot.worker ? item?.task : plan?.task;
+ if (!snapshot.worker && task && (!snapshot.registeredRoute ||
+ (['agentKind', 'providerId', 'model', 'effort', 'fastMode'] as const).some(
+ k => snapshot.registeredRoute![k] !== snapshot.session.route[k],
+ ))) return denied('Coordinator does not match its registered route.');
if (
snapshot.worker &&
(!snapshot.worker.activeTeam ||
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index 4670829ced..065374af07 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -13036,19 +13036,31 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
const epoch = getCurrentDbClientSnapshot();
if (!epoch) throw new Error('Task storage unavailable');
const db = epoch.client.drizzle;
- const store = createPluginTaskStore(epoch.client);
+ const [session] = await db.select().from(sessions).where(eq(sessions.id, sessionId)).limit(1);
+ if (!session) throw new Error('Task unavailable');
+ // Ordinary tasks do not depend on plugin receipt storage. Worker ownership
+ // is checked through its lead before touching the plugin task store.
+ if (session.source !== 'plugin' && session.orcaRole !== 'worker') {
+ if (epoch !== getCurrentDbClientSnapshot()) throw new Error('Account changed');
+ return null;
+ }
const [link] = await db.select({ label: orcaWorkers.label, leadId: orcaTeams.leadSessionId,
teamId: orcaTeams.id, teamStatus: orcaTeams.status }).from(orcaWorkers)
.innerJoin(orcaTeams, eq(orcaWorkers.teamId, orcaTeams.id))
.where(eq(orcaWorkers.sessionId, sessionId)).limit(1);
const leadId = link?.leadId ?? sessionId;
+ const [lead] = await db.select().from(sessions).where(eq(sessions.id, leadId)).limit(1);
+ if (!lead) throw new Error('Lead unavailable');
+ if (lead.source !== 'plugin') {
+ if (epoch !== getCurrentDbClientSnapshot()) throw new Error('Account changed');
+ return null;
+ }
+ const store = createPluginTaskStore(epoch.client);
const receipt = await store.get(leadId);
if (!receipt || receipt.operation !== 'create') {
if (epoch !== getCurrentDbClientSnapshot()) throw new Error('Account changed');
return null;
}
- const [session] = await db.select().from(sessions).where(eq(sessions.id, sessionId)).limit(1);
- const [lead] = await db.select().from(sessions).where(eq(sessions.id, leadId)).limit(1);
if (!session || !lead || !session.workingDir) throw new Error('Delegated task unavailable');
const agentKind = session.agentKind === 'cc' ? 'cc' : session.agentKind === 'pi' ? 'pi' : session.agentKind === 'codex' ? 'codex' : null;
if (!agentKind) throw new Error('Delegated task route unavailable');
@@ -13062,6 +13074,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
authorized: approvalRevision !== null && isPluginTaskAuthorized(receipt.pluginId) && config.permissionMode === 'auto',
revision: [epoch.userId, epoch.clientEpoch, approvalRevision, config.permissionMode, link],
plan: data.teamPlan, settledLabels: data.settledLabels,
+ registeredRoute: data.route,
session: { workingDir: session.workingDir, permissionMode: session.permissionMode, status: session.status,
route: { agentKind, providerId: session.providerId ?? '', model: session.model,
effort: session.effort, fastMode: !!session.fastMode } },
diff --git a/packages/maker-core/src/agents/shared/auto-review-context.test.ts b/packages/maker-core/src/agents/shared/auto-review-context.test.ts
index 559959bee9..8990ebf9f2 100644
--- a/packages/maker-core/src/agents/shared/auto-review-context.test.ts
+++ b/packages/maker-core/src/agents/shared/auto-review-context.test.ts
@@ -68,15 +68,15 @@ describe("live review context across decision caches", () => {
).verdict,
).toBe("block");
});
- it("passes the resolved context to the cache and fails closed on lookup error", async () => {
+ it("asks on infrastructure failure without evaluating or using cached authorization", async () => {
const delegate: AutoReviewDelegate = async () => null;
delegate.prepareRequest = async () => {
throw Error("DB changed");
};
const evaluate = vi.fn();
expect(
- (await withAutoReviewContext(request, delegate, evaluate)).verdict,
- ).toBe("block");
+ await withAutoReviewContext(request, delegate, evaluate),
+ ).toMatchObject({ verdict: "ask", unavailable: true });
expect(evaluate).not.toHaveBeenCalled();
});
});
@@ -99,3 +99,11 @@ it('reviews task-level read restrictions even without separate user text', async
expect((await resolveAutoReviewDecision(scoped, delegate)).verdict).toBe('block');
expect(delegate).toHaveBeenCalledOnce();
});
+
+it('does not execute a stale allow when the final authority lookup fails', async () => {
+ let calls = 0;
+ const delegate: AutoReviewDelegate = async () => null;
+ delegate.prepareRequest = async r => { if (++calls === 2) throw Error('storage offline'); return r; };
+ expect(await withAutoReviewContext(request, delegate, async () => ({verdict: 'allow'})))
+ .toMatchObject({verdict: 'ask', unavailable: true});
+});
diff --git a/packages/maker-core/src/agents/shared/auto-review-decision.ts b/packages/maker-core/src/agents/shared/auto-review-decision.ts
index a1e82483e9..a5c7b7a449 100644
--- a/packages/maker-core/src/agents/shared/auto-review-decision.ts
+++ b/packages/maker-core/src/agents/shared/auto-review-decision.ts
@@ -289,7 +289,7 @@ export async function withAutoReviewContext(
}
return decision;
} catch {
- return { verdict: 'block', reason: 'Host could not verify the current delegated authorization.' };
+ return { verdict: 'ask', unavailable: true, reason: 'Host could not verify the current authorization; this action needs your confirmation.' };
}
}