@@ -38,11 +38,7 @@ import {
3838 scopeProjectRef ,
3939 scopeThreadRef ,
4040} from "@t3tools/client-runtime/environment" ;
41- import {
42- applyClaudePromptEffortPrefix ,
43- createModelSelection ,
44- resolvePromptInjectedEffort ,
45- } from "@t3tools/shared/model" ;
41+ import { createModelSelection } from "@t3tools/shared/model" ;
4642import { CHAT_LIST_ANCHOR_OFFSET } from "@t3tools/shared/chatList" ;
4743import { projectScriptCwd , projectScriptRuntimeEnv } from "@t3tools/shared/projectScripts" ;
4844import { truncate } from "@t3tools/shared/String" ;
@@ -179,7 +175,7 @@ import {
179175} from "~/projectScripts" ;
180176import { newDraftId , newMessageId , newThreadId } from "~/lib/utils" ;
181177import { useBrowserHistoryStore } from "~/browserHistoryStore" ;
182- import { getProviderModelCapabilities , resolveSelectableProvider } from "../providerModels" ;
178+ import { resolveSelectableProvider } from "../providerModels" ;
183179import { NO_PROVIDER_MODEL_SELECTION } from "../providerInstances" ;
184180import {
185181 useClientSettings ,
@@ -493,17 +489,6 @@ function shouldTypeToFocusComposer(event: KeyboardEvent): boolean {
493489 return true ;
494490}
495491
496- function formatOutgoingPrompt ( params : {
497- provider : ProviderDriverKind ;
498- model : string | null ;
499- models : ReadonlyArray < ServerProvider [ "models" ] [ number ] > ;
500- effort : string | null ;
501- text : string ;
502- } ) : string {
503- const caps = getProviderModelCapabilities ( params . models , params . model , params . provider ) ;
504- const promptEffort = resolvePromptInjectedEffort ( caps , params . effort ) ;
505- return applyClaudePromptEffortPrefix ( params . text , promptEffort ) ;
506- }
507492const SCRIPT_TERMINAL_COLS = 120 ;
508493const SCRIPT_TERMINAL_ROWS = 30 ;
509494
@@ -4927,10 +4912,7 @@ function ChatViewContent(props: ChatViewProps) {
49274912 elementContexts : composerElementContexts ,
49284913 previewAnnotations : sendContextPreviewAnnotations ,
49294914 reviewComments : composerReviewComments ,
4930- selectedProvider : ctxSelectedProvider ,
49314915 selectedModel : ctxSelectedModel ,
4932- selectedProviderModels : ctxSelectedProviderModels ,
4933- selectedPromptEffort : ctxSelectedPromptEffort ,
49344916 selectedModelSelection : ctxSelectedModelSelection ,
49354917 } = sendCtx ;
49364918 const composerImages =
@@ -5079,13 +5061,7 @@ function ChatViewContent(props: ChatViewProps) {
50795061 ) ;
50805062 const messageIdForSend = newMessageId ( ) ;
50815063 const messageCreatedAt = new Date ( ) . toISOString ( ) ;
5082- const outgoingMessageText = formatOutgoingPrompt ( {
5083- provider : ctxSelectedProvider ,
5084- model : ctxSelectedModel ,
5085- models : ctxSelectedProviderModels ,
5086- effort : ctxSelectedPromptEffort ,
5087- text : messageTextForSend || IMAGE_ONLY_BOOTSTRAP_PROMPT ,
5088- } ) ;
5064+ const outgoingMessageText = ( messageTextForSend || IMAGE_ONLY_BOOTSTRAP_PROMPT ) . trim ( ) ;
50895065 const turnAttachmentsPromise = Promise . all (
50905066 composerImagesSnapshot . map ( async ( image ) => ( {
50915067 type : "image" as const ,
@@ -5527,24 +5503,12 @@ function ChatViewContent(props: ChatViewProps) {
55275503 if ( ! sendCtx ?. providerAvailable ) {
55285504 return ;
55295505 }
5530- const {
5531- selectedProvider : ctxSelectedProvider ,
5532- selectedModel : ctxSelectedModel ,
5533- selectedProviderModels : ctxSelectedProviderModels ,
5534- selectedPromptEffort : ctxSelectedPromptEffort ,
5535- selectedModelSelection : ctxSelectedModelSelection ,
5536- } = sendCtx ;
5506+ const { selectedModelSelection : ctxSelectedModelSelection } = sendCtx ;
55375507
55385508 const threadIdForSend = activeThread . id ;
55395509 const messageIdForSend = newMessageId ( ) ;
55405510 const messageCreatedAt = new Date ( ) . toISOString ( ) ;
5541- const outgoingMessageText = formatOutgoingPrompt ( {
5542- provider : ctxSelectedProvider ,
5543- model : ctxSelectedModel ,
5544- models : ctxSelectedProviderModels ,
5545- effort : ctxSelectedPromptEffort ,
5546- text : trimmed ,
5547- } ) ;
5511+ const outgoingMessageText = trimmed ;
55485512
55495513 sendInFlightRef . current = true ;
55505514 beginLocalDispatch ( { preparingWorktree : false } ) ;
@@ -5683,25 +5647,13 @@ function ChatViewContent(props: ChatViewProps) {
56835647 if ( ! sendCtx ?. providerAvailable ) {
56845648 return ;
56855649 }
5686- const {
5687- selectedProvider : ctxSelectedProvider ,
5688- selectedModel : ctxSelectedModel ,
5689- selectedProviderModels : ctxSelectedProviderModels ,
5690- selectedPromptEffort : ctxSelectedPromptEffort ,
5691- selectedModelSelection : ctxSelectedModelSelection ,
5692- } = sendCtx ;
5650+ const { selectedModelSelection : ctxSelectedModelSelection } = sendCtx ;
56935651
56945652 const createdAt = new Date ( ) . toISOString ( ) ;
56955653 const nextThreadId = newThreadId ( ) ;
56965654 const planMarkdown = activeProposedPlan . planMarkdown ;
56975655 const implementationPrompt = buildPlanImplementationPrompt ( planMarkdown ) ;
5698- const outgoingImplementationPrompt = formatOutgoingPrompt ( {
5699- provider : ctxSelectedProvider ,
5700- model : ctxSelectedModel ,
5701- models : ctxSelectedProviderModels ,
5702- effort : ctxSelectedPromptEffort ,
5703- text : implementationPrompt ,
5704- } ) ;
5656+ const outgoingImplementationPrompt = implementationPrompt . trim ( ) ;
57055657 const nextThreadTitle = truncate ( buildPlanImplementationThreadTitle ( planMarkdown ) ) ;
57065658 const nextThreadModelSelection : ModelSelection = ctxSelectedModelSelection ;
57075659
@@ -6405,7 +6357,6 @@ function ChatViewContent(props: ChatViewProps) {
64056357 handleRuntimeModeChange = { handleRuntimeModeChange }
64066358 handleInteractionModeChange = { handleInteractionModeChange }
64076359 focusComposer = { focusComposer }
6408- scheduleComposerFocus = { scheduleComposerFocus }
64096360 setThreadError = { setThreadError }
64106361 onExpandImage = { onExpandTimelineImage }
64116362 />
0 commit comments