fix(ai): improve API retry handling
This commit is contained in:
1 parent
a4352d6560
commit
52d5c99a92
29 files changed
+3962
-1097
No files matched your search
@@ -50,6 +50,10 @@ Thumbs.db
|
|||||||
# Temp
|
# Temp
|
||||||
tmp/
|
tmp/
|
||||||
|
|
||||||
|
# Code review tool artifacts
|
||||||
|
review_diff.json
|
||||||
|
review_classified.json
|
||||||
|
|
||||||
# Logs
|
# Logs
|
||||||
*.log
|
*.log
|
||||||
|
|
||||||
|
|||||||
Generated
+1
@@ -1920,6 +1920,7 @@ dependencies = [
|
|||||||
"flate2",
|
"flate2",
|
||||||
"font-kit",
|
"font-kit",
|
||||||
"futures",
|
"futures",
|
||||||
|
"httpdate",
|
||||||
"iana-time-zone",
|
"iana-time-zone",
|
||||||
"insta",
|
"insta",
|
||||||
"json5",
|
"json5",
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -1776,6 +1776,12 @@ export default {
|
|||||||
contextWindow: "Context Window",
|
contextWindow: "Context Window",
|
||||||
contextWindowAuto: "Auto (detect from model name)",
|
contextWindowAuto: "Auto (detect from model name)",
|
||||||
contextWindowHint: "Tokens. Leave empty to auto-detect. Set manually for local/custom models.",
|
contextWindowHint: "Tokens. Leave empty to auto-detect. Set manually for local/custom models.",
|
||||||
|
maxRetries: "Max Retries",
|
||||||
|
maxRetriesHint: "Retry on rate limits, timeouts, and temporary network errors. 0 = never, max 10.",
|
||||||
|
maxRetriesGlobal: "Max Retries",
|
||||||
|
maxRetriesGlobalDescription: "Number of automatic retries on transient API errors (rate limits, timeouts, network blips). Applies to all API-backed AI providers. CLI providers (claude-code, codex, pi) are unaffected.",
|
||||||
|
maxRetriesRange: "{min}–{max}, default {default}",
|
||||||
|
maxRetriesSaved: "Max retries saved",
|
||||||
codexCliPath: "Codex CLI Path",
|
codexCliPath: "Codex CLI Path",
|
||||||
codexCliPathHint: "Leave empty to use codex from PATH. Sign in separately with codex login.",
|
codexCliPathHint: "Leave empty to use codex from PATH. Sign in separately with codex login.",
|
||||||
codexCliPathEnvError: "Codex CLI Path should contain only the executable path. Add environment variables below.",
|
codexCliPathEnvError: "Codex CLI Path should contain only the executable path. Add environment variables below.",
|
||||||
|
|||||||
@@ -1815,6 +1815,10 @@ export default withEnglishFallback({
|
|||||||
contextWindow: "Ventana de contexto",
|
contextWindow: "Ventana de contexto",
|
||||||
contextWindowAuto: "Auto (detectar desde el nombre del modelo)",
|
contextWindowAuto: "Auto (detectar desde el nombre del modelo)",
|
||||||
contextWindowHint: "Tokens. Déjalo vacío para detección automática. Configúralo manualmente para modelos locales/personalizados.",
|
contextWindowHint: "Tokens. Déjalo vacío para detección automática. Configúralo manualmente para modelos locales/personalizados.",
|
||||||
|
maxRetriesGlobal: "Reintentos máximos",
|
||||||
|
maxRetriesGlobalDescription: "Número de reintentos automáticos en errores transitorios de API (límite de tasa, timeout, fallos de red). Se aplica a todos los proveedores de IA por API. Los proveedores CLI (claude-code, codex, pi) no se ven afectados.",
|
||||||
|
maxRetriesRange: "{min}–{max}, predeterminado {default}",
|
||||||
|
maxRetriesSaved: "Reintentos máximos guardados",
|
||||||
codexCliPath: "Ruta de Codex CLI",
|
codexCliPath: "Ruta de Codex CLI",
|
||||||
codexCliPathHint: "Déjalo vacío para usar codex desde PATH. Inicia sesión por separado con codex login.",
|
codexCliPathHint: "Déjalo vacío para usar codex desde PATH. Inicia sesión por separado con codex login.",
|
||||||
actions: {
|
actions: {
|
||||||
@@ -1846,6 +1850,8 @@ export default withEnglishFallback({
|
|||||||
editResend: "Reenviar",
|
editResend: "Reenviar",
|
||||||
editCancel: "Cancelar",
|
editCancel: "Cancelar",
|
||||||
cannotDeleteActiveConfig: "No se puede eliminar la configuración activa actual. Cambie a otra configuración primero.",
|
cannotDeleteActiveConfig: "No se puede eliminar la configuración activa actual. Cambie a otra configuración primero.",
|
||||||
|
maxRetries: "Número máximo de reintentos",
|
||||||
|
maxRetriesHint: "Reintentar automáticamente en caso de limitación de tasa, tiempo de espera o error de red temporal. 0 = no reintentar, máximo 10.",
|
||||||
},
|
},
|
||||||
contextMenu: {
|
contextMenu: {
|
||||||
openConnection: "Abrir conexión",
|
openConnection: "Abrir conexión",
|
||||||
|
|||||||
@@ -1755,6 +1755,10 @@ export default withEnglishFallback({
|
|||||||
contextWindow: "Finestra di Contesto",
|
contextWindow: "Finestra di Contesto",
|
||||||
contextWindowAuto: "Auto (rileva dal nome del modello)",
|
contextWindowAuto: "Auto (rileva dal nome del modello)",
|
||||||
contextWindowHint: "Token. Lascia vuoto per il rilevamento automatico. Imposta manualmente per modelli locali/personalizzati.",
|
contextWindowHint: "Token. Lascia vuoto per il rilevamento automatico. Imposta manualmente per modelli locali/personalizzati.",
|
||||||
|
maxRetriesGlobal: "Tentativi massimi",
|
||||||
|
maxRetriesGlobalDescription: "Numero di tentativi automatici su errori API transitori (limite di velocità, timeout, problemi di rete). Si applica a tutti i provider IA via API. I provider CLI (claude-code, codex, pi) non sono interessati.",
|
||||||
|
maxRetriesRange: "{min}–{max}, predefinito {default}",
|
||||||
|
maxRetriesSaved: "Tentativi massimi salvati",
|
||||||
codexCliPath: "Percorso Codex CLI",
|
codexCliPath: "Percorso Codex CLI",
|
||||||
codexCliPathHint: "Lascia vuoto per usare codex dal PATH. Esegui login separatamente con codex login.",
|
codexCliPathHint: "Lascia vuoto per usare codex dal PATH. Esegui login separatamente con codex login.",
|
||||||
codexCliPathEnvError: "Codex CLI Path deve contenere solo il percorso dell'eseguibile. Aggiungi le variabili d'ambiente sotto.",
|
codexCliPathEnvError: "Codex CLI Path deve contenere solo il percorso dell'eseguibile. Aggiungi le variabili d'ambiente sotto.",
|
||||||
@@ -1844,6 +1848,8 @@ export default withEnglishFallback({
|
|||||||
editResend: "Invia di nuovo",
|
editResend: "Invia di nuovo",
|
||||||
editCancel: "Annulla",
|
editCancel: "Annulla",
|
||||||
cannotDeleteActiveConfig: "Non è possibile eliminare la configurazione attualmente attiva. Passa a un'altra configurazione prima.",
|
cannotDeleteActiveConfig: "Non è possibile eliminare la configurazione attualmente attiva. Passa a un'altra configurazione prima.",
|
||||||
|
maxRetries: "Numero massimo di tentativi",
|
||||||
|
maxRetriesHint: "Riprova automaticamente in caso di limitazione, timeout o errore di rete temporaneo. 0 = nessun tentativo, massimo 10.",
|
||||||
},
|
},
|
||||||
contextMenu: {
|
contextMenu: {
|
||||||
openConnection: "Apri Connessione",
|
openConnection: "Apri Connessione",
|
||||||
|
|||||||
@@ -1649,6 +1649,10 @@ export default withEnglishFallback({
|
|||||||
contextWindow: "コンテキストウィンドウ",
|
contextWindow: "コンテキストウィンドウ",
|
||||||
contextWindowAuto: "自動(モデル名から検出)",
|
contextWindowAuto: "自動(モデル名から検出)",
|
||||||
contextWindowHint: "トークン数。空欄で自動検出。ローカル/カスタムモデルは手動設定してください。",
|
contextWindowHint: "トークン数。空欄で自動検出。ローカル/カスタムモデルは手動設定してください。",
|
||||||
|
maxRetriesGlobal: "最大再試行回数",
|
||||||
|
maxRetriesGlobalDescription: "一時的なAPIエラー(レート制限、タイムアウト、ネットワーク障害)発生時の自動再試行回数。すべてのAPI対応AIプロバイダーに適用されます。CLIプロバイダー(claude-code、codex、pi)は影響を受けません。",
|
||||||
|
maxRetriesRange: "{min}–{max}、デフォルト {default}",
|
||||||
|
maxRetriesSaved: "最大再試行回数を保存しました",
|
||||||
codexCliPath: "Codex CLI パス",
|
codexCliPath: "Codex CLI パス",
|
||||||
codexCliPathHint: "空欄の場合はPATHからcodexを使用します。codex loginで別途サインインしてください。",
|
codexCliPathHint: "空欄の場合はPATHからcodexを使用します。codex loginで別途サインインしてください。",
|
||||||
reasoningLevel: "推論レベル",
|
reasoningLevel: "推論レベル",
|
||||||
@@ -1845,6 +1849,8 @@ export default withEnglishFallback({
|
|||||||
editResend: "再送信",
|
editResend: "再送信",
|
||||||
editCancel: "キャンセル",
|
editCancel: "キャンセル",
|
||||||
cannotDeleteActiveConfig: "現在アクティブな設定は削除できません。先に他の設定に切り替えてください。",
|
cannotDeleteActiveConfig: "現在アクティブな設定は削除できません。先に他の設定に切り替えてください。",
|
||||||
|
maxRetries: "最大リトライ回数",
|
||||||
|
maxRetriesHint: "レート制限、タイムアウト、または一時的なネットワークエラーが発生した場合に自動的にリトライします。0 = リトライなし、最大10。",
|
||||||
},
|
},
|
||||||
contextMenu: {
|
contextMenu: {
|
||||||
openConnection: "接続を開く",
|
openConnection: "接続を開く",
|
||||||
|
|||||||
@@ -1813,6 +1813,10 @@ export default withEnglishFallback({
|
|||||||
contextWindow: "Janela de Contexto",
|
contextWindow: "Janela de Contexto",
|
||||||
contextWindowAuto: "Automático (detectar pelo nome do modelo)",
|
contextWindowAuto: "Automático (detectar pelo nome do modelo)",
|
||||||
contextWindowHint: "Tokens. Deixe vazio para detecção automática. Defina manualmente para modelos locais/personalizados.",
|
contextWindowHint: "Tokens. Deixe vazio para detecção automática. Defina manualmente para modelos locais/personalizados.",
|
||||||
|
maxRetriesGlobal: "Máximo de Tentativas",
|
||||||
|
maxRetriesGlobalDescription: "Número de tentativas automáticas em erros transitórios de API (limite de taxa, timeout, falhas de rede). Aplica-se a todos os provedores de IA via API. Provedores CLI (claude-code, codex, pi) não são afetados.",
|
||||||
|
maxRetriesRange: "{min}–{max}, padrão {default}",
|
||||||
|
maxRetriesSaved: "Máximo de tentativas salvo",
|
||||||
enableThinking: "Raciocínio",
|
enableThinking: "Raciocínio",
|
||||||
enableThinkingOn: "Ativado",
|
enableThinkingOn: "Ativado",
|
||||||
enableThinkingOff: "Desativado",
|
enableThinkingOff: "Desativado",
|
||||||
@@ -1846,6 +1850,8 @@ export default withEnglishFallback({
|
|||||||
editResend: "Reenviar",
|
editResend: "Reenviar",
|
||||||
editCancel: "Cancelar",
|
editCancel: "Cancelar",
|
||||||
cannotDeleteActiveConfig: "Não é possível excluir a configuração ativa atual. Mude para outra configuração primeiro.",
|
cannotDeleteActiveConfig: "Não é possível excluir a configuração ativa atual. Mude para outra configuração primeiro.",
|
||||||
|
maxRetries: "Número máximo de tentativas",
|
||||||
|
maxRetriesHint: "Tente novamente automaticamente ao encontrar limitação de taxa, tempo limite ou erro de rede temporário. 0 = não tentar novamente, máximo 10.",
|
||||||
},
|
},
|
||||||
contextMenu: {
|
contextMenu: {
|
||||||
openConnection: "Abrir Conexão",
|
openConnection: "Abrir Conexão",
|
||||||
|
|||||||
@@ -1777,6 +1777,12 @@ export default withEnglishFallback({
|
|||||||
contextWindow: "上下文窗口",
|
contextWindow: "上下文窗口",
|
||||||
contextWindowAuto: "自动(根据模型名称推断)",
|
contextWindowAuto: "自动(根据模型名称推断)",
|
||||||
contextWindowHint: "单位:token。留空自动推断,本地/自定义模型建议手动设置。",
|
contextWindowHint: "单位:token。留空自动推断,本地/自定义模型建议手动设置。",
|
||||||
|
maxRetries: "最大重试次数",
|
||||||
|
maxRetriesHint: "遇到限流、超时或临时网络错误时自动重试。0 = 不重试,最大 10。",
|
||||||
|
maxRetriesGlobal: "最大重试次数",
|
||||||
|
maxRetriesGlobalDescription: "遇到临时 API 错误(限流、超时、网络波动)时的自动重试次数。适用于所有 API 模式 AI 供应商。CLI 供应商(claude-code、codex、pi)不受影响。",
|
||||||
|
maxRetriesRange: "{min}–{max},默认 {default}",
|
||||||
|
maxRetriesSaved: "最大重试次数已保存",
|
||||||
codexCliPath: "Codex CLI 路径",
|
codexCliPath: "Codex CLI 路径",
|
||||||
codexCliPathHint: "留空则使用 PATH 中的 codex。请先在终端执行 codex login 登录。",
|
codexCliPathHint: "留空则使用 PATH 中的 codex。请先在终端执行 codex login 登录。",
|
||||||
codexCliPathEnvError: "Codex CLI 路径只能填写可执行文件路径。请在下方添加环境变量。",
|
codexCliPathEnvError: "Codex CLI 路径只能填写可执行文件路径。请在下方添加环境变量。",
|
||||||
|
|||||||
@@ -1756,6 +1756,12 @@ export default withEnglishFallback({
|
|||||||
contextWindow: "Context Window",
|
contextWindow: "Context Window",
|
||||||
contextWindowAuto: "自動(從模型名稱偵測)",
|
contextWindowAuto: "自動(從模型名稱偵測)",
|
||||||
contextWindowHint: "Token 數。留空以自動偵測。本機/自訂模型請手動設定。",
|
contextWindowHint: "Token 數。留空以自動偵測。本機/自訂模型請手動設定。",
|
||||||
|
maxRetries: "最大重試次數",
|
||||||
|
maxRetriesHint: "遇到限流、超時或暫時性網路錯誤時自動重試。0 = 不重試,最大 10。",
|
||||||
|
maxRetriesGlobal: "最大重試次數",
|
||||||
|
maxRetriesGlobalDescription: "遇到暫時性 API 錯誤(限流、超時、網路波動)時的自動重試次數。適用於所有 API 模式 AI 供應商。CLI 供應商(claude-code、codex、pi)不受影響。",
|
||||||
|
maxRetriesRange: "{min}–{max},預設 {default}",
|
||||||
|
maxRetriesSaved: "最大重試次數已儲存",
|
||||||
codexCliPath: "Codex CLI 路徑",
|
codexCliPath: "Codex CLI 路徑",
|
||||||
codexCliPathHint: "留空以使用 PATH 中的 codex。請另外以 codex login 登入。",
|
codexCliPathHint: "留空以使用 PATH 中的 codex。請另外以 codex login 登入。",
|
||||||
codexMcpRequiredTitle: "需要 DBX MCP Server",
|
codexMcpRequiredTitle: "需要 DBX MCP Server",
|
||||||
|
|||||||
@@ -272,6 +272,8 @@ export const loadMcpGlobalPolicy = forward("loadMcpGlobalPolicy");
|
|||||||
export const saveMcpGlobalPolicy = forward("saveMcpGlobalPolicy");
|
export const saveMcpGlobalPolicy = forward("saveMcpGlobalPolicy");
|
||||||
export const loadMaxAgentTurns = forward("loadMaxAgentTurns");
|
export const loadMaxAgentTurns = forward("loadMaxAgentTurns");
|
||||||
export const saveMaxAgentTurns = forward("saveMaxAgentTurns");
|
export const saveMaxAgentTurns = forward("saveMaxAgentTurns");
|
||||||
|
export const loadMaxRetries = forward("loadMaxRetries");
|
||||||
|
export const saveMaxRetries = forward("saveMaxRetries");
|
||||||
export const completeAppClose = forward("completeAppClose");
|
export const completeAppClose = forward("completeAppClose");
|
||||||
export const requestAppClose = forward("requestAppClose");
|
export const requestAppClose = forward("requestAppClose");
|
||||||
export const setDriverStoreDir = forward("setDriverStoreDir");
|
export const setDriverStoreDir = forward("setDriverStoreDir");
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -393,7 +393,14 @@ export interface CustomTheme {
|
|||||||
ddlColors: CustomThemeDdlColors;
|
ddlColors: CustomThemeDdlColors;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const DEFAULT_CUSTOM_THEMES: CustomTheme[] = [{ id: "default", name: "Custom", colors: { ...DEFAULT_CUSTOM_THEME_COLORS }, ddlColors: { ...DEFAULT_CUSTOM_THEME_DDL_COLORS } }];
|
export const DEFAULT_CUSTOM_THEMES: CustomTheme[] = [
|
||||||
|
{
|
||||||
|
id: "default",
|
||||||
|
name: "Custom",
|
||||||
|
colors: { ...DEFAULT_CUSTOM_THEME_COLORS },
|
||||||
|
ddlColors: { ...DEFAULT_CUSTOM_THEME_DDL_COLORS },
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
export type SidebarObjectInfoMode = "comment-inline" | "comment-aligned" | "comment-right" | "size" | "hidden";
|
export type SidebarObjectInfoMode = "comment-inline" | "comment-aligned" | "comment-right" | "size" | "hidden";
|
||||||
|
|
||||||
@@ -538,7 +545,11 @@ export function enforceRightSidebarPanelExclusivity(current: RightSidebarPanelSt
|
|||||||
return transitionRightSidebarPanels(current, panelToKeep, true, true);
|
return transitionRightSidebarPanels(current, panelToKeep, true, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
export const EDITOR_THEMES: { value: EditorTheme; label: string; dark: boolean }[] = [
|
export const EDITOR_THEMES: {
|
||||||
|
value: EditorTheme;
|
||||||
|
label: string;
|
||||||
|
dark: boolean;
|
||||||
|
}[] = [
|
||||||
{ value: "app", label: "Follow app theme", dark: false },
|
{ value: "app", label: "Follow app theme", dark: false },
|
||||||
{ value: "one-dark", label: "One Dark", dark: true },
|
{ value: "one-dark", label: "One Dark", dark: true },
|
||||||
{ value: "vscode-dark", label: "VS Dark+", dark: true },
|
{ value: "vscode-dark", label: "VS Dark+", dark: true },
|
||||||
@@ -790,7 +801,13 @@ function normalizeSqlSnippets(value: unknown, existing?: SqlSnippet[]): SqlSnipp
|
|||||||
if (seenPrefixes.has(item.prefix)) continue;
|
if (seenPrefixes.has(item.prefix)) continue;
|
||||||
seenPrefixes.add(item.prefix);
|
seenPrefixes.add(item.prefix);
|
||||||
// Older settings do not have this field; only an explicit false disables a snippet.
|
// Older settings do not have this field; only an explicit false disables a snippet.
|
||||||
valid.push({ id: item.id, label: item.label, prefix: item.prefix, body: item.body, enabled: item.enabled !== false });
|
valid.push({
|
||||||
|
id: item.id,
|
||||||
|
label: item.label,
|
||||||
|
prefix: item.prefix,
|
||||||
|
body: item.body,
|
||||||
|
enabled: item.enabled !== false,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
if (valid.length === 0) return existing ?? DEFAULT_SQL_SNIPPETS;
|
if (valid.length === 0) return existing ?? DEFAULT_SQL_SNIPPETS;
|
||||||
return valid;
|
return valid;
|
||||||
@@ -845,7 +862,10 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
|
|||||||
return {
|
return {
|
||||||
...renamed,
|
...renamed,
|
||||||
colors: { ...DEFAULT_CUSTOM_THEME_COLORS, ...renamed.colors },
|
colors: { ...DEFAULT_CUSTOM_THEME_COLORS, ...renamed.colors },
|
||||||
ddlColors: { ...DEFAULT_CUSTOM_THEME_DDL_COLORS, ...(renamed as any).ddlColors },
|
ddlColors: {
|
||||||
|
...DEFAULT_CUSTOM_THEME_DDL_COLORS,
|
||||||
|
...(renamed as any).ddlColors,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -854,7 +874,10 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
|
|||||||
{
|
{
|
||||||
id: "migrated",
|
id: "migrated",
|
||||||
name: "Migrated",
|
name: "Migrated",
|
||||||
colors: { ...DEFAULT_CUSTOM_THEME_COLORS, ...settings.customThemeColors },
|
colors: {
|
||||||
|
...DEFAULT_CUSTOM_THEME_COLORS,
|
||||||
|
...settings.customThemeColors,
|
||||||
|
},
|
||||||
ddlColors: { ...DEFAULT_CUSTOM_THEME_DDL_COLORS },
|
ddlColors: { ...DEFAULT_CUSTOM_THEME_DDL_COLORS },
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
@@ -915,17 +938,43 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
|
|||||||
sidebarObjectDisplay: settings.sidebarObjectDisplay === "simple" || settings.sidebarObjectDisplay === "grouped" ? settings.sidebarObjectDisplay : DEFAULT_EDITOR_SETTINGS.sidebarObjectDisplay,
|
sidebarObjectDisplay: settings.sidebarObjectDisplay === "simple" || settings.sidebarObjectDisplay === "grouped" ? settings.sidebarObjectDisplay : DEFAULT_EDITOR_SETTINGS.sidebarObjectDisplay,
|
||||||
sidebarTableSearchEnabled: typeof settings.sidebarTableSearchEnabled === "boolean" ? settings.sidebarTableSearchEnabled : DEFAULT_EDITOR_SETTINGS.sidebarTableSearchEnabled,
|
sidebarTableSearchEnabled: typeof settings.sidebarTableSearchEnabled === "boolean" ? settings.sidebarTableSearchEnabled : DEFAULT_EDITOR_SETTINGS.sidebarTableSearchEnabled,
|
||||||
autoSelectActiveSidebarNode: settings.autoSelectActiveSidebarNode ?? DEFAULT_EDITOR_SETTINGS.autoSelectActiveSidebarNode,
|
autoSelectActiveSidebarNode: settings.autoSelectActiveSidebarNode ?? DEFAULT_EDITOR_SETTINGS.autoSelectActiveSidebarNode,
|
||||||
openTabsRestoreMode: normalizeOpenTabsRestoreMode((settings as Partial<EditorSettings>).openTabsRestoreMode, (settings as Partial<EditorSettings> & { restoreOpenTabsOnLaunch?: boolean }).restoreOpenTabsOnLaunch),
|
openTabsRestoreMode: normalizeOpenTabsRestoreMode(
|
||||||
disconnectTabHandlingMode: normalizeDisconnectTabHandlingMode((settings as Partial<EditorSettings>).disconnectTabHandlingMode, (settings as Partial<EditorSettings> & { closeQueryTabsOnDisconnect?: boolean }).closeQueryTabsOnDisconnect),
|
(settings as Partial<EditorSettings>).openTabsRestoreMode,
|
||||||
|
(
|
||||||
|
settings as Partial<EditorSettings> & {
|
||||||
|
restoreOpenTabsOnLaunch?: boolean;
|
||||||
|
}
|
||||||
|
).restoreOpenTabsOnLaunch,
|
||||||
|
),
|
||||||
|
disconnectTabHandlingMode: normalizeDisconnectTabHandlingMode(
|
||||||
|
(settings as Partial<EditorSettings>).disconnectTabHandlingMode,
|
||||||
|
(
|
||||||
|
settings as Partial<EditorSettings> & {
|
||||||
|
closeQueryTabsOnDisconnect?: boolean;
|
||||||
|
}
|
||||||
|
).closeQueryTabsOnDisconnect,
|
||||||
|
),
|
||||||
reuseDataTab: settings.reuseDataTab ?? DEFAULT_EDITOR_SETTINGS.reuseDataTab,
|
reuseDataTab: settings.reuseDataTab ?? DEFAULT_EDITOR_SETTINGS.reuseDataTab,
|
||||||
prefillNewQueryWithSelect: typeof settings.prefillNewQueryWithSelect === "boolean" ? settings.prefillNewQueryWithSelect : DEFAULT_EDITOR_SETTINGS.prefillNewQueryWithSelect,
|
prefillNewQueryWithSelect: typeof settings.prefillNewQueryWithSelect === "boolean" ? settings.prefillNewQueryWithSelect : DEFAULT_EDITOR_SETTINGS.prefillNewQueryWithSelect,
|
||||||
updateNotificationsEnabled: settings.updateNotificationsEnabled ?? DEFAULT_EDITOR_SETTINGS.updateNotificationsEnabled,
|
updateNotificationsEnabled: settings.updateNotificationsEnabled ?? DEFAULT_EDITOR_SETTINGS.updateNotificationsEnabled,
|
||||||
sidebarHiddenTablePrefixes: normalizeSidebarHiddenTablePrefixes(settings.sidebarHiddenTablePrefixes),
|
sidebarHiddenTablePrefixes: normalizeSidebarHiddenTablePrefixes(settings.sidebarHiddenTablePrefixes),
|
||||||
sidebarObjectInfoMode: normalizeSidebarObjectInfoMode(
|
sidebarObjectInfoMode: normalizeSidebarObjectInfoMode(
|
||||||
settings.sidebarObjectInfoMode,
|
settings.sidebarObjectInfoMode,
|
||||||
(settings as Partial<EditorSettings> & { sidebarTableCommentLayout?: string }).sidebarTableCommentLayout,
|
(
|
||||||
(settings as Partial<EditorSettings> & { sidebarHideTableComments?: boolean }).sidebarHideTableComments,
|
settings as Partial<EditorSettings> & {
|
||||||
(settings as Partial<EditorSettings> & { sidebarShowDatabaseSizes?: boolean }).sidebarShowDatabaseSizes,
|
sidebarTableCommentLayout?: string;
|
||||||
|
}
|
||||||
|
).sidebarTableCommentLayout,
|
||||||
|
(
|
||||||
|
settings as Partial<EditorSettings> & {
|
||||||
|
sidebarHideTableComments?: boolean;
|
||||||
|
}
|
||||||
|
).sidebarHideTableComments,
|
||||||
|
(
|
||||||
|
settings as Partial<EditorSettings> & {
|
||||||
|
sidebarShowDatabaseSizes?: boolean;
|
||||||
|
}
|
||||||
|
).sidebarShowDatabaseSizes,
|
||||||
),
|
),
|
||||||
sidebarAllowHorizontalScroll: settings.sidebarAllowHorizontalScroll ?? DEFAULT_EDITOR_SETTINGS.sidebarAllowHorizontalScroll,
|
sidebarAllowHorizontalScroll: settings.sidebarAllowHorizontalScroll ?? DEFAULT_EDITOR_SETTINGS.sidebarAllowHorizontalScroll,
|
||||||
columnFormatters: normalizeColumnFormatters(settings.columnFormatters),
|
columnFormatters: normalizeColumnFormatters(settings.columnFormatters),
|
||||||
@@ -996,7 +1045,9 @@ export const useSettingsStore = defineStore("settings", () => {
|
|||||||
const isAiConfigLoaded = ref(false);
|
const isAiConfigLoaded = ref(false);
|
||||||
const aiConfigs = ref<AiConfigItem[]>([]);
|
const aiConfigs = ref<AiConfigItem[]>([]);
|
||||||
const desktopSettings = ref<DesktopSettings>({ ...DEFAULT_DESKTOP_SETTINGS });
|
const desktopSettings = ref<DesktopSettings>({ ...DEFAULT_DESKTOP_SETTINGS });
|
||||||
const mcpGlobalPolicy = ref<McpGlobalPolicy>({ ...DEFAULT_MCP_GLOBAL_POLICY });
|
const mcpGlobalPolicy = ref<McpGlobalPolicy>({
|
||||||
|
...DEFAULT_MCP_GLOBAL_POLICY,
|
||||||
|
});
|
||||||
const isDesktopSettingsLoaded = ref(false);
|
const isDesktopSettingsLoaded = ref(false);
|
||||||
const isMcpGlobalPolicyLoaded = ref(false);
|
const isMcpGlobalPolicyLoaded = ref(false);
|
||||||
const isEditorSettingsLoaded = ref(false);
|
const isEditorSettingsLoaded = ref(false);
|
||||||
@@ -1119,7 +1170,10 @@ export const useSettingsStore = defineStore("settings", () => {
|
|||||||
const savedActive = savedSelection?.active;
|
const savedActive = savedSelection?.active;
|
||||||
const savedConfig = savedActive ? aiConfigs.value.find((config) => config.id === savedActive.configId) : undefined;
|
const savedConfig = savedActive ? aiConfigs.value.find((config) => config.id === savedActive.configId) : undefined;
|
||||||
if (savedConfig && savedActive?.modelId.trim()) {
|
if (savedConfig && savedActive?.modelId.trim()) {
|
||||||
activeModel.value = { configId: savedConfig.id, modelId: savedActive.modelId.trim() };
|
activeModel.value = {
|
||||||
|
configId: savedConfig.id,
|
||||||
|
modelId: savedActive.modelId.trim(),
|
||||||
|
};
|
||||||
} else {
|
} else {
|
||||||
const fallback = aiConfigs.value.find((config) => config.isDefault) || aiConfigs.value[0];
|
const fallback = aiConfigs.value.find((config) => config.isDefault) || aiConfigs.value[0];
|
||||||
activeModel.value = fallback?.model.trim() ? { configId: fallback.id, modelId: fallback.model.trim() } : null;
|
activeModel.value = fallback?.model.trim() ? { configId: fallback.id, modelId: fallback.model.trim() } : null;
|
||||||
@@ -1175,7 +1229,10 @@ export const useSettingsStore = defineStore("settings", () => {
|
|||||||
await api.saveAiConfigItem(normalized);
|
await api.saveAiConfigItem(normalized);
|
||||||
aiConfigs.value.push(normalized);
|
aiConfigs.value.push(normalized);
|
||||||
if (aiConfigs.value.length === 1 && normalized.model.trim()) {
|
if (aiConfigs.value.length === 1 && normalized.model.trim()) {
|
||||||
activeModel.value = { configId: normalized.id, modelId: normalized.model };
|
activeModel.value = {
|
||||||
|
configId: normalized.id,
|
||||||
|
modelId: normalized.model,
|
||||||
|
};
|
||||||
persistAiChatSelection();
|
persistAiChatSelection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1214,7 +1271,10 @@ export const useSettingsStore = defineStore("settings", () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function updateActiveModel(model: { configId: string; modelId: string }) {
|
function updateActiveModel(model: { configId: string; modelId: string }) {
|
||||||
activeModel.value = { configId: model.configId, modelId: model.modelId.trim() };
|
activeModel.value = {
|
||||||
|
configId: model.configId,
|
||||||
|
modelId: model.modelId.trim(),
|
||||||
|
};
|
||||||
persistAiChatSelection();
|
persistAiChatSelection();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1412,7 +1472,9 @@ export const useSettingsStore = defineStore("settings", () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function deleteCustomColumnFormatter(id: string) {
|
function deleteCustomColumnFormatter(id: string) {
|
||||||
const customColumnFormatters = { ...editorSettings.value.customColumnFormatters };
|
const customColumnFormatters = {
|
||||||
|
...editorSettings.value.customColumnFormatters,
|
||||||
|
};
|
||||||
delete customColumnFormatters[id];
|
delete customColumnFormatters[id];
|
||||||
const columnFormatters = Object.fromEntries(
|
const columnFormatters = Object.fromEntries(
|
||||||
Object.entries(editorSettings.value.columnFormatters).filter(([, formatter]) => {
|
Object.entries(editorSettings.value.columnFormatters).filter(([, formatter]) => {
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ tracing-subscriber = "0.3"
|
|||||||
tokio = { version = "1", features = ["full"] }
|
tokio = { version = "1", features = ["full"] }
|
||||||
tokio-util = { version = "0.7", features = ["compat"] }
|
tokio-util = { version = "0.7", features = ["compat"] }
|
||||||
chrono = { version = "0.4", features = ["serde"] }
|
chrono = { version = "0.4", features = ["serde"] }
|
||||||
|
httpdate = "1"
|
||||||
rust_decimal = { version = "1", features = ["serde", "db-postgres"] }
|
rust_decimal = { version = "1", features = ["serde", "db-postgres"] }
|
||||||
anyhow = "1"
|
anyhow = "1"
|
||||||
uuid = { version = "1", features = ["v4", "serde"] }
|
uuid = { version = "1", features = ["v4", "serde"] }
|
||||||
|
|||||||
+1592
-709
File diff suppressed because it is too large.
Load diff
@@ -573,6 +573,7 @@ mod tests {
|
|||||||
reasoning_level: AiReasoningLevel::Default,
|
reasoning_level: AiReasoningLevel::Default,
|
||||||
runtime_effort: None,
|
runtime_effort: None,
|
||||||
context_window: None,
|
context_window: None,
|
||||||
|
max_retries: None,
|
||||||
codex_cli_path: None,
|
codex_cli_path: None,
|
||||||
codex_cli_env: Default::default(),
|
codex_cli_env: Default::default(),
|
||||||
claude_code_cli_path: None,
|
claude_code_cli_path: None,
|
||||||
|
|||||||
@@ -1029,6 +1029,7 @@ mod tests {
|
|||||||
reasoning_level: AiReasoningLevel::Default,
|
reasoning_level: AiReasoningLevel::Default,
|
||||||
runtime_effort: None,
|
runtime_effort: None,
|
||||||
context_window: None,
|
context_window: None,
|
||||||
|
max_retries: None,
|
||||||
codex_cli_path: None,
|
codex_cli_path: None,
|
||||||
codex_cli_env: Default::default(),
|
codex_cli_env: Default::default(),
|
||||||
claude_code_cli_path: None,
|
claude_code_cli_path: None,
|
||||||
|
|||||||
@@ -383,6 +383,7 @@ mod tests {
|
|||||||
reasoning_level: AiReasoningLevel::Default,
|
reasoning_level: AiReasoningLevel::Default,
|
||||||
runtime_effort: None,
|
runtime_effort: None,
|
||||||
context_window: None,
|
context_window: None,
|
||||||
|
max_retries: None,
|
||||||
codex_cli_path: None,
|
codex_cli_path: None,
|
||||||
codex_cli_env: HashMap::new(),
|
codex_cli_env: HashMap::new(),
|
||||||
claude_code_cli_path: None,
|
claude_code_cli_path: None,
|
||||||
|
|||||||
@@ -748,6 +748,7 @@ mod tests {
|
|||||||
reasoning_level: AiReasoningLevel::High,
|
reasoning_level: AiReasoningLevel::High,
|
||||||
runtime_effort: Some(AiEffortSelection::Enum("high".to_string())),
|
runtime_effort: Some(AiEffortSelection::Enum("high".to_string())),
|
||||||
context_window: None,
|
context_window: None,
|
||||||
|
max_retries: None,
|
||||||
codex_cli_path: None,
|
codex_cli_path: None,
|
||||||
codex_cli_env: HashMap::new(),
|
codex_cli_env: HashMap::new(),
|
||||||
claude_code_cli_path: None,
|
claude_code_cli_path: None,
|
||||||
|
|||||||
@@ -1093,6 +1093,7 @@ mod tests {
|
|||||||
reasoning_level: crate::ai::AiReasoningLevel::Default,
|
reasoning_level: crate::ai::AiReasoningLevel::Default,
|
||||||
runtime_effort: None,
|
runtime_effort: None,
|
||||||
context_window: None,
|
context_window: None,
|
||||||
|
max_retries: None,
|
||||||
codex_cli_path: None,
|
codex_cli_path: None,
|
||||||
codex_cli_env: Default::default(),
|
codex_cli_env: Default::default(),
|
||||||
claude_code_cli_path: None,
|
claude_code_cli_path: None,
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ const APP_STATE_EDITOR_SETTINGS_KEY: &str = "editor_settings";
|
|||||||
const APP_STATE_OPEN_TABS_KEY: &str = "open_tabs";
|
const APP_STATE_OPEN_TABS_KEY: &str = "open_tabs";
|
||||||
const APP_STATE_SAVED_SQL_EDITOR_POSITIONS_KEY: &str = "saved_sql_editor_positions";
|
const APP_STATE_SAVED_SQL_EDITOR_POSITIONS_KEY: &str = "saved_sql_editor_positions";
|
||||||
const MCP_GLOBAL_POLICY_KEY: &str = "mcp_global_policy";
|
const MCP_GLOBAL_POLICY_KEY: &str = "mcp_global_policy";
|
||||||
|
const MAX_RETRIES_KEY: &str = "max_retries";
|
||||||
const APP_STATE_AI_GLOBAL_INSTRUCTIONS_KEY: &str = "ai_global_custom_instructions";
|
const APP_STATE_AI_GLOBAL_INSTRUCTIONS_KEY: &str = "ai_global_custom_instructions";
|
||||||
const APP_STATE_AI_CHAT_SELECTION_KEY: &str = "ai_chat_selection_v1";
|
const APP_STATE_AI_CHAT_SELECTION_KEY: &str = "ai_chat_selection_v1";
|
||||||
const USER_DATA_TABLES: &[&str] = &[
|
const USER_DATA_TABLES: &[&str] = &[
|
||||||
@@ -1387,18 +1388,23 @@ impl Storage {
|
|||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
let mut settings = settings.clone();
|
let mut settings = settings.clone();
|
||||||
self.with_conn(move |conn| {
|
self.with_conn(move |conn| {
|
||||||
// The dedicated policy writer is the only owner of this key. Keep
|
// Dedicated writers are the only owners of these keys. Keep their
|
||||||
// its latest value across overlapping legacy settings saves.
|
// latest values across overlapping legacy settings saves.
|
||||||
let current: Option<String> = conn
|
let current: Option<String> = conn
|
||||||
.query_row("SELECT settings_json FROM app_settings WHERE id = 1", [], |row| row.get(0))
|
.query_row("SELECT settings_json FROM app_settings WHERE id = 1", [], |row| row.get(0))
|
||||||
.optional()
|
.optional()
|
||||||
.map_err(|e| e.to_string())?;
|
.map_err(|e| e.to_string())?;
|
||||||
settings.remove(MCP_GLOBAL_POLICY_KEY);
|
let dedicated_keys = [MCP_GLOBAL_POLICY_KEY, MAX_RETRIES_KEY];
|
||||||
|
for key in dedicated_keys {
|
||||||
|
settings.remove(key);
|
||||||
|
}
|
||||||
if let Some(current) = current {
|
if let Some(current) = current {
|
||||||
let current = serde_json::from_str::<serde_json::Map<String, serde_json::Value>>(¤t)
|
let current = serde_json::from_str::<serde_json::Map<String, serde_json::Value>>(¤t)
|
||||||
.map_err(|e| format!("invalid app settings JSON: {e}"))?;
|
.map_err(|e| format!("invalid app settings JSON: {e}"))?;
|
||||||
if let Some(policy) = current.get(MCP_GLOBAL_POLICY_KEY) {
|
for key in dedicated_keys {
|
||||||
settings.insert(MCP_GLOBAL_POLICY_KEY.to_string(), policy.clone());
|
if let Some(value) = current.get(key) {
|
||||||
|
settings.insert(key.to_string(), value.clone());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let json = serde_json::Value::Object(settings).to_string();
|
let json = serde_json::Value::Object(settings).to_string();
|
||||||
@@ -1809,6 +1815,37 @@ impl Storage {
|
|||||||
.map(|value| crate::agent_loop::clamp_max_agent_turns(value.min(u32::MAX as u64) as u32))
|
.map(|value| crate::agent_loop::clamp_max_agent_turns(value.min(u32::MAX as u64) as u32))
|
||||||
.unwrap_or(crate::agent_loop::DEFAULT_MAX_AGENT_TURNS))
|
.unwrap_or(crate::agent_loop::DEFAULT_MAX_AGENT_TURNS))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn save_max_retries(&self, max_retries: u32) -> Result<(), String> {
|
||||||
|
let max_retries = crate::ai::clamp_max_retries(max_retries);
|
||||||
|
self.with_conn(move |conn| {
|
||||||
|
let current: Option<String> = conn
|
||||||
|
.query_row("SELECT settings_json FROM app_settings WHERE id = 1", [], |row| row.get(0))
|
||||||
|
.optional()
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
let mut settings = match current {
|
||||||
|
Some(json) => serde_json::from_str::<serde_json::Map<String, serde_json::Value>>(&json)
|
||||||
|
.map_err(|e| format!("invalid app settings JSON: {e}"))?,
|
||||||
|
None => serde_json::Map::new(),
|
||||||
|
};
|
||||||
|
settings
|
||||||
|
.insert(MAX_RETRIES_KEY.to_string(), serde_json::Value::Number(serde_json::Number::from(max_retries)));
|
||||||
|
let json = serde_json::Value::Object(settings).to_string();
|
||||||
|
conn.execute("INSERT OR REPLACE INTO app_settings (id, settings_json) VALUES (1, ?1)", [json])
|
||||||
|
.map(|_| ())
|
||||||
|
.map_err(|e| e.to_string())
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn load_max_retries(&self) -> Result<u32, String> {
|
||||||
|
let settings = self.load_app_settings_json().await?;
|
||||||
|
Ok(settings
|
||||||
|
.get(MAX_RETRIES_KEY)
|
||||||
|
.and_then(serde_json::Value::as_u64)
|
||||||
|
.map(|value| crate::ai::clamp_max_retries(value.min(u32::MAX as u64) as u32))
|
||||||
|
.unwrap_or(crate::ai::DEFAULT_MAX_RETRIES))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// AI Conversations
|
// AI Conversations
|
||||||
@@ -4714,6 +4751,36 @@ mod tests {
|
|||||||
assert_eq!(storage.load_max_agent_turns().await.unwrap(), crate::agent_loop::MAX_MAX_AGENT_TURNS);
|
assert_eq!(storage.load_max_agent_turns().await.unwrap(), crate::agent_loop::MAX_MAX_AGENT_TURNS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn max_retries_defaults_and_persists_clamped() {
|
||||||
|
let path = temp_db_path("max-retries");
|
||||||
|
let storage = Storage::open(&path).await.unwrap();
|
||||||
|
|
||||||
|
assert_eq!(storage.load_max_retries().await.unwrap(), crate::ai::DEFAULT_MAX_RETRIES);
|
||||||
|
|
||||||
|
storage.save_max_retries(5).await.unwrap();
|
||||||
|
assert_eq!(storage.load_max_retries().await.unwrap(), 5);
|
||||||
|
|
||||||
|
storage.save_max_retries(0).await.unwrap();
|
||||||
|
assert_eq!(storage.load_max_retries().await.unwrap(), 0);
|
||||||
|
|
||||||
|
// Values above the cap are clamped so raw DB edits cannot bypass the limit.
|
||||||
|
storage.save_max_retries(u32::MAX).await.unwrap();
|
||||||
|
assert_eq!(storage.load_max_retries().await.unwrap(), crate::ai::MAX_MAX_RETRIES);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn max_retries_survives_stale_app_settings_save() {
|
||||||
|
let path = temp_db_path("max-retries-stale-save");
|
||||||
|
let storage = Storage::open(&path).await.unwrap();
|
||||||
|
let stale_settings = storage.load_app_settings_json().await.unwrap();
|
||||||
|
|
||||||
|
storage.save_max_retries(7).await.unwrap();
|
||||||
|
storage.save_app_settings_json(&stale_settings).await.unwrap();
|
||||||
|
|
||||||
|
assert_eq!(storage.load_max_retries().await.unwrap(), 7);
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn password_hash_preserves_existing_desktop_settings() {
|
async fn password_hash_preserves_existing_desktop_settings() {
|
||||||
let path = temp_db_path("password-preserve-desktop-settings");
|
let path = temp_db_path("password-preserve-desktop-settings");
|
||||||
@@ -5040,6 +5107,7 @@ mod tests {
|
|||||||
reasoning_level: AiReasoningLevel::Default,
|
reasoning_level: AiReasoningLevel::Default,
|
||||||
runtime_effort: None,
|
runtime_effort: None,
|
||||||
context_window: None,
|
context_window: None,
|
||||||
|
max_retries: None,
|
||||||
codex_cli_path: None,
|
codex_cli_path: None,
|
||||||
codex_cli_env: std::collections::HashMap::new(),
|
codex_cli_env: std::collections::HashMap::new(),
|
||||||
claude_code_cli_path: None,
|
claude_code_cli_path: None,
|
||||||
|
|||||||
@@ -719,6 +719,10 @@ async fn main() {
|
|||||||
"/app-settings/max-agent-turns",
|
"/app-settings/max-agent-turns",
|
||||||
get(routes::app_settings::load_max_agent_turns).put(routes::app_settings::save_max_agent_turns),
|
get(routes::app_settings::load_max_agent_turns).put(routes::app_settings::save_max_agent_turns),
|
||||||
)
|
)
|
||||||
|
.route(
|
||||||
|
"/app-settings/max-retries",
|
||||||
|
get(routes::app_settings::load_max_retries).put(routes::app_settings::save_max_retries),
|
||||||
|
)
|
||||||
.route("/app-settings/config/decrypt", post(routes::app_settings::decrypt_config))
|
.route("/app-settings/config/decrypt", post(routes::app_settings::decrypt_config))
|
||||||
// Cloud sync
|
// Cloud sync
|
||||||
.route("/cloud-sync/webdav/test", post(routes::cloud_sync::webdav_sync_test))
|
.route("/cloud-sync/webdav/test", post(routes::cloud_sync::webdav_sync_test))
|
||||||
|
|||||||
+124
-12
@@ -114,7 +114,7 @@ fn default_agent_mode() -> String {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn reject_web_unsupported_ai_provider(config: &AiConfig) -> Result<(), AppError> {
|
fn reject_web_unsupported_ai_provider(config: &AiConfig) -> Result<(), AppError> {
|
||||||
if matches!(config.provider, AiProvider::CodexCli | AiProvider::ClaudeCodeCli | AiProvider::PiAgentCli) {
|
if dbx_core::ai::is_cli_provider(&config.provider) {
|
||||||
return Err(AppError::bad_request("CLI providers are only supported in DBX Desktop."));
|
return Err(AppError::bad_request("CLI providers are only supported in DBX Desktop."));
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -269,9 +269,17 @@ pub async fn delete_ai_conversation(
|
|||||||
// AI complete (non-streaming)
|
// AI complete (non-streaming)
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
pub async fn ai_complete(Json(body): Json<AiCompleteRequest>) -> Result<Json<String>, AppError> {
|
pub async fn ai_complete(
|
||||||
|
State(state): State<Arc<WebState>>,
|
||||||
|
Json(body): Json<AiCompleteRequest>,
|
||||||
|
) -> Result<Json<String>, AppError> {
|
||||||
reject_web_unsupported_ai_provider(&body.request.config)?;
|
reject_web_unsupported_ai_provider(&body.request.config)?;
|
||||||
let result = dbx_core::ai::complete(&body.request).await.map_err(AppError::from)?;
|
let mut request = body.request;
|
||||||
|
dbx_core::ai::merge_global_max_retries(
|
||||||
|
&mut request.config,
|
||||||
|
state.app.storage.load_max_retries().await.unwrap_or(dbx_core::ai::DEFAULT_MAX_RETRIES),
|
||||||
|
);
|
||||||
|
let result = dbx_core::ai::complete(&request).await.map_err(AppError::from)?;
|
||||||
Ok(Json(result))
|
Ok(Json(result))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -280,24 +288,44 @@ pub async fn ai_complete(Json(body): Json<AiCompleteRequest>) -> Result<Json<Str
|
|||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
pub async fn ai_test_connection(
|
pub async fn ai_test_connection(
|
||||||
|
State(state): State<Arc<WebState>>,
|
||||||
Json(body): Json<AiTestConnectionRequest>,
|
Json(body): Json<AiTestConnectionRequest>,
|
||||||
) -> Result<Json<AiTestConnectionResult>, AppError> {
|
) -> Result<Json<AiTestConnectionResult>, AppError> {
|
||||||
reject_web_unsupported_ai_provider(&body.config)?;
|
let mut config = body.config;
|
||||||
let result = dbx_core::ai::test_connection_core(&body.config).await.map_err(AppError::from)?;
|
reject_web_unsupported_ai_provider(&config)?;
|
||||||
|
dbx_core::ai::merge_global_max_retries(
|
||||||
|
&mut config,
|
||||||
|
state.app.storage.load_max_retries().await.unwrap_or(dbx_core::ai::DEFAULT_MAX_RETRIES),
|
||||||
|
);
|
||||||
|
let result = dbx_core::ai::test_connection_core(&config).await.map_err(AppError::from)?;
|
||||||
Ok(Json(result))
|
Ok(Json(result))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn ai_list_models(Json(body): Json<AiListModelsRequest>) -> Result<Json<Vec<AiModelInfo>>, AppError> {
|
pub async fn ai_list_models(
|
||||||
reject_web_unsupported_ai_provider(&body.config)?;
|
State(state): State<Arc<WebState>>,
|
||||||
let result = dbx_core::ai::list_models_core(&body.config).await.map_err(AppError::from)?;
|
Json(body): Json<AiListModelsRequest>,
|
||||||
|
) -> Result<Json<Vec<AiModelInfo>>, AppError> {
|
||||||
|
let mut config = body.config;
|
||||||
|
reject_web_unsupported_ai_provider(&config)?;
|
||||||
|
dbx_core::ai::merge_global_max_retries(
|
||||||
|
&mut config,
|
||||||
|
state.app.storage.load_max_retries().await.unwrap_or(dbx_core::ai::DEFAULT_MAX_RETRIES),
|
||||||
|
);
|
||||||
|
let result = dbx_core::ai::list_models_core(&config).await.map_err(AppError::from)?;
|
||||||
Ok(Json(result))
|
Ok(Json(result))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn ai_resolve_model_effort(
|
pub async fn ai_resolve_model_effort(
|
||||||
|
State(state): State<Arc<WebState>>,
|
||||||
Json(body): Json<AiResolveModelEffortRequest>,
|
Json(body): Json<AiResolveModelEffortRequest>,
|
||||||
) -> Result<Json<AiEffortCapability>, AppError> {
|
) -> Result<Json<AiEffortCapability>, AppError> {
|
||||||
reject_web_unsupported_ai_provider(&body.config)?;
|
let mut config = body.config;
|
||||||
let result = dbx_core::ai::resolve_model_effort_core(&body.config, &body.model_id).await.map_err(AppError::from)?;
|
reject_web_unsupported_ai_provider(&config)?;
|
||||||
|
dbx_core::ai::merge_global_max_retries(
|
||||||
|
&mut config,
|
||||||
|
state.app.storage.load_max_retries().await.unwrap_or(dbx_core::ai::DEFAULT_MAX_RETRIES),
|
||||||
|
);
|
||||||
|
let result = dbx_core::ai::resolve_model_effort_core(&config, &body.model_id).await.map_err(AppError::from)?;
|
||||||
Ok(Json(result))
|
Ok(Json(result))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -315,11 +343,16 @@ pub async fn ai_cancel_stream(Json(body): Json<AiCancelStreamRequest>) -> Result
|
|||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
pub async fn ai_stream(
|
pub async fn ai_stream(
|
||||||
|
State(state): State<Arc<WebState>>,
|
||||||
Json(body): Json<AiStreamRequest>,
|
Json(body): Json<AiStreamRequest>,
|
||||||
) -> Result<Sse<impl Stream<Item = Result<Event, std::convert::Infallible>>>, AppError> {
|
) -> Result<Sse<impl Stream<Item = Result<Event, std::convert::Infallible>>>, AppError> {
|
||||||
let session_id = body.session_id;
|
let session_id = body.session_id;
|
||||||
let request = body.request;
|
let mut request = body.request;
|
||||||
reject_web_unsupported_ai_provider(&request.config)?;
|
reject_web_unsupported_ai_provider(&request.config)?;
|
||||||
|
dbx_core::ai::merge_global_max_retries(
|
||||||
|
&mut request.config,
|
||||||
|
state.app.storage.load_max_retries().await.unwrap_or(dbx_core::ai::DEFAULT_MAX_RETRIES),
|
||||||
|
);
|
||||||
|
|
||||||
let cancelled = dbx_core::ai::register_stream(&session_id).await;
|
let cancelled = dbx_core::ai::register_stream(&session_id).await;
|
||||||
let (tx, rx) = tokio::sync::broadcast::channel::<String>(256);
|
let (tx, rx) = tokio::sync::broadcast::channel::<String>(256);
|
||||||
@@ -380,6 +413,10 @@ pub async fn ai_agent_stream(
|
|||||||
log::warn!("Failed to load max_agent_turns setting, using default: {err}");
|
log::warn!("Failed to load max_agent_turns setting, using default: {err}");
|
||||||
dbx_core::agent_loop::DEFAULT_MAX_AGENT_TURNS
|
dbx_core::agent_loop::DEFAULT_MAX_AGENT_TURNS
|
||||||
});
|
});
|
||||||
|
let max_retries = state.app.storage.load_max_retries().await.unwrap_or_else(|err| {
|
||||||
|
log::warn!("Failed to load max_retries setting, using default: {err}");
|
||||||
|
dbx_core::ai::DEFAULT_MAX_RETRIES
|
||||||
|
});
|
||||||
// Reject the confirmed-write grant when the connection or database changed
|
// Reject the confirmed-write grant when the connection or database changed
|
||||||
// between the user's confirmation and this backend request (defense-in-depth).
|
// between the user's confirmation and this backend request (defense-in-depth).
|
||||||
let (allow_write_sql, confirmed_write_sql) = dbx_core::agent_tools::verify_confirmed_target(
|
let (allow_write_sql, confirmed_write_sql) = dbx_core::agent_tools::verify_confirmed_target(
|
||||||
@@ -409,7 +446,8 @@ pub async fn ai_agent_stream(
|
|||||||
};
|
};
|
||||||
|
|
||||||
let sid = session_id.clone();
|
let sid = session_id.clone();
|
||||||
let req_config = request.config;
|
let mut req_config = request.config;
|
||||||
|
dbx_core::ai::merge_global_max_retries(&mut req_config, max_retries);
|
||||||
let req_system_prompt = request.system_prompt;
|
let req_system_prompt = request.system_prompt;
|
||||||
let req_messages = request.messages;
|
let req_messages = request.messages;
|
||||||
let req_task_contract = request.task_contract;
|
let req_task_contract = request.task_contract;
|
||||||
@@ -475,6 +513,7 @@ mod tests {
|
|||||||
reasoning_level: AiReasoningLevel::Default,
|
reasoning_level: AiReasoningLevel::Default,
|
||||||
runtime_effort: None,
|
runtime_effort: None,
|
||||||
context_window: None,
|
context_window: None,
|
||||||
|
max_retries: None,
|
||||||
codex_cli_path: None,
|
codex_cli_path: None,
|
||||||
codex_cli_env: Default::default(),
|
codex_cli_env: Default::default(),
|
||||||
claude_code_cli_path: None,
|
claude_code_cli_path: None,
|
||||||
@@ -508,4 +547,77 @@ mod tests {
|
|||||||
assert!(reject_web_unsupported_ai_provider(&config).is_ok(), "provider {:?} should be allowed", provider);
|
assert!(reject_web_unsupported_ai_provider(&config).is_ok(), "provider {:?} should be allowed", provider);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Integration test: the `ai_test_connection` web handler applies global
|
||||||
|
/// max_retries=0 so that a 429 is not retried.
|
||||||
|
#[tokio::test]
|
||||||
|
async fn web_test_connection_respects_global_max_retries_zero() {
|
||||||
|
use std::sync::atomic::{AtomicU32, Ordering};
|
||||||
|
use std::sync::Arc;
|
||||||
|
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
||||||
|
|
||||||
|
use axum::extract::State;
|
||||||
|
use dbx_core::connection::AppState;
|
||||||
|
|
||||||
|
let dir = std::env::temp_dir().join(format!("dbx-web-intg-max-retries-{}", uuid::Uuid::new_v4()));
|
||||||
|
let _ = std::fs::create_dir_all(&dir);
|
||||||
|
let storage = dbx_core::storage::Storage::open(&dir.join("storage.db")).await.unwrap();
|
||||||
|
storage.save_max_retries(0).await.unwrap();
|
||||||
|
assert_eq!(storage.load_max_retries().await.unwrap(), 0);
|
||||||
|
|
||||||
|
let app = Arc::new(AppState::new_with_plugin_dir(storage, dir.join("plugins")));
|
||||||
|
let web_state = Arc::new(crate::state::WebState::for_tests(app, dir.clone()));
|
||||||
|
|
||||||
|
// Counting 429 server
|
||||||
|
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||||
|
let addr = listener.local_addr().unwrap();
|
||||||
|
let url = format!("http://{addr}");
|
||||||
|
let count = Arc::new(AtomicU32::new(0));
|
||||||
|
let count2 = count.clone();
|
||||||
|
let srv = tokio::spawn(async move {
|
||||||
|
while let Ok((mut socket, _)) = listener.accept().await {
|
||||||
|
count2.fetch_add(1, Ordering::SeqCst);
|
||||||
|
let mut buf = vec![0u8; 4096];
|
||||||
|
let _ = socket.read(&mut buf).await;
|
||||||
|
let resp = b"HTTP/1.1 429 Too Many Requests\r\nContent-Length: 0\r\nConnection: close\r\n\r\n";
|
||||||
|
let _ = socket.write_all(resp).await;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
let config = AiConfig {
|
||||||
|
provider: AiProvider::Claude,
|
||||||
|
api_key: "sk-test".to_string(),
|
||||||
|
auth_method: AiAuthMethod::ApiKey,
|
||||||
|
endpoint: url.clone(),
|
||||||
|
model: "claude-sonnet-4".to_string(),
|
||||||
|
models: vec![],
|
||||||
|
api_style: AiApiStyle::AnthropicMessages,
|
||||||
|
proxy_enabled: false,
|
||||||
|
proxy_url: String::new(),
|
||||||
|
enable_thinking: false,
|
||||||
|
reasoning_level: AiReasoningLevel::Default,
|
||||||
|
runtime_effort: None,
|
||||||
|
context_window: None,
|
||||||
|
max_retries: None,
|
||||||
|
codex_cli_path: None,
|
||||||
|
codex_cli_env: Default::default(),
|
||||||
|
claude_code_cli_path: None,
|
||||||
|
claude_code_cli_env: Default::default(),
|
||||||
|
pi_agent_cli_path: None,
|
||||||
|
pi_agent_cli_env: Default::default(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let body = super::AiTestConnectionRequest { config };
|
||||||
|
let result = super::ai_test_connection(State(web_state), axum::Json(body)).await;
|
||||||
|
|
||||||
|
// 429 → should NOT succeed (no retry).
|
||||||
|
if let Ok(axum::Json(resp)) = result {
|
||||||
|
assert!(!resp.success, "429 with max_retries=0 must fail, got success");
|
||||||
|
}
|
||||||
|
|
||||||
|
srv.abort();
|
||||||
|
assert_eq!(count.load(Ordering::SeqCst), 1, "max_retries=0 must mean exactly 1 request");
|
||||||
|
|
||||||
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -83,6 +83,24 @@ pub async fn save_max_agent_turns(
|
|||||||
Ok(Json(()))
|
Ok(Json(()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct SaveMaxRetriesRequest {
|
||||||
|
pub max_retries: u32,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn load_max_retries(State(state): State<Arc<WebState>>) -> Result<Json<u32>, AppError> {
|
||||||
|
state.app.storage.load_max_retries().await.map(Json).map_err(AppError::from)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn save_max_retries(
|
||||||
|
State(state): State<Arc<WebState>>,
|
||||||
|
Json(body): Json<SaveMaxRetriesRequest>,
|
||||||
|
) -> Result<Json<()>, AppError> {
|
||||||
|
state.app.storage.save_max_retries(body.max_retries).await.map_err(AppError::from)?;
|
||||||
|
Ok(Json(()))
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn decrypt_config(Json(body): Json<DecryptConfigRequest>) -> Result<Json<String>, AppError> {
|
pub async fn decrypt_config(Json(body): Json<DecryptConfigRequest>) -> Result<Json<String>, AppError> {
|
||||||
decrypt_config_payload(&body.payload, &body.passphrase).map(Json).map_err(AppError::from)
|
decrypt_config_payload(&body.payload, &body.passphrase).map(Json).map_err(AppError::from)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -67,6 +67,9 @@ font-kit = "0.14.3"
|
|||||||
tauri-plugin-clipboard-manager = "2.3.2"
|
tauri-plugin-clipboard-manager = "2.3.2"
|
||||||
sys-locale = "0.3"
|
sys-locale = "0.3"
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
tauri = { version = "2.10.3", features = ["test"] }
|
||||||
|
|
||||||
[target.'cfg(target_os = "macos")'.dependencies]
|
[target.'cfg(target_os = "macos")'.dependencies]
|
||||||
objc2 = { version = "0.6.4", default-features = false, features = ["std"] }
|
objc2 = { version = "0.6.4", default-features = false, features = ["std"] }
|
||||||
objc2-app-kit = { version = "0.3.2", default-features = false, features = ["NSApplication", "NSButton", "NSControl", "NSDockTile", "NSImage", "NSResponder", "NSView", "NSWindow"] }
|
objc2-app-kit = { version = "0.3.2", default-features = false, features = ["NSApplication", "NSButton", "NSControl", "NSDockTile", "NSImage", "NSResponder", "NSView", "NSWindow"] }
|
||||||
|
|||||||
+125
-13
@@ -6,20 +6,39 @@ use super::connection::AppState;
|
|||||||
pub use dbx_core::ai::*;
|
pub use dbx_core::ai::*;
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn ai_test_connection(config: AiConfig) -> Result<AiTestConnectionResult, String> {
|
pub async fn ai_test_connection(
|
||||||
let config = resolve_cli_provider_config(config);
|
state: State<'_, Arc<AppState>>,
|
||||||
|
config: AiConfig,
|
||||||
|
) -> Result<AiTestConnectionResult, String> {
|
||||||
|
let mut config = resolve_cli_provider_config(config);
|
||||||
|
merge_global_max_retries(
|
||||||
|
&mut config,
|
||||||
|
state.storage.load_max_retries().await.unwrap_or(dbx_core::ai::DEFAULT_MAX_RETRIES),
|
||||||
|
);
|
||||||
dbx_core::ai::test_connection_core(&config).await
|
dbx_core::ai::test_connection_core(&config).await
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn ai_list_models(config: AiConfig) -> Result<Vec<AiModelInfo>, String> {
|
pub async fn ai_list_models(state: State<'_, Arc<AppState>>, config: AiConfig) -> Result<Vec<AiModelInfo>, String> {
|
||||||
let config = resolve_cli_provider_config(config);
|
let mut config = resolve_cli_provider_config(config);
|
||||||
|
merge_global_max_retries(
|
||||||
|
&mut config,
|
||||||
|
state.storage.load_max_retries().await.unwrap_or(dbx_core::ai::DEFAULT_MAX_RETRIES),
|
||||||
|
);
|
||||||
dbx_core::ai::list_models_core(&config).await
|
dbx_core::ai::list_models_core(&config).await
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn ai_resolve_model_effort(config: AiConfig, model_id: String) -> Result<AiEffortCapability, String> {
|
pub async fn ai_resolve_model_effort(
|
||||||
let config = resolve_cli_provider_config(config);
|
state: State<'_, Arc<AppState>>,
|
||||||
|
config: AiConfig,
|
||||||
|
model_id: String,
|
||||||
|
) -> Result<AiEffortCapability, String> {
|
||||||
|
let mut config = resolve_cli_provider_config(config);
|
||||||
|
merge_global_max_retries(
|
||||||
|
&mut config,
|
||||||
|
state.storage.load_max_retries().await.unwrap_or(dbx_core::ai::DEFAULT_MAX_RETRIES),
|
||||||
|
);
|
||||||
dbx_core::ai::resolve_model_effort_core(&config, &model_id).await
|
dbx_core::ai::resolve_model_effort_core(&config, &model_id).await
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -67,12 +86,27 @@ pub async fn load_ai_chat_selection(state: State<'_, Arc<AppState>>) -> Result<O
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn ai_complete(request: AiCompletionRequest) -> Result<String, String> {
|
pub async fn ai_complete(state: State<'_, Arc<AppState>>, request: AiCompletionRequest) -> Result<String, String> {
|
||||||
|
let mut request = request;
|
||||||
|
merge_global_max_retries(
|
||||||
|
&mut request.config,
|
||||||
|
state.storage.load_max_retries().await.unwrap_or(dbx_core::ai::DEFAULT_MAX_RETRIES),
|
||||||
|
);
|
||||||
dbx_core::ai::complete(&request).await
|
dbx_core::ai::complete(&request).await
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn ai_stream(app: AppHandle, session_id: String, request: AiCompletionRequest) -> Result<(), String> {
|
pub async fn ai_stream(
|
||||||
|
app: AppHandle,
|
||||||
|
state: State<'_, Arc<AppState>>,
|
||||||
|
session_id: String,
|
||||||
|
request: AiCompletionRequest,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let mut request = request;
|
||||||
|
merge_global_max_retries(
|
||||||
|
&mut request.config,
|
||||||
|
state.storage.load_max_retries().await.unwrap_or(dbx_core::ai::DEFAULT_MAX_RETRIES),
|
||||||
|
);
|
||||||
let cancelled = dbx_core::ai::register_stream(&session_id).await;
|
let cancelled = dbx_core::ai::register_stream(&session_id).await;
|
||||||
|
|
||||||
let result = dbx_core::ai::stream(&session_id, &request, &cancelled, |chunk| {
|
let result = dbx_core::ai::stream(&session_id, &request, &cancelled, |chunk| {
|
||||||
@@ -110,7 +144,11 @@ pub async fn ai_agent_stream(
|
|||||||
confirmed_connection_id: Option<String>,
|
confirmed_connection_id: Option<String>,
|
||||||
confirmed_database: Option<String>,
|
confirmed_database: Option<String>,
|
||||||
) -> Result<String, String> {
|
) -> Result<String, String> {
|
||||||
let request = resolve_cli_provider_request(request);
|
let mut request = resolve_cli_provider_request(request);
|
||||||
|
merge_global_max_retries(
|
||||||
|
&mut request.config,
|
||||||
|
state.storage.load_max_retries().await.unwrap_or(dbx_core::ai::DEFAULT_MAX_RETRIES),
|
||||||
|
);
|
||||||
|
|
||||||
let parsed_db_type: DatabaseType =
|
let parsed_db_type: DatabaseType =
|
||||||
serde_json::from_str(&format!("\"{}\"", db_type)).map_err(|_| format!("Unknown database type: {db_type}"))?;
|
serde_json::from_str(&format!("\"{}\"", db_type)).map_err(|_| format!("Unknown database type: {db_type}"))?;
|
||||||
@@ -209,10 +247,6 @@ fn resolve_cli_provider_config(mut config: AiConfig) -> AiConfig {
|
|||||||
config
|
config
|
||||||
}
|
}
|
||||||
|
|
||||||
fn is_cli_provider(provider: &AiProvider) -> bool {
|
|
||||||
matches!(provider, AiProvider::CodexCli | AiProvider::ClaudeCodeCli | AiProvider::PiAgentCli)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn is_explicit_cli_path(command: &str) -> bool {
|
fn is_explicit_cli_path(command: &str) -> bool {
|
||||||
let path = Path::new(command);
|
let path = Path::new(command);
|
||||||
path.is_absolute() || command.contains('/') || command.contains('\\')
|
path.is_absolute() || command.contains('/') || command.contains('\\')
|
||||||
@@ -235,6 +269,58 @@ pub async fn delete_ai_conversation(state: State<'_, Arc<AppState>>, id: String)
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
|
use std::sync::atomic::{AtomicU32, Ordering};
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use tauri::Manager;
|
||||||
|
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
||||||
|
|
||||||
|
use super::super::connection::AppState;
|
||||||
|
use dbx_core::ai::{AiApiStyle, AiAuthMethod, AiConfig, AiProvider, AiReasoningLevel};
|
||||||
|
|
||||||
|
/// Spawn a TCP server that returns 429 and counts connections.
|
||||||
|
async fn counting_429_server() -> (String, Arc<AtomicU32>, tokio::task::JoinHandle<()>) {
|
||||||
|
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||||
|
let addr = listener.local_addr().unwrap();
|
||||||
|
let url = format!("http://{addr}");
|
||||||
|
let count = Arc::new(AtomicU32::new(0));
|
||||||
|
let count2 = count.clone();
|
||||||
|
let srv = tokio::spawn(async move {
|
||||||
|
while let Ok((mut socket, _)) = listener.accept().await {
|
||||||
|
count2.fetch_add(1, Ordering::SeqCst);
|
||||||
|
let mut buf = vec![0u8; 4096];
|
||||||
|
let _ = socket.read(&mut buf).await;
|
||||||
|
let resp = b"HTTP/1.1 429 Too Many Requests\r\nContent-Length: 0\r\nConnection: close\r\n\r\n";
|
||||||
|
let _ = socket.write_all(resp).await;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
(url, count, srv)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn test_ai_config(endpoint: &str, model: &str) -> AiConfig {
|
||||||
|
AiConfig {
|
||||||
|
provider: AiProvider::Claude,
|
||||||
|
api_key: "sk-test".to_string(),
|
||||||
|
auth_method: AiAuthMethod::ApiKey,
|
||||||
|
endpoint: endpoint.to_string(),
|
||||||
|
model: model.to_string(),
|
||||||
|
models: vec![],
|
||||||
|
api_style: AiApiStyle::AnthropicMessages,
|
||||||
|
proxy_enabled: false,
|
||||||
|
proxy_url: String::new(),
|
||||||
|
enable_thinking: false,
|
||||||
|
reasoning_level: AiReasoningLevel::Default,
|
||||||
|
runtime_effort: None,
|
||||||
|
context_window: None,
|
||||||
|
max_retries: None,
|
||||||
|
codex_cli_path: None,
|
||||||
|
codex_cli_env: Default::default(),
|
||||||
|
claude_code_cli_path: None,
|
||||||
|
claude_code_cli_env: Default::default(),
|
||||||
|
pi_agent_cli_path: None,
|
||||||
|
pi_agent_cli_env: Default::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn verify_confirmed_target_allows_matching_connection_and_database() {
|
fn verify_confirmed_target_allows_matching_connection_and_database() {
|
||||||
@@ -310,4 +396,30 @@ mod tests {
|
|||||||
assert_eq!(allow, Some(false));
|
assert_eq!(allow, Some(false));
|
||||||
assert_eq!(confirmed, None);
|
assert_eq!(confirmed, None);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn tauri_entry_respects_global_max_retries_zero() {
|
||||||
|
let dir = std::env::temp_dir().join(format!("dbx-tauri-mr-{}", uuid::Uuid::new_v4()));
|
||||||
|
let _ = std::fs::create_dir_all(&dir);
|
||||||
|
let storage = dbx_core::storage::Storage::open(&dir.join("storage.db")).await.unwrap();
|
||||||
|
storage.save_max_retries(0).await.unwrap();
|
||||||
|
assert_eq!(storage.load_max_retries().await.unwrap(), 0);
|
||||||
|
|
||||||
|
let (url, count, srv) = counting_429_server().await;
|
||||||
|
|
||||||
|
let app_state = Arc::new(AppState::new_with_plugin_dir(storage, dir.join("plugins")));
|
||||||
|
let app = tauri::test::mock_app();
|
||||||
|
app.manage(app_state);
|
||||||
|
|
||||||
|
let state: tauri::State<'_, Arc<AppState>> = app.state();
|
||||||
|
let config = test_ai_config(&url, "claude-sonnet-4");
|
||||||
|
let result = super::ai_test_connection(state, config).await;
|
||||||
|
|
||||||
|
assert!(result.is_err(), "429 with max_retries=0 must fail, got: {result:?}");
|
||||||
|
srv.abort();
|
||||||
|
assert_eq!(count.load(Ordering::SeqCst), 1, "max_retries=0 must mean exactly 1 request");
|
||||||
|
|
||||||
|
drop(app);
|
||||||
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -69,6 +69,16 @@ pub async fn save_max_agent_turns(state: State<'_, Arc<AppState>>, max_agent_tur
|
|||||||
state.storage.save_max_agent_turns(max_agent_turns).await
|
state.storage.save_max_agent_turns(max_agent_turns).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn load_max_retries(state: State<'_, Arc<AppState>>) -> Result<u32, String> {
|
||||||
|
state.storage.load_max_retries().await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn save_max_retries(state: State<'_, Arc<AppState>>, max_retries: u32) -> Result<(), String> {
|
||||||
|
state.storage.save_max_retries(max_retries).await
|
||||||
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn complete_app_close(app: AppHandle, window: Window, action: String) -> Result<(), String> {
|
pub async fn complete_app_close(app: AppHandle, window: Window, action: String) -> Result<(), String> {
|
||||||
match action.as_str() {
|
match action.as_str() {
|
||||||
|
|||||||
@@ -1352,6 +1352,8 @@ pub fn run() {
|
|||||||
commands::app_settings::save_desktop_settings,
|
commands::app_settings::save_desktop_settings,
|
||||||
commands::app_settings::load_max_agent_turns,
|
commands::app_settings::load_max_agent_turns,
|
||||||
commands::app_settings::save_max_agent_turns,
|
commands::app_settings::save_max_agent_turns,
|
||||||
|
commands::app_settings::load_max_retries,
|
||||||
|
commands::app_settings::save_max_retries,
|
||||||
commands::app_settings::set_app_locale,
|
commands::app_settings::set_app_locale,
|
||||||
commands::app_settings::complete_app_close,
|
commands::app_settings::complete_app_close,
|
||||||
commands::app_settings::mark_frontend_ready,
|
commands::app_settings::mark_frontend_ready,
|
||||||
|
|||||||
Reference in new issue
Block a user