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。

feat(settings): configure the default permission for new tasks

zqchris6af8963e822e
diff --git a/apps/desktop/src/renderer/__tests__/newMakerDraft.test.ts b/apps/desktop/src/renderer/__tests__/newMakerDraft.test.ts
index 3c735a5bc8..8040f8574c 100644
--- a/apps/desktop/src/renderer/__tests__/newMakerDraft.test.ts
+++ b/apps/desktop/src/renderer/__tests__/newMakerDraft.test.ts
@@ -2127,3 +2127,24 @@ describe('newMakerDraft agent computer', () => {
expect(mod.getDraft()).toMatchObject({ workingDir: '/local/proj', agentDeviceId: null, agentDeviceName: null });
});
});
+
+// Standard: the new-task preference must survive owner reload without becoming a picker override.
+it('persists the default, preserves explicit permissions, isolates owners and restores auto', async () => {
+ const m = await loadModule();
+ m.setNewMakerDraftOwner('permission-owner');
+ m.patchVendorPrefs('cc', { permissionMode: 'acceptEdits' });
+ m.setNewChatDefaultPermissionMode('bypassPermissions');
+ expect(m.getDraft().lastByVendor.cc.permissionMode).toBe('acceptEdits');
+ expect(m.getDraft().lastByVendor.pi.permissionMode).toBe('bypassPermissions');
+ m.setNewMakerDraftOwner('another-owner');
+ expect(m.getDraft().lastByVendor.pi.permissionMode).toBe('auto');
+ m.setNewMakerDraftOwner('permission-owner');
+ expect(m.getDraft().newChatDefaultPermissionMode).toBe('bypassPermissions');
+ m.setNewChatDefaultPermissionMode(null);
+ expect(m.getDraft().lastByVendor.pi.permissionMode).toBe('auto');
+ expect(m.getDraft().lastByVendor.cc.permissionMode).toBe('acceptEdits');
+ m.setNewMakerDraftOwner('another-owner');
+ m.setNewMakerDraftOwner('permission-owner');
+ expect(m.getDraft().newChatDefaultPermissionMode).toBeNull();
+ expect(m.getDraft().lastByVendor.pi.permissionMode).toBe('auto');
+});
diff --git a/apps/desktop/src/renderer/components/settings/GeneralSettings.settings-search.ts b/apps/desktop/src/renderer/components/settings/GeneralSettings.settings-search.ts
index 4122ae9c09..a14f2eebe1 100644
--- a/apps/desktop/src/renderer/components/settings/GeneralSettings.settings-search.ts
+++ b/apps/desktop/src/renderer/components/settings/GeneralSettings.settings-search.ts
@@ -13,6 +13,7 @@ export default {
{ id: 'general.windowBehavior', tab: 'general', targetId: 'settings-window-behavior', titleKey: 'settings.sections.windowBehavior', sectionKey: 'settings.sections.windowBehavior' },
{ id: 'general.composer', tab: 'general', targetId: 'settings-composer', titleKey: 'settings.sections.composer', sectionKey: 'settings.sections.composer' },
{ id: 'general.collaboration', tab: 'general', targetId: 'settings-collaboration', titleKey: 'settings.sections.collaboration', sectionKey: 'settings.sections.collaboration', aliases: ['collaboration'] },
+ { id: 'general.newChatPermission', tab: 'general', targetId: 'settings-new-chat-default-permission', titleKey: 'settings.newChatDefaults.title', sectionKey: 'settings.newChatDefaults.title' },
{ id: 'general.agentResource', tab: 'general', targetId: 'settings-agent-resource', titleKey: 'settings.sections.agentResource', sectionKey: 'settings.sections.agentResource' },
{ id: 'general.gitSafety', tab: 'general', targetId: 'settings-search-target-general-git-safety', titleKey: 'settings.sections.gitSafety', sectionKey: 'settings.sections.gitSafety' },
{ id: 'general.experimental', tab: 'general', targetId: 'settings-search-target-general-experimental', titleKey: 'settings.sections.experimental', sectionKey: 'settings.sections.experimental' },
diff --git a/apps/desktop/src/renderer/components/settings/NewChatDefaultPermissionSection.tsx b/apps/desktop/src/renderer/components/settings/NewChatDefaultPermissionSection.tsx
new file mode 100644
index 0000000000..9d7ec4a5a4
--- /dev/null
+++ b/apps/desktop/src/renderer/components/settings/NewChatDefaultPermissionSection.tsx
@@ -0,0 +1,27 @@
+import { useTranslation } from 'react-i18next';
+import { PermissionSelector } from '@/components/new-chat/PermissionSelector';
+import { setNewChatDefaultPermissionMode, useNewMakerDraft } from '@/state/newMakerDraft';
+import { DefaultOverrideControls } from './DefaultOverrideControls';
+
+const DEFAULT_MODES = ['auto', 'bypassPermissions'] as const;
+
+export function NewChatDefaultPermissionSection() {
+ const { t } = useTranslation();
+ const draft = useNewMakerDraft();
+ const override = draft.newChatDefaultPermissionMode;
+ return (
+ <div className="flex flex-col gap-3">
+ <div className="flex items-center justify-between gap-3">
+ <h3 className="text-14 font-medium text-[var(--settings-section-title)]">
+ {t('settings.newChatDefaults.title')}
+ </h3>
+ <DefaultOverrideControls isCustomized={override != null}
+ onReset={() => setNewChatDefaultPermissionMode(null)} />
+ </div>
+ <PermissionSelector permissionMode={override ?? 'auto'}
+ vendorKey="cc" triggerVariant="field" allowedModes={DEFAULT_MODES}
+ ariaContext={t('settings.newChatDefaults.title')}
+ onPermissionModeChange={setNewChatDefaultPermissionMode} />
+ </div>
+ );
+}
diff --git a/apps/desktop/src/renderer/components/settings/SettingsView.tsx b/apps/desktop/src/renderer/components/settings/SettingsView.tsx
index 3d4f43398f..c32bb76593 100644
--- a/apps/desktop/src/renderer/components/settings/SettingsView.tsx
+++ b/apps/desktop/src/renderer/components/settings/SettingsView.tsx
@@ -54,6 +54,7 @@ import { GitSafetySection } from './GitSafetySection';
import { SessionImportSection } from './SessionImportSection';
import { HelpSection } from './HelpSection';
import { HelpAssistantPanel } from './HelpAssistantPanel';
+import { NewChatDefaultPermissionSection } from './NewChatDefaultPermissionSection';
import { AgentResourceSection } from './AgentResourceSection';
import { PiPackagesSection } from './PiPackagesSection';
import { CollaborationSection } from './CollaborationSection';
@@ -413,6 +414,11 @@ export function SettingsView() {
<CollaborationSection />
</section>
+ <section id="settings-new-chat-default-permission" className="py-[18px]"
+ aria-label={t('settings.newChatDefaults.title')}>
+ <NewChatDefaultPermissionSection />
+ </section>
+
{/* Section — Agent resource usage (命令并发/进程优先级/工具链限核)。 */}
<section
id="settings-agent-resource"
diff --git a/apps/desktop/src/renderer/hooks/useCCSessions.ts b/apps/desktop/src/renderer/hooks/useCCSessions.ts
index 7a83f0d8e3..45657d2278 100644
--- a/apps/desktop/src/renderer/hooks/useCCSessions.ts
+++ b/apps/desktop/src/renderer/hooks/useCCSessions.ts
@@ -35,6 +35,7 @@ import { getStickySessionDeviceId } from '@/features/device-link/stickySessionOr
import * as sessionService from '@/lib/sessionService';
import type { ListStatusFilter } from '@/lib/sessionService';
import { sessionsStore } from '@/lib/sessionsStore';
+import { getDraft } from '@/state/newMakerDraft';
interface UseCCSessionsOptions {
/** Session status filter — F-PJ-10 V0.5.1。默认 'active'。 */
@@ -183,7 +184,7 @@ export function useCCSessions(options?: UseCCSessionsOptions): UseCCSessionsRetu
}): Promise<Session | null> => {
try {
const newSession = await sessionService.create({
- permissionMode: 'auto',
+ permissionMode: getDraft().newChatDefaultPermissionMode ?? 'auto',
fastMode: false,
...opts,
});
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 20e794740b..53c1391325 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -1675,6 +1675,7 @@
}
},
"settings": {
+ "newChatDefaults": { "title": "Default permission for new tasks" },
"imConnection": {
"reconnect": "Reconnect",
"savedNote": "Your saved binding is retained. You can retry the connection.",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index c9d64370c3..cb318e3ace 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -1645,6 +1645,7 @@
}
},
"settings": {
+ "newChatDefaults": { "title": "新しいタスクのデフォルト権限" },
"imConnection": {
"reconnect": "再接続",
"savedNote": "連携情報は保存されています。そのまま再接続できます。",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index b5c597adfe..4afdb8b863 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -1645,6 +1645,7 @@
}
},
"settings": {
+ "newChatDefaults": { "title": "새 작업의 기본 권한" },
"imConnection": {
"reconnect": "다시 연결",
"savedNote": "연결 정보가 저장되어 있습니다. 바로 다시 연결할 수 있습니다.",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index 3d5d09cb94..8096c99eca 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -1645,6 +1645,7 @@
}
},
"settings": {
+ "newChatDefaults": { "title": "新任务默认权限" },
"imConnection": {
"reconnect": "重新连接",
"savedNote": "绑定信息已保留,可直接重试连接。",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index cb08e66e30..c1cd6881d5 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -1645,6 +1645,7 @@
}
},
"settings": {
+ "newChatDefaults": { "title": "新任務預設權限" },
"imConnection": {
"reconnect": "重新連線",
"savedNote": "繫結資訊已保留,可直接重試連線。",
diff --git a/apps/desktop/src/renderer/state/newMakerDraft.ts b/apps/desktop/src/renderer/state/newMakerDraft.ts
index a749a8b91e..27cd7b5236 100644
--- a/apps/desktop/src/renderer/state/newMakerDraft.ts
+++ b/apps/desktop/src/renderer/state/newMakerDraft.ts
@@ -43,6 +43,8 @@ export interface VendorPrefs {
model: string;
effort: Effort;
permissionMode: PermissionMode;
+ /** Explicit picker choice; absent legacy non-auto values are preserved. */
+ permissionModeCustomized?: boolean;
/**
* 计划模式一级开关(与 permissionMode 正交)。草稿开着时,发送建会话透传
* planModeEnabled 落库 + createOpts.planMode 生效。老 localStorage 缺字段 → false。
@@ -186,6 +188,8 @@ export interface NewMakerDraft {
* false 才允许连接态为新任务下放产品默认;目录热更与登录变化不得覆盖 true。
*/
defaultTupleCustomized: boolean;
+ /** Local new-task default. null follows the product default (auto). */
+ newChatDefaultPermissionMode?: PermissionMode | null;
/**
* 自定义里是否包含 Harness / 来源 / 模型选择。与只调 effort / Fast 分开记,
* 这样「恢复推荐」只能撤销调档意图,不会顺手清掉真正的路由选择。
@@ -207,6 +211,7 @@ function defaultVendorPrefs(vendor: MakerVendor): VendorPrefs {
effort: 'high',
// 新 Pi 草稿默认走 Auto Review;完全访问只能由用户显式选择并持久化。
permissionMode: 'auto',
+ permissionModeCustomized: false,
planMode: false,
providerId: null,
};
@@ -216,6 +221,7 @@ function defaultVendorPrefs(vendor: MakerVendor): VendorPrefs {
model: getDefaultModelForVendor('codex').id,
effort: 'high',
permissionMode: 'auto',
+ permissionModeCustomized: false,
planMode: false,
providerId: null,
};
@@ -226,6 +232,7 @@ function defaultVendorPrefs(vendor: MakerVendor): VendorPrefs {
// 三种 vendor 都保留 Auto-review 种子默认;已有用户落盘的
// lastByVendor 记忆不受影响(sanitize 只在缺失 / 脏值时回落本默认)。
permissionMode: 'auto',
+ permissionModeCustomized: false,
planMode: false,
providerId: null,
};
@@ -261,6 +268,7 @@ function makeDefault(): NewMakerDraft {
},
modelChosenByVendor: {},
defaultTupleCustomized: false,
+ newChatDefaultPermissionMode: null,
defaultTupleSelectionCustomized: false,
};
}
@@ -366,8 +374,14 @@ function sanitize(raw: unknown): NewMakerDraft {
};
})();
const collab: CollabDraft = { enabled: collabEnabled, worker: collabWorker, workerConfig };
+ const newChatDefaultPermissionMode =
+ r.newChatDefaultPermissionMode === 'auto' || r.newChatDefaultPermissionMode === 'bypassPermissions'
+ ? r.newChatDefaultPermissionMode : null;
const sanitizeVendorPrefs = (p: Partial<VendorPrefs> | undefined, v: MakerVendor): VendorPrefs => {
- const fallback = defaultVendorPrefs(v);
+ const fallback = { ...defaultVendorPrefs(v), permissionMode: newChatDefaultPermissionMode ?? 'auto' };
+ const permissionModeCustomized = p?.permissionModeCustomized === true ||
+ (p?.permissionModeCustomized === undefined && typeof p?.permissionMode === 'string' &&
+ p.permissionMode !== 'auto' && p.permissionMode !== 'plan');
if (!p || typeof p !== 'object') return fallback;
// 计划模式独立成一级开关后, 历史草稿里 permissionMode='plan' 迁移为
// planMode=true + 该 vendor 默认权限档(与 DB 迁移同语义)。
@@ -376,9 +390,10 @@ function sanitize(raw: unknown): NewMakerDraft {
model: typeof p.model === 'string' && p.model.length > 0 ? p.model : fallback.model,
effort: typeof p.effort === 'string' ? (p.effort as Effort) : fallback.effort,
permissionMode:
- typeof p.permissionMode === 'string' && !legacyPlanPermission
+ permissionModeCustomized && typeof p.permissionMode === 'string' && !legacyPlanPermission
? (p.permissionMode as PermissionMode)
: fallback.permissionMode,
+ permissionModeCustomized,
planMode: p.planMode === true || legacyPlanPermission,
// providerId: 接受非空 string 或 null;脏数据 / 缺字段一律落 null(跟随默认路由)。
providerId:
@@ -491,6 +506,7 @@ function sanitize(raw: unknown): NewMakerDraft {
},
modelChosenByVendor,
defaultTupleCustomized,
+ newChatDefaultPermissionMode,
defaultTupleSelectionCustomized,
};
}
@@ -535,6 +551,7 @@ type StoredDefaultTuplePreference = Pick<
| 'effortByModel'
| 'lastByVendor'
| 'modelChosenByVendor'
+ | 'newChatDefaultPermissionMode'
| 'defaultTupleCustomized'
| 'defaultTupleSelectionCustomized'
>;
@@ -546,6 +563,7 @@ function defaultTuplePreferenceOf(draft: NewMakerDraft): StoredDefaultTuplePrefe
effortByModel: draft.effortByModel,
lastByVendor: draft.lastByVendor,
modelChosenByVendor: draft.modelChosenByVendor,
+ newChatDefaultPermissionMode: draft.newChatDefaultPermissionMode ?? null,
defaultTupleCustomized: draft.defaultTupleCustomized,
defaultTupleSelectionCustomized: draft.defaultTupleSelectionCustomized,
};
@@ -835,10 +853,26 @@ export function setWorktreePreference(enabled: boolean): void {
emit();
}
+/** Only explicit settings changes update the default; preserve independent picker choices. */
+export function setNewChatDefaultPermissionMode(mode: PermissionMode | null): void {
+ if (mode !== null && mode !== 'auto' && mode !== 'bypassPermissions') return;
+ rebaseStoredDefaultTuplePreference();
+ const lastByVendor = { ...currentDraft.lastByVendor };
+ for (const vendor of ['cc', 'pi', 'codex', 'orca'] as const) {
+ if (!lastByVendor[vendor].permissionModeCustomized) {
+ lastByVendor[vendor] = { ...lastByVendor[vendor], permissionMode: mode ?? 'auto', permissionModeCustomized: false };
+ }
+ }
+ currentDraft = { ...currentDraft, newChatDefaultPermissionMode: mode, lastByVendor };
+ scheduleWrite({ preserveStoredDefaultTuplePreference: false });
+ emit();
+}
+
export function patchDraft(patch: Partial<NewMakerDraft>): void {
const normalizedPatch: Partial<NewMakerDraft> = { ...patch };
// worktree 偏好只能经 setWorktreePreference 写入。把这条约束放在 store 边界,
// 避免项目切换、草稿恢复或未来的通用 patch 调用方绕过「仅 checkbox 修改」契约。
+ delete normalizedPatch.newChatDefaultPermissionMode;
delete normalizedPatch.worktreeEnabled;
delete normalizedPatch.worktreePreferenceCustomized;
if ('workingDir' in normalizedPatch) {
@@ -1119,6 +1153,10 @@ function patchVendorPrefsInternal(
const marksDefaultTuple = marksSelection || (opts.markModelChoice && 'effort' in patch);
const modelChosen = { ...currentDraft.modelChosenByVendor };
const nextPatch = { ...patch };
+ delete nextPatch.permissionModeCustomized;
+ if (opts.markModelChoice && typeof nextPatch.permissionMode === 'string') {
+ nextPatch.permissionModeCustomized = true;
+ }
if (typeof nextPatch.model === 'string' && nextPatch.model.length > 0) {
if (opts.markModelChoice) {
// 新建页 picker 或已有任务换模 → 打标记,下次新建跟随这次选择,不再回落区域默认。