3 Commits

Author SHA1 Message Date
2af79cf1dc fix: 修复对话会话管理问题
- 添加 serviceTier 调试日志
- abortCurrentSession 时清空会话引用,确保下次创建新会话
2026-01-10 21:15:48 +08:00
5b225126f1 fix: Plan 模式执行时传递服务等级参数
- planCard.ts: 计划操作时传递 model 参数
- ICHelperPanel.ts: 传递服务等级到 setPendingPlanExecution
- messageHandler.ts: 保存并传递服务等级,确保 Plan->Agent 切换时使用相同模型
2026-01-10 21:15:39 +08:00
4abb979eab feat: 新增 iverilog 工具支持
- api.ts: 新增 IverilogArgs 类型定义
- toolExecutor.ts: 新增 executeIverilog 函数,支持直接执行 iverilog 命令
2026-01-10 21:15:26 +08:00
6 changed files with 103 additions and 12 deletions

View File

@ -341,7 +341,8 @@ export async function showICHelperPanel(
panel,
message.planTitle || "计划",
context.extensionPath,
taskId
taskId,
message.model // 传递服务等级
);
} else {
console.warn(

View File

@ -369,6 +369,8 @@ export class DialogSession {
const knowledgeData = await this.loadKnowledgeData();
console.log('[DialogSession] knowledgeData 加载结果:', knowledgeData ? `${knowledgeData.length} 字符` : 'null');
console.log('[DialogSession] serviceTier 参数:', serviceTier, '-> 使用:', serviceTier || config.serviceTier);
const request: DialogRequest = {
taskId: this.taskId,
message,
@ -908,6 +910,7 @@ class DialogManager {
*/
abortCurrentSession(): void {
this.currentSession?.abort();
this.currentSession = null; // 清空会话,确保下次创建新会话
}
}

View File

@ -25,6 +25,7 @@ import type {
FileDeleteArgs,
FileListArgs,
SyntaxCheckArgs,
IverilogArgs,
SimulationArgs,
WaveformSummaryArgs,
KnowledgeSaveArgs,
@ -75,6 +76,9 @@ export async function executeToolCall(
case 'syntax_check':
resultText = await executeSyntaxCheck(args as unknown as SyntaxCheckArgs, context);
break;
case 'iverilog':
resultText = await executeIverilog(args as unknown as IverilogArgs, context);
break;
case 'simulation':
resultText = await executeSimulation(args as unknown as SimulationArgs, context);
break;
@ -270,6 +274,71 @@ async function executeSyntaxCheck(
}
}
/**
* 执行 iverilog 工具
* 直接执行 iverilog 命令
*/
async function executeIverilog(
args: IverilogArgs,
context: ToolExecutorContext
): Promise<string> {
// 检查 iverilog 是否可用
const iverilogCheck = await checkIverilogAvailable(context.extensionPath);
if (!iverilogCheck.available) {
throw new Error(`iverilog 不可用: ${iverilogCheck.message}`);
}
// 获取工作目录
const workspaceFolders = vscode.workspace.workspaceFolders;
if (!workspaceFolders || workspaceFolders.length === 0) {
throw new Error('没有打开的工作区');
}
const projectPath = workspaceFolders[0].uri.fsPath;
const workDir = args.workDir
? path.join(projectPath, args.workDir)
: projectPath;
// 解析参数
const iverilogPath = getIverilogPath(context.extensionPath);
const cmdArgs = args.args.split(/\s+/).filter(a => a.length > 0);
const { spawn } = require('child_process');
return new Promise((resolve, reject) => {
const child = spawn(iverilogPath, cmdArgs, {
cwd: workDir,
env: {
...process.env,
IVERILOG_ROOT: path.join(context.extensionPath, 'tools', 'iverilog')
}
});
let stdout = '';
let stderr = '';
child.stdout.on('data', (data: Buffer) => {
stdout += data.toString();
});
child.stderr.on('data', (data: Buffer) => {
stderr += data.toString();
});
child.on('close', (code: number) => {
const output = stderr || stdout || '(无输出)';
if (code === 0) {
resolve(`执行成功\n${output}`);
} else {
resolve(`执行失败 (exit code: ${code})\n${output}`);
}
});
child.on('error', (error: Error) => {
reject(error);
});
});
}
/**
* 执行 simulation 工具
*/

View File

@ -518,6 +518,12 @@ export interface SyntaxCheckArgs {
code: string;
}
/** iverilog 工具参数 */
export interface IverilogArgs {
args: string;
workDir?: string;
}
/** simulation 工具参数 */
export interface SimulationArgs {
rtlPath: string;
@ -566,6 +572,7 @@ export type ToolArgs =
| FileDeleteArgs
| FileListArgs
| SyntaxCheckArgs
| IverilogArgs
| SimulationArgs
| WaveformSummaryArgs
| WaveformTraceArgs

View File

@ -36,6 +36,7 @@ let pendingPlanExecution: {
planTitle: string;
extensionPath: string;
taskId: string; // 保存 taskId 以便复用
serviceTier?: ServiceTier; // 保存服务等级
} | null = null;
/**
@ -45,10 +46,11 @@ export function setPendingPlanExecution(
panel: vscode.WebviewPanel,
planTitle: string,
extensionPath: string,
taskId: string
taskId: string,
serviceTier?: ServiceTier
): void {
pendingPlanExecution = { panel, planTitle, extensionPath, taskId };
console.log("[MessageHandler] 设置待执行计划:", planTitle, "taskId:", taskId);
pendingPlanExecution = { panel, planTitle, extensionPath, taskId, serviceTier };
console.log("[MessageHandler] 设置待执行计划:", planTitle, "taskId:", taskId, "serviceTier:", serviceTier);
}
/**
@ -229,13 +231,16 @@ async function handleUserMessageWithBackend(
planTitle,
extensionPath: execPath,
taskId: reuseTaskId,
serviceTier: savedServiceTier,
} = pendingPlanExecution;
pendingPlanExecution = null;
console.log(
"[MessageHandler] 自动执行计划:",
planTitle,
"复用 taskId:",
reuseTaskId
reuseTaskId,
"serviceTier:",
savedServiceTier
);
// 延迟一小段时间确保当前对话完全结束
@ -247,7 +252,8 @@ async function handleUserMessageWithBackend(
`请按照刚才的计划执行:${planTitle}`,
execPath,
"agent",
reuseTaskId // 复用 Plan 模式的 taskId
reuseTaskId, // 复用 Plan 模式的 taskId
savedServiceTier // 传递保存的服务等级
);
} catch (err) {
console.error("[MessageHandler] 自动执行计划失败:", err);
@ -400,9 +406,10 @@ export async function handlePlanAction(
panel: vscode.WebviewPanel,
action: string,
planTitle: string,
extensionPath: string
extensionPath: string,
serviceTier?: ServiceTier
): Promise<void> {
console.log("[handlePlanAction] action:", action, "planTitle:", planTitle);
console.log("[handlePlanAction] action:", action, "planTitle:", planTitle, "serviceTier:", serviceTier);
switch (action) {
case "confirm":
@ -416,7 +423,8 @@ export async function handlePlanAction(
panel,
`请按照刚才的计划执行:${planTitle}`,
extensionPath,
"agent"
"agent",
serviceTier
);
break;
@ -432,7 +440,8 @@ export async function handlePlanAction(
panel,
`请根据以下建议修改计划:${modification}`,
extensionPath,
"plan"
"plan",
serviceTier
);
}
break;

View File

@ -646,7 +646,8 @@ export function getPlanCardScript(): string {
vscode.postMessage({
command: 'planAction',
action: actionMap[option] || option,
planTitle: segment.planTitle
planTitle: segment.planTitle,
model: getCurrentModel()
});
});
});
@ -720,7 +721,8 @@ export function getPlanCardScript(): string {
vscode.postMessage({
command: 'planAction',
action: action,
planTitle: segment.planTitle
planTitle: segment.planTitle,
model: getCurrentModel()
});
});
});