versun/claude-code
1
0
Fork 0
mirror of https://github.com/claude-code-best/claude-code.git synced 2026-06-15 12:55:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复类型问题

Browse Source
This commit is contained in:
claude-code-best
2026-04-10 17:34:01 +08:00
parent e70319e8f5
commit ff03fe7fcb
18 changed files with 70 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/@ant/ink/src/index.ts
View File

@@ -12,7 +12,7 @@
// ============================================================
export { default as wrappedRender, renderSync, createRoot } from './core/root.js'
export type { RenderOptions, Instance, Root } from './core/root.js'
export * from './theme/theme-types.js'
// InkCore class
export { default as Ink } from './core/ink.js'

64
src/cli/print.ts
View File

@@ -2256,7 +2256,7 @@ function runHeadlessStreaming(
{ turnStartTime } as import('src/utils/filePersistence/types.js').TurnStartTime,
abortController.signal,
result => {
const filesResult = result as { persistedFiles: { filename: string; file_id: string }[]; failedFiles: { filename: string; error: string }[] }
const filesResult = result as unknown as { persistedFiles: { filename: string; file_id: string }[]; failedFiles: { filename: string; error: string }[] }
output.enqueue({
type: 'system' as const,
subtype: 'files_persisted' as const,
@@ -3315,7 +3315,7 @@ function runHeadlessStreaming(
output,
)
} else if (req.subtype === 'mcp_authenticate') {
const { serverName } = req
const serverName = req.serverName as string
const currentAppState = getAppState()
const config =
getMcpConfigByName(serverName) ??
@@ -3333,9 +3333,9 @@ function runHeadlessStreaming(
} else {
try {
// Abort any previous in-flight OAuth flow for this server
activeOAuthFlows.get(serverName)?.abort()
activeOAuthFlows.get(serverName as string)?.abort()
const controller = new AbortController()
activeOAuthFlows.set(serverName, controller)
activeOAuthFlows.set(serverName as string, controller)
// Capture the auth URL from the callback
let resolveAuthUrl: (url: string) => void
@@ -3345,14 +3345,14 @@ function runHeadlessStreaming(
// Start the OAuth flow in the background
const oauthPromise = performMCPOAuthFlow(
serverName,
serverName as string,
config,
url => resolveAuthUrl!(url),
controller.signal,
{
skipBrowserOpen: true,
onWaitingForCallback: submit => {
oauthCallbackSubmitters.set(serverName, submit)
oauthCallbackSubmitters.set(serverName as string, submit)
},
},
)
@@ -3386,27 +3386,27 @@ function runHeadlessStreaming(
const fullFlowPromise = oauthPromise
.then(async () => {
// Don't reconnect if the server was disabled during the OAuth flow
if (isMcpServerDisabled(serverName)) {
if (isMcpServerDisabled(serverName as string)) {
return
}
// Skip reconnect if the manual callback path was used —
// handleAuthDone will do it via mcp_reconnect (which
// updates dynamicMcpState for tool registration).
if (oauthManualCallbackUsed.has(serverName)) {
if (oauthManualCallbackUsed.has(serverName as string)) {
return
}
// Reconnect the server after successful auth
const result = await reconnectMcpServerImpl(
serverName,
serverName as string,
config,
)
const prefix = getMcpPrefix(serverName)
const prefix = getMcpPrefix(serverName as string)
setAppState(prev => ({
...prev,
mcp: {
...prev.mcp,
clients: prev.mcp.clients.map(c =>
c.name === serverName ? result.client : c,
c.name === serverName as string ? result.client : c,
),
tools: [
...reject(prev.mcp.tools, t =>
@@ -3416,7 +3416,7 @@ function runHeadlessStreaming(
],
commands: [
...reject(prev.mcp.commands, c =>
commandBelongsToServer(c, serverName),
commandBelongsToServer(c, serverName as string),
),
...result.commands,
],
@@ -3424,9 +3424,9 @@ function runHeadlessStreaming(
result.resources && result.resources.length > 0
? {
...prev.mcp.resources,
[serverName]: result.resources,
[serverName as string]: result.resources,
}
: omit(prev.mcp.resources, serverName),
: omit(prev.mcp.resources, serverName as string),
},
}))
// Also update dynamicMcpState so run() picks up the new tools
@@ -3449,17 +3449,17 @@ function runHeadlessStreaming(
})
.catch(error => {
logForDebugging(
`MCP OAuth failed for ${serverName}: ${error}`,
`MCP OAuth failed for ${serverName as string}: ${error}`,
{ level: 'error' },
)
})
.finally(() => {
// Clean up only if this is still the active flow
if (activeOAuthFlows.get(serverName) === controller) {
activeOAuthFlows.delete(serverName)
oauthCallbackSubmitters.delete(serverName)
oauthManualCallbackUsed.delete(serverName)
oauthAuthPromises.delete(serverName)
if (activeOAuthFlows.get(serverName as string) === controller) {
activeOAuthFlows.delete(serverName as string)
oauthCallbackSubmitters.delete(serverName as string)
oauthManualCallbackUsed.delete(serverName as string)
oauthAuthPromises.delete(serverName as string)
}
})
void fullFlowPromise
@@ -3468,7 +3468,8 @@ function runHeadlessStreaming(
}
}
} else if (req.subtype === 'mcp_oauth_callback_url') {
const { serverName, callbackUrl } = req
const serverName = req.serverName as string
const callbackUrl = req.callbackUrl as string
const submit = oauthCallbackSubmitters.get(serverName)
if (submit) {
// Validate the callback URL before submitting. The submit
@@ -3477,7 +3478,7 @@ function runHeadlessStreaming(
// block the control message loop until timeout.
let hasCodeOrError = false
try {
const parsed = new URL(callbackUrl)
const parsed = new URL(callbackUrl as string | URL)
hasCodeOrError =
parsed.searchParams.has('code') ||
parsed.searchParams.has('error')
@@ -3491,7 +3492,7 @@ function runHeadlessStreaming(
)
} else {
oauthManualCallbackUsed.add(serverName)
submit(callbackUrl)
submit(callbackUrl as string)
// Wait for auth (token exchange) to complete before responding.
// Reconnect is handled by the extension via handleAuthDone →
// mcp_reconnect (which updates dynamicMcpState for tools).
@@ -3524,7 +3525,7 @@ function runHeadlessStreaming(
// both URLs and wait. Automatic URL → localhost listener catches
// the redirect if the browser is on this host; manual URL → the
// success page shows "code#state" for claude_oauth_callback.
const { loginWithClaudeAi } = req
const loginWithClaudeAi = req.loginWithClaudeAi as boolean | undefined
// Clean up any prior flow. cleanup() closes the localhost listener
// and nulls the manual resolver. The prior `flow` promise is left
@@ -3534,7 +3535,7 @@ function runHeadlessStreaming(
claudeOAuth?.service.cleanup()
logEvent('tengu_oauth_flow_start', {
loginWithClaudeAi: loginWithClaudeAi ?? true,
loginWithClaudeAi: (loginWithClaudeAi ?? true) as boolean | number,
})
const service = new OAuthService()
@@ -3557,7 +3558,7 @@ function runHeadlessStreaming(
urlResolver({ manualUrl, automaticUrl: automaticUrl! })
},
{
loginWithClaudeAi: loginWithClaudeAi ?? true,
loginWithClaudeAi: (loginWithClaudeAi ?? true) as boolean,
skipBrowserOpen: true,
},
)
@@ -3569,7 +3570,7 @@ function runHeadlessStreaming(
// next API call re-reads keychain/file and works. No respawn.
await installOAuthTokens(tokens)
logEvent('tengu_oauth_success', {
loginWithClaudeAi: loginWithClaudeAi ?? true,
loginWithClaudeAi: (loginWithClaudeAi ?? true) as boolean | number,
})
})
.finally(() => {
@@ -3656,7 +3657,7 @@ function runHeadlessStreaming(
)
}
} else if (req.subtype === 'mcp_clear_auth') {
const { serverName } = req
const serverName = req.serverName as string
const currentAppState = getAppState()
const config =
getMcpConfigByName(serverName) ??
@@ -3680,7 +3681,7 @@ function runHeadlessStreaming(
mcp: {
...prev.mcp,
clients: prev.mcp.clients.map(c =>
c.name === serverName ? result.client : c,
c.name === serverName as string ? result.client : c,
),
tools: [
...reject(prev.mcp.tools, t => t.name?.startsWith(prefix)),
@@ -3791,7 +3792,8 @@ function runHeadlessStreaming(
// Fire-and-forget so the Haiku call does not block the stdin loop
// (which would delay processing of subsequent user messages /
// interrupts for the duration of the API roundtrip).
const { description, persist } = req
const description = req.description as string
const persist = req.persist as boolean
// Reuse the live controller only if it has not already been aborted
// (e.g. by interrupt()); an aborted signal would cause queryHaiku to
// immediately throw APIUserAbortError → {title: null}.
@@ -3835,7 +3837,7 @@ function runHeadlessStreaming(
// matches in the common case. May still miss the cache for
// coordinator mode or memory-mechanics extras — acceptable, the
// alternative is the side question failing entirely.
const { question } = req
const question = req.question as string
void (async () => {
try {
const saved = getLastCacheSafeParams()

2
src/cli/structuredIO.ts
View File

@@ -679,7 +679,7 @@ export class StructuredIO {
{
subtype: 'hook_callback',
callback_id: callbackId,
input: input as Parameters<HookCallback['callback']>[0],
input: input as any,
tool_use_id: toolUseID || undefined,
},
hookJSONOutputSchema(),

2
src/components/BuiltinStatusLine.tsx
View File

@@ -81,7 +81,7 @@ function BuiltinStatusLineInner({
const tokenDisplay = `${formatTokens(usedTokens)}/${formatTokens(contextWindowSize)}`;
return (
<Box wrap="truncate">
<Box>
{/* Model name */}
<Text>{shortModel}</Text>

2
src/components/PromptInput/PromptInputFooterSuggestions.tsx
View File

@@ -163,7 +163,7 @@ const SuggestionItemRow = memo(function SuggestionItemRow({
{paddedDisplayText}
</Text>
{tagText ? (
<Text color={item.tag === 'local' ? ('yellow' as const) : undefined} dimColor={item.tag !== 'local'}>
<Text color={item.tag === 'local' ? 'ansi:yellow' : undefined} dimColor={item.tag !== 'local'}>
{tagText}
</Text>
) : null}

4
src/components/skills/SkillsMenu.tsx
View File

@@ -9,6 +9,7 @@ import {
type PromptCommand,
} from '../../commands.js'
import { Box, Text } from '@anthropic/ink'
import type { Theme } from '@anthropic/ink'
import {
estimateSkillFrontmatterTokens,
getSkillsPath,
@@ -140,7 +141,7 @@ export function SkillsMenu({ onExit, commands }: Props): React.ReactNode {
}
const getScopeTag = (
source: SkillSource,
source: string,
): { label: string; color: string } | undefined => {
switch (source) {
case 'projectSettings':
@@ -169,6 +170,7 @@ export function SkillsMenu({ onExit, commands }: Props): React.ReactNode {
<Text>{getCommandName(skill)}</Text>
{scopeTag && (
<Text color={scopeTag.color as keyof Theme}> [{scopeTag.label}]</Text>
)}
<Text dimColor>
{pluginName ? ` · ${pluginName}` : ''} · {tokenDisplay} description

5
src/components/tasks/RemoteSessionDetailDialog.tsx
View File

@@ -29,6 +29,7 @@ import {
formatReviewStageCounts,
RemoteSessionProgress,
} from './RemoteSessionProgress.js'
import { AssistantMessage } from 'src/types/message.js'
type Props = {
session: DeepImmutable<RemoteAgentTaskState>
@@ -122,7 +123,7 @@ function UltraplanSessionDetail({
let lastBlock: { name: string; input: unknown } | null = null
for (const msg of session.log) {
if (msg.type !== 'assistant') continue
const content = msg.message?.content ?? []
const content = (msg.message as { content?: unknown[] })?.content ?? []
for (const block of content as Array<{type: string; name: string; input: unknown}>) {
if (block.type !== 'tool_use') continue
calls++
@@ -612,7 +613,7 @@ export function RemoteSessionDetailDialog({
{lastMessages.map((msg, i) => (
<Message
key={i}
message={msg}
message={msg as AssistantMessage}
lookups={EMPTY_LOOKUPS}
addMargin={i > 0}
tools={toolUseContext.options.tools}

5
src/hooks/useReplBridge.tsx
View File

@@ -44,6 +44,7 @@ import {
transitionPermissionMode,
} from '../utils/permissions/permissionSetup.js'
import { getLeaderToolUseConfirmQueue } from '../utils/swarm/leaderPermissionBridge.js'
import { ContentBlockParam } from '@anthropic-ai/sdk/resources'
/** How long after a failure before replBridgeEnabled is auto-cleared (stops retries). */
export const BRIDGE_FAILURE_DISMISS_MS = 10_000
@@ -226,7 +227,7 @@ export function useReplBridge(
'../bridge/inboundAttachments.js'
)
const rawContent = fields.content
let sanitized: string | Array<{ type: string; [key: string]: unknown }> = typeof rawContent === 'string' ? rawContent : rawContent as Array<{ type: string; [key: string]: unknown }>
let sanitized: string | Array<{ type: string; [key: string]: unknown }> = typeof rawContent === 'string' ? rawContent : rawContent as unknown as Array<{ type: string; [key: string]: unknown }>
if (feature('KAIROS_GITHUB_WEBHOOKS')) {
/* eslint-disable @typescript-eslint/no-require-imports */
const { sanitizeInboundWebhookContent } =
@@ -236,7 +237,7 @@ export function useReplBridge(
sanitized = sanitizeInboundWebhookContent(sanitized)
}
}
const content = await resolveAndPrepend(msg, sanitized)
const content = await resolveAndPrepend(msg, sanitized as string | ContentBlockParam[])
const preview =
typeof content === 'string'

2
src/hooks/useSSHSession.ts
View File

@@ -98,7 +98,7 @@ export function useSSHSession({
createToolStub(request.tool_name)
const syntheticMessage = createSyntheticAssistantMessage(
request,
request as unknown as Parameters<typeof createSyntheticAssistantMessage>[0],
requestId,
)

3
src/services/api/gemini/index.ts
View File

@@ -14,6 +14,7 @@ import {
normalizeContentFromAPI,
normalizeMessagesForAPI,
} from '../../../utils/messages.js'
import type { SDKAssistantMessageError } from '../../../entrypoints/agentSdkTypes.js'
import type { SystemPrompt } from '../../../utils/systemPromptType.js'
import type { ThinkingConfig } from '../../../utils/thinking.js'
import type { Options } from '../claude.js'
@@ -186,7 +187,7 @@ export async function* queryModelGemini(
yield createAssistantAPIErrorMessage({
content: `API Error: ${errorMessage}`,
apiError: 'api_error',
error: (error instanceof Error ? error : new Error(String(error))) as Error,
error: (error instanceof Error ? error : new Error(String(error))) as unknown as SDKAssistantMessageError,
})
}
}

2
src/services/api/grok/client.ts
View File

@@ -28,7 +28,7 @@ export function getGrokClient(options?: {
maxRetries: options?.maxRetries ?? 0,
timeout: parseInt(process.env.API_TIMEOUT_MS || String(600 * 1000), 10),
dangerouslyAllowBrowser: true,
fetchOptions: getProxyFetchOptions({ forAnthropicAPI: false }) as RequestInit,
fetchOptions: getProxyFetchOptions({ forAnthropicAPI: false }),
...(options?.fetchOverride && { fetch: options.fetchOverride }),
})

3
src/services/api/grok/index.ts
View File

@@ -12,6 +12,7 @@ import { anthropicToolsToOpenAI, anthropicToolChoiceToOpenAI } from '../openai/c
import { adaptOpenAIStreamToAnthropic } from '../openai/streamAdapter.js'
import { resolveGrokModel } from './modelMapping.js'
import { normalizeMessagesForAPI } from '../../../utils/messages.js'
import type { SDKAssistantMessageError } from '../../../entrypoints/agentSdkTypes.js'
import { toolToAPISchema } from '../../../utils/api.js'
import { logForDebugging } from '../../../utils/debug.js'
import { addToTotalSessionCost } from '../../../cost-tracker.js'
@@ -190,7 +191,7 @@ export async function* queryModelGrok(
yield createAssistantAPIErrorMessage({
content: `API Error: ${errorMessage}`,
apiError: 'api_error',
error: (error instanceof Error ? error : new Error(String(error))) as Error,
error: (error instanceof Error ? error : new Error(String(error))) as unknown as SDKAssistantMessageError,
})
}
}

2
src/services/api/openai/__tests__/thinking.test.ts
View File

@@ -151,7 +151,7 @@ describe('buildOpenAIRequestBody — thinking params', () => {
messages: [{ role: 'user', content: 'hello' }],
tools: [] as any[],
toolChoice: undefined as any,
}
} as any
test('includes official DeepSeek API thinking format when enabled', () => {
const body = buildOpenAIRequestBody({ ...baseParams, enableThinking: true })

2
src/services/api/openai/client.ts
View File

@@ -31,7 +31,7 @@ export function getOpenAIClient(options?: {
dangerouslyAllowBrowser: true,
...(process.env.OPENAI_ORG_ID && { organization: process.env.OPENAI_ORG_ID }),
...(process.env.OPENAI_PROJECT_ID && { project: process.env.OPENAI_PROJECT_ID }),
fetchOptions: getProxyFetchOptions({ forAnthropicAPI: false }) as RequestInit,
fetchOptions: getProxyFetchOptions({ forAnthropicAPI: false }),
...(options?.fetchOverride && { fetch: options.fetchOverride }),
})

11
src/services/api/openai/index.ts
View File

@@ -36,6 +36,7 @@ import {
createAssistantAPIErrorMessage,
normalizeContentFromAPI,
} from '../../../utils/messages.js'
import type { SDKAssistantMessageError } from '../../../entrypoints/agentSdkTypes.js'
import {
isToolSearchEnabled,
extractDiscoveredToolNames,
@@ -87,7 +88,11 @@ export function buildOpenAIRequestBody(params: {
toolChoice: any
enableThinking: boolean
temperatureOverride?: number
}): ChatCompletionCreateParamsStreaming {
}): ChatCompletionCreateParamsStreaming & {
thinking?: { type: string }
enable_thinking?: boolean
chat_template_kwargs?: { thinking: boolean }
} {
const { model, messages, tools, toolChoice, enableThinking, temperatureOverride } = params
return {
model,
@@ -220,7 +225,7 @@ export async function* queryModelOpenAI(
// 10. Get client and make streaming request
const client = getOpenAIClient({
maxRetries: 0,
fetchOverride: options.fetchOverride,
fetchOverride: options.fetchOverride as unknown as typeof fetch,
source: options.querySource,
})
@@ -354,7 +359,7 @@ export async function* queryModelOpenAI(
yield createAssistantAPIErrorMessage({
content: `API Error: ${errorMessage}`,
apiError: 'api_error',
error: (error instanceof Error ? error : new Error(String(error))) as Error,
error: (error instanceof Error ? error : new Error(String(error))) as unknown as SDKAssistantMessageError,
})
}
}

3
src/tools/AgentTool/UI.tsx
View File

@@ -49,6 +49,7 @@ import type {
import { inputSchema } from './AgentTool.js'
import { getAgentColor } from './agentColorManager.js'
import { GENERAL_PURPOSE_AGENT } from './built-in/generalPurposeAgent.js'
import { BetaUsage } from '@anthropic-ai/sdk/resources/beta.mjs'
const MAX_PROGRESS_MESSAGES_TO_SHOW = 3
@@ -411,7 +412,7 @@ export function renderToolResultMessage(
const finalAssistantMessage = createAssistantMessage({
content: completionMessage,
usage: { ...usage, inference_geo: null, iterations: null, speed: null } as typeof usage,
usage: { ...usage, inference_geo: null, iterations: null, speed: null } as unknown as BetaUsage,
})
return (

8
src/utils/computerUse/win32/bridgeClient.ts
View File

@@ -131,10 +131,10 @@ export async function call<T = unknown>(
try {
const stdin = bridgeProc!.stdin
if (stdin) {
const writable = stdin as Writable
const writable = stdin as unknown as Writable
writable.write(JSON.stringify(req) + '\n')
if (typeof writable.flush === 'function') {
writable.flush()
if (typeof (writable as any).flush === 'function') {
(writable as any).flush()
}
}
} catch (err) {
@@ -185,7 +185,7 @@ export function stopBridge(): void {
try {
const stdin = bridgeProc.stdin
if (stdin) {
const writable = stdin as Writable
const writable = stdin as unknown as Writable
if (typeof writable.end === 'function') {
writable.end()
}

4
src/utils/streamlinedTransform.ts
View File

@@ -137,14 +137,14 @@ export function createStreamlinedTransformer(): (
): StdoutMessage | null {
switch (message.type) {
case 'assistant': {
const messageContent = (message as SDKAssistantMessage).message
const messageContent = (message as unknown as SDKAssistantMessage).message
const content = messageContent?.content
const text = Array.isArray(content)
? extractTextContent(content, '\n').trim()
: ''
// Accumulate tool counts from this message
accumulateToolUses(message as SDKAssistantMessage, cumulativeCounts)
accumulateToolUses(message as unknown as SDKAssistantMessage, cumulativeCounts)
if (text.length > 0) {
// Text message: emit text only, reset counts