diff --git a/Cargo.lock b/Cargo.lock index f40f142..0fbcf09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -953,6 +953,7 @@ dependencies = [ "anyhow", "axum", "df-nodes", + "df-project", "df-storage", "df-types", "futures", diff --git a/src/components/ai/ChatInput.vue b/src/components/ai/ChatInput.vue index 63a0917..197b2f9 100644 --- a/src/components/ai/ChatInput.vue +++ b/src/components/ai/ChatInput.vue @@ -114,7 +114,8 @@ import { ref, computed, nextTick, watch } from 'vue' import { useI18n } from 'vue-i18n' import { useAiStore } from '../../stores/ai' import { useProjectStore } from '../../stores/project' -import { getConvState, textIdle } from '../../composables/ai/useAiEvents' +import { getConvState } from '../../composables/ai/useAiEvents' +import { textIdle } from '../../composables/ai/useAiPendingState' import { extractImageUrlParts } from '../../composables/ai/utils' import { uploadFile } from '../../composables/ai/fileUpload' import { open } from '@tauri-apps/plugin-dialog' diff --git a/src/components/ai/DirAuthDialog.vue b/src/components/ai/DirAuthDialog.vue index b46146e..87102f8 100644 --- a/src/components/ai/DirAuthDialog.vue +++ b/src/components/ai/DirAuthDialog.vue @@ -43,7 +43,7 @@ import { reactive, computed, watch, nextTick, ref } from 'vue' import { useI18n } from 'vue-i18n' import { useAiStore } from '../../stores/ai' -import { pendingDirAuths } from '../../composables/ai/useAiEvents' +import { pendingDirAuths } from '../../composables/ai/useAiPendingState' import { aiApi } from '../../api' const emit = defineEmits<{ diff --git a/src/components/ai/HelpRequiredCard.vue b/src/components/ai/HelpRequiredCard.vue index ebf5dcd..2583d93 100644 --- a/src/components/ai/HelpRequiredCard.vue +++ b/src/components/ai/HelpRequiredCard.vue @@ -25,7 +25,7 @@ import { computed, ref, watch, nextTick } from 'vue' import { useI18n } from 'vue-i18n' import { useAiStore } from '../../stores/ai' -import { pendingHelp } from '../../composables/ai/useAiEvents' +import { pendingHelp } from '../../composables/ai/useAiPendingState' // toast 经 emit 转父(保持单一 toast 源,与 MaxRoundsCard 一致) const emit = defineEmits<{ diff --git a/src/components/ai/MaxRoundsCard.vue b/src/components/ai/MaxRoundsCard.vue index 8587108..db958a5 100644 --- a/src/components/ai/MaxRoundsCard.vue +++ b/src/components/ai/MaxRoundsCard.vue @@ -27,7 +27,8 @@ import { ref, computed, watch, nextTick } from 'vue' import { useI18n } from 'vue-i18n' import { useAiStore } from '../../stores/ai' -import { pendingMaxRounds, getConvState } from '../../composables/ai/useAiEvents' +import { getConvState } from '../../composables/ai/useAiEvents' +import { pendingMaxRounds } from '../../composables/ai/useAiPendingState' import { aiApi } from '../../api' const emit = defineEmits<{ diff --git a/src/components/ai/MessageList.vue b/src/components/ai/MessageList.vue index 6de80d9..000152f 100644 --- a/src/components/ai/MessageList.vue +++ b/src/components/ai/MessageList.vue @@ -901,7 +901,7 @@ defineExpose({ :aria-expanded="tokenPopoverMsgId === item.msg.id" @click="toggleTokenPopover(item.msg, $event)" > - {{ formatTokens(tokenInOf(item.msg)) }} in(估算) + {{ formatTokens(tokenInOf(item.msg)) }} in({{ $t('aiChat.estimated') }}) · {{ formatTokens(tokenCacheOf(item.msg)) }} cache · @@ -917,34 +917,34 @@ defineExpose({ class="ai-token-popover" @click.stop > -