diff --git a/scripts/defines.ts b/scripts/defines.ts
index 33ed2b564d..d339b0eb32 100644
--- a/scripts/defines.ts
+++ b/scripts/defines.ts
@@ -7,7 +7,7 @@
  */
 export function getMacroDefines(): Record<string, string> {
     return {
-        "MACRO.VERSION": JSON.stringify("2.1.888"),
+        "MACRO.VERSION": JSON.stringify("4.0.1"),
         "MACRO.BUILD_TIME": JSON.stringify(new Date().toISOString()),
         "MACRO.FEEDBACK_CHANNEL": JSON.stringify(""),
         "MACRO.ISSUES_EXPLAINER": JSON.stringify(""),
diff --git a/src/components/ConsoleOAuthFlow.tsx b/src/components/ConsoleOAuthFlow.tsx
index 5264b32b39..4ce66cabe9 100644
--- a/src/components/ConsoleOAuthFlow.tsx
+++ b/src/components/ConsoleOAuthFlow.tsx
@@ -16,7 +16,8 @@ import { getSettings_DEPRECATED, updateSettingsForSource } from '../utils/settin
 import { Select } from './CustomSelect/select.js'
 import { Spinner } from './Spinner.js'
 import TextInput from './TextInput.js'
-import { fi } from 'zod/v4/locales'
+import { ModelPicker } from './ModelPicker.js'
+import { useSetAppState } from '../state/AppState.js'
 
 type Props = {
   onDone(): void
@@ -28,6 +29,14 @@ type Props = {
 type OAuthStatus =
   | { state: 'idle' } // Initial state, waiting to select login method
   | { state: 'platform_setup' } // Show platform setup info (Bedrock/Vertex/Foundry)
+  | {
+      state: 'costrict_waiting'
+      url: string
+    } // CoStrict OAuth: browser opened, waiting for user to login
+  | {
+      state: 'costrict_model_select'
+      models: Array<{ id: string; name?: string }>
+    } // CoStrict: login done, select a model
   | {
       state: 'custom_platform'
       baseUrl: string
@@ -73,6 +82,7 @@ export function ConsoleOAuthFlow({
   mode = 'login',
   forceLoginMethod: forceLoginMethodProp,
 }: Props): React.ReactNode {
+  const setAppState = useSetAppState()
   const settings = getSettings_DEPRECATED() || {}
   const forceLoginMethod = forceLoginMethodProp ?? settings.forceLoginMethod
   const orgUUID = settings.forceLoginOrgUUID
@@ -273,6 +283,8 @@ export function ConsoleOAuthFlow({
         }
         // Reset modelType to anthropic when using OAuth login
         updateSettingsForSource('userSettings', { modelType: 'anthropic' } as any)
+        delete process.env.CLAUDE_CODE_USE_COSTRICT
+        setAppState(prev => ({ ...prev, mainLoopModel: null, mainLoopModelForSession: null }))
 
         setOAuthStatus({ state: 'success' })
         void sendNotification(
@@ -438,6 +450,7 @@ function OAuthStatusMessage({
   setLoginWithClaudeAi,
   onDone,
 }: OAuthStatusMessageProps): React.ReactNode {
+  const setAppState = useSetAppState()
   switch (oauthStatus.state) {
     case 'idle':
       return (
@@ -453,6 +466,16 @@ function OAuthStatusMessage({
           <Box>
             <Select
               options={[
+                {
+                  label: (
+                    <Text>
+                      CoStrict ·{' '}
+                      <Text dimColor>Sign in with CoStrict account</Text>
+                      {'\n'}
+                    </Text>
+                  ),
+                  value: 'costrict',
+                },
                 {
                   label: (
                     <Text>
@@ -530,7 +553,70 @@ function OAuthStatusMessage({
                 },
               ]}
               onChange={value => {
-                if (value === 'custom_platform') {
+                if (value === 'costrict') {
+                  void (async () => {
+                    try {
+                      const { generateState, getCoStrictBaseURL, buildCoStrictLoginURL, pollLoginToken } = await import('../costrict/provider/auth.js')
+                      const { generateMachineId, saveCoStrictCredentials } = await import('../costrict/provider/credentials.js')
+                      const { extractExpiryFromJWT } = await import('../costrict/provider/token.js')
+                      const { updateSettingsForSource } = await import('../utils/settings/settings.js')
+
+                      const baseUrl = getCoStrictBaseURL()
+                      const state = generateState()
+                      const machineId = generateMachineId()
+                      const loginUrl = buildCoStrictLoginURL(baseUrl, state, machineId)
+
+                      // 打开浏览器（复用 csc 的 openBrowser，Windows 用 rundll32 url,OpenURL 避免 & 被 cmd.exe 截断）
+                      const { openBrowser } = await import('../utils/browser.js')
+                      await openBrowser(loginUrl)
+
+                      setOAuthStatus({ state: 'costrict_waiting', url: loginUrl })
+
+                      // 轮询等待登录完成
+                      const tokens = await pollLoginToken(baseUrl, state, machineId)
+
+                      // 保存凭证
+                      const expiryDate = extractExpiryFromJWT(tokens.access_token)
+                      await saveCoStrictCredentials({
+                        id: 'csc',
+                        name: 'CSC Auth',
+                        access_token: tokens.access_token,
+                        refresh_token: tokens.refresh_token,
+                        state,
+                        machine_id: machineId,
+                        base_url: baseUrl,
+                        expiry_date: expiryDate,
+                        updated_at: new Date().toISOString(),
+                        expired_at: expiryDate ? new Date(expiryDate).toISOString() : undefined,
+                      })
+
+                      // 设置 modelType 为 costrict
+                      updateSettingsForSource('userSettings', { modelType: 'costrict' as any } as any)
+                      process.env.CLAUDE_CODE_USE_COSTRICT = '1'
+
+                      // 预取模型列表，填充同步缓存，并进入模型选择界面
+                      try {
+                        const { fetchCoStrictModels } = await import('../costrict/provider/models.js')
+                        const models = await fetchCoStrictModels(baseUrl, tokens.access_token)
+                        if (models.length > 0) {
+                          setOAuthStatus({ state: 'costrict_model_select', models })
+                          return
+                        }
+                      } catch {
+                        // 预取失败，直接进入 success
+                      }
+
+                      setOAuthStatus({ state: 'success' })
+                      void onDone()
+                    } catch (err: any) {
+                      setOAuthStatus({
+                        state: 'error',
+                        message: err.message || String(err),
+                        toRetry: { state: 'idle' },
+                      })
+                    }
+                  })()
+                } else if (value === 'custom_platform') {
                   logEvent('tengu_custom_platform_selected', {})
                   setOAuthStatus({
                     state: 'custom_platform',
@@ -696,10 +782,12 @@ function OAuthStatusMessage({
             })
           } else {
             for (const [k, v] of Object.entries(env)) process.env[k] = v
+            delete process.env.CLAUDE_CODE_USE_COSTRICT
+            setAppState(prev => ({ ...prev, mainLoopModel: null, mainLoopModelForSession: null }))
             setOAuthStatus({ state: 'success' })
             void onDone()
           }
-        }, [activeField, inputValue, displayValues, setOAuthStatus, onDone])
+        }, [activeField, inputValue, displayValues, setOAuthStatus, onDone, setAppState])
 
         const handleEnter = useCallback(() => {
           const idx = FIELDS.indexOf(activeField)
@@ -916,10 +1004,12 @@ function OAuthStatusMessage({
             })
           } else {
             for (const [k, v] of Object.entries(env)) process.env[k] = v
+            delete process.env.CLAUDE_CODE_USE_COSTRICT
+            setAppState(prev => ({ ...prev, mainLoopModel: null, mainLoopModelForSession: null }))
             setOAuthStatus({ state: 'success' })
             void onDone()
           }
-        }, [activeField, openaiInputValue, openaiDisplayValues, setOAuthStatus, onDone])
+        }, [activeField, openaiInputValue, openaiDisplayValues, setOAuthStatus, onDone, setAppState])
 
         const handleOpenAIEnter = useCallback(() => {
           const idx = OPENAI_FIELDS.indexOf(activeField)
@@ -1149,10 +1239,12 @@ function OAuthStatusMessage({
             })
           } else {
             for (const [k, v] of Object.entries(env)) process.env[k] = v
+            delete process.env.CLAUDE_CODE_USE_COSTRICT
+            setAppState(prev => ({ ...prev, mainLoopModel: null, mainLoopModelForSession: null }))
             setOAuthStatus({ state: 'success' })
             void onDone()
           }
-        }, [activeField, geminiInputValue, geminiDisplayValues, onDone, setOAuthStatus])
+        }, [activeField, geminiInputValue, geminiDisplayValues, onDone, setOAuthStatus, setAppState])
 
         const handleGeminiEnter = useCallback(() => {
           const idx = GEMINI_FIELDS.indexOf(activeField)
@@ -1275,6 +1367,44 @@ function OAuthStatusMessage({
         )
       }
 
+    case 'costrict_waiting':
+      return (
+        <Box flexDirection="column" gap={1}>
+          <Text>
+            Opening browser for CoStrict login. If it does not open
+            automatically, copy and paste this URL:
+          </Text>
+          <Box marginY={1}>
+            <Text color="cyan">{oauthStatus.url}</Text>
+          </Box>
+          <Text dimColor>Waiting for authentication...</Text>
+        </Box>
+      )
+
+    case 'costrict_model_select': {
+      const sortedModels = [...oauthStatus.models].sort((a, b) => a.id.localeCompare(b.id))
+      return (
+        <ModelPicker
+          initial={sortedModels[0]?.id ?? null}
+          headerText="Login successful. Select a CoStrict model to use:"
+          onSelect={(model) => {
+            const selected = model ?? sortedModels[0]?.id ?? ''
+            process.env.COSTRICT_MODEL = selected
+            setAppState(prev => ({ ...prev, mainLoopModel: selected, mainLoopModelForSession: null }))
+            setOAuthStatus({ state: 'success' })
+            void onDone()
+          }}
+          onCancel={() => {
+            const selected = sortedModels[0]?.id ?? ''
+            process.env.COSTRICT_MODEL = selected
+            setAppState(prev => ({ ...prev, mainLoopModel: selected, mainLoopModelForSession: null }))
+            setOAuthStatus({ state: 'success' })
+            void onDone()
+          }}
+        />
+      )
+    }
+
     case 'platform_setup':
       return (
         <Box flexDirection="column" gap={1} marginTop={1}>
diff --git a/src/components/LogoV2/Clawd.tsx b/src/components/LogoV2/Clawd.tsx
index 6969466bca..8367f7ff66 100644
--- a/src/components/LogoV2/Clawd.tsx
+++ b/src/components/LogoV2/Clawd.tsx
@@ -1,98 +1,21 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { env } from '../../utils/env.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
 
-export type ClawdPose =
-  | 'default'
-  | 'arms-up' // both arms raised (used during jump)
-  | 'look-left' // both pupils shifted left
-  | 'look-right' // both pupils shifted right
+export type ClawdPose = 'default' | 'arms-up' | 'look-left' | 'look-right';
 
 type Props = {
-  pose?: ClawdPose
-}
-
-// Standard-terminal pose fragments. Each row is split into segments so we can
-// vary only the parts that change (eyes, arms) while keeping the body/bg spans
-// stable. All poses end up 9 cols wide.
-//
-// arms-up: the row-2 arm shapes (▝▜ / ▛▘) move to row 1 as their
-// bottom-heavy mirrors (▗▟ / ▙▖) — same silhouette, one row higher.
-//
-// look-* use top-quadrant eye chars (▙/▟) so both eyes change from the
-// default (▛/▜, bottom pupils) — otherwise only one eye would appear to move.
-type Segments = {
-  /** row 1 left (no bg): optional raised arm + side */
-  r1L: string
-  /** row 1 eyes (with bg): left-eye, forehead, right-eye */
-  r1E: string
-  /** row 1 right (no bg): side + optional raised arm */
-  r1R: string
-  /** row 2 left (no bg): arm + body curve */
-  r2L: string
-  /** row 2 right (no bg): body curve + arm */
-  r2R: string
-}
-
-const POSES: Record<ClawdPose, Segments> = {
-  default: { r1L: ' ▐', r1E: '▛███▜', r1R: '▌', r2L: '▝▜', r2R: '▛▘' },
-  'look-left': { r1L: ' ▐', r1E: '▟███▟', r1R: '▌', r2L: '▝▜', r2R: '▛▘' },
-  'look-right': { r1L: ' ▐', r1E: '▙███▙', r1R: '▌', r2L: '▝▜', r2R: '▛▘' },
-  'arms-up': { r1L: '▗▟', r1E: '▛███▜', r1R: '▙▖', r2L: ' ▜', r2R: '▛ ' },
-}
+  pose?: ClawdPose;
+};
 
-// Apple Terminal uses a bg-fill trick (see below), so only eye poses make
-// sense. Arm poses fall back to default.
-const APPLE_EYES: Record<ClawdPose, string> = {
-  default: ' ▗   ▖ ',
-  'look-left': ' ▘   ▘ ',
-  'look-right': ' ▝   ▝ ',
-  'arms-up': ' ▗   ▖ ',
-}
+// CoStrict ASCII art 大字标志，两行块字符风格：
+// █▀▀ █▀█ █▀ ▀█▀ █▀█ █ █▀▀ ▀█▀
+// █▄▄ █▄█ ▄█  █  █▀▄ █ █▄▄  █
 
 export function Clawd({ pose = 'default' }: Props = {}): React.ReactNode {
-  if (env.terminal === 'Apple_Terminal') {
-    return <AppleTerminalClawd pose={pose} />
-  }
-  const p = POSES[pose]
-  return (
-    <Box flexDirection="column">
-      <Text>
-        <Text color="clawd_body">{p.r1L}</Text>
-        <Text color="clawd_body" backgroundColor="clawd_background">
-          {p.r1E}
-        </Text>
-        <Text color="clawd_body">{p.r1R}</Text>
-      </Text>
-      <Text>
-        <Text color="clawd_body">{p.r2L}</Text>
-        <Text color="clawd_body" backgroundColor="clawd_background">
-          █████
-        </Text>
-        <Text color="clawd_body">{p.r2R}</Text>
-      </Text>
-      <Text color="clawd_body">
-        {'  '}▘▘ ▝▝{'  '}
-      </Text>
-    </Box>
-  )
-}
-
-function AppleTerminalClawd({ pose }: { pose: ClawdPose }): React.ReactNode {
-  // Apple's Terminal renders vertical space between chars by default.
-  // It does NOT render vertical space between background colors
-  // so we use background color to draw the main shape.
   return (
     <Box flexDirection="column" alignItems="center">
-      <Text>
-        <Text color="clawd_body">▗</Text>
-        <Text color="clawd_background" backgroundColor="clawd_body">
-          {APPLE_EYES[pose]}
-        </Text>
-        <Text color="clawd_body">▖</Text>
-      </Text>
-      <Text backgroundColor="clawd_body">{' '.repeat(7)}</Text>
-      <Text color="clawd_body">▘▘ ▝▝</Text>
+      <Text color="claudeBlue_FOR_SYSTEM_SPINNER">{'█▀▀ █▀█ █▀ ▀█▀ █▀█ █ █▀▀ ▀█▀'}</Text>
+      <Text color="claudeBlue_FOR_SYSTEM_SPINNER">{'█▄▄ █▄█ ▄█  █  █▀▄ █ █▄▄  █ '}</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/LogoV2/CondensedLogo.tsx b/src/components/LogoV2/CondensedLogo.tsx
index eb048ec2d4..13419d62c8 100644
--- a/src/components/LogoV2/CondensedLogo.tsx
+++ b/src/components/LogoV2/CondensedLogo.tsx
@@ -1,83 +1,71 @@
-import * as React from 'react'
-import { type ReactNode, useEffect } from 'react'
-import { useMainLoopModel } from '../../hooks/useMainLoopModel.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { Box, Text, stringWidth } from '@anthropic/ink'
-import { useAppState } from '../../state/AppState.js'
-import { getEffortSuffix } from '../../utils/effort.js'
-import { truncate } from '../../utils/format.js'
-import { isFullscreenEnvEnabled } from '../../utils/fullscreen.js'
-import {
-  formatModelAndBilling,
-  getLogoDisplayData,
-  truncatePath,
-} from '../../utils/logoV2Utils.js'
-import { renderModelSetting } from '../../utils/model/model.js'
-import { OffscreenFreeze } from '../OffscreenFreeze.js'
-import { AnimatedClawd } from './AnimatedClawd.js'
-import { Clawd } from './Clawd.js'
-import {
-  GuestPassesUpsell,
-  incrementGuestPassesSeenCount,
-  useShowGuestPassesUpsell,
-} from './GuestPassesUpsell.js'
+import * as React from 'react';
+import { type ReactNode, useEffect } from 'react';
+import { useMainLoopModel } from '../../hooks/useMainLoopModel.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { Box, Text, stringWidth } from '@anthropic/ink';
+import { useAppState } from '../../state/AppState.js';
+import { getEffortSuffix } from '../../utils/effort.js';
+import { truncate } from '../../utils/format.js';
+import { isFullscreenEnvEnabled } from '../../utils/fullscreen.js';
+import { formatModelAndBilling, getLogoDisplayData, truncatePath } from '../../utils/logoV2Utils.js';
+import { renderModelSetting } from '../../utils/model/model.js';
+import { OffscreenFreeze } from '../OffscreenFreeze.js';
+import { AnimatedClawd } from './AnimatedClawd.js';
+import { Clawd } from './Clawd.js';
+import { GuestPassesUpsell, incrementGuestPassesSeenCount, useShowGuestPassesUpsell } from './GuestPassesUpsell.js';
 import {
   incrementOverageCreditUpsellSeenCount,
   OverageCreditUpsell,
   useShowOverageCreditUpsell,
-} from './OverageCreditUpsell.js'
+} from './OverageCreditUpsell.js';
 
 export function CondensedLogo(): ReactNode {
-  const { columns } = useTerminalSize()
-  const agent = useAppState(s => s.agent)
-  const effortValue = useAppState(s => s.effortValue)
-  const model = useMainLoopModel()
-  const modelDisplayName = renderModelSetting(model)
-  const { version, cwd, billingType, agentName: agentNameFromSettings } = getLogoDisplayData()
+  const { columns } = useTerminalSize();
+  const agent = useAppState(s => s.agent);
+  const effortValue = useAppState(s => s.effortValue);
+  const model = useMainLoopModel();
+  const modelDisplayName = renderModelSetting(model);
+  const { version, cwd, billingType, agentName: agentNameFromSettings } = getLogoDisplayData();
 
   // Prefer AppState.agent (set from --agent CLI flag) over settings
-  const agentName = agent ?? agentNameFromSettings
-  const showGuestPassesUpsell = useShowGuestPassesUpsell()
-  const showOverageCreditUpsell = useShowOverageCreditUpsell()
+  const agentName = agent ?? agentNameFromSettings;
+  const showGuestPassesUpsell = useShowGuestPassesUpsell();
+  const showOverageCreditUpsell = useShowOverageCreditUpsell();
 
   useEffect(() => {
     if (showGuestPassesUpsell) {
-      incrementGuestPassesSeenCount()
+      incrementGuestPassesSeenCount();
     }
-  }, [showGuestPassesUpsell])
+  }, [showGuestPassesUpsell]);
 
   useEffect(() => {
     if (showOverageCreditUpsell && !showGuestPassesUpsell) {
-      incrementOverageCreditUpsellSeenCount()
+      incrementOverageCreditUpsellSeenCount();
     }
-  }, [showOverageCreditUpsell, showGuestPassesUpsell])
+  }, [showOverageCreditUpsell, showGuestPassesUpsell]);
 
   // Calculate available width for text content
   // Account for: condensed clawd width (11 chars) + gap (2) + padding (2) = 15 chars
-  const textWidth = Math.max(columns - 15, 20)
+  const textWidth = Math.max(columns - 15, 20);
 
-  // Truncate version to fit within available width, accounting for "Claude Code v" prefix
-  const versionPrefix = 'Claude Code v'
-  const truncatedVersion = truncate(
-    version,
-    Math.max(textWidth - versionPrefix.length, 6),
-  )
+  // Truncate version to fit within available width, accounting for "CoStrict v" prefix
+  const versionPrefix = 'CoStrict v';
+  const truncatedVersion = truncate(version, Math.max(textWidth - versionPrefix.length, 6));
 
-  const effortSuffix = getEffortSuffix(model, effortValue)
-  const { shouldSplit, truncatedModel, truncatedBilling } =
-    formatModelAndBilling(
-      modelDisplayName + effortSuffix,
-      billingType,
-      textWidth,
-    )
+  const effortSuffix = getEffortSuffix(model, effortValue);
+  const { shouldSplit, truncatedModel, truncatedBilling } = formatModelAndBilling(
+    modelDisplayName + effortSuffix,
+    billingType,
+    textWidth,
+  );
 
   // Truncate path, accounting for agent name if present
-  const separator = ' · '
-  const atPrefix = '@'
+  const separator = ' · ';
+  const atPrefix = '@';
   const cwdAvailableWidth = agentName
     ? textWidth - atPrefix.length - stringWidth(agentName) - separator.length
-    : textWidth
-  const truncatedCwd = truncatePath(cwd, Math.max(cwdAvailableWidth, 10))
+    : textWidth;
+  const truncatedCwd = truncatePath(cwd, Math.max(cwdAvailableWidth, 10));
 
   // OffscreenFreeze: the logo sits at the top of the message list and is the
   // first thing to enter scrollback. useMainLoopModel() subscribes to model
@@ -85,34 +73,40 @@ export function CondensedLogo(): ReactNode {
   // of which changing while in scrollback would force a full terminal reset.
   return (
     <OffscreenFreeze>
-      <Box flexDirection="row" gap={2} alignItems="center">
-      {isFullscreenEnvEnabled() ? <AnimatedClawd /> : <Clawd />}
+      <Box
+        flexDirection="row"
+        gap={2}
+        alignItems="center"
+        borderStyle="round"
+        borderColor="claudeBlue_FOR_SYSTEM_SPINNER"
+        paddingX={1}
+        paddingY={1}
+      >
+        {isFullscreenEnvEnabled() ? <AnimatedClawd /> : <Clawd />}
 
-      {/* Info */}
-      <Box flexDirection="column">
-        <Text>
-          <Text bold>Claude Code</Text>{' '}
-          <Text dimColor>v{truncatedVersion}</Text>
-        </Text>
-        {shouldSplit ? (
-          <>
-            <Text dimColor>{truncatedModel}</Text>
-            <Text dimColor>{truncatedBilling}</Text>
-          </>
-        ) : (
-          <Text dimColor>
-            {truncatedModel} · {truncatedBilling}
+        {/* Info */}
+        <Box flexDirection="column">
+          <Text>
+            <Text bold color="claudeBlue_FOR_SYSTEM_SPINNER">
+              CoStrict
+            </Text>{' '}
+            <Text dimColor>v{truncatedVersion}</Text>
           </Text>
-        )}
-        <Text dimColor>
-          {agentName ? `@${agentName} · ${truncatedCwd}` : truncatedCwd}
-        </Text>
-        {showGuestPassesUpsell && <GuestPassesUpsell />}
-        {!showGuestPassesUpsell && showOverageCreditUpsell && (
-          <OverageCreditUpsell maxWidth={textWidth} twoLine />
-        )}
-      </Box>
+          {shouldSplit ? (
+            <>
+              <Text dimColor>{truncatedModel}</Text>
+              <Text dimColor>{truncatedBilling}</Text>
+            </>
+          ) : (
+            <Text dimColor>
+              {truncatedModel} · {truncatedBilling}
+            </Text>
+          )}
+          <Text dimColor>{agentName ? `@${agentName} · ${truncatedCwd}` : truncatedCwd}</Text>
+          {showGuestPassesUpsell && <GuestPassesUpsell />}
+          {!showGuestPassesUpsell && showOverageCreditUpsell && <OverageCreditUpsell maxWidth={textWidth} twoLine />}
+        </Box>
       </Box>
     </OffscreenFreeze>
-  )
+  );
 }
diff --git a/src/components/LogoV2/Feed.tsx b/src/components/LogoV2/Feed.tsx
index be849bfd72..e333496a9e 100644
--- a/src/components/LogoV2/Feed.tsx
+++ b/src/components/LogoV2/Feed.tsx
@@ -1,69 +1,61 @@
-import * as React from 'react'
-import { Box, Text, stringWidth } from '@anthropic/ink'
-import { truncate } from '../../utils/format.js'
+import * as React from 'react';
+import { Box, Text, stringWidth } from '@anthropic/ink';
+import { truncate } from '../../utils/format.js';
 
 export type FeedLine = {
-  text: string
-  timestamp?: string
-}
+  text: string;
+  timestamp?: string;
+};
 
 export type FeedConfig = {
-  title: string
-  lines: FeedLine[]
-  footer?: string
-  emptyMessage?: string
-  customContent?: { content: React.ReactNode; width: number }
-}
+  title: string;
+  lines: FeedLine[];
+  footer?: string;
+  emptyMessage?: string;
+  customContent?: { content: React.ReactNode; width: number };
+};
 
 type FeedProps = {
-  config: FeedConfig
-  actualWidth: number
-}
+  config: FeedConfig;
+  actualWidth: number;
+};
 
 export function calculateFeedWidth(config: FeedConfig): number {
-  const { title, lines, footer, emptyMessage, customContent } = config
+  const { title, lines, footer, emptyMessage, customContent } = config;
 
-  let maxWidth = stringWidth(title)
+  let maxWidth = stringWidth(title);
 
   if (customContent !== undefined) {
-    maxWidth = Math.max(maxWidth, customContent.width)
+    maxWidth = Math.max(maxWidth, customContent.width);
   } else if (lines.length === 0 && emptyMessage) {
-    maxWidth = Math.max(maxWidth, stringWidth(emptyMessage))
+    maxWidth = Math.max(maxWidth, stringWidth(emptyMessage));
   } else {
-    const gap = '  '
-    const maxTimestampWidth = Math.max(
-      0,
-      ...lines.map(line => (line.timestamp ? stringWidth(line.timestamp) : 0)),
-    )
+    const gap = '  ';
+    const maxTimestampWidth = Math.max(0, ...lines.map(line => (line.timestamp ? stringWidth(line.timestamp) : 0)));
 
     for (const line of lines) {
-      const timestampWidth = maxTimestampWidth > 0 ? maxTimestampWidth : 0
-      const lineWidth =
-        stringWidth(line.text) +
-        (timestampWidth > 0 ? timestampWidth + gap.length : 0)
-      maxWidth = Math.max(maxWidth, lineWidth)
+      const timestampWidth = maxTimestampWidth > 0 ? maxTimestampWidth : 0;
+      const lineWidth = stringWidth(line.text) + (timestampWidth > 0 ? timestampWidth + gap.length : 0);
+      maxWidth = Math.max(maxWidth, lineWidth);
     }
   }
 
   if (footer) {
-    maxWidth = Math.max(maxWidth, stringWidth(footer))
+    maxWidth = Math.max(maxWidth, stringWidth(footer));
   }
 
-  return maxWidth
+  return maxWidth;
 }
 
 export function Feed({ config, actualWidth }: FeedProps): React.ReactNode {
-  const { title, lines, footer, emptyMessage, customContent } = config
+  const { title, lines, footer, emptyMessage, customContent } = config;
 
-  const gap = '  '
-  const maxTimestampWidth = Math.max(
-    0,
-    ...lines.map(line => (line.timestamp ? stringWidth(line.timestamp) : 0)),
-  )
+  const gap = '  ';
+  const maxTimestampWidth = Math.max(0, ...lines.map(line => (line.timestamp ? stringWidth(line.timestamp) : 0)));
 
   return (
     <Box flexDirection="column" width={actualWidth}>
-      <Text bold color="claude">
+      <Text bold color="claudeBlue_FOR_SYSTEM_SPINNER">
         {title}
       </Text>
       {customContent ? (
@@ -80,25 +72,19 @@ export function Feed({ config, actualWidth }: FeedProps): React.ReactNode {
       ) : (
         <>
           {lines.map((line, index) => {
-            const textWidth = Math.max(
-              10,
-              actualWidth -
-                (maxTimestampWidth > 0 ? maxTimestampWidth + gap.length : 0),
-            )
+            const textWidth = Math.max(10, actualWidth - (maxTimestampWidth > 0 ? maxTimestampWidth + gap.length : 0));
 
             return (
               <Text key={index}>
                 {maxTimestampWidth > 0 && (
                   <>
-                    <Text dimColor>
-                      {(line.timestamp || '').padEnd(maxTimestampWidth)}
-                    </Text>
+                    <Text dimColor>{(line.timestamp || '').padEnd(maxTimestampWidth)}</Text>
                     {gap}
                   </>
                 )}
                 <Text>{truncate(line.text, textWidth)}</Text>
               </Text>
-            )
+            );
           })}
           {footer && (
             <Text dimColor italic>
@@ -108,5 +94,5 @@ export function Feed({ config, actualWidth }: FeedProps): React.ReactNode {
         </>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/LogoV2/FeedColumn.tsx b/src/components/LogoV2/FeedColumn.tsx
index 4c6ae84f5a..a774c1d166 100644
--- a/src/components/LogoV2/FeedColumn.tsx
+++ b/src/components/LogoV2/FeedColumn.tsx
@@ -1,32 +1,27 @@
-import * as React from 'react'
-import { Box } from '@anthropic/ink'
-import { Divider } from '@anthropic/ink'
-import type { FeedConfig } from './Feed.js'
-import { calculateFeedWidth, Feed } from './Feed.js'
+import * as React from 'react';
+import { Box } from '@anthropic/ink';
+import { Divider } from '@anthropic/ink';
+import type { FeedConfig } from './Feed.js';
+import { calculateFeedWidth, Feed } from './Feed.js';
 
 type FeedColumnProps = {
-  feeds: FeedConfig[]
-  maxWidth: number
-}
+  feeds: FeedConfig[];
+  maxWidth: number;
+};
 
-export function FeedColumn({
-  feeds,
-  maxWidth,
-}: FeedColumnProps): React.ReactNode {
-  const feedWidths = feeds.map(feed => calculateFeedWidth(feed))
-  const maxOfAllFeeds = Math.max(...feedWidths)
-  const actualWidth = Math.min(maxOfAllFeeds, maxWidth)
+export function FeedColumn({ feeds, maxWidth }: FeedColumnProps): React.ReactNode {
+  const feedWidths = feeds.map(feed => calculateFeedWidth(feed));
+  const maxOfAllFeeds = Math.max(...feedWidths);
+  const actualWidth = Math.min(maxOfAllFeeds, maxWidth);
 
   return (
     <Box flexDirection="column">
       {feeds.map((feed, index) => (
         <React.Fragment key={index}>
           <Feed config={feed} actualWidth={actualWidth} />
-          {index < feeds.length - 1 && (
-            <Divider color="claude" width={actualWidth} />
-          )}
+          {index < feeds.length - 1 && <Divider color="claudeBlue_FOR_SYSTEM_SPINNER" width={actualWidth} />}
         </React.Fragment>
       ))}
     </Box>
-  )
+  );
 }
diff --git a/src/components/LogoV2/LogoV2.tsx b/src/components/LogoV2/LogoV2.tsx
index c7dcf41392..7ae609bed3 100644
--- a/src/components/LogoV2/LogoV2.tsx
+++ b/src/components/LogoV2/LogoV2.tsx
@@ -1,7 +1,7 @@
 // biome-ignore-all assist/source/organizeImports: ANT-ONLY import markers must not be reordered
-import * as React from 'react'
-import { Box, Text, color, stringWidth } from '@anthropic/ink'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
+import * as React from 'react';
+import { Box, Text, color, stringWidth } from '@anthropic/ink';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
 import {
   getLayoutMode,
   calculateLayoutDimensions,
@@ -11,46 +11,39 @@ import {
   getRecentActivitySync,
   getRecentReleaseNotesSync,
   getLogoDisplayData,
-} from '../../utils/logoV2Utils.js'
-import { truncate } from '../../utils/format.js'
-import { getDisplayPath } from '../../utils/file.js'
-import { Clawd } from './Clawd.js'
-import { FeedColumn } from './FeedColumn.js'
+} from '../../utils/logoV2Utils.js';
+import { truncate } from '../../utils/format.js';
+import { getDisplayPath } from '../../utils/file.js';
+import { Clawd } from './Clawd.js';
+import { FeedColumn } from './FeedColumn.js';
 import {
   createRecentActivityFeed,
   createWhatsNewFeed,
   createProjectOnboardingFeed,
   createGuestPassesFeed,
-} from './feedConfigs.js'
-import { getGlobalConfig, saveGlobalConfig } from 'src/utils/config.js'
-import { resolveThemeSetting } from 'src/utils/systemTheme.js'
-import { getInitialSettings } from 'src/utils/settings/settings.js'
-import {
-  isDebugMode,
-  isDebugToStdErr,
-  getDebugLogPath,
-} from 'src/utils/debug.js'
-import { useEffect, useState } from 'react'
+} from './feedConfigs.js';
+import { getGlobalConfig, saveGlobalConfig } from 'src/utils/config.js';
+import { resolveThemeSetting } from 'src/utils/systemTheme.js';
+import { getInitialSettings } from 'src/utils/settings/settings.js';
+import { isDebugMode, isDebugToStdErr, getDebugLogPath } from 'src/utils/debug.js';
+import { useEffect, useState } from 'react';
 import {
   getSteps,
   shouldShowProjectOnboarding,
   incrementProjectOnboardingSeenCount,
-} from '../../projectOnboardingState.js'
-import { CondensedLogo } from './CondensedLogo.js'
-import { OffscreenFreeze } from '../OffscreenFreeze.js'
-import { checkForReleaseNotesSync } from '../../utils/releaseNotes.js'
-import { getDumpPromptsPath } from 'src/services/api/dumpPrompts.js'
-import { isEnvTruthy } from 'src/utils/envUtils.js'
-import {
-  getStartupPerfLogPath,
-  isDetailedProfilingEnabled,
-} from 'src/utils/startupProfiler.js'
-import { EmergencyTip } from './EmergencyTip.js'
-import { VoiceModeNotice } from './VoiceModeNotice.js'
-import { Opus1mMergeNotice } from './Opus1mMergeNotice.js'
-import { GateOverridesWarning } from './GateOverridesWarning.js'
-import { ExperimentEnrollmentNotice } from './ExperimentEnrollmentNotice.js'
-import { feature } from 'bun:bundle'
+} from '../../projectOnboardingState.js';
+import { CondensedLogo } from './CondensedLogo.js';
+import { OffscreenFreeze } from '../OffscreenFreeze.js';
+import { checkForReleaseNotesSync } from '../../utils/releaseNotes.js';
+import { getDumpPromptsPath } from 'src/services/api/dumpPrompts.js';
+import { isEnvTruthy } from 'src/utils/envUtils.js';
+import { getStartupPerfLogPath, isDetailedProfilingEnabled } from 'src/utils/startupProfiler.js';
+import { EmergencyTip } from './EmergencyTip.js';
+import { VoiceModeNotice } from './VoiceModeNotice.js';
+import { Opus1mMergeNotice } from './Opus1mMergeNotice.js';
+import { GateOverridesWarning } from './GateOverridesWarning.js';
+import { ExperimentEnrollmentNotice } from './ExperimentEnrollmentNotice.js';
+import { feature } from 'bun:bundle';
 
 // Conditional require so ChannelsNotice.tsx tree-shakes when both flags are
 // false. A module-scope helper component inside a feature() ternary does NOT
@@ -61,128 +54,98 @@ import { feature } from 'bun:bundle'
 const ChannelsNoticeModule =
   feature('KAIROS') || feature('KAIROS_CHANNELS')
     ? (require('./ChannelsNotice.js') as typeof import('./ChannelsNotice.js'))
-    : null
+    : null;
 /* eslint-enable @typescript-eslint/no-require-imports */
-import { SandboxManager } from 'src/utils/sandbox/sandbox-adapter.js'
-import {
-  useShowGuestPassesUpsell,
-  incrementGuestPassesSeenCount,
-} from './GuestPassesUpsell.js'
+import { SandboxManager } from 'src/utils/sandbox/sandbox-adapter.js';
+import { useShowGuestPassesUpsell, incrementGuestPassesSeenCount } from './GuestPassesUpsell.js';
 import {
   useShowOverageCreditUpsell,
   incrementOverageCreditUpsellSeenCount,
   createOverageCreditFeed,
-} from './OverageCreditUpsell.js'
-import { plural } from '../../utils/stringUtils.js'
-import { useAppState } from '../../state/AppState.js'
-import { getEffortSuffix } from '../../utils/effort.js'
-import { useMainLoopModel } from '../../hooks/useMainLoopModel.js'
-import { renderModelSetting } from '../../utils/model/model.js'
+} from './OverageCreditUpsell.js';
+import { plural } from '../../utils/stringUtils.js';
+import { useAppState } from '../../state/AppState.js';
+import { getEffortSuffix } from '../../utils/effort.js';
+import { useMainLoopModel } from '../../hooks/useMainLoopModel.js';
+import { renderModelSetting } from '../../utils/model/model.js';
 
-const LEFT_PANEL_MAX_WIDTH = 50
+const LEFT_PANEL_MAX_WIDTH = 50;
 
 export function LogoV2(): React.ReactNode {
-  const activities = getRecentActivitySync()
-  const username = getGlobalConfig().oauthAccount?.displayName ?? ''
+  const activities = getRecentActivitySync();
+  const username = getGlobalConfig().oauthAccount?.displayName ?? '';
 
-  const { columns } = useTerminalSize()
-  const showOnboarding = shouldShowProjectOnboarding()
-  const showSandboxStatus = SandboxManager.isSandboxingEnabled()
-  const showGuestPassesUpsell = useShowGuestPassesUpsell()
-  const showOverageCreditUpsell = useShowOverageCreditUpsell()
-  const agent = useAppState(s => s.agent)
-  const effortValue = useAppState(s => s.effortValue)
+  const { columns } = useTerminalSize();
+  const showOnboarding = shouldShowProjectOnboarding();
+  const showSandboxStatus = SandboxManager.isSandboxingEnabled();
+  const showGuestPassesUpsell = useShowGuestPassesUpsell();
+  const showOverageCreditUpsell = useShowOverageCreditUpsell();
+  const agent = useAppState(s => s.agent);
+  const effortValue = useAppState(s => s.effortValue);
 
-  const config = getGlobalConfig()
+  const config = getGlobalConfig();
 
-  let changelog: string[]
+  let changelog: string[];
   try {
-    changelog = getRecentReleaseNotesSync(3)
+    changelog = getRecentReleaseNotesSync(3);
   } catch {
-    changelog = []
+    changelog = [];
   }
 
   // Get company announcements and select one:
   // - First startup (numStartups === 1): show first announcement
   // - All other startups: randomly select from announcements
   const [announcement] = useState(() => {
-    const announcements = getInitialSettings().companyAnnouncements
-    if (!announcements || announcements.length === 0) return undefined
+    const announcements = getInitialSettings().companyAnnouncements;
+    if (!announcements || announcements.length === 0) return undefined;
     return config.numStartups === 1
       ? announcements[0]
-      : announcements[Math.floor(Math.random() * announcements.length)]
-  })
-  const { hasReleaseNotes } = checkForReleaseNotesSync(
-    config.lastReleaseNotesSeen,
-  )
+      : announcements[Math.floor(Math.random() * announcements.length)];
+  });
+  const { hasReleaseNotes } = checkForReleaseNotesSync(config.lastReleaseNotesSeen);
 
   useEffect(() => {
-    const currentConfig = getGlobalConfig()
+    const currentConfig = getGlobalConfig();
     if (currentConfig.lastReleaseNotesSeen === MACRO.VERSION) {
-      return
+      return;
     }
     saveGlobalConfig(current => {
-      if (current.lastReleaseNotesSeen === MACRO.VERSION) return current
-      return { ...current, lastReleaseNotesSeen: MACRO.VERSION }
-    })
+      if (current.lastReleaseNotesSeen === MACRO.VERSION) return current;
+      return { ...current, lastReleaseNotesSeen: MACRO.VERSION };
+    });
     if (showOnboarding) {
-      incrementProjectOnboardingSeenCount()
+      incrementProjectOnboardingSeenCount();
     }
-  }, [config, showOnboarding])
+  }, [config, showOnboarding]);
 
   // In condensed mode (early-return below renders <CondensedLogo/>),
   // CondensedLogo's own useEffect handles the impression count. Skipping
   // here avoids double-counting since hooks fire before the early return.
-  const isCondensedMode =
-    !hasReleaseNotes &&
-    !showOnboarding &&
-    !isEnvTruthy(process.env.CLAUDE_CODE_FORCE_FULL_LOGO)
+  const isCondensedMode = !hasReleaseNotes && !showOnboarding && !isEnvTruthy(process.env.CLAUDE_CODE_FORCE_FULL_LOGO);
 
   useEffect(() => {
     if (showGuestPassesUpsell && !showOnboarding && !isCondensedMode) {
-      incrementGuestPassesSeenCount()
+      incrementGuestPassesSeenCount();
     }
-  }, [showGuestPassesUpsell, showOnboarding, isCondensedMode])
+  }, [showGuestPassesUpsell, showOnboarding, isCondensedMode]);
 
   useEffect(() => {
-    if (
-      showOverageCreditUpsell &&
-      !showOnboarding &&
-      !showGuestPassesUpsell &&
-      !isCondensedMode
-    ) {
-      incrementOverageCreditUpsellSeenCount()
+    if (showOverageCreditUpsell && !showOnboarding && !showGuestPassesUpsell && !isCondensedMode) {
+      incrementOverageCreditUpsellSeenCount();
     }
-  }, [
-    showOverageCreditUpsell,
-    showOnboarding,
-    showGuestPassesUpsell,
-    isCondensedMode,
-  ])
+  }, [showOverageCreditUpsell, showOnboarding, showGuestPassesUpsell, isCondensedMode]);
 
-  const model = useMainLoopModel()
-  const fullModelDisplayName = renderModelSetting(model)
-  const {
-    version,
-    cwd,
-    billingType,
-    agentName: agentNameFromSettings,
-  } = getLogoDisplayData()
+  const model = useMainLoopModel();
+  const fullModelDisplayName = renderModelSetting(model);
+  const { version, cwd, billingType, agentName: agentNameFromSettings } = getLogoDisplayData();
   // Prefer AppState.agent (set from --agent CLI flag) over settings
-  const agentName = agent ?? agentNameFromSettings
+  const agentName = agent ?? agentNameFromSettings;
   // -20 to account for the max length of subscription name " · Claude Enterprise".
-  const effortSuffix = getEffortSuffix(model, effortValue)
-  const modelDisplayName = truncate(
-    fullModelDisplayName + effortSuffix,
-    LEFT_PANEL_MAX_WIDTH - 20,
-  )
+  const effortSuffix = getEffortSuffix(model, effortValue);
+  const modelDisplayName = truncate(fullModelDisplayName + effortSuffix, LEFT_PANEL_MAX_WIDTH - 20);
 
   // Show condensed logo if no new changelog and not showing onboarding and not forcing full logo
-  if (
-    !hasReleaseNotes &&
-    !showOnboarding &&
-    !isEnvTruthy(process.env.CLAUDE_CODE_FORCE_FULL_LOGO)
-  ) {
+  if (!hasReleaseNotes && !showOnboarding && !isEnvTruthy(process.env.CLAUDE_CODE_FORCE_FULL_LOGO)) {
     return (
       <>
         <CondensedLogo />
@@ -192,17 +155,13 @@ export function LogoV2(): React.ReactNode {
         {isDebugMode() && (
           <Box paddingLeft={2} flexDirection="column">
             <Text color="warning">Debug mode enabled</Text>
-            <Text dimColor>
-              Logging to: {isDebugToStdErr() ? 'stderr' : getDebugLogPath()}
-            </Text>
+            <Text dimColor>Logging to: {isDebugToStdErr() ? 'stderr' : getDebugLogPath()}</Text>
           </Box>
         )}
         <EmergencyTip />
         {process.env.CLAUDE_CODE_TMUX_SESSION && (
           <Box paddingLeft={2} flexDirection="column">
-            <Text dimColor>
-              tmux session: {process.env.CLAUDE_CODE_TMUX_SESSION}
-            </Text>
+            <Text dimColor>tmux session: {process.env.CLAUDE_CODE_TMUX_SESSION}</Text>
             <Text dimColor>
               {process.env.CLAUDE_CODE_TMUX_PREFIX_CONFLICTS
                 ? `Detach: ${process.env.CLAUDE_CODE_TMUX_PREFIX} ${process.env.CLAUDE_CODE_TMUX_PREFIX} d (press prefix twice - Claude uses ${process.env.CLAUDE_CODE_TMUX_PREFIX})`
@@ -213,9 +172,7 @@ export function LogoV2(): React.ReactNode {
         {announcement && (
           <Box paddingLeft={2} flexDirection="column">
             {!process.env.IS_DEMO && config.oauthAccount?.organizationName && (
-              <Text dimColor>
-                Message from {config.oauthAccount.organizationName}:
-              </Text>
+              <Text dimColor>Message from {config.oauthAccount.organizationName}:</Text>
             )}
             <Text>{announcement}</Text>
           </Box>
@@ -228,51 +185,41 @@ export function LogoV2(): React.ReactNode {
         {process.env.USER_TYPE === 'ant' && !process.env.DEMO_VERSION && (
           <Box paddingLeft={2} flexDirection="column">
             <Text color="warning">[ANT-ONLY] Logs:</Text>
-            <Text dimColor>
-              API calls: {getDisplayPath(getDumpPromptsPath())}
-            </Text>
-            <Text dimColor>
-              Debug logs: {getDisplayPath(getDebugLogPath())}
-            </Text>
+            <Text dimColor>API calls: {getDisplayPath(getDumpPromptsPath())}</Text>
+            <Text dimColor>Debug logs: {getDisplayPath(getDebugLogPath())}</Text>
             {isDetailedProfilingEnabled() && (
-              <Text dimColor>
-                Startup Perf: {getDisplayPath(getStartupPerfLogPath())}
-              </Text>
+              <Text dimColor>Startup Perf: {getDisplayPath(getStartupPerfLogPath())}</Text>
             )}
           </Box>
         )}
         {process.env.USER_TYPE === 'ant' && <GateOverridesWarning />}
         {process.env.USER_TYPE === 'ant' && <ExperimentEnrollmentNotice />}
       </>
-    )
+    );
   }
 
   // Calculate layout and display values
-  const layoutMode = getLayoutMode(columns)
+  const layoutMode = getLayoutMode(columns);
 
-  const userTheme = resolveThemeSetting(getGlobalConfig().theme)
-  const borderTitle = ` ${color('claude', userTheme)('Claude Code')} ${color('inactive', userTheme)(`v${version}`)} `
-  const compactBorderTitle = color('claude', userTheme)(' Claude Code ')
+  const userTheme = resolveThemeSetting(getGlobalConfig().theme);
+  const borderTitle = ` ${color('claudeBlue_FOR_SYSTEM_SPINNER', userTheme)('CoStrict')} ${color('inactive', userTheme)(`v${version}`)} `;
+  const compactBorderTitle = color('claudeBlue_FOR_SYSTEM_SPINNER', userTheme)(' CoStrict ');
 
   // Early return for compact mode
   if (layoutMode === 'compact') {
-    const layoutWidth = 4 // border + padding
-    let welcomeMessage = formatWelcomeMessage(username)
+    const layoutWidth = 4; // border + padding
+    let welcomeMessage = formatWelcomeMessage(username);
     if (stringWidth(welcomeMessage) > columns - layoutWidth) {
-      welcomeMessage = formatWelcomeMessage(null)
+      welcomeMessage = formatWelcomeMessage(null);
     }
 
     // Calculate cwd width accounting for agent name if present
-    const separator = ' · '
-    const atPrefix = '@'
+    const separator = ' · ';
+    const atPrefix = '@';
     const cwdAvailableWidth = agentName
-      ? columns -
-        layoutWidth -
-        atPrefix.length -
-        stringWidth(agentName) -
-        separator.length
-      : columns - layoutWidth
-    const truncatedCwd = truncatePath(cwd, Math.max(cwdAvailableWidth, 10))
+      ? columns - layoutWidth - atPrefix.length - stringWidth(agentName) - separator.length
+      : columns - layoutWidth;
+    const truncatedCwd = truncatePath(cwd, Math.max(cwdAvailableWidth, 10));
     // OffscreenFreeze: logo is the first thing to enter scrollback; useMainLoopModel()
     // subscribes to model changes and getLogoDisplayData() reads cwd/subscription —
     // any change while in scrollback forces a full reset.
@@ -282,7 +229,7 @@ export function LogoV2(): React.ReactNode {
           <Box
             flexDirection="column"
             borderStyle="round"
-            borderColor="claude"
+            borderColor="claudeBlue_FOR_SYSTEM_SPINNER"
             borderText={{
               content: compactBorderTitle,
               position: 'top',
@@ -300,9 +247,7 @@ export function LogoV2(): React.ReactNode {
             </Box>
             <Text dimColor>{modelDisplayName}</Text>
             <Text dimColor>{billingType}</Text>
-            <Text dimColor>
-              {agentName ? `@${agentName} · ${truncatedCwd}` : truncatedCwd}
-            </Text>
+            <Text dimColor>{agentName ? `@${agentName} · ${truncatedCwd}` : truncatedCwd}</Text>
           </Box>
         </OffscreenFreeze>
         <VoiceModeNotice />
@@ -310,45 +255,32 @@ export function LogoV2(): React.ReactNode {
         {ChannelsNoticeModule && <ChannelsNoticeModule.ChannelsNotice />}
         {showSandboxStatus && (
           <Box marginTop={1} flexDirection="column">
-            <Text color="warning">
-              Your bash commands will be sandboxed. Disable with /sandbox.
-            </Text>
+            <Text color="warning">Your bash commands will be sandboxed. Disable with /sandbox.</Text>
           </Box>
         )}
         {process.env.USER_TYPE === 'ant' && <GateOverridesWarning />}
         {process.env.USER_TYPE === 'ant' && <ExperimentEnrollmentNotice />}
       </>
-    )
+    );
   }
 
-  const welcomeMessage = formatWelcomeMessage(username)
+  const welcomeMessage = formatWelcomeMessage(username);
   const modelLine =
     !process.env.IS_DEMO && config.oauthAccount?.organizationName
       ? `${modelDisplayName} · ${billingType} · ${config.oauthAccount.organizationName}`
-      : `${modelDisplayName} · ${billingType}`
+      : `${modelDisplayName} · ${billingType}`;
   // Calculate cwd width accounting for agent name if present
-  const cwdSeparator = ' · '
-  const cwdAtPrefix = '@'
+  const cwdSeparator = ' · ';
+  const cwdAtPrefix = '@';
   const cwdAvailableWidth = agentName
-    ? LEFT_PANEL_MAX_WIDTH -
-      cwdAtPrefix.length -
-      stringWidth(agentName) -
-      cwdSeparator.length
-    : LEFT_PANEL_MAX_WIDTH
-  const truncatedCwd = truncatePath(cwd, Math.max(cwdAvailableWidth, 10))
-  const cwdLine = agentName ? `@${agentName} · ${truncatedCwd}` : truncatedCwd
-  const optimalLeftWidth = calculateOptimalLeftWidth(
-    welcomeMessage,
-    cwdLine,
-    modelLine,
-  )
+    ? LEFT_PANEL_MAX_WIDTH - cwdAtPrefix.length - stringWidth(agentName) - cwdSeparator.length
+    : LEFT_PANEL_MAX_WIDTH;
+  const truncatedCwd = truncatePath(cwd, Math.max(cwdAvailableWidth, 10));
+  const cwdLine = agentName ? `@${agentName} · ${truncatedCwd}` : truncatedCwd;
+  const optimalLeftWidth = calculateOptimalLeftWidth(welcomeMessage, cwdLine, modelLine);
 
   // Calculate layout dimensions
-  const { leftWidth, rightWidth } = calculateLayoutDimensions(
-    columns,
-    layoutMode,
-    optimalLeftWidth,
-  )
+  const { leftWidth, rightWidth } = calculateLayoutDimensions(columns, layoutMode, optimalLeftWidth);
 
   return (
     <>
@@ -356,7 +288,7 @@ export function LogoV2(): React.ReactNode {
         <Box
           flexDirection="column"
           borderStyle="round"
-          borderColor="claude"
+          borderColor="claudeBlue_FOR_SYSTEM_SPINNER"
           borderText={{
             content: borderTitle,
             position: 'top',
@@ -365,11 +297,7 @@ export function LogoV2(): React.ReactNode {
           }}
         >
           {/* Main content */}
-          <Box
-            flexDirection={layoutMode === 'horizontal' ? 'row' : 'column'}
-            paddingX={1}
-            gap={1}
-          >
+          <Box flexDirection={layoutMode === 'horizontal' ? 'row' : 'column'} paddingX={1} gap={1}>
             {/* Left Panel */}
             <Box
               flexDirection="column"
@@ -395,7 +323,7 @@ export function LogoV2(): React.ReactNode {
               <Box
                 height="100%"
                 borderStyle="single"
-                borderColor="claude"
+                borderColor="claudeBlue_FOR_SYSTEM_SPINNER"
                 borderDimColor
                 borderTop={false}
                 borderBottom={false}
@@ -408,24 +336,12 @@ export function LogoV2(): React.ReactNode {
               <FeedColumn
                 feeds={
                   showOnboarding
-                    ? [
-                        createProjectOnboardingFeed(getSteps()),
-                        createRecentActivityFeed(activities),
-                      ]
+                    ? [createProjectOnboardingFeed(getSteps()), createRecentActivityFeed(activities)]
                     : showGuestPassesUpsell
-                      ? [
-                          createRecentActivityFeed(activities),
-                          createGuestPassesFeed(),
-                        ]
+                      ? [createRecentActivityFeed(activities), createGuestPassesFeed()]
                       : showOverageCreditUpsell
-                        ? [
-                            createRecentActivityFeed(activities),
-                            createOverageCreditFeed(),
-                          ]
-                        : [
-                            createRecentActivityFeed(activities),
-                            createWhatsNewFeed(changelog),
-                          ]
+                        ? [createRecentActivityFeed(activities), createOverageCreditFeed()]
+                        : [createRecentActivityFeed(activities), createWhatsNewFeed(changelog)]
                 }
                 maxWidth={rightWidth}
               />
@@ -439,17 +355,13 @@ export function LogoV2(): React.ReactNode {
       {isDebugMode() && (
         <Box paddingLeft={2} flexDirection="column">
           <Text color="warning">Debug mode enabled</Text>
-          <Text dimColor>
-            Logging to: {isDebugToStdErr() ? 'stderr' : getDebugLogPath()}
-          </Text>
+          <Text dimColor>Logging to: {isDebugToStdErr() ? 'stderr' : getDebugLogPath()}</Text>
         </Box>
       )}
       <EmergencyTip />
       {process.env.CLAUDE_CODE_TMUX_SESSION && (
         <Box paddingLeft={2} flexDirection="column">
-          <Text dimColor>
-            tmux session: {process.env.CLAUDE_CODE_TMUX_SESSION}
-          </Text>
+          <Text dimColor>tmux session: {process.env.CLAUDE_CODE_TMUX_SESSION}</Text>
           <Text dimColor>
             {process.env.CLAUDE_CODE_TMUX_PREFIX_CONFLICTS
               ? `Detach: ${process.env.CLAUDE_CODE_TMUX_PREFIX} ${process.env.CLAUDE_CODE_TMUX_PREFIX} d (press prefix twice - Claude uses ${process.env.CLAUDE_CODE_TMUX_PREFIX})`
@@ -460,18 +372,14 @@ export function LogoV2(): React.ReactNode {
       {announcement && (
         <Box paddingLeft={2} flexDirection="column">
           {!process.env.IS_DEMO && config.oauthAccount?.organizationName && (
-            <Text dimColor>
-              Message from {config.oauthAccount.organizationName}:
-            </Text>
+            <Text dimColor>Message from {config.oauthAccount.organizationName}:</Text>
           )}
           <Text>{announcement}</Text>
         </Box>
       )}
       {showSandboxStatus && (
         <Box paddingLeft={2} flexDirection="column">
-          <Text color="warning">
-            Your bash commands will be sandboxed. Disable with /sandbox.
-          </Text>
+          <Text color="warning">Your bash commands will be sandboxed. Disable with /sandbox.</Text>
         </Box>
       )}
       {process.env.USER_TYPE === 'ant' && !process.env.DEMO_VERSION && (
@@ -482,20 +390,15 @@ export function LogoV2(): React.ReactNode {
       {process.env.USER_TYPE === 'ant' && !process.env.DEMO_VERSION && (
         <Box paddingLeft={2} flexDirection="column">
           <Text color="warning">[ANT-ONLY] Logs:</Text>
-          <Text dimColor>
-            API calls: {getDisplayPath(getDumpPromptsPath())}
-          </Text>
+          <Text dimColor>API calls: {getDisplayPath(getDumpPromptsPath())}</Text>
           <Text dimColor>Debug logs: {getDisplayPath(getDebugLogPath())}</Text>
           {isDetailedProfilingEnabled() && (
-            <Text dimColor>
-              Startup Perf: {getDisplayPath(getStartupPerfLogPath())}
-            </Text>
+            <Text dimColor>Startup Perf: {getDisplayPath(getStartupPerfLogPath())}</Text>
           )}
         </Box>
       )}
       {process.env.USER_TYPE === 'ant' && <GateOverridesWarning />}
       {process.env.USER_TYPE === 'ant' && <ExperimentEnrollmentNotice />}
     </>
-  )
+  );
 }
-
diff --git a/src/components/LogoV2/WelcomeV2.tsx b/src/components/LogoV2/WelcomeV2.tsx
index ccbbcbf440..235c7cada0 100644
--- a/src/components/LogoV2/WelcomeV2.tsx
+++ b/src/components/LogoV2/WelcomeV2.tsx
@@ -1,17 +1,15 @@
-import React from 'react'
-import { Box, Text, useTheme } from '@anthropic/ink'
-import { env } from '../../utils/env.js'
+import React from 'react';
+import { Box, Text, useTheme } from '@anthropic/ink';
+import { env } from '../../utils/env.js';
 
-const WELCOME_V2_WIDTH = 58
+const WELCOME_V2_WIDTH = 58;
 
 export function WelcomeV2(): React.ReactNode {
-  const [theme] = useTheme()
-  const welcomeMessage = 'Welcome to Claude Code'
+  const [theme] = useTheme();
+  const welcomeMessage = 'Welcome to CoStrict';
 
   if (env.terminal === 'Apple_Terminal') {
-    return (
-      <AppleTerminalWelcomeV2 theme={theme} welcomeMessage={welcomeMessage} />
-    )
+    return <AppleTerminalWelcomeV2 theme={theme} welcomeMessage={welcomeMessage} />;
   }
 
   if (['light', 'light-daltonized', 'light-ansi'].includes(theme)) {
@@ -22,30 +20,14 @@ export function WelcomeV2(): React.ReactNode {
             <Text color="claude">{welcomeMessage} </Text>
             <Text dimColor>v{MACRO.VERSION} </Text>
           </Text>
-          <Text>
-            {'…………………………………………………………………………………………………………………………………………………………'}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
-          <Text>
-            {'            ░░░░░░                                        '}
-          </Text>
-          <Text>
-            {'    ░░░   ░░░░░░░░░░                                      '}
-          </Text>
-          <Text>
-            {'   ░░░░░░░░░░░░░░░░░░░                                    '}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
+          <Text>{'…………………………………………………………………………………………………………………………………………………………'}</Text>
+          <Text>{'                                                          '}</Text>
+          <Text>{'                                                          '}</Text>
+          <Text>{'                                                          '}</Text>
+          <Text>{'            ░░░░░░                                        '}</Text>
+          <Text>{'    ░░░   ░░░░░░░░░░                                      '}</Text>
+          <Text>{'   ░░░░░░░░░░░░░░░░░░░                                    '}</Text>
+          <Text>{'                                                          '}</Text>
           <Text>
             <Text dimColor>{'                           ░░░░'}</Text>
             <Text>{'                     ██    '}</Text>
@@ -54,9 +36,7 @@ export function WelcomeV2(): React.ReactNode {
             <Text dimColor>{'                         ░░░░░░░░░░'}</Text>
             <Text>{'               ██▒▒██  '}</Text>
           </Text>
-          <Text>
-            {'                                            ▒▒      ██   ▒'}
-          </Text>
+          <Text>{'                                            ▒▒      ██   ▒'}</Text>
           <Text>
             {'      '}
             <Text color="clawd_body"> █████████ </Text>
@@ -81,7 +61,7 @@ export function WelcomeV2(): React.ReactNode {
           </Text>
         </Text>
       </Box>
-    )
+    );
   }
 
   return (
@@ -91,41 +71,21 @@ export function WelcomeV2(): React.ReactNode {
           <Text color="claude">{welcomeMessage} </Text>
           <Text dimColor>v{MACRO.VERSION} </Text>
         </Text>
-        <Text>
-          {'…………………………………………………………………………………………………………………………………………………………'}
-        </Text>
-        <Text>
-          {'                                                          '}
-        </Text>
-        <Text>
-          {'     *                                       █████▓▓░     '}
-        </Text>
-        <Text>
-          {'                                 *         ███▓░     ░░   '}
-        </Text>
-        <Text>
-          {'            ░░░░░░                        ███▓░           '}
-        </Text>
-        <Text>
-          {'    ░░░   ░░░░░░░░░░                      ███▓░           '}
-        </Text>
+        <Text>{'…………………………………………………………………………………………………………………………………………………………'}</Text>
+        <Text>{'                                                          '}</Text>
+        <Text>{'     *                                       █████▓▓░     '}</Text>
+        <Text>{'                                 *         ███▓░     ░░   '}</Text>
+        <Text>{'            ░░░░░░                        ███▓░           '}</Text>
+        <Text>{'    ░░░   ░░░░░░░░░░                      ███▓░           '}</Text>
         <Text>
           <Text>{'   ░░░░░░░░░░░░░░░░░░░    '}</Text>
           <Text bold>*</Text>
           <Text>{'                ██▓░░      ▓   '}</Text>
         </Text>
-        <Text>
-          {'                                             ░▓▓███▓▓░    '}
-        </Text>
-        <Text dimColor>
-          {' *                                 ░░░░                   '}
-        </Text>
-        <Text dimColor>
-          {'                                 ░░░░░░░░                 '}
-        </Text>
-        <Text dimColor>
-          {'                               ░░░░░░░░░░░░░░░░           '}
-        </Text>
+        <Text>{'                                             ░▓▓███▓▓░    '}</Text>
+        <Text dimColor>{' *                                 ░░░░                   '}</Text>
+        <Text dimColor>{'                                 ░░░░░░░░                 '}</Text>
+        <Text dimColor>{'                               ░░░░░░░░░░░░░░░░           '}</Text>
         <Text>
           {'      '}
           <Text color="clawd_body"> █████████ </Text>
@@ -152,21 +112,16 @@ export function WelcomeV2(): React.ReactNode {
         </Text>
       </Text>
     </Box>
-  )
+  );
 }
 
 type AppleTerminalWelcomeV2Props = {
-  theme: string
-  welcomeMessage: string
-}
+  theme: string;
+  welcomeMessage: string;
+};
 
-function AppleTerminalWelcomeV2({
-  theme,
-  welcomeMessage,
-}: AppleTerminalWelcomeV2Props): React.ReactNode {
-  const isLightTheme = ['light', 'light-daltonized', 'light-ansi'].includes(
-    theme,
-  )
+function AppleTerminalWelcomeV2({ theme, welcomeMessage }: AppleTerminalWelcomeV2Props): React.ReactNode {
+  const isLightTheme = ['light', 'light-daltonized', 'light-ansi'].includes(theme);
 
   if (isLightTheme) {
     return (
@@ -176,30 +131,14 @@ function AppleTerminalWelcomeV2({
             <Text color="claude">{welcomeMessage} </Text>
             <Text dimColor>v{MACRO.VERSION} </Text>
           </Text>
-          <Text>
-            {'…………………………………………………………………………………………………………………………………………………………'}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
-          <Text>
-            {'            ░░░░░░                                        '}
-          </Text>
-          <Text>
-            {'    ░░░   ░░░░░░░░░░                                      '}
-          </Text>
-          <Text>
-            {'   ░░░░░░░░░░░░░░░░░░░                                    '}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
+          <Text>{'…………………………………………………………………………………………………………………………………………………………'}</Text>
+          <Text>{'                                                          '}</Text>
+          <Text>{'                                                          '}</Text>
+          <Text>{'                                                          '}</Text>
+          <Text>{'            ░░░░░░                                        '}</Text>
+          <Text>{'    ░░░   ░░░░░░░░░░                                      '}</Text>
+          <Text>{'   ░░░░░░░░░░░░░░░░░░░                                    '}</Text>
+          <Text>{'                                                          '}</Text>
           <Text>
             <Text dimColor>{'                           ░░░░'}</Text>
             <Text>{'                     ██    '}</Text>
@@ -208,12 +147,8 @@ function AppleTerminalWelcomeV2({
             <Text dimColor>{'                         ░░░░░░░░░░'}</Text>
             <Text>{'               ██▒▒██  '}</Text>
           </Text>
-          <Text>
-            {'                                            ▒▒      ██   ▒'}
-          </Text>
-          <Text>
-            {'                                          ▒▒░░▒▒      ▒ ▒▒'}
-          </Text>
+          <Text>{'                                            ▒▒      ██   ▒'}</Text>
+          <Text>{'                                          ▒▒░░▒▒      ▒ ▒▒'}</Text>
           <Text>
             {'      '}
             <Text color="clawd_body">▗</Text>
@@ -242,7 +177,7 @@ function AppleTerminalWelcomeV2({
           </Text>
         </Text>
       </Box>
-    )
+    );
   }
 
   return (
@@ -252,41 +187,21 @@ function AppleTerminalWelcomeV2({
           <Text color="claude">{welcomeMessage} </Text>
           <Text dimColor>v{MACRO.VERSION} </Text>
         </Text>
-        <Text>
-          {'…………………………………………………………………………………………………………………………………………………………'}
-        </Text>
-        <Text>
-          {'                                                          '}
-        </Text>
-        <Text>
-          {'     *                                       █████▓▓░     '}
-        </Text>
-        <Text>
-          {'                                 *         ███▓░     ░░   '}
-        </Text>
-        <Text>
-          {'            ░░░░░░                        ███▓░           '}
-        </Text>
-        <Text>
-          {'    ░░░   ░░░░░░░░░░                      ███▓░           '}
-        </Text>
+        <Text>{'…………………………………………………………………………………………………………………………………………………………'}</Text>
+        <Text>{'                                                          '}</Text>
+        <Text>{'     *                                       █████▓▓░     '}</Text>
+        <Text>{'                                 *         ███▓░     ░░   '}</Text>
+        <Text>{'            ░░░░░░                        ███▓░           '}</Text>
+        <Text>{'    ░░░   ░░░░░░░░░░                      ███▓░           '}</Text>
         <Text>
           <Text>{'   ░░░░░░░░░░░░░░░░░░░    '}</Text>
           <Text bold>*</Text>
           <Text>{'                ██▓░░      ▓   '}</Text>
         </Text>
-        <Text>
-          {'                                             ░▓▓███▓▓░    '}
-        </Text>
-        <Text dimColor>
-          {' *                                 ░░░░                   '}
-        </Text>
-        <Text dimColor>
-          {'                                 ░░░░░░░░                 '}
-        </Text>
-        <Text dimColor>
-          {'                               ░░░░░░░░░░░░░░░░           '}
-        </Text>
+        <Text>{'                                             ░▓▓███▓▓░    '}</Text>
+        <Text dimColor>{' *                                 ░░░░                   '}</Text>
+        <Text dimColor>{'                                 ░░░░░░░░                 '}</Text>
+        <Text dimColor>{'                               ░░░░░░░░░░░░░░░░           '}</Text>
         <Text>
           {'                                                      '}
           <Text dimColor>*</Text>
@@ -322,5 +237,5 @@ function AppleTerminalWelcomeV2({
         </Text>
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/LogoV2/costrict-logo.png b/src/components/LogoV2/costrict-logo.png
new file mode 100644
index 0000000000..12b72ecfcb
Binary files /dev/null and b/src/components/LogoV2/costrict-logo.png differ
diff --git a/src/costrict/provider/auth.ts b/src/costrict/provider/auth.ts
new file mode 100644
index 0000000000..9344db0b43
--- /dev/null
+++ b/src/costrict/provider/auth.ts
@@ -0,0 +1,191 @@
+/**
+ * CoStrict OAuth 登录流程模块
+ * 负责浏览器登录、Token 轮询和登录 URL 构建
+ */
+
+import { randomBytes } from 'node:crypto'
+import {
+  generateMachineId,
+  saveCoStrictCredentials,
+  type CoStrictCredentials,
+} from './credentials.js'
+import { extractExpiryFromJWT } from './token.js'
+import { buildOAuthParams } from './oauth-params.js'
+
+/**
+ * 生成随机 state 字符串 (格式: {12hex}.{12hex})
+ */
+export function generateState(): string {
+  const part1 = randomBytes(6).toString('hex')
+  const part2 = randomBytes(6).toString('hex')
+  return `${part1}.${part2}`
+}
+
+/**
+ * 获取 CoStrict Base URL
+ * 优先级: 环境变量 > credentialsBaseUrl > 默认值
+ */
+export function getCoStrictBaseURL(credentialsBaseUrl?: string): string {
+  const envUrl = process.env.COSTRICT_BASE_URL
+  const defaultUrl = 'https://zgsm.sangfor.com'
+  const baseUrl = envUrl || credentialsBaseUrl || defaultUrl
+  return baseUrl.replace(/\/chat-rag\/api\/v1$/, '').replace(/\/$/, '')
+}
+
+/**
+ * 构建 CoStrict 登录 URL (初次登录包含 machine_code)
+ */
+export function buildCoStrictLoginURL(
+  baseUrl: string,
+  state: string,
+  machineId: string,
+): string {
+  const params = buildOAuthParams(true, machineId, state)
+  const queryString = params
+    .map(([k, v]) => `${k}=${encodeURIComponent(v)}`)
+    .join('&')
+  return `${baseUrl}/oidc-auth/api/v1/plugin/login?${queryString}`
+}
+
+/**
+ * 轮询 Token 端点获取登录凭证 (轮询时保留 machine_code)
+ */
+export async function pollLoginToken(
+  baseUrl: string,
+  state: string,
+  machineId: string,
+  maxAttempts = 120,
+  intervalMs = 5000,
+  abortSignal?: AbortSignal,
+): Promise<{ access_token: string; refresh_token: string }> {
+  const params = buildOAuthParams(true, machineId, state)
+  const queryString = params
+    .map(([k, v]) => `${k}=${encodeURIComponent(v)}`)
+    .join('&')
+  const url = `${baseUrl}/oidc-auth/api/v1/plugin/login/token?${queryString}`
+
+  const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms))
+
+  for (let attempt = 0; attempt < maxAttempts; attempt++) {
+    if (abortSignal?.aborted) throw new Error('Login cancelled by user')
+
+    await sleep(intervalMs)
+
+    try {
+      const response = await fetch(url, {
+        method: 'GET',
+        headers: { Accept: 'application/json' },
+        signal: abortSignal,
+      })
+
+      if (!response.ok) continue
+
+      const result = (await response.json()) as any
+
+      if (!result.success) {
+        const errorMsg = result.message || result.error || 'Unknown error'
+        if (
+          errorMsg.includes('invalid') ||
+          errorMsg.includes('expired') ||
+          errorMsg.includes('failed')
+        ) {
+          throw new Error(`Login failed: ${errorMsg}`)
+        }
+        continue
+      }
+
+      if (
+        !result.data?.access_token ||
+        !result.data?.refresh_token ||
+        result.data.access_token === '' ||
+        result.data.refresh_token === ''
+      ) {
+        continue
+      }
+
+      if (result.data.state !== state) continue
+
+      return {
+        access_token: result.data.access_token,
+        refresh_token: result.data.refresh_token,
+      }
+    } catch (error: any) {
+      if (error.name === 'AbortError' || error.message?.includes('aborted')) {
+        throw new Error('Login cancelled')
+      }
+      if (error.message?.includes('Login failed')) throw error
+      continue
+    }
+  }
+
+  throw new Error(
+    `Login timeout after ${(maxAttempts * intervalMs) / 1000} seconds. Please try again.`,
+  )
+}
+
+/**
+ * 执行完整的 CoStrict OAuth 登录流程
+ *
+ * 步骤:
+ * 1. 生成 state 和 machine_id
+ * 2. 打开浏览器
+ * 3. 轮询 Token 端点
+ * 4. 保存凭证到 ~/.costrict/share/auth.json
+ */
+export async function loginCoStrict(
+  openBrowser?: (url: string) => Promise<void>,
+  abortSignal?: AbortSignal,
+): Promise<CoStrictCredentials> {
+  const baseUrl = getCoStrictBaseURL()
+  const state = generateState()
+  const machineId = generateMachineId()
+  const loginUrl = buildCoStrictLoginURL(baseUrl, state, machineId)
+
+  if (openBrowser) {
+    await openBrowser(loginUrl)
+  } else {
+    const { spawn } = await import('node:child_process')
+    const platform = process.platform
+    let command: string
+    let args: string[]
+
+    if (platform === 'darwin') {
+      command = 'open'
+      args = [loginUrl]
+    } else if (platform === 'win32') {
+      command = 'cmd.exe'
+      args = ['/c', 'start', '', loginUrl]
+    } else {
+      command = 'xdg-open'
+      args = [loginUrl]
+    }
+
+    spawn(command, args, { detached: true, stdio: 'ignore' }).unref()
+  }
+
+  const tokens = await pollLoginToken(
+    baseUrl,
+    state,
+    machineId,
+    120,
+    5000,
+    abortSignal,
+  )
+
+  const expiryDate = extractExpiryFromJWT(tokens.access_token)
+  const credentials: CoStrictCredentials = {
+    id: 'csc',
+    name: 'CSC Auth',
+    access_token: tokens.access_token,
+    refresh_token: tokens.refresh_token,
+    state,
+    machine_id: machineId,
+    base_url: baseUrl,
+    expiry_date: expiryDate,
+    updated_at: new Date().toISOString(),
+    expired_at: expiryDate ? new Date(expiryDate).toISOString() : undefined,
+  }
+
+  await saveCoStrictCredentials(credentials)
+  return credentials
+}
diff --git a/src/costrict/provider/credentials.ts b/src/costrict/provider/credentials.ts
new file mode 100644
index 0000000000..5bc58f80cd
--- /dev/null
+++ b/src/costrict/provider/credentials.ts
@@ -0,0 +1,104 @@
+/**
+ * CoStrict 凭证管理模块
+ * 负责读写 ~/.costrict/share/auth.json，与 CoStrict IDE 插件共享凭证
+ */
+
+import { promises as fs } from 'node:fs'
+import { join } from 'node:path'
+import { homedir } from 'node:os'
+import { createHash } from 'node:crypto'
+
+/**
+ * CoStrict 凭证格式 (与 IDE 插件兼容)
+ */
+export interface CoStrictCredentials {
+  id: string // 标识符
+  name: string // 显示名称
+  access_token: string // OAuth 访问令牌
+  refresh_token?: string // OAuth 刷新令牌 (可选)
+  state?: string // OAuth 状态标识 (可选)
+  machine_id: string // 机器唯一标识 (SHA256)
+  base_url: string // CoStrict 服务器地址
+  expiry_date: number // Token 过期时间戳 (毫秒)
+  updated_at: string // 最后更新时间 (ISO 8601)
+  expired_at?: string // Token 过期时间 (ISO 8601)
+}
+
+/**
+ * 获取 CoStrict 凭证文件路径
+ * @returns ~/.costrict/share/auth.json
+ */
+export function getCoStrictCredentialsPath(): string {
+  return join(homedir(), '.costrict', 'share', 'auth.json')
+}
+
+/**
+ * 生成机器唯一标识 (SHA256)
+ * 基于平台、主机名、用户名
+ */
+export function generateMachineId(): string {
+  const os = require('node:os')
+  const platform = os.platform()
+  const hostname = os.hostname()
+  const username = os.userInfo().username
+  const machineInfo = `${platform}-${hostname}-${username}`
+  return createHash('sha256').update(machineInfo).digest('hex')
+}
+
+/**
+ * 加载 CoStrict 凭证
+ * @returns 凭证对象或 null
+ */
+export async function loadCoStrictCredentials(): Promise<CoStrictCredentials | null> {
+  try {
+    const filepath = getCoStrictCredentialsPath()
+    const content = await fs.readFile(filepath, 'utf-8')
+    const credentials = JSON.parse(content) as CoStrictCredentials
+
+    if (!credentials.access_token || !credentials.base_url) {
+      return null
+    }
+
+    return credentials
+  } catch (error: any) {
+    if (error.code === 'ENOENT') return null
+    if (error instanceof SyntaxError) return null
+    return null
+  }
+}
+
+/**
+ * 保存 CoStrict 凭证
+ */
+export async function saveCoStrictCredentials(
+  credentials: CoStrictCredentials,
+): Promise<void> {
+  const filepath = getCoStrictCredentialsPath()
+  const dir = join(homedir(), '.costrict', 'share')
+  await fs.mkdir(dir, { recursive: true, mode: 0o755 })
+  const content = JSON.stringify(credentials, null, 2)
+  await fs.writeFile(filepath, content, { encoding: 'utf-8', mode: 0o600 })
+}
+
+/**
+ * 删除 CoStrict 凭证
+ */
+export async function deleteCoStrictCredentials(): Promise<void> {
+  try {
+    await fs.unlink(getCoStrictCredentialsPath())
+  } catch (error: any) {
+    if (error.code !== 'ENOENT') throw error
+  }
+}
+
+/**
+ * 检查 CoStrict 凭证是否存在
+ */
+export async function hasCoStrictCredentials(): Promise<boolean> {
+  try {
+    await fs.access(getCoStrictCredentialsPath())
+    return true
+  } catch {
+    return false
+  }
+}
diff --git a/src/costrict/provider/fetch.ts b/src/costrict/provider/fetch.ts
new file mode 100644
index 0000000000..73cfd7f1a2
--- /dev/null
+++ b/src/costrict/provider/fetch.ts
@@ -0,0 +1,122 @@
+/**
+ * CoStrict 自定义 fetch 模块
+ * 动态注入 Authorization header 并处理 token 刷新
+ */
+
+import { randomUUID } from 'node:crypto'
+import {
+  loadCoStrictCredentials,
+  saveCoStrictCredentials,
+} from './credentials.js'
+import {
+  isCoStrictTokenValid,
+  refreshCoStrictToken,
+  extractExpiryFromJWT,
+} from './token.js'
+
+import { createRequire } from 'module'
+
+function getVersion(): string {
+  try {
+    if (typeof MACRO !== 'undefined' && MACRO.VERSION) return MACRO.VERSION
+  } catch { /* ignore */ }
+  try {
+    const require = createRequire(import.meta.url)
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const pkg = require('../../../package.json') as { version: string }
+    return pkg.version
+  } catch {
+    return '1.0.0'
+  }
+}
+
+const VERSION = getVersion()
+
+/**
+ * 创建自定义 fetch 函数，用于 CoStrict API 请求
+ *
+ * 功能:
+ * 1. 动态读取凭证
+ * 2. 预防性 Token 刷新（请求前检查）
+ * 3. 注入 Authorization 和 CoStrict 特有 headers
+ * 4. 反应性 401 错误恢复（自动重试一次）
+ */
+export function createCoStrictFetch(): typeof fetch {
+  return async (input: RequestInfo | URL, init?: RequestInit) => {
+    // ========== 步骤 1: 动态读取凭证 ==========
+    let creds = await loadCoStrictCredentials()
+
+    if (!creds) {
+      throw new Error(
+        'CoStrict credentials not found. Please run /costrict-login first.',
+      )
+    }
+
+    // ========== 步骤 2: 预防性 Token 刷新 ==========
+    if (creds.refresh_token && !isCoStrictTokenValid(creds)) {
+      try {
+        const refreshed = await refreshCoStrictToken({
+          baseUrl: creds.base_url,
+          refreshToken: creds.refresh_token,
+          state: creds.state,
+        })
+        const updatedCreds = {
+          ...creds,
+          access_token: refreshed.access_token,
+          refresh_token: refreshed.refresh_token,
+          expiry_date: extractExpiryFromJWT(refreshed.access_token),
+          updated_at: new Date().toISOString(),
+          expired_at: new Date(
+            extractExpiryFromJWT(refreshed.access_token),
+          ).toISOString(),
+        }
+        await saveCoStrictCredentials(updatedCreds)
+        creds = updatedCreds
+      } catch {
+        // 刷新失败，继续使用旧 token 尝试
+      }
+    }
+
+    // ========== 步骤 3: 构建 headers ==========
+    const headers = new Headers(init?.headers)
+    headers.set('Authorization', `Bearer ${creds.access_token}`)
+    headers.set('HTTP-Referer', 'https://github.com/zgsm-ai/costrict-cli')
+    headers.set('X-Title', 'CoStrict-CLI')
+    headers.set('X-Costrict-Version', `costrict-cli-${VERSION}`)
+    headers.set('X-Request-ID', randomUUID())
+    headers.set('zgsm-client-id', creds.machine_id)
+    headers.set('zgsm-client-ide', 'cli')
+
+    // ========== 步骤 4: 发起请求 ==========
+    const response = await fetch(input, { ...init, headers })
+
+    // ========== 步骤 5: 反应性 401 恢复 ==========
+    if (response.status === 401 && creds.refresh_token) {
+      try {
+        const refreshed = await refreshCoStrictToken({
+          baseUrl: creds.base_url,
+          refreshToken: creds.refresh_token,
+          state: creds.state,
+        })
+        const updatedCreds = {
+          ...creds,
+          access_token: refreshed.access_token,
+          refresh_token: refreshed.refresh_token,
+          expiry_date: extractExpiryFromJWT(refreshed.access_token),
+          updated_at: new Date().toISOString(),
+          expired_at: new Date(
+            extractExpiryFromJWT(refreshed.access_token),
+          ).toISOString(),
+        }
+        await saveCoStrictCredentials(updatedCreds)
+        headers.set('Authorization', `Bearer ${refreshed.access_token}`)
+        headers.set('X-Request-ID', randomUUID())
+        return fetch(input, { ...init, headers })
+      } catch {
+        // 重试失败，返回原始 401 响应
+      }
+    }
+
+    return response
+  }
+}
diff --git a/src/costrict/provider/index.ts b/src/costrict/provider/index.ts
new file mode 100644
index 0000000000..69faf495be
--- /dev/null
+++ b/src/costrict/provider/index.ts
@@ -0,0 +1,225 @@
+/**
+ * CoStrict 查询入口
+ * 复用 OpenAI 兼容路径，注入 CoStrict 自定义 fetch 和 baseURL
+ */
+
+import type { BetaToolUnion } from '@anthropic-ai/sdk/resources/beta/messages/messages.mjs'
+import type { SystemPrompt } from '../../utils/systemPromptType.js'
+import type {
+  Message,
+  StreamEvent,
+  SystemAPIErrorMessage,
+  AssistantMessage,
+} from '../../types/message.js'
+import type { Tools } from '../../Tool.js'
+import type { Options } from '../../services/api/claude.js'
+import OpenAI from 'openai'
+import { getProxyFetchOptions } from '../../utils/proxy.js'
+import { anthropicMessagesToOpenAI } from '../../services/api/openai/convertMessages.js'
+import {
+  anthropicToolsToOpenAI,
+  anthropicToolChoiceToOpenAI,
+} from '../../services/api/openai/convertTools.js'
+import { adaptOpenAIStreamToAnthropic } from '../../services/api/openai/streamAdapter.js'
+import { normalizeMessagesForAPI } from '../../utils/messages.js'
+import { toolToAPISchema } from '../../utils/api.js'
+import { logForDebugging } from '../../utils/debug.js'
+import { addToTotalSessionCost } from '../../cost-tracker.js'
+import { calculateUSDCost } from '../../utils/modelCost.js'
+import {
+  createAssistantAPIErrorMessage,
+  normalizeContentFromAPI,
+} from '../../utils/messages.js'
+import { randomUUID } from 'crypto'
+import { createCoStrictFetch } from './fetch.js'
+import { resolveCoStrictModel } from './modelMapping.js'
+import { getCoStrictBaseURL } from './auth.js'
+import { loadCoStrictCredentials } from './credentials.js'
+
+/**
+ * CoStrict 查询路径
+ * 与 queryModelOpenAI 结构相同，使用 CoStrict 自定义 fetch 和 baseURL
+ */
+export async function* queryModelCoStrict(
+  messages: Message[],
+  systemPrompt: SystemPrompt,
+  tools: Tools,
+  signal: AbortSignal,
+  options: Options,
+): AsyncGenerator<StreamEvent | AssistantMessage | SystemAPIErrorMessage, void> {
+  try {
+    // 1. 解析模型名
+    const costrictModel = resolveCoStrictModel(options.model)
+
+    // 2. 获取 CoStrict base URL
+    const creds = await loadCoStrictCredentials()
+    const baseUrl = getCoStrictBaseURL(creds?.base_url)
+    const chatBaseURL = `${baseUrl}/chat-rag/api/v1`
+
+    // 3. 规范化消息
+    const messagesForAPI = normalizeMessagesForAPI(messages, tools)
+
+    // 4. 构建工具 schema
+    const toolSchemas = await Promise.all(
+      tools.map(tool =>
+        toolToAPISchema(tool, {
+          getToolPermissionContext: options.getToolPermissionContext,
+          tools,
+          agents: options.agents,
+          allowedAgentTypes: options.allowedAgentTypes,
+          model: options.model,
+        }),
+      ),
+    )
+    const standardTools = toolSchemas.filter(
+      (t): t is BetaToolUnion & { type: string } => {
+        const anyT = t as Record<string, unknown>
+        return (
+          anyT.type !== 'advisor_20260301' && anyT.type !== 'computer_20250124'
+        )
+      },
+    )
+
+    // 5. 转换为 OpenAI 格式
+    const openaiMessages = anthropicMessagesToOpenAI(messagesForAPI, systemPrompt)
+    const openaiTools = anthropicToolsToOpenAI(standardTools)
+    const openaiToolChoice = anthropicToolChoiceToOpenAI(options.toolChoice)
+
+    // 6. 创建专用的 CoStrict OpenAI 客户端（不缓存，每次使用新的 fetch）
+    const costrictFetch = createCoStrictFetch()
+    const client = new OpenAI({
+      apiKey: 'costrict-managed', // 实际 token 由 createCoStrictFetch 注入
+      baseURL: chatBaseURL,
+      maxRetries: 0,
+      timeout: parseInt(process.env.API_TIMEOUT_MS || String(600 * 1000), 10),
+      dangerouslyAllowBrowser: true,
+      fetchOptions: getProxyFetchOptions({ forAnthropicAPI: false }) as RequestInit,
+      fetch: costrictFetch as any,
+    })
+
+    logForDebugging(
+      `[CoStrict] model=${costrictModel}, baseURL=${chatBaseURL}, messages=${openaiMessages.length}, tools=${openaiTools.length}`,
+    )
+
+    // 7. 调用 API（流式）
+    const stream = await client.chat.completions.create(
+      {
+        model: costrictModel,
+        messages: openaiMessages,
+        ...(openaiTools.length > 0 && {
+          tools: openaiTools,
+          ...(openaiToolChoice && { tool_choice: openaiToolChoice }),
+        }),
+        stream: true,
+        stream_options: { include_usage: true },
+        ...(options.temperatureOverride !== undefined && {
+          temperature: options.temperatureOverride,
+        }),
+      },
+      { signal },
+    )
+
+    // 8. 转换流并 yield 事件
+    const adaptedStream = adaptOpenAIStreamToAnthropic(stream, costrictModel)
+
+    const contentBlocks: Record<number, any> = {}
+    let partialMessage: any = undefined
+    let usage = {
+      input_tokens: 0,
+      output_tokens: 0,
+      cache_creation_input_tokens: 0,
+      cache_read_input_tokens: 0,
+    }
+    let ttftMs = 0
+    const start = Date.now()
+
+    for await (const event of adaptedStream) {
+      switch (event.type) {
+        case 'message_start': {
+          partialMessage = (event as any).message
+          ttftMs = Date.now() - start
+          if ((event as any).message?.usage) {
+            usage = { ...usage, ...((event as any).message.usage) }
+          }
+          break
+        }
+        case 'content_block_start': {
+          const idx = (event as any).index
+          const cb = (event as any).content_block
+          if (cb.type === 'tool_use') {
+            contentBlocks[idx] = { ...cb, input: '' }
+          } else if (cb.type === 'text') {
+            contentBlocks[idx] = { ...cb, text: '' }
+          } else if (cb.type === 'thinking') {
+            contentBlocks[idx] = { ...cb, thinking: '', signature: '' }
+          } else {
+            contentBlocks[idx] = { ...cb }
+          }
+          break
+        }
+        case 'content_block_delta': {
+          const idx = (event as any).index
+          const delta = (event as any).delta
+          const block = contentBlocks[idx]
+          if (!block) break
+          if (delta.type === 'text_delta') {
+            block.text = (block.text || '') + delta.text
+          } else if (delta.type === 'input_json_delta') {
+            block.input = (block.input || '') + delta.partial_json
+          } else if (delta.type === 'thinking_delta') {
+            block.thinking = (block.thinking || '') + delta.thinking
+          } else if (delta.type === 'signature_delta') {
+            block.signature = delta.signature
+          }
+          break
+        }
+        case 'content_block_stop': {
+          const idx = (event as any).index
+          const block = contentBlocks[idx]
+          if (!block || !partialMessage) break
+          const m: AssistantMessage = {
+            message: {
+              ...partialMessage,
+              content: normalizeContentFromAPI([block], tools, options.agentId),
+            },
+            requestId: undefined,
+            type: 'assistant',
+            uuid: randomUUID(),
+            timestamp: new Date().toISOString(),
+          }
+          yield m
+          break
+        }
+        case 'message_delta': {
+          const deltaUsage = (event as any).usage
+          if (deltaUsage) usage = { ...usage, ...deltaUsage }
+          break
+        }
+        case 'message_stop':
+          break
+      }
+
+      if (
+        event.type === 'message_stop' &&
+        usage.input_tokens + usage.output_tokens > 0
+      ) {
+        const costUSD = calculateUSDCost(costrictModel, usage as any)
+        addToTotalSessionCost(costUSD, usage as any, options.model)
+      }
+
+      yield {
+        type: 'stream_event',
+        event,
+        ...(event.type === 'message_start' ? { ttftMs } : undefined),
+      } as StreamEvent
+    }
+  } catch (error) {
+    const errorMsg = error instanceof Error ? error.message : String(error)
+    logForDebugging(`[CoStrict] Error: ${errorMsg}`, { level: 'error' })
+    yield createAssistantAPIErrorMessage({
+      content: `CoStrict API Error: ${errorMsg}`,
+      apiError: 'api_error',
+      error: error instanceof Error ? error : new Error(String(error)),
+    })
+  }
+}
diff --git a/src/costrict/provider/modelMapping.ts b/src/costrict/provider/modelMapping.ts
new file mode 100644
index 0000000000..73a415f3da
--- /dev/null
+++ b/src/costrict/provider/modelMapping.ts
@@ -0,0 +1,48 @@
+/**
+ * CoStrict 模型名称解析模块
+ * 将 Anthropic 模型名映射到 CoStrict 模型名
+ */
+
+import { getCachedCoStrictModels } from './models.js'
+
+function getModelFamily(model: string): 'haiku' | 'sonnet' | 'opus' | null {
+  if (/haiku/i.test(model)) return 'haiku'
+  if (/opus/i.test(model)) return 'opus'
+  if (/sonnet/i.test(model)) return 'sonnet'
+  return null
+}
+
+/**
+ * 解析 CoStrict 模型名
+ *
+ * 优先级:
+ * 1. 传入的 model 本身就是已知的 CoStrict 模型 ID（用户通过 /model 明确选择）
+ * 2. COSTRICT_MODEL 环境变量（管理员全局覆盖 / 登录默认值）
+ * 3. COSTRICT_DEFAULT_{FAMILY}_MODEL 环境变量（按模型族）
+ * 4. 已缓存的 CoStrict 模型列表中的第一个
+ * 5. 直接透传原始模型名（最后兜底）
+ */
+export function resolveCoStrictModel(anthropicModel: string): string {
+  const cleanModel = anthropicModel.replace(/\[1m\]$/, '')
+
+  // 优先级 1: 如果传入的 model 本身就是已知 CoStrict 模型 ID，直接使用
+  const cached = getCachedCoStrictModels()
+  if (cached.some(m => m.id === cleanModel)) return cleanModel
+
+  // 优先级 2: COSTRICT_MODEL 环境变量
+  if (process.env.COSTRICT_MODEL) return process.env.COSTRICT_MODEL
+
+  // 优先级 3: COSTRICT_DEFAULT_{FAMILY}_MODEL 环境变量
+  const family = getModelFamily(cleanModel)
+  if (family) {
+    const envVar = `COSTRICT_DEFAULT_${family.toUpperCase()}_MODEL`
+    const override = process.env[envVar]
+    if (override) return override
+  }
+
+  // 优先级 4: 缓存中的第一个模型
+  if (cached.length > 0) return cached[0].id
+
+  // 优先级 5: 透传原始模型名
+  return cleanModel
+}
diff --git a/src/costrict/provider/models.ts b/src/costrict/provider/models.ts
new file mode 100644
index 0000000000..16743ba5d0
--- /dev/null
+++ b/src/costrict/provider/models.ts
@@ -0,0 +1,83 @@
+/**
+ * CoStrict 动态模型列表模块
+ * 从 /ai-gateway/api/v1/models 获取可用模型，1小时缓存
+ */
+
+export interface CoStrictModel {
+  id: string
+  name?: string
+  object?: string
+  created?: number
+  owned_by?: string
+  supportsImages?: boolean
+  contextWindow?: number
+  maxTokens?: number
+  creditConsumption?: number
+  creditDiscount?: number
+  [key: string]: any
+}
+
+interface ModelCache {
+  models: CoStrictModel[]
+  timestamp: number
+}
+
+let modelCache: ModelCache | null = null
+const CACHE_TTL_MS = 60 * 60 * 1000 // 1 小时
+
+/**
+ * 获取 CoStrict 可用模型列表
+ */
+export async function fetchCoStrictModels(
+  baseUrl: string,
+  accessToken: string,
+): Promise<CoStrictModel[]> {
+  if (modelCache && Date.now() - modelCache.timestamp < CACHE_TTL_MS) {
+    return modelCache.models
+  }
+
+  try {
+    const response = await fetch(`${baseUrl}/ai-gateway/api/v1/models`, {
+      method: 'GET',
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        Accept: 'application/json',
+      },
+    })
+
+    if (!response.ok) {
+      throw new Error(`Failed to fetch models: HTTP ${response.status}`)
+    }
+
+    const data = (await response.json()) as { data?: CoStrictModel[] }
+    const models = data.data || []
+
+    if (models.length === 0) return getDefaultModels()
+
+    modelCache = { models, timestamp: Date.now() }
+    return models
+  } catch {
+    // 有旧缓存则使用旧缓存
+    if (modelCache) return modelCache.models
+    return getDefaultModels()
+  }
+}
+
+function getDefaultModels(): CoStrictModel[] {
+  return [
+    { id: 'gpt-4', name: 'GPT-4' },
+    { id: 'gpt-3.5-turbo', name: 'GPT-3.5 Turbo' },
+  ]
+}
+
+export function clearModelCache(): void {
+  modelCache = null
+}
+
+/**
+ * 同步读取已缓存的模型列表（不发起网络请求）
+ * 供 modelOptions.ts 等同步上下文使用
+ */
+export function getCachedCoStrictModels(): CoStrictModel[] {
+  return modelCache?.models ?? []
+}
diff --git a/src/costrict/provider/oauth-params.ts b/src/costrict/provider/oauth-params.ts
new file mode 100644
index 0000000000..6e84f5fef6
--- /dev/null
+++ b/src/costrict/provider/oauth-params.ts
@@ -0,0 +1,58 @@
+/**
+ * CoStrict OAuth 参数构建模块
+ */
+
+import { createRequire } from 'module'
+
+// 优先使用构建时注入的 MACRO.VERSION，否则回退到 package.json（与 opencode Installation.VERSION 逻辑一致）
+function getVersion(): string {
+  try {
+    // MACRO.VERSION 由 Bun dev/build 构建时注入（scripts/defines.ts）
+    if (typeof MACRO !== 'undefined' && MACRO.VERSION) return MACRO.VERSION
+  } catch {
+    // 动态 import 时 MACRO 尚未定义，继续回退
+  }
+  try {
+    const require = createRequire(import.meta.url)
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const pkg = require('../../../package.json') as { version: string }
+    return pkg.version
+  } catch {
+    return '1.0.0'
+  }
+}
+
+const COSTRICT_PLUGIN_VERSION = `costrict-cli-${getVersion()}`
+
+/**
+ * 构建标准的 OAuth 查询参数
+ *
+ * @param includeMachineCode 是否包含 machine_code (登录和轮询时需要，刷新时不需要)
+ * @param machineId 机器唯一标识
+ * @param state OAuth state (可选)
+ */
+export function buildOAuthParams(
+  includeMachineCode: boolean,
+  machineId?: string,
+  state?: string,
+): [string, string][] {
+  const params: [string, string][] = []
+
+  if (includeMachineCode) {
+    if (!machineId) throw new Error('machineId is required when includeMachineCode is true')
+    params.push(['machine_code', machineId])
+  }
+
+  if (state) {
+    params.push(['state', state])
+  }
+
+  params.push(
+    ['provider', 'casdoor'],
+    ['plugin_version', COSTRICT_PLUGIN_VERSION],
+    ['vscode_version', COSTRICT_PLUGIN_VERSION],
+    ['uri_scheme', 'costrict-cli'],
+  )
+
+  return params
+}
diff --git a/src/costrict/provider/token.ts b/src/costrict/provider/token.ts
new file mode 100644
index 0000000000..03ea932245
--- /dev/null
+++ b/src/costrict/provider/token.ts
@@ -0,0 +1,119 @@
+/**
+ * CoStrict Token 管理模块
+ * 负责 Token 验证、刷新和 JWT 解析
+ */
+
+import type { CoStrictCredentials } from './credentials.js'
+import { buildOAuthParams } from './oauth-params.js'
+
+interface JWTPayload {
+  exp?: number
+  iat?: number
+  [key: string]: any
+}
+
+/**
+ * 解析 JWT Token (不验证签名)
+ */
+export function parseJWT(token: string): JWTPayload {
+  const parts = token.split('.')
+  if (parts.length !== 3) throw new Error('Invalid JWT format')
+  const decoded = Buffer.from(parts[1], 'base64url').toString('utf-8')
+  return JSON.parse(decoded) as JWTPayload
+}
+
+/**
+ * 从 JWT Token 提取过期时间 (毫秒)
+ */
+export function extractExpiryFromJWT(token: string): number {
+  try {
+    const payload = parseJWT(token)
+    return payload.exp ? payload.exp * 1000 : 0
+  } catch {
+    return 0
+  }
+}
+
+/**
+ * 三层 Token 验证策略
+ */
+export function isCoStrictTokenValid(credentials: CoStrictCredentials): boolean {
+  const now = Date.now()
+  const bufferMs = 30 * 60 * 1000 // 30 分钟
+
+  // 策略 1: expiry_date (30 分钟缓冲)
+  if (credentials.expiry_date) {
+    return now < credentials.expiry_date - bufferMs
+  }
+
+  // 策略 2: refresh_token JWT
+  if (credentials.refresh_token) {
+    try {
+      const payload = parseJWT(credentials.refresh_token)
+      if (payload.exp) return payload.exp * 1000 > now
+    } catch {
+      // fall through
+    }
+  }
+
+  // 策略 3: access_token JWT (30 分钟缓冲)
+  try {
+    const payload = parseJWT(credentials.access_token)
+    if (payload.exp) return now < payload.exp * 1000 - bufferMs
+  } catch {
+    // fall through
+  }
+
+  return false
+}
+
+export interface RefreshTokenParams {
+  baseUrl: string
+  refreshToken: string
+  state?: string
+}
+
+export interface RefreshTokenResponse {
+  access_token: string
+  refresh_token: string
+}
+
+/**
+ * 刷新 CoStrict Token
+ * ⚠️ 刷新时**排除** machine_code 参数
+ */
+export async function refreshCoStrictToken(
+  params: RefreshTokenParams,
+): Promise<RefreshTokenResponse> {
+  const queryParams = buildOAuthParams(false, undefined, params.state)
+  const queryString = queryParams
+    .map(([k, v]) => `${k}=${encodeURIComponent(v)}`)
+    .join('&')
+
+  const url = `${params.baseUrl}/oidc-auth/api/v1/plugin/login/token?${queryString}`
+
+  const response = await fetch(url, {
+    method: 'GET',
+    headers: {
+      Authorization: `Bearer ${params.refreshToken}`,
+      Accept: 'application/json',
+    },
+  })
+
+  if (!response.ok) {
+    const body = await response.text()
+    throw new Error(
+      response.status === 400 || response.status === 401
+        ? `Refresh token is invalid or expired (${response.status}): ${body}`
+        : `Token refresh failed with status ${response.status}: ${body}`,
+    )
+  }
+
+  const data = (await response.json()) as RefreshTokenResponse
+
+  if (!data.access_token || !data.refresh_token) {
+    throw new Error('Token refresh response is missing required fields')
+  }
+
+  return data
+}
diff --git a/src/services/api/claude.ts b/src/services/api/claude.ts
index e455655466..8faecb576b 100644
--- a/src/services/api/claude.ts
+++ b/src/services/api/claude.ts
@@ -1356,6 +1356,12 @@ async function* queryModel(
     return
   }
 
+  if (getAPIProvider() === 'costrict') {
+    const { queryModelCoStrict } = await import('../../costrict/provider/index.js')
+    yield* queryModelCoStrict(messagesForAPI, systemPrompt, filteredTools, signal, options)
+    return
+  }
+
   // Instrumentation: Track message count after normalization
   logEvent('tengu_api_after_normalize', {
     postNormalizedMessageCount: messagesForAPI.length,
diff --git a/src/setup.ts b/src/setup.ts
index 985e8577a6..331c5c1f62 100644
--- a/src/setup.ts
+++ b/src/setup.ts
@@ -46,6 +46,7 @@ import type { PermissionMode } from './utils/permissions/PermissionMode.js'
 import { getPlanSlug } from './utils/plans.js'
 import { saveWorktreeState } from './utils/sessionStorage.js'
 import { profileCheckpoint } from './utils/startupProfiler.js'
+import { getAPIProvider } from './utils/model/providers.js'
 import {
   createTmuxSessionForWorktree,
   createWorktreeForSession,
@@ -380,6 +381,68 @@ export async function setup(
   void prefetchApiKeyFromApiKeyHelperIfSafe(getIsNonInteractiveSession()) // Prefetch safely - only executes if trust already confirmed
   profileCheckpoint('setup_after_prefetch')
 
+  // CoStrict provider: 启动时恢复凭证并预取模型列表
+  if (getAPIProvider() === 'costrict') {
+    void (async () => {
+      try {
+        const { loadCoStrictCredentials, saveCoStrictCredentials } = await import('./costrict/provider/credentials.js')
+        const { isCoStrictTokenValid, refreshCoStrictToken, extractExpiryFromJWT } = await import('./costrict/provider/token.js')
+        const { fetchCoStrictModels } = await import('./costrict/provider/models.js')
+        const { getCoStrictBaseURL } = await import('./costrict/provider/auth.js')
+
+        const creds = await loadCoStrictCredentials()
+        if (!creds) {
+          // 没有凭证，清除 modelType 让下次启动回到登录界面
+          const { updateSettingsForSource } = await import('./utils/settings/settings.js')
+          updateSettingsForSource('userSettings', { modelType: undefined } as any)
+          return
+        }
+
+        // 验证 / 刷新 token（注意 refreshCoStrictToken 接收 RefreshTokenParams，字段名与 CoStrictCredentials 不同）
+        let activeCreds = creds
+        if (!isCoStrictTokenValid(creds)) {
+          if (creds.refresh_token) {
+            try {
+              const refreshed = await refreshCoStrictToken({
+                baseUrl: getCoStrictBaseURL(creds.base_url),
+                refreshToken: creds.refresh_token,
+                state: creds.state,
+              })
+              activeCreds = {
+                ...creds,
+                access_token: refreshed.access_token,
+                refresh_token: refreshed.refresh_token,
+                expiry_date: extractExpiryFromJWT(refreshed.access_token),
+                updated_at: new Date().toISOString(),
+              }
+              await saveCoStrictCredentials(activeCreds)
+            } catch {
+              // 刷新失败，清除 modelType 提示重新登录
+              const { updateSettingsForSource } = await import('./utils/settings/settings.js')
+              updateSettingsForSource('userSettings', { modelType: undefined } as any)
+              return
+            }
+          } else {
+            // 无 refresh_token，清除 modelType
+            const { updateSettingsForSource } = await import('./utils/settings/settings.js')
+            updateSettingsForSource('userSettings', { modelType: undefined } as any)
+            return
+          }
+        }
+
+        // 预取模型列表，填充同步缓存
+        const baseUrl = getCoStrictBaseURL(activeCreds.base_url)
+        const models = await fetchCoStrictModels(baseUrl, activeCreds.access_token)
+        if (models.length > 0 && !process.env.COSTRICT_MODEL) {
+          process.env.COSTRICT_MODEL = models[0].id
+        }
+        process.env.CLAUDE_CODE_USE_COSTRICT = '1'
+      } catch {
+        // 初始化失败不阻断启动
+      }
+    })()
+  }
+
   // Pre-fetch data for Logo v2 - await to ensure it's ready before logo renders.
   // --bare / SIMPLE: skip — release notes are interactive-UI display data,
   // and getRecentActivity() reads up to 10 session JSONL files.
diff --git a/src/tools/AgentTool/built-in/costrict/planApply.ts b/src/tools/AgentTool/built-in/costrict/planApply.ts
new file mode 100644
index 0000000000..85ada6af9f
--- /dev/null
+++ b/src/tools/AgentTool/built-in/costrict/planApply.ts
@@ -0,0 +1,135 @@
+import { EXIT_PLAN_MODE_TOOL_NAME } from 'src/tools/ExitPlanModeTool/constants.js'
+import { FILE_EDIT_TOOL_NAME } from 'src/tools/FileEditTool/constants.js'
+import { FILE_WRITE_TOOL_NAME } from 'src/tools/FileWriteTool/prompt.js'
+import { NOTEBOOK_EDIT_TOOL_NAME } from 'src/tools/NotebookEditTool/constants.js'
+import type { BuiltInAgentDefinition } from '../loadAgentsDir.js'
+
+function getPlanApplySystemPrompt(): string {
+  return `你是 CodingAgent，软件开发团队的项目管理者和技术架构师。
+
+核心职责：
+1. 理解全局：深入理解任务规划（task.md）
+2. 任务分发：将开发任务分发给 SubCodingAgent，确保有序高效执行
+3. 任务审查：审查 SubCodingAgent 的代码提交，确保分发给任务都得到正确实现
+4. 决策响应：处理 SubCodingAgent 反馈的问题，做出技术决策或调整任务
+5. 进度追踪：维护 task.md，准确记录任务完成状态
+
+你与 SubCodingAgent 的关系：你是决策者和协调者，SubCodingAgent 是执行者。你不直接编写代码，而是通过分发任务、提供上下文、审查结果、在task.md中记录任务进度来推动项目进展。
+
+
+## 工作原则
+
+### 状态更新强制要求 
+
+#### task.md 状态更新要求
+- **每个任务完成后必须立即更新**：无论是顺序执行还是批量执行，任务完成后的第一件事就是更新task.md文件中的对应任务状态
+- **标记格式**：将已完成的任务标记为 \`- [x]\`
+- **更新时机**：在开始下一个任务或任务组之前，必须先完成当前任务的task.md状态更新
+- **更新范围**：状态更新时只能修改状态标记，禁止修改其他内容
+
+### 禁止直接修改代码
+- 禁止使用 \`edit\` 修改项目代码文件
+- 所有代码修改必须通过 \`task\` 分发给 SubCodingAgent 执行
+- 唯一例外：可使用 \`edit\` 修改 task.md
+
+### 合理的任务粒度
+一个 SubCodingAgent 负责一个阶段内的相关任务或一个独立功能模块。分发任务时必须明确：
+- 做什么：具体的修改内容和预期结果
+- 改哪里：涉及的文件或模块
+
+### 精准提供上下文
+SubCodingAgent 只需理解与其任务直接相关的内容。分发任务时提供关键补充说明：
+- 该任务涉及的设计决策和技术约束
+- 相关的接口定义、数据结构、类/函数签名
+- 与其他模块的依赖关系
+
+### 分发任务
+- 将task.md中的子任务分发给\`SubCodingAgent\`执行，分发的子任务可以是1个或多个（最多不超过10个）
+  - 关联性不高，可单独执行的任务单独分发。
+  - **强关联性**的多个任务可一起分发，例：
+    - 当多个任务属于创建同一个新页面或组件的不同部分时
+    - 当多个任务高度关联，分开执行会导致代码不完整或无法测试时
+    - 当多个任务构成一个不可分割的原子操作时
+- 创建SubCodingAgent的目标描述中，必须包含：<change-id>，各任务对应的序号和目标（必须与task.md中一致）。
+- 对于没有关联性和依赖，可独立执行的任务，可同时启动多个SubCodingAgent并行执行（最多不超过5个）。
+
+### git使用原则
+- 禁止使用\`git commit\` 或 \`git push\`等提交操作
+- 禁止使用restore、reset、revert等撤销修改的操作
+- 只允许使用git查看操作，如\`git status\`, \`git diff\`, \`git log\`等
+
+
+## 工作流程
+
+使用 \`todowrite\` 工具列出任务清单，将这些步骤作为待办事项跟踪，**并根据任务性质选择合适的执行模式**。
+
+### 阶段 1：理解全局
+1. 阅读 .cospec/plan/changes/<id>/task.md：理解任务拆解、阶段划分、依赖关系
+- 使用todowrite跟踪<objective>中用户提到的具体任务，如果没有提到具体任务，列出所有\`.cospec/plan/changes/<id>/task.md\`中的任务。
+- 阅读 \`.cospec/plan/changes/<id>/proposal.md\`（如果存在）和\`task.md\`（如果存在）以确认范围和验收标准。
+- todowrite的todos描述模板：
+  '''
+  任务1. {任务描述}
+  任务2. {任务描述}
+  ...
+  任务N. {任务描述}
+  '''
+
+### 阶段 2：按阶段推进
+对 task.md 中的每个阶段循环执行以下步骤：
+
+#### 2.1 分发任务
+调用 \`task\`工具中 SubCodingAgent 分发任务
+
+#### 2.2 检查任务完成情况
+SubCodingAgent 完成后，审查其代码提交：
+- 使用\`checkpoint (action: list)\`工具了解当前已经完成的代码编写工作，如果存在重复记录，以最新的一条为准
+- 根据list的结果，找到对应的与问题最相关的提交，使用\`checkpoint (action: show_diff)\`工具查看具体变更内容
+
+根据查看到的修改内容，判断是否完成所有分配的任务
+- 如果未完成任务，分析原因后指派新的SubCodingAgent进行改进。
+- 如果已完成任务，使用\`edit\`更新task.md的完成进度。
+  - **立即更新task.md**：**必须立即**更新task.md文件，将刚完成的任务标记为已完成（\`- [x]\`）
+  - **标记todos完成**：使用 \`todowrite\` 工具将当前任务标记为完成
+  - **重要顺序说明**：**必须先更新task.md，最后标记todos**。
+
+### 阶段 3：代码审查
+- 当task.md中任务全部执行完成后，必须进行一次**最终代码审查**，必须启动\`ReviewAndFix\`Agent进行审查。
+- 审查的主要内容是：逐项检查task.md中的任务与提交的代码，是否存在遗漏和实现偏差。
+- 创建\`ReviewAndFix\`Agent的目标描述中，必须包含<change-id>
+
+### 阶段 4：完成收尾
+- 完成所有任务后，检查所有任务是否都已在task.md中正确标记为完成
+- 验证所有变更都已使用\`checkpoint\`工具提交
+- 最终确认，使用\`question\`工具，向用户说明：已完成修改，是否有问题需要进一步修改？
+  - 提供选项（只提供一个选项）：
+    * "确认任务完成" - 如果用户对修改结果满意，结束CodingAgent任务
+  - 如果用户通过"自定义输入"提供新的反馈，则在task.md中创建一个新的fix任务，分发给SubCodingAgent进行修改
+  - 直到用户选择"确认任务完成"，才退出CodingAgent任务
+
+
+<directory_structure>
+.cospec/plan/
+└── changes/               # 提案 - 具体变更的内容
+    └─ [change-id]/
+       ├── proposal.md     # 原因、内容、影响
+       └── task.md         # 更新后的实施清单
+</directory_structure>`
+}
+
+export const PLAN_APPLY_AGENT: BuiltInAgentDefinition = {
+  agentType: 'PlanApply',
+  whenToUse:
+    '基于制定好的计划，使用编程语言实现功能、修复错误、或进行代码改进。Use this when you need to implement a planned task, fix bugs, or improve code based on a structured plan.',
+  disallowedTools: [
+    EXIT_PLAN_MODE_TOOL_NAME,
+    FILE_EDIT_TOOL_NAME,
+    FILE_WRITE_TOOL_NAME,
+    NOTEBOOK_EDIT_TOOL_NAME,
+  ],
+  source: 'built-in',
+  baseDir: 'built-in',
+  model: 'inherit',
+  omitClaudeMd: false,
+  getSystemPrompt: () => getPlanApplySystemPrompt(),
+}
diff --git a/src/tools/AgentTool/built-in/costrict/quickExplore.ts b/src/tools/AgentTool/built-in/costrict/quickExplore.ts
new file mode 100644
index 0000000000..714ef3e0c7
--- /dev/null
+++ b/src/tools/AgentTool/built-in/costrict/quickExplore.ts
@@ -0,0 +1,201 @@
+import { BASH_TOOL_NAME } from 'src/tools/BashTool/toolName.js'
+import { EXIT_PLAN_MODE_TOOL_NAME } from 'src/tools/ExitPlanModeTool/constants.js'
+import { FILE_EDIT_TOOL_NAME } from 'src/tools/FileEditTool/constants.js'
+import { FILE_READ_TOOL_NAME } from 'src/tools/FileReadTool/prompt.js'
+import { FILE_WRITE_TOOL_NAME } from 'src/tools/FileWriteTool/prompt.js'
+import { GLOB_TOOL_NAME } from 'src/tools/GlobTool/prompt.js'
+import { GREP_TOOL_NAME } from 'src/tools/GrepTool/prompt.js'
+import { NOTEBOOK_EDIT_TOOL_NAME } from 'src/tools/NotebookEditTool/constants.js'
+import { hasEmbeddedSearchTools } from 'src/utils/embeddedTools.js'
+import { AGENT_TOOL_NAME } from '../../constants.js'
+import type { BuiltInAgentDefinition } from '../../loadAgentsDir.js'
+
+function getQuickExploreSystemPrompt(): string {
+  const embedded = hasEmbeddedSearchTools()
+  const globGuidance = embedded
+    ? `- Use \`find\` via ${BASH_TOOL_NAME} for broad file pattern matching`
+    : `- Use ${GLOB_TOOL_NAME} for broad file pattern matching`
+  const grepGuidance = embedded
+    ? `- Use \`grep\` via ${BASH_TOOL_NAME} for searching file contents with regex`
+    : `- Use ${GREP_TOOL_NAME} for searching file contents with regex`
+
+  return `你是 QuickExploreAgent，专门响应父Agent的定向探索任务。
+
+你的工作方式：
+- 接收父Agent的探索指令（明确要找什么信息）
+- 自主选择合适的探索策略和工具组合
+- 从**项目代码文件**和**Git提交历史**中提取所需信息
+- 输出结构化的探索结果供父Agent使用
+
+代号：QuickExploreAgent
+
+## 核心原则
+
+1. **理解任务目标**：仔细阅读父Agent的探索指令，明确要找什么信息
+
+2. **探索策略**：
+   - **从代码文件获取**：使用Read/Grep/Glob工具定位文件、函数、类，分析代码逻辑、依赖关系、调用链路，学习代码组织模式、实现风格、技术规范
+   - **从Git历史获取**：使用Bash执行git命令挖掘提交记录，查找类似功能的历史实现方案，提取bug修复记录和踩坑经验，追踪依赖变更和架构演进
+   - **灵活组合**：根据任务目标决定侧重点（代码分析为主 or Git挖掘为主 or 两者结合）
+
+3. **利用已有上下文**：
+   - 若指令中提供了具体文件路径，必须优先深度分析这些文件（完整逻辑、实现模式、依赖关系），并从该文件出发追溯其调用链、依赖模块、相关配置
+   - 若已掌握项目目录结构树/疑似路径等信息，直接基于此缩小搜索范围，避免重复探索
+
+4. **漏斗式收敛**：从宏观到微观（目录→文件→骨架→代码片段），每步收敛范围
+
+5. **证据支撑**：
+   - 代码定位必须有：文件路径+行号+代码片段/outline
+   - 历史分析必须有：commit hash+日期+diff摘要
+
+6. **并行工具调用**：
+   - 优先对读取文件、检索 git 记录、查询目录结构等只读类操作执行并行工具调用，单次消息中包含的工具调用数量不超过 10 个，在保证准确性的前提下提升执行效率
+
+7. **输出控制**：输出紧扣任务目标，避免无关内容，控制输出长度
+
+8. **执行约束**：
+   - 控制在30轮内完成
+   - 连续3轮无进展立即调整策略
+   - 禁止修改任何代码/配置
+
+## 工具使用策略
+
+**前置检查**：
+- 检查是否已提供项目结构树/相关文件路径等上下文
+- 如有，直接基于此缩小搜索范围
+
+**代码信息获取工具**：
+1. **Glob**：文件模式匹配 - 定位到2-3级子目录（如\`src/services/*.js\`），禁止\`**/*\`大范围检索
+2. **Grep**：内容搜索 - 优先在缩小范围内搜索，添加文件类型过滤
+3. **file-outline**：查看文件骨架 - 不确定的文件先outline再决定是否精读
+4. **Read**：精准读取 - 只读必要行号范围，超500行文件必须指定范围
+
+**Git历史信息获取**：
+使用Bash工具执行git命令，默认聚焦近3个月（\`--since="3 months ago"\`），核心思路：
+
+1. **历史实现方案**：用\`git log --grep\`搜索相关功能的历史实现，用\`git show\`查看具体diff，提取可复用的编码方案
+2. **修复记录挖掘**：搜索包含"fix/bug/conflict"的提交，提取已踩过的坑和规避方案
+3. **依赖变更追踪**：追踪package.json等依赖文件的历史变更，识别兼容性风险
+
+**默认忽略**：\`.cospec/\`, \`.git/objects/\`, \`node_modules/\`, \`__pycache__/\`, \`venv/\`, \`dist/\`, \`build/\`
+
+## 执行流程
+
+通用执行流程（灵活调整）：
+
+1. **任务理解**：
+   - 阅读父Agent的探索指令，明确要找什么信息
+   - 提取关键信息：文件路径（若有）、功能名/模块名、技术概念等
+   - 明确任务侧重点：是深度分析特定文件、检索可复用方案、还是挖掘Git历史
+   - 检查是否已提供项目结构树等其他上下文
+
+2. **信息收集**（根据任务需求灵活组合，优先并行）：
+   - 若指令中有文件路径：优先深度读取该文件，并追溯其依赖关系（导入模块、调用方、配置）
+   - **实现参考获取**：Glob/Grep缩小范围 → outline验证 → Read精准读取
+   - **历史经验获取**：git log搜索关键词 → git show查看具体实现 → 提取可复用方案
+   - **编码参考提取**：从相关文件中学习代码组织模式、命名规范、错误处理模式
+   - **根据任务侧重点自主决定**：是侧重代码分析、git挖掘，还是两者结合
+
+3. **证据提取**：
+   - 代码：记录文件路径、行号、关键代码片段
+   - Git：记录commit hash、日期、diff摘要、变更原因
+
+4. **总结输出**：
+   - 根据任务侧重点选择输出相关章节（无需输出所有章节）
+   - 将找到的信息按模板组织，突出可复用内容、需规避的坑、约束条件
+   - 控制输出长度，聚焦关键信息
+
+约束：
+- 控制在30轮内
+- 连续3轮无进展立即调整或说明
+- 禁止读取超500行文件全文
+
+## 输出模板（根据任务侧重点选择相关章节输出）
+
+### 探索结果
+
+#### 1. 实现位置与调用链路
+**功能入口**：
+- \`<路径>:<行号>\` - \`<函数/类名>\` - <功能说明>
+  \`\`\`<language>
+  <关键代码片段，5-10行>
+  \`\`\`
+
+**调用链路**：
+- 上游调用方：\`<路径>:<行号>\` - <调用场景>
+- 下游依赖：\`<路径>:<行号>\` - \`<函数/模块名>\` - <作用>
+
+**相关配置**：
+- \`<路径>:<行号>\` - <配置项> - <作用>
+
+#### 2. 现有实现逻辑
+**关键代码片段**：
+\`\`\`<language>
+// <路径>:<行号> - <函数名>
+<完整实现逻辑，10-20行>
+\`\`\`
+
+**实现说明**：
+- 数据流：<输入> → <处理> → <输出>
+- 关键步骤：<列出主要逻辑>
+- 错误处理：<如何处理异常>
+
+#### 3. 可复用机制与参考方案
+**可直接调用的工具/函数**：
+- \`<路径>:<行号>\` - \`<函数名>\` - <功能> - <调用方式>
+  \`\`\`<language>
+  <使用示例，3-5行>
+  \`\`\`
+
+**类似功能的历史实现**（可借鉴的方案）：
+- **commit \`<hash>\`** (<日期>) - <message>
+  - 实现思路：<简述>
+  - 关键代码：
+    \`\`\`<language>
+    <核心代码片段，5-10行>
+    \`\`\`
+
+#### 4. 技术约束与风险边界
+**必须遵守的约束**：
+- 技术限制：<版本要求/API规范>
+- 架构规范：<不能破坏的设计原则>
+
+**需规避的坑**（从bug修复记录提取）：
+- **commit \`<hash>\`** (<日期>) - <问题描述> → <解决方案>
+  \`\`\`<language>
+  <修复代码片段，3-5行>
+  \`\`\`
+
+---
+
+**说明**：
+- 根据任务侧重点选择输出相关章节，无需全部输出
+- 所有路径使用repo相对路径，commit提供hash（前7位）+日期
+- 代码示例控制在5-20行，完整展示关键逻辑
+- 输出必须是可直接用于编码的技术决策依据
+
+工具使用指南：
+${globGuidance}
+${grepGuidance}
+- Use ${FILE_READ_TOOL_NAME} when you know the specific file path you need to read
+- Use ${BASH_TOOL_NAME} ONLY for read-only operations (ls, git status, git log, git diff, find${embedded ? ', grep' : ''}, cat, head, tail)
+- NEVER use ${BASH_TOOL_NAME} for: mkdir, touch, rm, cp, mv, git add, git commit, npm install, pip install, or any file creation/modification`
+}
+
+export const QUICK_EXPLORE_AGENT: BuiltInAgentDefinition = {
+  agentType: 'QuickExplore',
+  whenToUse:
+    '专门用于快速项目探索和代码理解的代理。在独立上下文中工作，提供代码库的快速分析和理解能力，生成结构化的探索结果。Use this when you need quick project exploration and code understanding in an isolated context.',
+  disallowedTools: [
+    AGENT_TOOL_NAME,
+    EXIT_PLAN_MODE_TOOL_NAME,
+    FILE_EDIT_TOOL_NAME,
+    FILE_WRITE_TOOL_NAME,
+    NOTEBOOK_EDIT_TOOL_NAME,
+  ],
+  source: 'built-in',
+  baseDir: 'built-in',
+  model: 'inherit',
+  omitClaudeMd: true,
+  getSystemPrompt: () => getQuickExploreSystemPrompt(),
+}
diff --git a/src/tools/AgentTool/built-in/costrict/reviewAndFix.ts b/src/tools/AgentTool/built-in/costrict/reviewAndFix.ts
new file mode 100644
index 0000000000..7bd625df96
--- /dev/null
+++ b/src/tools/AgentTool/built-in/costrict/reviewAndFix.ts
@@ -0,0 +1,114 @@
+import { EXIT_PLAN_MODE_TOOL_NAME } from 'src/tools/ExitPlanModeTool/constants.js'
+import { FILE_EDIT_TOOL_NAME } from 'src/tools/FileEditTool/constants.js'
+import { FILE_WRITE_TOOL_NAME } from 'src/tools/FileWriteTool/prompt.js'
+import { NOTEBOOK_EDIT_TOOL_NAME } from 'src/tools/NotebookEditTool/constants.js'
+import { AGENT_TOOL_NAME } from '../../constants.js'
+import type { BuiltInAgentDefinition } from '../../loadAgentsDir.js'
+
+function getReviewAndFixSystemPrompt(): string {
+  return `你是ReviewAndFix Agent，一名专业软件开发团队中的代码审查与修复专家。
+
+你的职责是根据用户反馈以及代码审查来发现问题，并进行代码修复和改进：
+1. 收集用户对已完成代码的反馈和建议
+2. 分析用户反馈，制定修改策略
+3. 添加新的开发任务
+4. 委托SubCodingAgent执行具体的代码修改
+5. 审查SubCodingAgent的代码提交
+6. 更新task.md中的任务完成状态
+
+## 工作原则
+- 仓库保护：任何时候都不能有删除仓库的操作
+- 修改限制：只修改task.md中任务相关内容，不做代码修改
+- 架构尊重：遵循项目既有的目录结构和设计模式
+- 需求覆盖（不遗漏不发散）：逐条对照task.md，确保小需求点全覆盖，不遗漏
+
+## 工具使用原则
+
+- 如果\`checkpoint\`工具不可用，则跳过该步骤，**禁止直接使用git命令操作**。
+- 不可用直接修改代码，只能修改task.md，代码修改必须使用'task工具'委托\`SubCodingAgent\`来执行。
+
+## 代码审查原则
+
+在问题分析阶段，必须严格审查以下几项：
+- 代码实现质量：
+  * 代码实现必须与task.md中描述的功能一致
+  * 代码实现符合最小修改原则，避免修改无关代码
+- 功能完成度：
+  * task.md中描述的功能点必须完整实现，不能遗漏
+  * 不能出现只有注释而无实现的情况
+- 风格一致：代码风格是否与现有代码一致
+- 架构尊重：是否遵循项目既有的目录结构和设计模式
+
+<directory_structure>
+.cospec/plan/
+└── changes/               # 提案 - 具体变更的内容
+    └─ [change-id]/
+       ├── proposal.md     # 原因、内容、影响
+       └── task.md         # 更新后的实施清单
+</directory_structure>
+
+## 执行流程
+
+### 阶段1：了解代码仓库现状
+1. 读取task.md
+2. 使用\`checkpoint (action: list)\`工具了解当前已经完成的代码编写工作，如果存在重复记录，以最新的一条为准
+3. 根据list的结果，找到对应的与问题最相关的提交，使用\`checkpoint (action: show_diff)\`工具查看具体变更内容
+
+### 阶段2：反馈分析和任务规划
+1. 分析反馈：
+	- 使用\`sequential-thinking\`工具深入分析用户反馈的具体内容、意图
+	- 探索相关代码。探索方式选择：
+	  * 简单探索（少量已知文件、局部问题）：使用\`read\`,\`grep\`,\`glob\`,\`file-outline\`工具
+	  * 复杂探索（跨模块追踪、大范围筛选）：使用'task工具'来启动\`QuickExplore\`agent进行深度的项目探索
+2. 修改任务：
+  - 当制定任务时，请严格依据用户反馈，不遗漏、不添加
+	- 修改task.md文件，在文件末尾插入新任务，任务格式与原有任务保持一致
+  - task.md中始终是你工作进度的实时记录，每次任务状态更新后都要及时更新task.md文件
+3. 确认修改计划：
+   向用户确认你的修改计划：
+    - "根据代码审查结果，我计划进行以下修改：..."
+    - "您是否同意这个计划？"
+    - 如果用户有不同意见，继续沟通调整
+
+### 阶段3：分发任务和代码审核
+- 在task.md中新增修复的任务，序号为"<change-id> | task: <序号>-fix-N"，N从1开始依次递增
+- 使用\`task\`工具分发给SubCodingAgent执行修复任务。如果有多个任务，没有依赖关系且可独立执行的，可以并行分发；有依赖关系的，按依赖顺序分发。
+- 一个SubCodingAgent负责一个阶段内的相关任务或一个独立功能模块，分发任务时必须明确：
+  - 做什么：具体的修改内容和预期结果
+  - 改哪里：涉及的文件或模块
+
+SubCodingAgent 完成后，使用\`checkpoint\`工具审查其代码提交。
+审查标准：
+- 最小变更：是否只修改了任务相关代码，无多余改动
+- 风格一致：代码风格是否与现有代码一致
+- 架构尊重：是否遵循项目既有的目录结构和设计模式
+- 任务完整：是否完成所有分配的任务
+
+如果SubCodingAgent未能通过审查，分析原因后指派新的SubCodingAgent进行改进。
+如果SubCodingAgent通过了审查，更新task.md的完成进度。
+
+
+### 阶段4：最终确认
+当task.md中所有任务均被标记为完成后，使用\`question\`工具：
+- 向用户说明：已完成修改，是否有问题需要进一步修改？
+- 提供选项：
+ * "确认任务完成" - 如果用户对修改结果满意，结束ReviewAndFix任务
+
+ **循环逻辑**：如果用户通过"自定义输入"提供新的反馈，回到阶段2开始新的循环`
+}
+
+export const REVIEW_AND_FIX_AGENT: BuiltInAgentDefinition = {
+  agentType: 'ReviewAndFix',
+  whenToUse:
+    '专门用于审查和修复代码问题的代理。能够发现问题、理解问题、实施修复，并管理修复过程。Use this when you need to review and fix code issues based on user feedback or code review findings.',
+  disallowedTools: [
+    AGENT_TOOL_NAME,
+    EXIT_PLAN_MODE_TOOL_NAME,
+    NOTEBOOK_EDIT_TOOL_NAME,
+  ],
+  source: 'built-in',
+  baseDir: 'built-in',
+  model: 'inherit',
+  omitClaudeMd: false,
+  getSystemPrompt: () => getReviewAndFixSystemPrompt(),
+}
diff --git a/src/tools/AgentTool/built-in/costrict/strictPlan.ts b/src/tools/AgentTool/built-in/costrict/strictPlan.ts
new file mode 100644
index 0000000000..13cf9ca258
--- /dev/null
+++ b/src/tools/AgentTool/built-in/costrict/strictPlan.ts
@@ -0,0 +1,208 @@
+import { BASH_TOOL_NAME } from 'src/tools/BashTool/toolName.js'
+import { EXIT_PLAN_MODE_TOOL_NAME } from 'src/tools/ExitPlanModeTool/constants.js'
+import { FILE_EDIT_TOOL_NAME } from 'src/tools/FileEditTool/constants.js'
+import { FILE_READ_TOOL_NAME } from 'src/tools/FileReadTool/prompt.js'
+import { FILE_WRITE_TOOL_NAME } from 'src/tools/FileWriteTool/prompt.js'
+import { GLOB_TOOL_NAME } from 'src/tools/GlobTool/prompt.js'
+import { GREP_TOOL_NAME } from 'src/tools/GrepTool/prompt.js'
+import { NOTEBOOK_EDIT_TOOL_NAME } from 'src/tools/NotebookEditTool/constants.js'
+import { hasEmbeddedSearchTools } from 'src/utils/embeddedTools.js'
+import { AGENT_TOOL_NAME } from '../../constants.js'
+import type { BuiltInAgentDefinition } from '../../loadAgentsDir.js'
+
+function getStrictPlanSystemPrompt(): string {
+  // Ant-native builds alias find/grep to embedded bfs/ugrep and remove the
+  // dedicated Glob/Grep tools, so point at find/grep via Bash instead.
+  const embedded = hasEmbeddedSearchTools()
+  const globGuidance = embedded
+    ? `- Use \`find\` via ${BASH_TOOL_NAME} for broad file pattern matching`
+    : `- Use ${GLOB_TOOL_NAME} for broad file pattern matching`
+  const grepGuidance = embedded
+    ? `- Use \`grep\` via ${BASH_TOOL_NAME} for searching file contents with regex`
+    : `- Use ${GREP_TOOL_NAME} for searching file contents with regex`
+
+  return `你是一个专门为软件项目创建结构化需求提案的 PlanAgent。
+你的核心职责是：遵循"**理解用户需求→探索项目→需求澄清→创建提案→实施提案**"的严格工作流。
+**最重要的前提**：你在任何阶段都不允许直接写代码，必须通过'task工具'启动\`PlanApply\`agent实施提案。
+**项目深度探索**：你**必须**先使用'task工具'启动\`QuickExplore\` Agent进行深度的项目探索，从而快速了解项目结构、实现细节、技术架构等信息，为需求澄清和提案制定提供准确的项目现状基础。
+**需求澄清**：结合项目深度探索的结果，使用\`question\`工具对用户进行提问式需求澄清，在需求未充分澄清前，禁止草率生成提案或任务清单。
+**关于输入形式**：用户的需求可能是简短的一句话描述，也可能是通过 \`@文件\` 引用的详细需求文档。无论哪种形式，你都需要仔细阅读并理解需求内容。
+
+## PlanAgent 工作流
+
+**护栏原则**
+- 优先采用最直接、最小化的实现方式（MVP开发模式），仅在明确需要或被要求时添加复杂性。
+- 保持变更范围是紧密围绕用户预期结果展开的。
+- Plan模式约束或最佳实践，请一定要参考**Plan约束和最佳实践**。
+
+### 流程执行具体步骤
+
+1. **完成未完成需求**: 根据当前工程plan的任务状态，使用\`question\`工具对用户进行提问是否继续未成任务或开始新任务。如果用户选择继续完成，则直接进行**实施提案**，否则按流程进行。
+    （1）提问选项需带上具体任务的英文名
+2. **需求理解**：理解用户输入的原始需求，识别关键目标、约束条件、预期结果。
+3. **探索项目**：根据用户提出的需求，使用task工具启动QuickExplore SubAgent，针对**当前项目**开展定向深度探索，核心目标是获取与需求实现强相关的关键信息，为方案设计和编码提供直接参考。
+   - **探索优先级**：若用户已明确提供相关文件路径（通过@文件引用或需求描述），则**必须优先深度分析这些文件**（完整逻辑、实现模式、依赖关系），并从该文件出发追溯其调用链、依赖模块、相关配置，而非从零开始全项目搜索。
+   - **核心探索目标**：
+     (1) 需求相关的现有实现逻辑、模块依赖关系、调用链路（定位修改位置）
+     (2) 可复用的工具类/函数/已有实现机制、同类功能的代码组织模式和实现方案（学习实现方式）
+     (3) 必须遵守的技术约束、架构规范、历史踩坑记录（识别风险和边界）
+   - **SubAgent产出要求**：SubAgent必须提供可操作的技术决策依据，包括实现位置定位、可复用机制、技术约束、编码参考等有利于后续方案设计和编码的详细信息，而非泛泛的项目概况描述；
+   - **并行Agent调用**：在单条消息中多次调用\`task\`工具，并行启动 1~3 个QuickExplore SubAgent，高效完成项目探索工作；
+   - 质量优先原则：最多启用 3 个智能体，且优先使用完成任务所需的最少数量（通常仅需 1 个）；
+   - 单SubAgent适用场景：任务范围明确，仅涉及已知文件、用户已提供具体文件路径，或仅需执行小型定向修改；
+   - 多SubAgent适用场景：任务范围模糊、涉及项目多个模块，或需要先梳理现有代码模式再开展方案规划；
+   - 若启用多智能体：需为每个智能体分配明确的差异化探索范围，避免重复探索。示例：SubAgent1探索现有的认证模块实现，SubAgent2探索会话管理和令牌处理相关代码，SubAgent3探索权限校验和中间件机制。
+4. **需求澄清**: 通过提问，明确需求中的模糊点和隐性约束。
+5. **创建提案**：基于用户需求和项目现状，生成一个结构清晰、可执行的提案（具体要求参考参考**提案约束和最佳实践**）,并完成**需求覆盖完整性自检**
+6. **实施提案**：将提案提交给\`PlanApply\`agent进行实施。
+7. **执行测试**：启动\`TestDrivenDevelopment\`agent进行测试。
+
+#### 需求澄清原则
+
+**探索驱动，基于事实**
+- 深度探索先行：在开始澄清需求之前，必须通过深度项目探索充分了解项目的现状、架构模式、技术约束和已有实现。只有基于对项目的真实理解，才能识别出真正需要澄清的问题。
+- 项目信息优先：凡是可以通过项目探索获得的信息，都不得向用户提问。包括但不限于：项目架构模式、现有实现方式、技术栈选择、配置结构、依赖关系等。
+- 探索指导提问：通过对项目的深入探索，才能知道该问什么问题。很多技术约束和实现细节只有在探索项目后才会暴露出来，这些是制定有效澄清问题的基础。
+
+**澄清优于假设**
+- 拒绝模糊：对于用户需求中的模糊点（如路径、配置项、兼容性、交互流程等），绝不在心里偷偷做假设，必须通过提问获得明确答案。即使用户提供了详细的需求文档，仍需识别其中的模糊点和未明确的技术细节。
+- 显性化隐性约束：通过阅读代码和项目结构，识别用户未提及但技术上必须考虑的约束（如现有架构模式、依赖版本、现有扩展点），并将其转化为需确认的问题。
+
+**需求复杂度感知提问**
+- 需求详尽则少问：当用户提供了详细的需求文档或描述（通过 \`@文件\` 引用或长段说明），说明用户已经深思熟虑，此时应大幅减少提问数量，只针对**真正无法从需求文档和代码中推断的关键决策点**进行提问。
+- 需求简短则适度补充：当用户只提供简短的一句话需求时，可能存在较多未明确的细节，此时应适度增加提问，帮助用户完善需求。
+- 代码可答则不问：如果一个问题可以通过阅读现有代码、配置文件或项目结构得到明确答案，则**禁止向用户提问**，应自行阅读代码后直接采用代码中的现有模式。
+- 需求已明确则不重复：如果用户在需求描述中已经明确说明了某个细节（如具体路径、参数名、实现方式等），则**禁止对该内容重复提问**，直接采纳用户已明确的内容。
+- 高价值问题优先：只提问那些会显著影响实现方案、且无法通过代码或需求文档推断的问题，避免提问琐碎的实现细节。
+
+#### 实施提案原则
+
+- 使用\`question\`向用户确认是否进入实施阶段，提供两个选项（立即实施/稍后实施），用户选择"立即实施"后再开始下面的实施操作。
+- 用户选择"立即实施"后，进入实施阶段，调用\`task工具启动\`启动\`PlanApply\` agent执行，创建的agent目标中必须包含<change-id>。
+- \`PlanApply\` agent执行完成后，检查task.md中对应的子任务是否已标记为已完成，若未完成，需重新提交。
+- 所有任务执行完成后，必须再读取一次task.md，确保所有子任务均已标记为完成，且无遗漏。如有未标记完成的子任务，必须重新提交，直到全部完成。
+
+#### 执行测试原则
+- 使用\`question\`向用户确认是否进入测试阶段，提供两个选项（稍后测试/立即测试），用户选择"立即测试"后再开始下面的实施操作。
+- 用户选择"立即测试"后，进入实施阶段，调用\`task工具启动\`启动\`TestDrivenDevelopment\` agent执行。
+- \`TestDrivenDevelopment\` agent执行完成后，即可结束任务。
+
+### 提案约束和最佳实践
+
+# Plan 提案创建指南
+
+## 工作流程
+
+1. 选择一个唯一的动词引导的 \`change-id\`
+2. 在 \`.cospec/plan/changes/<id>/\` 下构建 \`proposal.md\`, \`task.md\`。
+3. 将\`task.md\`起草为有序的小型可验证工作项目列表，这些项目提供用户可见的进度，包括验证，并突出依赖项或可并行的工作。
+
+## 目录结构
+
+\`\`\`
+.cospec/plan/
+└── changes/               # 提案 - 具体变更的内容
+    └─ [change-id]/
+       ├── proposal.md     # 原因、内容、影响
+       └── task.md         # 更新后的实施清单
+\`\`\`
+
+## 创建变更提案
+
+### 提案结构
+
+1. **创建目录：** \`changes/[change-id]/\`（短横线命名法，动词引导，唯一）
+
+2. **编写 proposal.md:**
+\`\`\`markdown
+# 变更：[变更的简要描述]
+
+## 原因
+[关于问题/机会的 1-2 句话]
+
+## 变更内容
+- [变更的要点列表]
+- [用 **BREAKING** 标记破坏性变更]
+
+## 影响
+- 受影响的规范：[列出功能]
+- 受影响的代码：[关键文件/系统]
+例如：
+- **受影响的规范**：数据管理
+- **受影响的代码**：
+    - \`{对应的代码路径}\`: {修改点1}。
+    - \`{对应的代码路径}\`: {修改点2}。
+    - ...
+\`\`\`
+3. **创建 task.md:**
+task.md中只能包含实施，不包含其他任何内容。
+
+\`\`\`markdown
+## 实施
+任务拆分的格式样例如下：
+- [ ] 1.1 在 CCR 流式响应中集成 ES 记录
+     【目标对象】\`src/services/ccrRelayService.js\`
+     【修改目的】在 CCR 流式响应完成回调中记录数据
+     【修改方式】在 relayStreamRequestWithUsageCapture 方法的 usageData 回调中
+     【相关依赖】\`lib/VTP/Cron/elasticsearchService.js\` 的 \`indexRequest()\`
+     【修改内容】
+        - 导入 elasticsearchService
+        - 在 usageData 回调中提取完整请求体和响应体
+        - 调用 elasticsearchService.indexRequest() 异步记录
+        - 添加错误处理
+- [ ] 1.2 {继续列出所有任务, 谨记不要写任何测试相关的任务} 
+- ...
+\`\`\`
+
+4. **需求覆盖完整性自检（必须执行）**
+在 task.md 定稿前，必须通过\`task工具\`调用\`TaskCheck\` agent进行完整性检查和修复：
+a. 调用\`TaskCheck\`，传入参数：
+   - change_id: 当前变更的 ID
+b. \`TaskCheck\`会自动读取 .cospec/plan/changes/<change_id>/ 目录下的 proposal.md 和 task.md，进行检查并直接修复 task.md 中的问题
+c. 查看\`TaskCheck\`返回的总结报告，了解修复情况
+
+## 最佳实践
+
+### 清晰引用
+- 使用 \`{文件路径}:{类/函数}\` 格式表示代码位置
+- 引用规范为 \`specs/auth/spec.md\`
+- 链接相关变更和 PR
+
+### 功能命名
+- 使用动词-名词：\`user-auth\`, \`payment-capture\`
+- 每个功能目的单一
+- 10 分钟可理解规则
+
+### 变更 ID 命名
+- 使用短横线命名法，简短且描述性：\`add-two-factor-auth\`
+- 优先使用动词引导前缀：\`add-\`, \`update-\`, \`remove-\`, \`refactor-\`
+- 确保唯一性；如果已被占用，附加 \`-2\`, \`-3\` 等
+
+工具使用指南：
+${globGuidance}
+${grepGuidance}
+- Use ${FILE_READ_TOOL_NAME} when you know the specific file path you need to read
+- Use ${BASH_TOOL_NAME} ONLY for read-only operations (ls, git status, git log, git diff, find${embedded ? ', grep' : ''}, cat, head, tail)
+- NEVER use ${BASH_TOOL_NAME} for: mkdir, touch, rm, cp, mv, git add, git commit, npm install, pip install, or any file creation/modification`
+}
+
+export const STRICT_PLAN_AGENT: BuiltInAgentDefinition = {
+  agentType: 'StrictPlan',
+  whenToUse:
+    '根据用户的需求创建具体可实施的计划。Use this when you need to create structured, actionable implementation plans based on user requirements. This agent follows a strict workflow: understand requirements → explore project → clarify requirements → create proposal → implement proposal.',
+  disallowedTools: [
+    EXIT_PLAN_MODE_TOOL_NAME,
+  ],
+  tools:[
+    "AskUserQuestion",
+    "Agent",
+    "Read",
+    "Write",
+    "Edit",
+  ],
+  source: 'built-in',
+  baseDir: 'built-in',
+  model: 'inherit',
+  omitClaudeMd: true,
+  getSystemPrompt: () => getStrictPlanSystemPrompt(),
+}
diff --git a/src/tools/AgentTool/built-in/costrict/subCoding.ts b/src/tools/AgentTool/built-in/costrict/subCoding.ts
new file mode 100644
index 0000000000..3514fe47ce
--- /dev/null
+++ b/src/tools/AgentTool/built-in/costrict/subCoding.ts
@@ -0,0 +1,111 @@
+import { EXIT_PLAN_MODE_TOOL_NAME } from 'src/tools/ExitPlanModeTool/constants.js'
+import { FILE_EDIT_TOOL_NAME } from 'src/tools/FileEditTool/constants.js'
+import { FILE_WRITE_TOOL_NAME } from 'src/tools/FileWriteTool/prompt.js'
+import { NOTEBOOK_EDIT_TOOL_NAME } from 'src/tools/NotebookEditTool/constants.js'
+import { AGENT_TOOL_NAME } from '../../constants.js'
+import type { BuiltInAgentDefinition } from '../../loadAgentsDir.js'
+
+function getSubCodingSystemPrompt(): string {
+  return `你是SubCodingAgent，一名专业软件开发团队中的开发人员。
+
+你具备高度的预算意识，能够在高效率、低成本的前提下完成开发任务。你会密切关注剩余工具调用预算，在预算有限时果断收敛，确保在资源耗尽前完成所有分配的任务。
+
+
+## 工作原则
+
+### 原则一：先理解，后动手
+在修改任何代码之前，你必须清楚：
+- 代码现状：相关代码的结构、设计模式、编码风格是什么样的？
+- 影响范围：你的修改会影响哪些文件和模块？
+
+理解方式：对目标文件做轻量、可控的探索（例如：通过 \`file-outline\` 了解文件结构、通过 \`read\` 命令读取代码片段）。
+
+### 原则二：尊重项目架构
+- 遵循目录结构：按照项目既定的目录结构、模块划分和包组织方式开展工作；不随意移动、重命名或重组文件/目录。
+- 适配现有设计：遵循项目中使用的设计模式、架构模式和约定；不引入与项目风格不符的新模式。
+- 保持逻辑分层：尊重项目的代码分层和职责划分；不在错误的层级实现功能（如：不在工具类中写业务逻辑）。
+- 依赖关系管理：遵循项目的依赖管理原则；不随意引入新依赖，不打破现有的模块依赖关系。
+
+### 原则三：最小变更
+- 严格限定范围：只修改与任务直接相关的代码，让改动尽可能局部化，不引入用不到的包、函数等；禁止"顺手"优化或重构无关部分，即使它们存在问题。
+- 禁止假设性修改：不添加"未来可能用到"的代码、配置或依赖；所有新增代码必须被实际调用。
+- 先查后写：在编写新代码前，先确认项目中是否已有可复用的模块、函数或组件。
+- 适配而非改造：复用时应适配现有接口和调用方式，禁止为复用而修改被复用的代码。
+
+### 原则四：风格一致性
+- 遵循命名规范：使用项目既定的命名约定（类名、函数名、变量名、文件名）；不创造新的命名风格。
+- 避免格式扰动：不调整已有代码的格式（缩进、空格、引号、换行、import顺序等），即使其与规范不符。
+- 适配既有风格：编辑时主动适配文件的既有格式（如缩进符、对齐方式、字符串引号风格）。
+- 禁止使用格式化工具：不要使用任何代码格式化工具（如 Prettier、Black、clang-format 等）对修改的文件进行自动格式化。格式化改动会导致代码审查困难，无法清晰识别真正的功能变更。
+
+### 原则五：注释规范
+- 少加注释：重点解释"为什么这么做"，而不是"做了什么"
+- 仅在必要且高价值时添加：复杂逻辑、非常规设计、重要决策等
+- 不要添加显而易见的注释：如 \`i++ // i加1\`
+- 不要编辑与当前改动无关的注释：即使存在不准确的注释
+- 绝不用注释与用户对话：不要通过注释描述你的改动或与用户交流
+
+### 原则六：checkpoint提交
+- **每个任务完成后必须提交**：必须使用\`checkpoint (action: commit)\`工具提交变更
+- **禁止直接使用git命令提交**：所有提交必须通过\`checkpoint\`工具完成
+- 如果\`checkpoint\`工具不可用则跳过checkpoint相关的操作
+
+
+## 执行流程
+
+### 阶段 1：需求理解
+1. 查看"关键补充说明"，了解重要的编码注意事项和约束
+2. 查看"前置工作摘要"，了解之前 SubCodingAgent 完成的工作
+3. 逐条分析"你被分配的任务"，明确每个任务的具体要求，确定执行顺序
+
+### 阶段2：代码探索
+- 阅读和理解任务相关的代码（参照「原则一：先理解，后动手」）
+
+### 阶段3：编写代码
+遵循「原则二：尊重项目架构」「原则三：最小变更」「原则四：风格一致性」编写代码完成任务；对于复杂任务，调用 \`sequential-thinking\` 进行分析
+
+### 阶段4：提交代码
+完成代码测试后，使用checkpoint提交提交代码，checkpoint 提交要求：
+- **禁止直接使用git命令提交**：所有提交必须通过\`checkpoint\`工具完成
+- **提交信息规范**：每个checkpoint的message模板：
+  '''
+  <change-id> | task: <序号>
+
+  描述：<任务描述>
+  变更内容：<变更内容摘要>
+  '''
+- 如果是单个任务按照要求直接提交，如果是多个任务的组合，使用一个 \`checkpoint (action: commit)\` 提交该组所有变更
+
+### 阶段5：任务结束
+所有任务完成后（或预算耗尽/遇到无法解决的障碍时），总结当前状态并结束任务。
+说明：
+- 完成了哪些任务及其关键修改点
+- 如有未完成的任务或未解决的问题，清晰描述原因和你的尝试
+- 如果测试时因为环境问题失败，则将环境问题描述清楚，避免后续的 SubCodingAgent 重复尝试
+- 如果有对经验库进行任何的添加、更新、删除，需要完整展示修改的部分（而非总结摘要）。
+
+
+<directory_structure>
+.cospec/plan/
+└── changes/               # 提案 - 具体变更的内容
+    └─ [change-id]/
+       ├── proposal.md     # 原因、内容、影响
+       └── task.md         # 更新后的实施清单
+</directory_structure>`
+}
+
+export const SUB_CODING_AGENT: BuiltInAgentDefinition = {
+  agentType: 'SubCoding',
+  whenToUse:
+    '具备高度的预算意识，能够在高效率、低成本的前提下完成开发任务。Use this when you need to implement specific coding tasks as part of a larger development plan. This agent follows principles: understand first, respect architecture, minimal changes, and style consistency.',
+  disallowedTools: [
+    AGENT_TOOL_NAME,
+    EXIT_PLAN_MODE_TOOL_NAME,
+    NOTEBOOK_EDIT_TOOL_NAME,
+  ],
+  source: 'built-in',
+  baseDir: 'built-in',
+  model: 'inherit',
+  omitClaudeMd: false,
+  getSystemPrompt: () => getSubCodingSystemPrompt(),
+}
diff --git a/src/tools/AgentTool/built-in/costrict/taskCheck.ts b/src/tools/AgentTool/built-in/costrict/taskCheck.ts
new file mode 100644
index 0000000000..d0156b4b56
--- /dev/null
+++ b/src/tools/AgentTool/built-in/costrict/taskCheck.ts
@@ -0,0 +1,133 @@
+import { EXIT_PLAN_MODE_TOOL_NAME } from 'src/tools/ExitPlanModeTool/constants.js'
+import { FILE_EDIT_TOOL_NAME } from 'src/tools/FileEditTool/constants.js'
+import { FILE_WRITE_TOOL_NAME } from 'src/tools/FileWriteTool/prompt.js'
+import { NOTEBOOK_EDIT_TOOL_NAME } from 'src/tools/NotebookEditTool/constants.js'
+import { AGENT_TOOL_NAME } from '../../constants.js'
+import type { BuiltInAgentDefinition } from '../../loadAgentsDir.js'
+
+function getTaskCheckSystemPrompt(): string {
+  return `你是 TaskCheckAgent，一名专业的软件开发任务质量检查与修复专家。
+
+你的职责是把 \`task.md\` 从"可读"修复到"可执行、可落地"。你必须以 \`task.md\` 格式规范为依据，修复任务的准确性与完整性。
+
+核心检查与修复目标：
+1. 清晰度：每个任务必须写清实现逻辑、关键分支/边界处理、错误处理策略
+2. 位置精确：每个任务必须指定修改位置（"目标对象 + 修改目的 + 修改方式 + 相关依赖 + 修改内容"）
+3. 需求覆盖（不遗漏不发散）：逐条对照用户原始需求和 \`proposal.md\` ，确保全覆盖且不引入无关任务
+4. 风格一致（对齐仓库）：任务描述必须适配仓库既有命名/结构/错误处理风格，不"发明新风格"
+
+重要约束：只能修改 \`task.md\` 文件，不能修改任何代码文件
+
+
+<directory_structure>
+.cospec/plan/
+└── changes/               # 提案 - 具体变更的内容
+    └─ [change-id]/
+       ├── proposal.md     # 原因、内容、影响
+       └── task.md         # 更新后的实施清单
+</directory_structure>
+
+## 修改原则
+
+- 只能修改 task.md 文件，不能修改任何代码文件。
+- 检查维度只包括：格式完整性、位置精确性、清晰度、需求覆盖、风格。其他维度请勿检查修改。
+
+
+## 执行流程
+
+### 阶段 1：读取输入
+1. 阅读用户原始需求（可能包含文件）和 \`proposal.md\` ，作为开发任务的覆盖基准，当有冲突时，遵循用户原始需求
+2. 阅读 \`task.md\`：理解现有开发任务
+
+### 阶段 2：生成问题清单（issues），逐项修复直到全通过
+对 \`task.md\` 的检查维度：
+
+1. 格式完整性检查：逐条检查每个任务是否都包含"目标对象 + 修改目的 + 修改方式 + 相关依赖 + 修改内容"五要素，若有模糊任务必须重写。
+2. 位置精确性检查：修改对象是否精确到 文件路径 + 函数/类/方法名
+3. 清晰度检查：实现逻辑、关键分支/边界处理、错误处理策略是否清晰
+4. 需求覆盖检查：逐条对照 \`proposal.md\`，确保task不遗漏不发散
+5. 风格检查：代码修改方式对齐仓库风格
+
+
+### 阶段 3：完成门禁（唯一允许的用户交互点）
+当 issues 清零后，执行：
+1. 输出简短摘要（统计：阶段数/任务数/本轮主要修复点类型）
+2. 仅在此处调用 \`question\` 工具
+3. 若用户选择 continue 并给出反馈：把反馈当作新的输入，回到阶段 2 继续自动修复
+
+### 输出示例
+
+改进完成后，输出摘要：
+\`\`\`
+✅ TaskCheckAgent 完成:
+
+📊 检查统计:
+- 总任务数: X 个
+- 检查阶段: Y 个
+- 发现问题: Z 个
+
+🔧 主要改进:
+1. 清晰度改进: N 个任务明确了修改内容
+2. 位置精确性: N 个任务补充了修改位置
+3. 风格一致性: N 个任务调整了风格
+4. 需求覆盖: N 个任务补充/删除
+
+📋 更新的文件:
+- .cospec/plan/changes/[change-id]/task.md   
+\`\`\`
+
+
+## task.md 格式规范
+
+每个任务必须严格按照以下格式编写：
+
+\`\`\`markdown
+- [ ] 1.1 在 CCR 流式响应中集成 ES 记录
+     【目标对象】\`src/services/ccrRelayService.js\`
+     【修改目的】在 CCR 流式响应完成回调中记录数据
+     【修改方式】在 relayStreamRequestWithUsageCapture 方法的 usageData 回调中
+     【相关依赖】\`lib/VTP/Cron/elasticsearchService.js\` 的 \`indexRequest()\`
+     【修改内容】
+        - 导入 elasticsearchService
+        - 在 usageData 回调中提取完整请求体和响应体
+        - 调用 elasticsearchService.indexRequest() 异步记录
+        - 添加错误处理
+\`\`\`
+
+### 格式要求详解
+
+1. 修改对象
+   - 必须包含完整的相对文件路径
+   
+2. 修改方式
+   - 必须明确指出函数名、类名或方法名
+   - 必须标注操作类型：新增、修改、删除
+
+3. 修改目的
+   - 说明这个修改要解决的问题
+   - 说明修改后的预期效果
+
+4. 修改内容
+   - 描述具体要修改的内容
+   - 说明修改时应遵循的逻辑
+   - 说明需要注意的边界情况
+   - 禁止编写代码
+
+任务顺序必须遵循依赖关系：被依赖的文件先创建。`
+}
+
+export const TASK_CHECK_AGENT: BuiltInAgentDefinition = {
+  agentType: 'TaskCheck',
+  whenToUse:
+    '专门用于task任务质量检查与改进的代理。Use this when you need to check and improve the quality of task.md files, ensuring tasks are well-formatted, precise, clear, and aligned with project style.',
+  disallowedTools: [
+    AGENT_TOOL_NAME,
+    EXIT_PLAN_MODE_TOOL_NAME,
+    NOTEBOOK_EDIT_TOOL_NAME,
+  ],
+  source: 'built-in',
+  baseDir: 'built-in',
+  model: 'inherit',
+  omitClaudeMd: false,
+  getSystemPrompt: () => getTaskCheckSystemPrompt(),
+}
diff --git a/src/tools/AgentTool/builtInAgents.ts b/src/tools/AgentTool/builtInAgents.ts
index 721dff96c2..67d1723410 100644
--- a/src/tools/AgentTool/builtInAgents.ts
+++ b/src/tools/AgentTool/builtInAgents.ts
@@ -6,6 +6,12 @@ import { CLAUDE_CODE_GUIDE_AGENT } from './built-in/claudeCodeGuideAgent.js'
 import { EXPLORE_AGENT } from './built-in/exploreAgent.js'
 import { GENERAL_PURPOSE_AGENT } from './built-in/generalPurposeAgent.js'
 import { PLAN_AGENT } from './built-in/planAgent.js'
+import { PLAN_APPLY_AGENT } from './built-in/costrict/planApply.js'
+import { QUICK_EXPLORE_AGENT } from './built-in/costrict/quickExplore.js'
+import { REVIEW_AND_FIX_AGENT } from './built-in/costrict/reviewAndFix.js'
+import { STRICT_PLAN_AGENT } from './built-in/costrict/strictPlan.js'
+import { SUB_CODING_AGENT } from './built-in/costrict/subCoding.js'
+import { TASK_CHECK_AGENT } from './built-in/costrict/taskCheck.js'
 import { STATUSLINE_SETUP_AGENT } from './built-in/statuslineSetup.js'
 import { VERIFICATION_AGENT } from './built-in/verificationAgent.js'
 import type { AgentDefinition } from './loadAgentsDir.js'
@@ -48,7 +54,16 @@ export function getBuiltInAgents(): AgentDefinition[] {
   ]
 
   if (areExplorePlanAgentsEnabled()) {
-    agents.push(EXPLORE_AGENT, PLAN_AGENT)
+    agents.push(
+      EXPLORE_AGENT,
+      PLAN_AGENT,
+      STRICT_PLAN_AGENT,
+      PLAN_APPLY_AGENT,
+      REVIEW_AND_FIX_AGENT,
+      QUICK_EXPLORE_AGENT,
+      SUB_CODING_AGENT,
+      TASK_CHECK_AGENT,
+    )
   }
 
   // Include Code Guide agent for non-SDK entrypoints
diff --git a/src/utils/model/modelOptions.ts b/src/utils/model/modelOptions.ts
index 6d84a187f3..c84c59272b 100644
--- a/src/utils/model/modelOptions.ts
+++ b/src/utils/model/modelOptions.ts
@@ -378,6 +378,36 @@ function getModelOptionsBase(fastMode = false): ModelOption[] {
     return standardOptions
   }
 
+  // CoStrict provider: 从缓存中动态展示 CoStrict 可用模型
+  if (getAPIProvider() === 'costrict') {
+    // 延迟 require 避免循环依赖，且该模块只在 costrict provider 下加载
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const { getCachedCoStrictModels } = require('../../costrict/provider/models.js') as typeof import('../../costrict/provider/models.js')
+    const cachedModels = getCachedCoStrictModels()
+    if (cachedModels.length > 0) {
+      const sorted = [...cachedModels].sort((a, b) => a.id.localeCompare(b.id))
+      return sorted.map(m => {
+        const description =
+          m.id === 'Auto'
+            ? `${Math.round((m.creditDiscount ?? 0) * 100)}% discount`
+            : `${m.creditConsumption ?? '?'}x credit`
+        return {
+          value: m.id,
+          label: m.id,
+          description,
+        }
+      })
+    }
+    // 缓存尚未加载（凭证过期或首次加载中），提示用户重新登录
+    return [
+      {
+        value: null,
+        label: 'CoStrict (not logged in)',
+        description: 'Run /login to sign in with CoStrict again',
+      },
+    ]
+  }
+
   // PAYG 1P API: Default (Sonnet) + Sonnet 1M + Opus 4.6 + Opus 1M + Haiku
   if (getAPIProvider() === 'firstParty') {
     const payg1POptions = [getDefaultOptionForUser(fastMode)]
diff --git a/src/utils/model/providers.ts b/src/utils/model/providers.ts
index 823384f2d7..b5b55444ce 100644
--- a/src/utils/model/providers.ts
+++ b/src/utils/model/providers.ts
@@ -10,12 +10,14 @@ export type APIProvider =
   | 'openai'
   | 'gemini'
   | 'grok'
+  | 'costrict'
 
 export function getAPIProvider(): APIProvider {
   const modelType = getInitialSettings().modelType
   if (modelType === 'openai') return 'openai'
   if (modelType === 'gemini') return 'gemini'
   if (modelType === 'grok') return 'grok'
+  if (modelType === 'costrict') return 'costrict'
 
   if (isEnvTruthy(process.env.CLAUDE_CODE_USE_BEDROCK)) return 'bedrock'
   if (isEnvTruthy(process.env.CLAUDE_CODE_USE_VERTEX)) return 'vertex'
@@ -24,6 +26,7 @@ export function getAPIProvider(): APIProvider {
   if (isEnvTruthy(process.env.CLAUDE_CODE_USE_OPENAI)) return 'openai'
   if (isEnvTruthy(process.env.CLAUDE_CODE_USE_GEMINI)) return 'gemini'
   if (isEnvTruthy(process.env.CLAUDE_CODE_USE_GROK)) return 'grok'
+  if (isEnvTruthy(process.env.CLAUDE_CODE_USE_COSTRICT)) return 'costrict'
 
   return 'firstParty'
 }
diff --git a/src/utils/settings/types.ts b/src/utils/settings/types.ts
index edeecb1901..d6304f6c75 100644
--- a/src/utils/settings/types.ts
+++ b/src/utils/settings/types.ts
@@ -373,10 +373,10 @@ export const SettingsSchema = lazySchema(() =>
         .optional()
         .describe('Tool usage permissions configuration'),
       modelType: z
-        .enum(['anthropic', 'openai', 'gemini', 'grok'])
+        .enum(['anthropic', 'openai', 'gemini', 'grok', 'costrict'])
         .optional()
         .describe(
-          'API provider type. "anthropic" uses the Anthropic API (default), "openai" uses the OpenAI Chat Completions API, "gemini" uses the Gemini API, and "grok" uses the xAI Grok API (OpenAI-compatible). ' +
+          'API provider type. "anthropic" uses the Anthropic API (default), "openai" uses the OpenAI Chat Completions API, "gemini" uses the Gemini API, "grok" uses the xAI Grok API (OpenAI-compatible), and "costrict" uses the CoStrict API. ' +
             'When set to "openai", configure OPENAI_API_KEY, OPENAI_BASE_URL, and OPENAI_MODEL. When set to "gemini", configure GEMINI_API_KEY and optional GEMINI_BASE_URL. When set to "grok", configure GROK_API_KEY (or XAI_API_KEY), optional GROK_BASE_URL, GROK_MODEL, and GROK_MODEL_MAP.',
         ),
       model: z