mirror of
https://github.com/claude-code-best/claude-code.git
synced 2026-06-18 06:15:51 +00:00
更新大量 tsx 原始文件; 已经迁移 login panel; 部分 (#121)
* style(B1-1): 格式化 ink/buddy/cli/context/screens/tasks/services/keybindings/state (43 files) 纯格式化:移除分号、React Compiler import、import 多行展开。 修复了 Box.tsx 和 ScrollBox.tsx 中无效的 global.d.ts import。 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * style(B1-2): 格式化 commands (79 files) 纯格式化:移除分号、React Compiler import、import 多行展开。 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * style(B1-3): 格式化 components/messages,permissions,mcp,sandbox,shell (104 files) 纯格式化:移除分号、React Compiler import、import 多行展开。 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * style(B1-4): 格式化 components/PromptInput,FeedbackSurvey,tasks,agents,skills,design-system,wizard (73 files) 纯格式化:移除分号、React Compiler import、import 多行展开。 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * style(B1-5): 格式化 components其余 + hooks + tools (232 files) 纯格式化:移除分号、React Compiler import、import 多行展开。 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * style(B1-6): 格式化 main/entrypoints/utils/moreright (21 files) 纯格式化:移除分号、React Compiler import、import 多行展开。 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * docs: 更新 README,新增 Run.ps1/TODO.md,删除 V6.md - README.md: 大幅重写,更详细版本历史和配置示例 - Run.ps1: 新增 Windows 启动脚本 - TODO.md: 新增包完成清单 - V6.md: 删除(架构重构规划已不适用) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: 修复以前的问题 * fix: 修复 login 面板的问题 --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,72 +1,74 @@
|
||||
import { c as _c } from "react/compiler-runtime";
|
||||
import React, { createContext, type ReactNode, useContext, useMemo } from 'react';
|
||||
import type { Command } from '../../commands.js';
|
||||
import type { Tool } from '../../Tool.js';
|
||||
import type { MCPServerConnection, ScopedMcpServerConfig, ServerResource } from './types.js';
|
||||
import { useManageMCPConnections } from './useManageMCPConnections.js';
|
||||
import React, {
|
||||
createContext,
|
||||
type ReactNode,
|
||||
useContext,
|
||||
useMemo,
|
||||
} from 'react'
|
||||
import type { Command } from '../../commands.js'
|
||||
import type { Tool } from '../../Tool.js'
|
||||
import type {
|
||||
MCPServerConnection,
|
||||
ScopedMcpServerConfig,
|
||||
ServerResource,
|
||||
} from './types.js'
|
||||
import { useManageMCPConnections } from './useManageMCPConnections.js'
|
||||
|
||||
interface MCPConnectionContextValue {
|
||||
reconnectMcpServer: (serverName: string) => Promise<{
|
||||
client: MCPServerConnection;
|
||||
tools: Tool[];
|
||||
commands: Command[];
|
||||
resources?: ServerResource[];
|
||||
}>;
|
||||
toggleMcpServer: (serverName: string) => Promise<void>;
|
||||
client: MCPServerConnection
|
||||
tools: Tool[]
|
||||
commands: Command[]
|
||||
resources?: ServerResource[]
|
||||
}>
|
||||
toggleMcpServer: (serverName: string) => Promise<void>
|
||||
}
|
||||
const MCPConnectionContext = createContext<MCPConnectionContextValue | null>(null);
|
||||
|
||||
const MCPConnectionContext = createContext<MCPConnectionContextValue | null>(
|
||||
null,
|
||||
)
|
||||
|
||||
export function useMcpReconnect() {
|
||||
const context = useContext(MCPConnectionContext);
|
||||
const context = useContext(MCPConnectionContext)
|
||||
if (!context) {
|
||||
throw new Error("useMcpReconnect must be used within MCPConnectionManager");
|
||||
throw new Error('useMcpReconnect must be used within MCPConnectionManager')
|
||||
}
|
||||
return context.reconnectMcpServer;
|
||||
return context.reconnectMcpServer
|
||||
}
|
||||
|
||||
export function useMcpToggleEnabled() {
|
||||
const context = useContext(MCPConnectionContext);
|
||||
const context = useContext(MCPConnectionContext)
|
||||
if (!context) {
|
||||
throw new Error("useMcpToggleEnabled must be used within MCPConnectionManager");
|
||||
throw new Error(
|
||||
'useMcpToggleEnabled must be used within MCPConnectionManager',
|
||||
)
|
||||
}
|
||||
return context.toggleMcpServer;
|
||||
return context.toggleMcpServer
|
||||
}
|
||||
|
||||
interface MCPConnectionManagerProps {
|
||||
children: ReactNode;
|
||||
dynamicMcpConfig: Record<string, ScopedMcpServerConfig> | undefined;
|
||||
isStrictMcpConfig: boolean;
|
||||
children: ReactNode
|
||||
dynamicMcpConfig: Record<string, ScopedMcpServerConfig> | undefined
|
||||
isStrictMcpConfig: boolean
|
||||
}
|
||||
|
||||
// TODO (ollie): We may be able to get rid of this context by putting these function on app state
|
||||
export function MCPConnectionManager(t0) {
|
||||
const $ = _c(6);
|
||||
const {
|
||||
children,
|
||||
export function MCPConnectionManager({
|
||||
children,
|
||||
dynamicMcpConfig,
|
||||
isStrictMcpConfig,
|
||||
}: MCPConnectionManagerProps): React.ReactNode {
|
||||
const { reconnectMcpServer, toggleMcpServer } = useManageMCPConnections(
|
||||
dynamicMcpConfig,
|
||||
isStrictMcpConfig
|
||||
} = t0;
|
||||
const {
|
||||
reconnectMcpServer,
|
||||
toggleMcpServer
|
||||
} = useManageMCPConnections(dynamicMcpConfig, isStrictMcpConfig);
|
||||
let t1;
|
||||
if ($[0] !== reconnectMcpServer || $[1] !== toggleMcpServer) {
|
||||
t1 = {
|
||||
reconnectMcpServer,
|
||||
toggleMcpServer
|
||||
};
|
||||
$[0] = reconnectMcpServer;
|
||||
$[1] = toggleMcpServer;
|
||||
$[2] = t1;
|
||||
} else {
|
||||
t1 = $[2];
|
||||
}
|
||||
const value = t1;
|
||||
let t2;
|
||||
if ($[3] !== children || $[4] !== value) {
|
||||
t2 = <MCPConnectionContext.Provider value={value}>{children}</MCPConnectionContext.Provider>;
|
||||
$[3] = children;
|
||||
$[4] = value;
|
||||
$[5] = t2;
|
||||
} else {
|
||||
t2 = $[5];
|
||||
}
|
||||
return t2;
|
||||
isStrictMcpConfig,
|
||||
)
|
||||
const value = useMemo(
|
||||
() => ({ reconnectMcpServer, toggleMcpServer }),
|
||||
[reconnectMcpServer, toggleMcpServer],
|
||||
)
|
||||
|
||||
return (
|
||||
<MCPConnectionContext.Provider value={value}>
|
||||
{children}
|
||||
</MCPConnectionContext.Provider>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import React from 'react';
|
||||
import { MCPServerApprovalDialog } from '../components/MCPServerApprovalDialog.js';
|
||||
import { MCPServerMultiselectDialog } from '../components/MCPServerMultiselectDialog.js';
|
||||
import type { Root } from '../ink.js';
|
||||
import { KeybindingSetup } from '../keybindings/KeybindingProviderSetup.js';
|
||||
import { AppStateProvider } from '../state/AppState.js';
|
||||
import { getMcpConfigsByScope } from './mcp/config.js';
|
||||
import { getProjectMcpServerStatus } from './mcp/utils.js';
|
||||
import React from 'react'
|
||||
import { MCPServerApprovalDialog } from '../components/MCPServerApprovalDialog.js'
|
||||
import { MCPServerMultiselectDialog } from '../components/MCPServerMultiselectDialog.js'
|
||||
import type { Root } from '../ink.js'
|
||||
import { KeybindingSetup } from '../keybindings/KeybindingProviderSetup.js'
|
||||
import { AppStateProvider } from '../state/AppState.js'
|
||||
import { getMcpConfigsByScope } from './mcp/config.js'
|
||||
import { getProjectMcpServerStatus } from './mcp/utils.js'
|
||||
|
||||
/**
|
||||
* Show MCP server approval dialogs for pending project servers.
|
||||
@@ -13,28 +13,37 @@ import { getProjectMcpServerStatus } from './mcp/utils.js';
|
||||
* from main.tsx instead of creating a separate one).
|
||||
*/
|
||||
export async function handleMcpjsonServerApprovals(root: Root): Promise<void> {
|
||||
const {
|
||||
servers: projectServers
|
||||
} = getMcpConfigsByScope('project');
|
||||
const pendingServers = Object.keys(projectServers).filter(serverName => getProjectMcpServerStatus(serverName) === 'pending');
|
||||
const { servers: projectServers } = getMcpConfigsByScope('project')
|
||||
const pendingServers = Object.keys(projectServers).filter(
|
||||
serverName => getProjectMcpServerStatus(serverName) === 'pending',
|
||||
)
|
||||
|
||||
if (pendingServers.length === 0) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
|
||||
await new Promise<void>(resolve => {
|
||||
const done = (): void => void resolve();
|
||||
const done = (): void => void resolve()
|
||||
if (pendingServers.length === 1 && pendingServers[0] !== undefined) {
|
||||
const serverName = pendingServers[0];
|
||||
root.render(<AppStateProvider>
|
||||
const serverName = pendingServers[0]
|
||||
root.render(
|
||||
<AppStateProvider>
|
||||
<KeybindingSetup>
|
||||
<MCPServerApprovalDialog serverName={serverName} onDone={done} />
|
||||
</KeybindingSetup>
|
||||
</AppStateProvider>);
|
||||
</AppStateProvider>,
|
||||
)
|
||||
} else {
|
||||
root.render(<AppStateProvider>
|
||||
root.render(
|
||||
<AppStateProvider>
|
||||
<KeybindingSetup>
|
||||
<MCPServerMultiselectDialog serverNames={pendingServers} onDone={done} />
|
||||
<MCPServerMultiselectDialog
|
||||
serverNames={pendingServers}
|
||||
onDone={done}
|
||||
/>
|
||||
</KeybindingSetup>
|
||||
</AppStateProvider>);
|
||||
</AppStateProvider>,
|
||||
)
|
||||
}
|
||||
});
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1,15 +1,20 @@
|
||||
import React from 'react';
|
||||
import { getIsInteractive } from '../../bootstrap/state.js';
|
||||
import { ManagedSettingsSecurityDialog } from '../../components/ManagedSettingsSecurityDialog/ManagedSettingsSecurityDialog.js';
|
||||
import { extractDangerousSettings, hasDangerousSettings, hasDangerousSettingsChanged } from '../../components/ManagedSettingsSecurityDialog/utils.js';
|
||||
import { render } from '../../ink.js';
|
||||
import { KeybindingSetup } from '../../keybindings/KeybindingProviderSetup.js';
|
||||
import { AppStateProvider } from '../../state/AppState.js';
|
||||
import { gracefulShutdownSync } from '../../utils/gracefulShutdown.js';
|
||||
import { getBaseRenderOptions } from '../../utils/renderOptions.js';
|
||||
import type { SettingsJson } from '../../utils/settings/types.js';
|
||||
import { logEvent } from '../analytics/index.js';
|
||||
export type SecurityCheckResult = 'approved' | 'rejected' | 'no_check_needed';
|
||||
import React from 'react'
|
||||
import { getIsInteractive } from '../../bootstrap/state.js'
|
||||
import { ManagedSettingsSecurityDialog } from '../../components/ManagedSettingsSecurityDialog/ManagedSettingsSecurityDialog.js'
|
||||
import {
|
||||
extractDangerousSettings,
|
||||
hasDangerousSettings,
|
||||
hasDangerousSettingsChanged,
|
||||
} from '../../components/ManagedSettingsSecurityDialog/utils.js'
|
||||
import { render } from '../../ink.js'
|
||||
import { KeybindingSetup } from '../../keybindings/KeybindingProviderSetup.js'
|
||||
import { AppStateProvider } from '../../state/AppState.js'
|
||||
import { gracefulShutdownSync } from '../../utils/gracefulShutdown.js'
|
||||
import { getBaseRenderOptions } from '../../utils/renderOptions.js'
|
||||
import type { SettingsJson } from '../../utils/settings/types.js'
|
||||
import { logEvent } from '../analytics/index.js'
|
||||
|
||||
export type SecurityCheckResult = 'approved' | 'rejected' | 'no_check_needed'
|
||||
|
||||
/**
|
||||
* Check if new remote managed settings contain dangerous settings that require user approval.
|
||||
@@ -19,55 +24,68 @@ export type SecurityCheckResult = 'approved' | 'rejected' | 'no_check_needed';
|
||||
* @param newSettings The new settings fetched from the API
|
||||
* @returns 'approved' if user accepts, 'rejected' if user declines, 'no_check_needed' if no dangerous changes
|
||||
*/
|
||||
export async function checkManagedSettingsSecurity(cachedSettings: SettingsJson | null, newSettings: SettingsJson | null): Promise<SecurityCheckResult> {
|
||||
export async function checkManagedSettingsSecurity(
|
||||
cachedSettings: SettingsJson | null,
|
||||
newSettings: SettingsJson | null,
|
||||
): Promise<SecurityCheckResult> {
|
||||
// If new settings don't have dangerous settings, no check needed
|
||||
if (!newSettings || !hasDangerousSettings(extractDangerousSettings(newSettings))) {
|
||||
return 'no_check_needed';
|
||||
if (
|
||||
!newSettings ||
|
||||
!hasDangerousSettings(extractDangerousSettings(newSettings))
|
||||
) {
|
||||
return 'no_check_needed'
|
||||
}
|
||||
|
||||
// If dangerous settings haven't changed, no check needed
|
||||
if (!hasDangerousSettingsChanged(cachedSettings, newSettings)) {
|
||||
return 'no_check_needed';
|
||||
return 'no_check_needed'
|
||||
}
|
||||
|
||||
// Skip dialog in non-interactive mode (consistent with trust dialog behavior)
|
||||
if (!getIsInteractive()) {
|
||||
return 'no_check_needed';
|
||||
return 'no_check_needed'
|
||||
}
|
||||
|
||||
// Log that dialog is being shown
|
||||
logEvent('tengu_managed_settings_security_dialog_shown', {});
|
||||
logEvent('tengu_managed_settings_security_dialog_shown', {})
|
||||
|
||||
// Show blocking dialog
|
||||
return new Promise<SecurityCheckResult>(resolve => {
|
||||
void (async () => {
|
||||
const {
|
||||
unmount
|
||||
} = await render(<AppStateProvider>
|
||||
const { unmount } = await render(
|
||||
<AppStateProvider>
|
||||
<KeybindingSetup>
|
||||
<ManagedSettingsSecurityDialog settings={newSettings} onAccept={() => {
|
||||
logEvent('tengu_managed_settings_security_dialog_accepted', {});
|
||||
unmount();
|
||||
void resolve('approved');
|
||||
}} onReject={() => {
|
||||
logEvent('tengu_managed_settings_security_dialog_rejected', {});
|
||||
unmount();
|
||||
void resolve('rejected');
|
||||
}} />
|
||||
<ManagedSettingsSecurityDialog
|
||||
settings={newSettings}
|
||||
onAccept={() => {
|
||||
logEvent('tengu_managed_settings_security_dialog_accepted', {})
|
||||
unmount()
|
||||
void resolve('approved')
|
||||
}}
|
||||
onReject={() => {
|
||||
logEvent('tengu_managed_settings_security_dialog_rejected', {})
|
||||
unmount()
|
||||
void resolve('rejected')
|
||||
}}
|
||||
/>
|
||||
</KeybindingSetup>
|
||||
</AppStateProvider>, getBaseRenderOptions(false));
|
||||
})();
|
||||
});
|
||||
</AppStateProvider>,
|
||||
getBaseRenderOptions(false),
|
||||
)
|
||||
})()
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle the security check result by exiting if rejected
|
||||
* Returns true if we should continue, false if we should stop
|
||||
*/
|
||||
export function handleSecurityCheckResult(result: SecurityCheckResult): boolean {
|
||||
export function handleSecurityCheckResult(
|
||||
result: SecurityCheckResult,
|
||||
): boolean {
|
||||
if (result === 'rejected') {
|
||||
gracefulShutdownSync(1);
|
||||
return false;
|
||||
gracefulShutdownSync(1)
|
||||
return false
|
||||
}
|
||||
return true;
|
||||
return true
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user