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。

merge: 同步父分支并保留 Auto 审阅上下文准备

Dashbe007ea6cdfd
diff --cc apps/desktop/src/main/maker-host/index.ts
index b4aa7f9f01,6daa0275e8..a704f2af88
--- a/apps/desktop/src/main/maker-host/index.ts
+++ b/apps/desktop/src/main/maker-host/index.ts
@@@ -402,13 -404,7 +405,13 @@@ const requestAutoReviewText = createAut
logger: desktopMakerLogger,
});
-export const reviewAutoPermissionAction = createAutoPermissionReviewer({
+let autoReviewContextResolver: AutoReviewDelegate['prepareRequest'];
+/** Main bootstrap supplies a fresh owner-bound lookup; no plugin/renderer can set this. */
+export function setAutoReviewContextResolver(resolver: AutoReviewDelegate['prepareRequest']): void {
+ autoReviewContextResolver = resolver;
+}
+
- const reviewAutoPermissionAction: AutoReviewDelegate = createAutoPermissionReviewer({
++export const reviewAutoPermissionAction: AutoReviewDelegate = createAutoPermissionReviewer({
logger: desktopMakerLogger,
managesRetries: true,
resolveRequestTimeoutMs: () => AUTO_REVIEW_ROUTER_GUARD_TIMEOUT_MS,
diff --cc apps/desktop/src/main/maker-ipc/register.ts
index b59afc05b3,2350d70946..2c4e777263
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@@ -5,9 -4,13 +5,13 @@@ import { PluginWriteAccessGate } from '
import { pluginWorkerCompletedAt } from './pluginWorkerCompletion.js';
import { createPluginTaskStore } from './pluginTaskStore.js';
import { controlOwnedSessionExecution, isSameSessionExecution, withdrawOwnedSessionInputs } from './sessionExecutionOwnership.js';
-import { setPluginTaskHandler, isPluginTaskAuthorized, getPluginTaskInstallRevision } from '../cindy-brain/index.js';
+import { setPluginTaskHandler, isPluginTaskAuthorized, getPluginTaskInstallRevision, pluginTaskAuthorizationRevision } from '../cindy-brain/index.js';
import type { PluginTaskRoute, PluginTaskRequest } from '../../shared/pluginTasks.js';
import { createHash as pluginTaskConfigHash } from 'node:crypto';
+ import { finishCompanionEnvironmentRemoval } from '../bot-import/runtime.js';
+ import { setImportProbeConfirmation } from '../bot-import/probeAuthorization.js';
+ import { requestHostInteraction } from './interactionRouter.js';
+ import { prepareCompanionImportDeletion } from '../bot-import/host.js';
import { createBotMessageTransport } from './botMessageTransport.js';
import { setBotRemoteMessageService } from './botRemoteMessageReceiver.js';
import { handleListDevices, defaultDeps as deviceDirectoryDeps } from '../device-link/ipc.js';