fix: 修复 showPlan 工具交互逻辑和 JWT Token 问题

- 修复 pendingQuestions 缺失时无法提交回答的问题
- 添加 fallbackTaskId 参数支持直接发送到后端
- apiClient 自动获取 JWT Token
- 取消按钮改为中止对话而非发送消息

src/views/ICViewProvider.ts

@@ -1,5 +1,6 @@
 import * as vscode from "vscode";
 import { getWebviewContent } from "./webviewContent";
+import { isTokenExpired } from "../utils/jwtUtils";
 import {
   handleUserMessage,
   insertCodeToEditor,
@@ -138,7 +139,17 @@ export class ICViewProvider implements vscode.WebviewViewProvider {
   private async checkLoginStatus(): Promise<boolean> {
     try {
       const session = await vscode.authentication.getSession("iccoder", [], { createIfNone: false });
-      return !!session;
+      if (!session) {
+        return false;
+      }
+      // 检查 token 是否过期
+      const expired = isTokenExpired(session.accessToken);
+      // 如果已过期或无法判断（null），都认为未登录
+      if (expired === true || expired === null) {
+        console.log("Token 已过期或无法判断过期状态");
+        return false;
+      }
+      return true;
     } catch (error) {
       console.log("检查登录状态失败:", error);
       return false;

src/views/planCard.ts

@@ -150,24 +150,50 @@ export function getPlanCardStyles(): string {
     .plan-actions {
       display: flex;
       flex-direction: column;
-      gap: 10px;
+      gap: 12px;
       padding: 14px 16px;
       border-top: 1px solid var(--vscode-input-border);
       background: var(--vscode-sideBar-background);
     }
-    .plan-actions .question-options {
+    .plan-input-row {
       display: flex;
-      flex-wrap: wrap;
       gap: 8px;
+      width: 100%;
+    }
+    .plan-input {
+      flex: 1;
+      padding: 10px 12px;
+      background: var(--vscode-input-background);
+      color: var(--vscode-input-foreground);
+      border: 1px solid var(--vscode-input-border);
+      border-radius: 4px;
+      font-size: 13px;
+      box-sizing: border-box;
+    }
+    .plan-input:focus {
+      outline: none;
+      border-color: var(--vscode-focusBorder);
+    }
+    .plan-btn-row {
+      display: flex;
+      gap: 10px;
     }
     .plan-btn {
-      padding: 8px 18px;
+      padding: 8px 20px;
       border-radius: 4px;
       border: none;
       cursor: pointer;
-      font-size: 12px;
+      font-size: 13px;
       font-weight: 500;
     }
+    .plan-btn-submit {
+      background: var(--vscode-input-background);
+      color: var(--vscode-foreground);
+      border: 1px solid var(--vscode-input-border);
+    }
+    .plan-btn-submit:hover {
+      background: var(--vscode-list-hoverBackground);
+    }
     .plan-btn-confirm {
       background: var(--vscode-button-background);
       color: var(--vscode-button-foreground);
@@ -175,41 +201,26 @@ export function getPlanCardStyles(): string {
     .plan-btn-confirm:hover {
       background: var(--vscode-button-hoverBackground);
     }
-    .plan-btn-modify {
-      background: var(--vscode-input-background);
-      color: var(--vscode-foreground);
-      border: 1px solid var(--vscode-input-border);
-    }
     .plan-btn-cancel {
       background: transparent;
       color: var(--vscode-descriptionForeground);
-    }
-    .plan-actions .custom-input-container {
-      display: flex;
-      gap: 8px;
-      width: 100%;
-    }
-    .plan-actions .custom-input {
-      flex: 1;
-      padding: 8px 12px;
-      background: var(--vscode-input-background);
-      color: var(--vscode-input-foreground);
       border: 1px solid var(--vscode-input-border);
-      border-radius: 4px;
+    }
+    .plan-btn-cancel:hover {
+      background: var(--vscode-list-hoverBackground);
+    }
+    .plan-answered {
+      padding: 12px 16px;
+      border-top: 1px solid var(--vscode-input-border);
+      background: var(--vscode-sideBar-background);
       font-size: 13px;
     }
-    .plan-actions .custom-submit {
-      padding: 8px 18px;
-      background: var(--vscode-button-background);
-      color: var(--vscode-button-foreground);
-      border: none;
-      border-radius: 4px;
-      cursor: pointer;
-      font-size: 12px;
-      font-weight: 500;
+    .answered-label {
+      color: var(--vscode-descriptionForeground);
     }
-    .plan-actions .custom-submit:hover {
-      background: var(--vscode-button-hoverBackground);
+    .answered-value {
+      color: var(--vscode-textLink-foreground);
+      font-weight: 500;
     }
 
     /* 阶段进度条样式 */
@@ -597,16 +608,17 @@ export function getPlanCardScript(): string {
       // 兼容旧格式：渲染步骤列表
       const stepsHtml = !hasPhases ? renderPlanSteps(segment.planSteps || []) : '';
 
-      // 选项按钮
-      const options = ['确认执行', '修改计划', '取消'];
-      const optionsHtml = options.map(opt => {
-        const isSelected = isAnswered && opt === selectedAnswer;
-        return \`<button class="question-option\${isSelected ? ' selected' : ''}" data-option="\${opt}">\${opt}</button>\`;
-      }).join('');
-
       // 渲染 Markdown 格式的摘要
       const summaryHtml = renderPlanMarkdown(segment.planSummary || '');
 
+      // 已回答时显示用户的选择
+      const answeredHtml = isAnswered ? \`
+        <div class="plan-answered">
+          <span class="answered-label">已回复：</span>
+          <span class="answered-value">\${selectedAnswer}</span>
+        </div>
+      \` : '';
+
       segmentDiv.innerHTML = \`
         <div class="plan-card">
           <div class="plan-header">
@@ -618,59 +630,72 @@ export function getPlanCardScript(): string {
             <div class="plan-summary">\${summaryHtml}</div>
             \${hasPhases ? \`<div class="plan-phases">\${phasesHtml}</div>\` : \`<div class="plan-steps">\${stepsHtml}</div>\`}
           </div>
-          <div class="plan-actions">
-            <div class="question-options" data-ask-id="\${segment.askId}">\${optionsHtml}</div>
-            <div class="custom-input-container" style="display: \${isAnswered ? 'none' : 'flex'};">
-              <input type="text" class="custom-input" placeholder="输入修改建议..." />
-              <button class="custom-submit">提交</button>
+          <div class="plan-actions" data-ask-id="\${segment.askId}" style="display: \${isAnswered ? 'none' : 'flex'};">
+            <div class="plan-input-row">
+              <input type="text" class="plan-input" placeholder="输入修改建议..." />
+              <button class="plan-btn plan-btn-submit">提交修改</button>
+            </div>
+            <div class="plan-btn-row">
+              <button class="plan-btn plan-btn-confirm">确认执行</button>
+              <button class="plan-btn plan-btn-cancel">取消</button>
             </div>
           </div>
+          \${answeredHtml}
         </div>
       \`;
 
       // 只在未回答时添加事件监听
       if (!isAnswered) {
         setTimeout(() => {
-          const optionButtons = segmentDiv.querySelectorAll('.question-option');
-          optionButtons.forEach(btn => {
-            btn.addEventListener('click', function() {
-              const option = this.getAttribute('data-option');
-              // 发送答案到后端
-              handleQuestionAnswerInSegment(segment.askId, option, segmentDiv);
-              // 同时发送 planAction 用于模式切换
-              const actionMap = {
-                '确认执行': 'confirm',
-                '修改计划': 'modify',
-                '取消': 'cancel'
-              };
-              vscode.postMessage({
-                command: 'planAction',
-                action: actionMap[option] || option,
-                planTitle: segment.planTitle,
-                model: getCurrentModel()
-              });
-            });
-          });
+          const submitBtn = segmentDiv.querySelector('.plan-btn-submit');
+          const confirmBtn = segmentDiv.querySelector('.plan-btn-confirm');
+          const cancelBtn = segmentDiv.querySelector('.plan-btn-cancel');
+          const planInput = segmentDiv.querySelector('.plan-input');
 
-          const submitBtn = segmentDiv.querySelector('.custom-submit');
-          const customInput = segmentDiv.querySelector('.custom-input');
-          if (submitBtn && customInput) {
+          // 提交修改按钮
+          if (submitBtn && planInput) {
             submitBtn.addEventListener('click', function() {
-              const customValue = customInput.value.trim();
-              if (customValue) {
-                handleQuestionAnswerInSegment(segment.askId, customValue, segmentDiv);
+              const inputValue = planInput.value.trim();
+              if (inputValue) {
+                handleQuestionAnswerInSegment(segment.askId, inputValue, segmentDiv);
               }
             });
 
-            customInput.addEventListener('keypress', function(e) {
+            // 回车键提交修改
+            planInput.addEventListener('keypress', function(e) {
               if (e.key === 'Enter') {
-                const customValue = customInput.value.trim();
-                if (customValue) {
-                  handleQuestionAnswerInSegment(segment.askId, customValue, segmentDiv);
+                const inputValue = planInput.value.trim();
+                if (inputValue) {
+                  handleQuestionAnswerInSegment(segment.askId, inputValue, segmentDiv);
                 }
               }
             });
           }
+
+          // 确认执行按钮
+          if (confirmBtn) {
+            confirmBtn.addEventListener('click', function() {
+              handleQuestionAnswerInSegment(segment.askId, '确认执行', segmentDiv);
+            });
+          }
+
+          // 取消按钮 - 直接中止对话，不发送给智能体
+          if (cancelBtn) {
+            cancelBtn.addEventListener('click', function() {
+              // 标记问题已回答
+              answeredQuestions.set(segment.askId, '取消');
+              segmentDiv.classList.add('answered');
+
+              // 隐藏操作按钮
+              const actionsDiv = segmentDiv.querySelector('.plan-actions');
+              if (actionsDiv) {
+                actionsDiv.style.display = 'none';
+              }
+
+              // 发送中止对话命令
+              vscode.postMessage({ command: 'abortDialog' });
+            });
+          }
         }, 0);
       }
     }
@@ -703,30 +728,65 @@ export function getPlanCardScript(): string {
             <div class="plan-summary">\${summaryHtml}</div>
             \${hasPhases ? \`<div class="plan-phases">\${phasesHtml}</div>\` : \`<div class="plan-steps">\${stepsHtml}</div>\`}
           </div>
-          <div class="plan-actions">
-            <button class="plan-btn plan-btn-confirm" data-action="confirm">确认执行</button>
-            <button class="plan-btn plan-btn-modify" data-action="modify">修改计划</button>
-            <button class="plan-btn plan-btn-cancel" data-action="cancel">取消</button>
+          <div class="plan-actions" data-ask-id="\${segment.askId}">
+            <div class="plan-input-row">
+              <input type="text" class="plan-input" placeholder="输入修改建议..." />
+              <button class="plan-btn plan-btn-submit">提交修改</button>
+            </div>
+            <div class="plan-btn-row">
+              <button class="plan-btn plan-btn-confirm">确认执行</button>
+              <button class="plan-btn plan-btn-cancel">取消</button>
+            </div>
           </div>
         </div>
       \`;
 
-      // 绑定按钮事件
+      // 绑定按钮事件（静态渲染时也需要能响应）
       setTimeout(() => {
-        const planCard = segmentDiv.querySelector('.plan-card');
-        if (planCard) {
-          planCard.querySelectorAll('.plan-btn').forEach(btn => {
-            btn.addEventListener('click', (e) => {
-              const action = e.currentTarget?.dataset?.action;
+        const submitBtn = segmentDiv.querySelector('.plan-btn-submit');
+        const confirmBtn = segmentDiv.querySelector('.plan-btn-confirm');
+        const cancelBtn = segmentDiv.querySelector('.plan-btn-cancel');
+        const planInput = segmentDiv.querySelector('.plan-input');
+
+        // 提交修改按钮
+        if (submitBtn && planInput) {
+          submitBtn.addEventListener('click', function() {
+            const inputValue = planInput.value.trim();
+            if (inputValue) {
               vscode.postMessage({
-                command: 'planAction',
-                action: action,
-                planTitle: segment.planTitle,
-                model: getCurrentModel()
+                command: 'submitAnswer',
+                askId: segment.askId,
+                selected: [inputValue],
+                customInput: inputValue
               });
+            }
+          });
+        }
+
+        // 确认执行按钮
+        if (confirmBtn) {
+          confirmBtn.addEventListener('click', function() {
+            vscode.postMessage({
+              command: 'submitAnswer',
+              askId: segment.askId,
+              selected: ['确认执行'],
+              customInput: '确认执行'
             });
           });
         }
+
+        // 取消按钮 - 直接中止对话
+        if (cancelBtn) {
+          cancelBtn.addEventListener('click', function() {
+            // 隐藏操作按钮
+            const actionsDiv = segmentDiv.querySelector('.plan-actions');
+            if (actionsDiv) {
+              actionsDiv.style.display = 'none';
+            }
+            // 发送中止对话命令
+            vscode.postMessage({ command: 'abortDialog' });
+          });
+        }
       }, 0);
     }
   `;