refactor: AI session managed server-side, sessionId returned from API
This commit is contained in:
@@ -40,9 +40,9 @@ function apiSavePlugin() {
|
||||
req.on('end', () => {
|
||||
try {
|
||||
const { sessionId, userMessage, apiKey, mode } = JSON.parse(body)
|
||||
if (!userMessage || !sessionId) { res.writeHead(400); res.end(JSON.stringify({ error: 'missing fields' })); return }
|
||||
if (!userMessage) { res.writeHead(400); res.end(JSON.stringify({ error: 'missing fields' })); return }
|
||||
|
||||
const dedupKey = `${mode}_${userMessage}`
|
||||
const dedupKey = `${mode}_${sessionId || ''}_${userMessage}`
|
||||
const last = dedupMap.get(dedupKey) || 0
|
||||
if (Date.now() - last < 3000) {
|
||||
res.writeHead(429)
|
||||
@@ -56,8 +56,12 @@ function apiSavePlugin() {
|
||||
: 'JSON模式:只返回修改后的 JSON 文本,不要写任何文件。需求:'
|
||||
const fullMessage = modePrefix + userMessage
|
||||
|
||||
const args = ['run', '--model', 'deepseek/deepseek-v4-pro', '--format', 'json']
|
||||
if (sessionId) args.push('--session', sessionId)
|
||||
args.push(fullMessage)
|
||||
|
||||
const opencodeBin = resolve(__dirname, 'node_modules', '.bin', 'opencode')
|
||||
const child = spawn(opencodeBin, ['run', '--session', sessionId, '--model', 'deepseek', '--format', 'json', fullMessage], {
|
||||
const child = spawn(opencodeBin, args, {
|
||||
env: { ...process.env, DEEPSEEK_API_KEY: apiKey || process.env.DEEPSEEK_API_KEY || '' },
|
||||
timeout: 15000,
|
||||
})
|
||||
@@ -67,14 +71,35 @@ function apiSavePlugin() {
|
||||
child.stdout.on('data', (d: Buffer) => stdout += d.toString())
|
||||
child.stderr.on('data', (d: Buffer) => stderr += d.toString())
|
||||
|
||||
child.on('close', (code) => {
|
||||
child.on('close', async (code) => {
|
||||
if (code !== 0) {
|
||||
res.writeHead(500)
|
||||
res.end(JSON.stringify({ error: 'opencode exited with code ' + code, stderr }))
|
||||
return
|
||||
}
|
||||
|
||||
let resolvedSessionId = sessionId
|
||||
if (!resolvedSessionId) {
|
||||
try {
|
||||
const listChild = spawn(opencodeBin, ['session', 'list', '--format', 'json', '--max-count', '1'], {
|
||||
timeout: 5000,
|
||||
env: { ...process.env, DEEPSEEK_API_KEY: apiKey || process.env.DEEPSEEK_API_KEY || '' },
|
||||
})
|
||||
let listOut = ''
|
||||
listChild.stdout.on('data', (d: Buffer) => listOut += d.toString())
|
||||
await new Promise<void>((resolveList) => listChild.on('close', () => {
|
||||
try {
|
||||
const sessions = JSON.parse(listOut)
|
||||
if (Array.isArray(sessions) && sessions.length > 0) {
|
||||
resolvedSessionId = sessions[0].id
|
||||
}
|
||||
} catch {}
|
||||
resolveList()
|
||||
}))
|
||||
} catch {}
|
||||
}
|
||||
|
||||
if (mode === 'json') {
|
||||
// try to extract JSON block from response
|
||||
const match = stdout.match(/```json\n?([\s\S]*?)\n?```|\{[\s\S]*\}/)
|
||||
const jsonStr = match ? (match[1] || match[0]) : stdout
|
||||
try { JSON.parse(jsonStr) } catch {
|
||||
@@ -83,10 +108,10 @@ function apiSavePlugin() {
|
||||
return
|
||||
}
|
||||
res.writeHead(200, { 'Content-Type': 'application/json' })
|
||||
res.end(JSON.stringify({ result: jsonStr }))
|
||||
res.end(JSON.stringify({ result: jsonStr, sessionId: resolvedSessionId || '' }))
|
||||
} else {
|
||||
res.writeHead(200, { 'Content-Type': 'application/json' })
|
||||
res.end(JSON.stringify({ result: stdout || 'done' }))
|
||||
res.end(JSON.stringify({ result: stdout || 'done', sessionId: resolvedSessionId || '' }))
|
||||
}
|
||||
})
|
||||
} catch (e: any) {
|
||||
@@ -99,7 +124,7 @@ function apiSavePlugin() {
|
||||
server.middlewares.use('/api/ai/sessions', (req: any, res: any) => {
|
||||
try {
|
||||
const opencodeBin = resolve(__dirname, 'node_modules', '.bin', 'opencode')
|
||||
const child = spawn(opencodeBin, ['session', 'list'], { timeout: 5000 })
|
||||
const child = spawn(opencodeBin, ['session', 'list', '--format', 'json'], { timeout: 5000 })
|
||||
let stdout = ''
|
||||
child.stdout.on('data', (d: Buffer) => stdout += d.toString())
|
||||
child.on('close', () => {
|
||||
|
||||
Reference in New Issue
Block a user