feihong-code 7.2.0 → 7.6.0

package/dist/web/public/js/app.js

@@ -953,11 +953,12 @@
       const box = document.getElementById('messages');
       const el = document.createElement('div');
       el.className = 'msg ' + role;
-      if (extras.html) el.innerHTML = extras.html;
+      const actionsHtml = (typeof renderMsgActions === 'function') ? renderMsgActions() : '';
+      if (extras.html) el.innerHTML = actionsHtml + extras.html;
       else if (extras.file) {
-        el.innerHTML = '<span class="file-chip" data-path="' + escapeHtml(extras.file) + '" data-type="' + escapeHtml(extras.mime || 'file') + '">📎 ' + escapeHtml(extras.name) + '</span>';
+        el.innerHTML = actionsHtml + '<span class="file-chip" data-path="' + escapeHtml(extras.file) + '" data-type="' + escapeHtml(extras.mime || 'file') + '">📎 ' + escapeHtml(extras.name) + '</span>';
       } else {
-        el.innerHTML = linkifyArtifacts(text);
+        el.innerHTML = actionsHtml + linkifyArtifacts(text);
       }
       box.appendChild(el);
       box.scrollTop = box.scrollHeight;
@@ -1178,142 +1179,164 @@
     });
 
 
-    // 截图锁，防止重复触发
-    let screenshotRunning = false;
+    // ========== 截图功能（极简重写版） ==========
+    let _screenshotBusy = false;
 
     async function takeScreenshot() {
-      if (screenshotRunning) {
-        toast('正在截图中，请稍候...');
-        return;
-      }
-      screenshotRunning = true;
+      if (_screenshotBusy) { toast('正在截图中，按 ESC 可取消'); return; }
+      _screenshotBusy = true;
+
+      const overlay = document.getElementById('cropOverlay');
+      const selection = document.getElementById('cropSelection');
+      let stream = null;
+      let cleanup = null;
+
       try {
-        const overlay = document.getElementById('cropOverlay');
-        const selection = document.getElementById('cropSelection');
-        const video = document.getElementById('cropVideo');
-
-        let srcImage = null; // 用于裁剪的源图像（Image 对象）
-        let stream = null;   // 浏览器模式下的视频流
-
-        // Electron 环境：用主进程截图，更稳定
-        if (window.isElectron && window.electronAPI && window.electronAPI.screenshot) {
-          toast('正在截取屏幕...');
-          const result = await window.electronAPI.screenshot.capture();
-          if (!result || !result.success) {
-            toast('截图失败：' + (result?.error || '未知错误'));
-            return;
-          }
-          // 加载截图为 Image 对象
-          srcImage = new Image();
-          srcImage.src = result.dataUrl;
-          await new Promise((resolve, reject) => {
-            srcImage.onload = resolve;
-            srcImage.onerror = () => reject(new Error('截图加载失败'));
-          });
-          // 把截图显示到 video 元素的位置（用一个 img 覆盖）
-          video.style.display = 'none';
-          let bgImg = document.getElementById('cropBgImg');
-          if (!bgImg) {
-            bgImg = document.createElement('img');
-            bgImg.id = 'cropBgImg';
-            bgImg.style.cssText = 'position:fixed;top:0;left:0;width:100vw;height:100vh;object-fit:cover;z-index:9998;';
-            overlay.appendChild(bgImg);
-          }
-          bgImg.src = result.dataUrl;
-          bgImg.style.display = 'block';
-        } else {
-          // 浏览器模式：用 getDisplayMedia
-          stream = await navigator.mediaDevices.getDisplayMedia({ video: true });
-          video.srcObject = stream;
-          await video.play();
-          video.style.display = 'block';
-          const bgImg = document.getElementById('cropBgImg');
-          if (bgImg) bgImg.style.display = 'none';
-        }
+        // 1. 获取屏幕共享流（请求高分辨率）
+        toast('请选择要截取的屏幕或窗口...');
+        stream = await navigator.mediaDevices.getDisplayMedia({
+          video: { width: { ideal: 3840 }, height: { ideal: 2160 }, frameRate: { ideal: 30 } }
+        });
 
+        // 2. 用 video 播放流，等待元数据加载完成（确保 videoWidth/Height 有效）
+        const video = document.createElement('video');
+        video.style.display = 'none';
+        video.srcObject = stream;
+        video.muted = true;
+        await new Promise((resolve, reject) => {
+          video.onloadedmetadata = () => { video.play().then(resolve).catch(reject); };
+          video.onerror = () => reject(new Error('视频加载失败'));
+          setTimeout(() => reject(new Error('视频加载超时')), 5000);
+        });
+
+        const vw = video.videoWidth, vh = video.videoHeight;
+        if (!vw || !vh) throw new Error('屏幕画面尺寸无效');
+
+        // 3. 隐藏当前页面，避免截到自己（抓帧后立即恢复）
+        const docEl = document.documentElement;
+        const prevVis = docEl.style.visibility;
+        docEl.style.visibility = 'hidden';
+        await new Promise(r => requestAnimationFrame(r));
+        await new Promise(r => setTimeout(r, 200));
+
+        // 4. canvas 抓帧
+        const capCanvas = document.createElement('canvas');
+        capCanvas.width = vw; capCanvas.height = vh;
+        capCanvas.getContext('2d').drawImage(video, 0, 0, vw, vh);
+        const fullDataUrl = capCanvas.toDataURL('image/png');
+
+        // 5. 停止流 + 恢复页面
+        stream.getTracks().forEach(t => t.stop());
+        stream = null;
+        docEl.style.visibility = prevVis;
+
+        // 6. 加载为 Image 对象供裁剪
+        const srcImg = new Image();
+        srcImg.src = fullDataUrl;
+        await new Promise((resolve, reject) => {
+          srcImg.onload = resolve;
+          srcImg.onerror = () => reject(new Error('截图加载失败'));
+        });
+
+        // 7. 显示裁剪 overlay
+        let bgImg = document.getElementById('cropBgImg');
+        if (!bgImg) {
+          bgImg = document.createElement('img');
+          bgImg.id = 'cropBgImg';
+          bgImg.style.cssText = 'position:fixed;inset:0;width:100vw;height:100vh;object-fit:scale-down;object-position:center;background:#000;z-index:9998;pointer-events:none;';
+          overlay.appendChild(bgImg);
+        }
+        bgImg.src = fullDataUrl;
+        bgImg.style.display = 'block';
         overlay.style.display = 'block';
         selection.style.display = 'none';
-        let startX = 0, startY = 0, drawing = false;
-
-        const onDown = (e) => {
-          drawing = true;
-          startX = e.clientX; startY = e.clientY;
-          selection.style.display = 'block';
-          selection.style.left = startX + 'px';
-          selection.style.top = startY + 'px';
-          selection.style.width = '0px';
-          selection.style.height = '0px';
-        };
-        const onMove = (e) => {
-          if (!drawing) return;
-          const x = Math.min(e.clientX, startX), y = Math.min(e.clientY, startY);
-          const w = Math.abs(e.clientX - startX), h = Math.abs(e.clientY - startY);
-          selection.style.left = x + 'px';
-          selection.style.top = y + 'px';
-          selection.style.width = w + 'px';
-          selection.style.height = h + 'px';
-        };
-        const finish = async (e) => {
-          if (!drawing) return;
-          drawing = false;
-          window.removeEventListener('mousedown', onDown);
-          window.removeEventListener('mousemove', onMove);
-          window.removeEventListener('mouseup', finish);
-          const x = Math.min(e.clientX, startX), y = Math.min(e.clientY, startY);
-          const w = Math.abs(e.clientX - startX), h = Math.abs(e.clientY - startY);
-          overlay.style.display = 'none';
-          if (w < 8 || h < 8) {
-            if (stream) stream.getTracks().forEach((t) => t.stop());
-            return;
-          }
-          try {
-            let srcW, srcH, source;
-            if (srcImage) {
-              // Electron 模式：从 Image 裁剪
-              srcW = srcImage.naturalWidth;
-              srcH = srcImage.naturalHeight;
-              source = srcImage;
-            } else {
-              // 浏览器模式：从 video 裁剪
-              srcW = video.videoWidth;
-              srcH = video.videoHeight;
-              source = video;
-            }
-            const scaleX = srcW / window.innerWidth, scaleY = srcH / window.innerHeight;
-            const sx = Math.round(x * scaleX), sy = Math.round(y * scaleY);
-            const sw = Math.round(w * scaleX), sh = Math.round(h * scaleY);
-            const canvas = document.createElement('canvas');
-            canvas.width = sw; canvas.height = sh;
-            canvas.getContext('2d').drawImage(source, sx, sy, sw, sh, 0, 0, sw, sh);
-            if (stream) stream.getTracks().forEach((t) => t.stop());
-            const dataUrl = canvas.toDataURL('image/png');
-            stageFile({ name: 'screenshot.png', mime: 'image/png', dataUrl });
-            toast('截图已添加到输入框，可直接输入文字发送');
-          } catch (err) { toast('截图失败：' + err.message); }
-          screenshotRunning = false;
-        };
-        const onKey = (e) => {
-          if (e.key === 'Escape') {
-            overlay.style.display = 'none';
-            if (stream) stream.getTracks().forEach((t) => t.stop());
+
+        // 8. 等待用户拖拽选择区域
+        const result = await new Promise((resolve) => {
+          let sx = 0, sy = 0, dragging = false;
+
+          const onDown = (e) => {
+            dragging = true;
+            sx = e.clientX; sy = e.clientY;
+            selection.style.display = 'block';
+            selection.style.left = sx + 'px';
+            selection.style.top = sy + 'px';
+            selection.style.width = '0px';
+            selection.style.height = '0px';
+          };
+          const onMove = (e) => {
+            if (!dragging) return;
+            const x = Math.min(e.clientX, sx), y = Math.min(e.clientY, sy);
+            const w = Math.abs(e.clientX - sx), h = Math.abs(e.clientY - sy);
+            selection.style.left = x + 'px';
+            selection.style.top = y + 'px';
+            selection.style.width = w + 'px';
+            selection.style.height = h + 'px';
+          };
+          const onUp = (e) => {
+            if (!dragging) return;
+            dragging = false;
+            const x = Math.min(e.clientX, sx), y = Math.min(e.clientY, sy);
+            const w = Math.abs(e.clientX - sx), h = Math.abs(e.clientY - sy);
+            cleanup();
+            if (w < 10 || h < 10) { resolve(null); return; }
+            resolve({ x, y, w, h });
+          };
+          const onKey = (e) => {
+            if (e.key === 'Escape') { cleanup(); resolve(null); }
+          };
+
+          cleanup = () => {
             window.removeEventListener('mousedown', onDown);
             window.removeEventListener('mousemove', onMove);
-            window.removeEventListener('mouseup', finish);
+            window.removeEventListener('mouseup', onUp);
             window.removeEventListener('keydown', onKey);
-            screenshotRunning = false;
-          }
-        };
-        window.addEventListener('mousedown', onDown);
-        window.addEventListener('mousemove', onMove);
-        window.addEventListener('mouseup', finish);
-        window.addEventListener('keydown', onKey);
-      } catch (e) {
-        if (e.name === 'NotAllowedError') {
-          toast('已取消截图。也可以用 Win+Shift+S 截图后直接粘贴到输入框');
+            overlay.style.display = 'none';
+            selection.style.display = 'none';
+          };
+
+          window.addEventListener('mousedown', onDown);
+          window.addEventListener('mousemove', onMove);
+          window.addEventListener('mouseup', onUp);
+          window.addEventListener('keydown', onKey);
+        });
+
+        // 9. 用户取消
+        if (!result) {
+          toast('已取消截图');
+          _screenshotBusy = false;
+          return;
+        }
+
+        // 10. 裁剪选中区域
+        const scaleX = srcImg.naturalWidth / window.innerWidth;
+        const scaleY = srcImg.naturalHeight / window.innerHeight;
+        const cropCanvas = document.createElement('canvas');
+        cropCanvas.width = Math.round(result.w * scaleX);
+        cropCanvas.height = Math.round(result.h * scaleY);
+        cropCanvas.getContext('2d').drawImage(
+          srcImg,
+          Math.round(result.x * scaleX), Math.round(result.y * scaleY),
+          Math.round(result.w * scaleX), Math.round(result.h * scaleY),
+          0, 0, cropCanvas.width, cropCanvas.height
+        );
+        const croppedUrl = cropCanvas.toDataURL('image/png');
+
+        // 11. 添加到输入框
+        stageFile({ name: 'screenshot.png', mime: 'image/png', dataUrl: croppedUrl });
+        toast('截图已添加到输入框');
+      } catch (err) {
+        if (err.name === 'NotAllowedError') {
+          toast('已取消截图。也可用 Win+Shift+S 截图后粘贴');
         } else {
-          toast('截图失败：' + e.message);
+          console.error('[screenshot] 失败:', err);
+          toast('截图失败：' + err.message);
         }
-        screenshotRunning = false;
+        if (stream) { try { stream.getTracks().forEach(t => t.stop()); } catch(e){} }
+        if (cleanup) { try { cleanup(); } catch(e){} }
+        else { overlay.style.display = 'none'; selection.style.display = 'none'; }
+      } finally {
+        _screenshotBusy = false;
       }
     }
 

package/dist/web/public/js/mock-api.js

@@ -12,6 +12,22 @@
  */
 (function () {
   if (window.__feihongMockInstalled) return;
+
+  // ========== 环境检测：仅在安卓离线模式下激活 Mock ==========
+  // Web 控制台通过 http://localhost:8080 加载，有真实 Node.js 后端，不应拦截 fetch。
+  // 安卓 WebView 通过 file:// 或 content:// 加载本地 HTML，无后端，才需要 Mock。
+  var proto = (location.protocol || '').toLowerCase();
+  var isAndroid = /android/i.test(navigator.userAgent || '');
+  var isLocalFile = proto === 'file:' || proto === 'content:';
+  // 仅在「安卓 + 本地文件协议」下激活 Mock；其他情况（Web 控制台、远程服务器）直接放行
+  if (!(isAndroid && isLocalFile)) {
+    console.log('[MockAPI] 检测到 HTTP 环境，跳过 Mock 拦截（mode=passthrough）');
+    window.__feihongMockInstalled = true;
+    window.FeiHongApp = window.FeiHongApp || {};
+    window.FeiHongApp.isMock = function () { return false; };
+    return;
+  }
+
   window.__feihongMockInstalled = true;
 
   // ========== 远程服务器配置 ==========
@@ -70,6 +86,15 @@
       return ok({ product: '飞虹 Code', version: '7.0.0', enterprise: true, signature: '安卓版 · 离线演示模式', mode: 'mock', time: new Date().toISOString() });
     }
 
+    // 安全：加密公钥（Mock 模式下返回固定测试公钥，仅供前端加密流程演示）
+    if (lower === '/api/security/public-key') {
+      return ok({
+        ok: true,
+        publicKey: '-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmock-public-key-for-demo-only\n-----END PUBLIC KEY-----',
+        algorithm: 'RSA-OAEP-2048-SHA256'
+      });
+    }
+
     // 模型
     if (lower === '/api/models' && method === 'GET') return ok({ models: MODELS });
     if (lower === '/api/models' && method === 'POST') {

package/dist/web/public/js/monaco-editor.js

@@ -10,9 +10,15 @@
   let monacoInstance = null;
   let initPromise = null;
   const editors = new Map(); // containerId -> editor instance
+  let activeEditor = null; // 最近创建的编辑器（供 lint/诊断反馈定位）
   let inlineCompletionProvider = null;
   let completionItemProvider = null;
 
+  /** 获取当前活跃编辑器（P6-1 lint 反馈定位） */
+  function getActiveEditor() {
+    return activeEditor;
+  }
+
   /** 根据文件扩展名推断 Monaco language id */
   function detectLanguage(filePath) {
     const ext = filePath.split('.').pop().toLowerCase();
@@ -98,6 +104,7 @@
 
     const key = el.id || container;
     editors.set(key, editor);
+    activeEditor = editor; // P6-1: 记录最近活跃编辑器供 lint 反馈定位
     return editor;
   }
 
@@ -121,11 +128,18 @@
    * 注册内联补全 Provider（ghost text，Tab 接受）
    * @param {function} fetchFn - 异步补全函数，参数 {filePath, content, offset}，返回 {text: string}
    */
-  function registerInlineCompletions(fetchFn) {
+  /**
+   * 注册行内补全 Provider（ghost text）
+   * @param {function} fetchFn - 异步补全函数，参数 {filePath, content, offset, token}，返回 {text} 或 null
+   * @param {{getActiveEditor?:function, onAccept?:function}} [opts] - P6-1: getActiveEditor 取当前编辑器；onAccept 在补全被接受（插入）时回调插入文本
+   */
+  function registerInlineCompletions(fetchFn, opts) {
+    const o = opts || {};
     initMonaco().then((monaco) => {
       if (inlineCompletionProvider) {
         inlineCompletionProvider.dispose();
       }
+      let lastText = '';
       inlineCompletionProvider = monaco.languages.registerInlineCompletionsProvider('*', {
         provideInlineCompletions: async function (model, position, context, token) {
           try {
@@ -139,6 +153,7 @@
               insertText: result.text,
               filterText: result.text.slice(0, 20),
             };
+            lastText = result.text;
             return { items: [item] };
           } catch (e) {
             return { items: [] };
@@ -146,6 +161,28 @@
         },
         freeInlineCompletions: function () {},
       });
+
+      // P6-1: accept 检测——编辑器内容变化且插入文本匹配最近补全 → onAccept(插入文本)
+      const bindAccept = function () {
+        const editor = typeof o.getActiveEditor === 'function' ? o.getActiveEditor() : null;
+        if (!editor || editor.__fhInlineAcceptBound) return;
+        editor.__fhInlineAcceptBound = true;
+        editor.onDidChangeModelContent((e) => {
+          if (!lastText) return;
+          for (const ch of e.changes || []) {
+            const ins = ch.text || '';
+            if (ins && (ins.startsWith(lastText) || lastText.startsWith(ins))) {
+              const accepted = ins.length >= lastText.length ? ins : lastText;
+              if (typeof o.onAccept === 'function') {
+                try { o.onAccept(accepted); } catch { /* lint 回调失败不阻塞编辑 */ }
+              }
+              lastText = '';
+              break;
+            }
+          }
+        });
+      };
+      bindAccept();
     });
   }
 
@@ -190,6 +227,126 @@
     });
   }
 
+  /**
+   * 注册语义诊断 Provider（P4-2：编辑时错误波浪线）
+   * @param {function} fetchFn - 异步诊断函数，参数 {filePath, content}，返回 [{line, column, endLine, endColumn, message, severity}]
+   * @param {function} [getEditor] - 获取当前编辑器实例（默认遍历已注册编辑器）
+   */
+  function registerDiagnostics(fetchFn, getActiveEditor) {
+    initMonaco().then((monaco) => {
+      // P5-2: 诊断 hover 提示——hover 到有 marker 的行时展示错误/警告详情
+      const langSet = [
+        'typescript', 'javascript', 'json', 'markdown', 'html', 'css', 'scss', 'less',
+        'python', 'java', 'c', 'cpp', 'csharp', 'go', 'rust', 'php', 'ruby', 'swift',
+        'kotlin', 'scala', 'shell', 'sql', 'yaml', 'xml', 'protobuf', 'dockerfile',
+        'ini', 'plaintext',
+      ];
+      const hoverDisp = monaco.languages.registerHoverProvider(langSet, {
+        provideHover(model, position) {
+          let editor;
+          try { editor = typeof getActiveEditor === 'function' ? getActiveEditor() : null; } catch { editor = null; }
+          if (!editor || editor.isDisposed?.()) return null;
+          const cur = editor.getModel();
+          if (!cur || model.uri.toString() !== cur.uri.toString()) return null;
+          const markers = monaco.editor.getModelMarkers({ resource: model.uri })
+            .filter((x) => x.startLineNumber <= position.lineNumber && position.lineNumber <= x.endLineNumber);
+          if (markers.length === 0) return null;
+          const md = markers.map((x) => {
+            const sevName = x.severity === monaco.MarkerSeverity.Error ? '错误' : x.severity === monaco.MarkerSeverity.Warning ? '警告' : '提示';
+            const icon = x.severity === monaco.MarkerSeverity.Error ? '⛔' : x.severity === monaco.MarkerSeverity.Warning ? '⚠️' : 'ℹ️';
+            return '**' + icon + ' ' + sevName + '** (L' + x.startLineNumber + ':' + x.startColumn + ')  \n' + x.message;
+          }).join('\n\n---\n\n');
+          return {
+            contents: [{ value: '#### 飞虹 Code 诊断\n\n' + md, isTrusted: true }],
+            range: new monaco.Range(position.lineNumber, 1, position.lineNumber, 1),
+          };
+        },
+      });
+      hoverDisp; // 引用保持存活（Monaco 内部维护）
+
+      // 防抖 + 单飞，避免编辑时高频请求
+      let timer = null;
+      let inflight = false;
+      let queued = false;
+      const run = async function () {
+        if (inflight) { queued = true; return; }
+        const editor = typeof getActiveEditor === 'function' ? getActiveEditor() : null;
+        if (!editor || editor.isDisposed?.()) return;
+        const model = editor.getModel();
+        if (!model) return;
+        inflight = true;
+        try {
+          const filePath = model.uri.path || 'untitled';
+          const content = model.getValue();
+          const result = await fetchFn({ filePath, content });
+          if (!result || !Array.isArray(result.diagnostics)) {
+            monaco.editor.setModelMarkers(model, 'fhcode', []);
+            return;
+          }
+          const markers = result.diagnostics.map((d) => {
+            const sev = d.severity === 1 || d.severity === 'error'
+              ? monaco.MarkerSeverity.Error
+              : d.severity === 2 || d.severity === 'warning'
+                ? monaco.MarkerSeverity.Warning
+                : monaco.MarkerSeverity.Info;
+            return {
+              severity: sev,
+              message: d.message || '',
+              startLineNumber: d.line ?? 1,
+              startColumn: d.column ?? 1,
+              endLineNumber: d.endLine ?? (d.line ?? 1),
+              endColumn: d.endColumn ?? (d.column ?? 1) + (d.message?.length || 8),
+            };
+          });
+          monaco.editor.setModelMarkers(model, 'fhcode', markers);
+        } catch {
+          /* 诊断失败静默（不阻塞编辑） */
+        } finally {
+          inflight = false;
+          if (queued) { queued = false; timer = setTimeout(run, 200); }
+        }
+      };
+      const schedule = function () {
+        clearTimeout(timer);
+        timer = setTimeout(run, 350);
+      };
+      // 绑定现有编辑器（createEditor 后由 ui 层调用 attachDiagnostics 触发监听）
+      const editor = typeof getActiveEditor === 'function' ? getActiveEditor() : null;
+      if (editor && !editor.__fhDiagnosticsBound) {
+        editor.__fhDiagnosticsBound = true;
+        editor.onDidChangeModelContent(schedule);
+        editor.onDidChangeModel(() => schedule());
+      }
+      return { run, schedule };
+    });
+  }
+
+  /**
+   * P6-1: 补全接受后的 lint 反馈——把 /api/lint 结果追加为编辑器波浪线（owner: fhcode-lint）
+   * @param {Array} issues - [{severity, line, column, message}]
+   */
+  function showLintFeedback(issues) {
+    initMonaco().then((monaco) => {
+      const editor = activeEditor;
+      if (!editor || editor.isDisposed?.()) return;
+      const model = editor.getModel();
+      if (!model) return;
+      if (!Array.isArray(issues) || issues.length === 0) {
+        monaco.editor.setModelMarkers(model, 'fhcode-lint', []);
+        return;
+      }
+      const markers = issues.map((d) => ({
+        severity: d.severity === 1 ? monaco.MarkerSeverity.Error : d.severity === 2 ? monaco.MarkerSeverity.Warning : monaco.MarkerSeverity.Info,
+        message: '补全校验：' + (d.message || ''),
+        startLineNumber: d.line ?? 1,
+        startColumn: d.column ?? 1,
+        endLineNumber: d.line ?? 1,
+        endColumn: (d.column ?? 1) + (d.message?.length || 20),
+      }));
+      monaco.editor.setModelMarkers(model, 'fhcode-lint', markers);
+    });
+  }
+
   /** 暴露全局 API */
   global.FHMonaco = {
     init: initMonaco,
@@ -197,7 +354,10 @@
     getEditor: getEditor,
     disposeEditor: disposeEditor,
     detectLanguage: detectLanguage,
+    getActiveEditor: getActiveEditor,
     registerInlineCompletions: registerInlineCompletions,
     registerCompletionItems: registerCompletionItems,
+    registerDiagnostics: registerDiagnostics,
+    showLintFeedback: showLintFeedback,
   };
 })(window);