Skip to content

Update provider DB refresh flow and add manual model config refresh #1421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zerob13 merged 4 commits into from
Apr 1, 2026
Merged

Update provider DB refresh flow and add manual model config refresh #1421

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85a1264
feat(settings): refresh provider db
zerob13 Apr 1, 2026
7334027
fix(chat): use command icon for slash suggestions
zerob13 Apr 1, 2026
d63f593
fix(agent): unify shell PATH resolution
zerob13 Apr 1, 2026
9c03504
fix(agent): merge env for background exec
zerob13 Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/main/lib/agentRuntime/backgroundExecSessionManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import fs from 'fs'
import path from 'path'
import { nanoid } from 'nanoid'
import logger from '@shared/logger'
import { getShellEnvironment, getUserShell } from './shellEnvHelper'
import { getUserShell } from './shellEnvHelper'
import { terminateProcessTree } from './processTree'
import { resolveSessionDir } from './sessionPaths'

Expand Down Expand Up @@ -121,7 +121,6 @@ export class BackgroundExecSessionManager {
const config = getConfig()
const sessionId = `bg_${nanoid(12)}`
const { shell, args } = getUserShell()
const shellEnv = await getShellEnvironment()

const sessionDir = resolveSessionDir(conversationId)
if (sessionDir) {
Expand All @@ -134,11 +133,7 @@ export class BackgroundExecSessionManager {

const child = spawn(shell, [...args, command], {
cwd,
env: {
...process.env,
...shellEnv,
...options?.env
},
env: options?.env ? { ...options.env } : { ...process.env },
detached: process.platform !== 'win32',
stdio: ['pipe', 'pipe', 'pipe']
})
Expand Down
17 changes: 7 additions & 10 deletions src/main/lib/agentRuntime/rtkRuntimeService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type {
UsageDashboardRtkSummary
} from '@shared/types/agent-interface'
import logger from '@shared/logger'
import { getShellEnvironment } from './shellEnvHelper'
import { getShellEnvironment, mergeCommandEnvironment } from './shellEnvHelper'
import { RuntimeHelper } from '../runtimeHelper'

const RTK_ENABLED_SETTING_KEY = 'rtkEnabled'
Expand Down Expand Up @@ -650,15 +650,12 @@ export class RtkRuntimeService {
dbPath?: string
): Promise<Record<string, string>> {
const shellEnv = await this.getShellEnvironmentImpl()
const env = this.runtimeHelper.prependBundledRuntimeToEnv({
...Object.fromEntries(
Object.entries(process.env).filter(
(entry): entry is [string, string] => typeof entry[1] === 'string'
)
),
...shellEnv,
...baseEnv
})
const env = this.runtimeHelper.prependBundledRuntimeToEnv(
mergeCommandEnvironment({
shellEnv,
overrides: baseEnv
})
)

if (dbPath) {
fs.mkdirSync(path.dirname(dbPath), { recursive: true })
Expand Down
Loading
Loading