Skip to content

Commit 44cca5f

Browse files
saynowordKomachiSion
authored andcommitted
[ISSUE #15435] Improve next console AI resource version diff (#15436)
* Refine skill diff and resource editing * Add prompt version diff * Sync next console static assets # Conflicts: # console/src/main/resources/static/next/css/main3.css # console/src/main/resources/static/next/js/FileTreePanel.js # console/src/main/resources/static/next/js/index28.js # console/src/main/resources/static/next/js/index29.js # console/src/main/resources/static/next/js/index32.js # console/src/main/resources/static/next/js/index33.js # console/src/main/resources/static/next/js/index34.js # console/src/main/resources/static/next/js/index35.js # console/src/main/resources/static/next/js/main.js # console/src/main/resources/static/next/js/skill-store.js # console/src/main/resources/static/next/js/vendor-icons.js * Handle non-text skill version diffs * Refine AI resource diff interactions * Fix AI resource file tree rename prop * Sync next console static assets * Sync next console static assets (cherry picked from commit 5db14e3)
1 parent dfd215a commit 44cca5f

87 files changed

Lines changed: 2007 additions & 335 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
import { describe, expect, it } from 'vitest';
2+
3+
import { prepareSkillMarkdownPreview } from '../markdown-utils';
4+
5+
describe('prepareSkillMarkdownPreview', () => {
6+
it('converts equals title blocks to markdown headings', () => {
7+
const source = [
8+
'你必须严格遵循以下流程:',
9+
'==========================',
10+
'1. 问题本质(What)',
11+
'==========================',
12+
'用一句话描述这个问题的真实目标',
13+
].join('\n');
14+
15+
expect(prepareSkillMarkdownPreview(source)).toBe([
16+
'你必须严格遵循以下流程:',
17+
'## 1. 问题本质(What)',
18+
'用一句话描述这个问题的真实目标',
19+
].join('\n'));
20+
});
21+
22+
it('escapes a leftover standalone equals divider', () => {
23+
const source = [
24+
'你必须严格遵循以下流程:',
25+
'==========================',
26+
].join('\n');
27+
28+
expect(prepareSkillMarkdownPreview(source)).toBe([
29+
'你必须严格遵循以下流程:',
30+
'\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=',
31+
].join('\n'));
32+
});
33+
34+
it('keeps equals lines inside fenced code blocks unchanged', () => {
35+
const source = [
36+
'```text',
37+
'==========================',
38+
'```',
39+
'==========================',
40+
].join('\n');
41+
42+
expect(prepareSkillMarkdownPreview(source)).toBe([
43+
'```text',
44+
'==========================',
45+
'```',
46+
'\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=\\=',
47+
].join('\n'));
48+
});
49+
});

‎console-ui-next/src/lib/markdown-utils.ts‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,59 @@ export function hasNonFrontmatterMarkdownBody(md: string): boolean {
1212
return stripFrontmatter(md || '').trim().length > 0;
1313
}
1414

15+
/**
16+
* Skill docs often use "=" blocks as prompt section titles:
17+
*
18+
* ========================
19+
* 1. Section
20+
* ========================
21+
*
22+
* Markdown interprets the closing line as a Setext H1 marker. Convert the
23+
* block to an ATX heading for preview only, leaving the saved content intact.
24+
*/
25+
export function prepareSkillMarkdownPreview(md: string): string {
26+
let fenceChar = '';
27+
let fenceLength = 0;
28+
const lines = (md || '').split(/\r?\n/);
29+
const result: string[] = [];
30+
31+
for (let i = 0; i < lines.length; i += 1) {
32+
const line = lines[i];
33+
const trimmed = line.trim();
34+
const fenceMatch = trimmed.match(/^(`{3,}|~{3,})/);
35+
if (fenceMatch) {
36+
const marker = fenceMatch[1];
37+
const markerChar = marker[0];
38+
if (!fenceChar) {
39+
fenceChar = markerChar;
40+
fenceLength = marker.length;
41+
} else if (markerChar === fenceChar && marker.length >= fenceLength) {
42+
fenceChar = '';
43+
fenceLength = 0;
44+
}
45+
result.push(line);
46+
continue;
47+
}
48+
49+
if (!fenceChar && /^={3,}$/.test(trimmed)) {
50+
const title = lines[i + 1]?.trim();
51+
const closing = lines[i + 2]?.trim();
52+
if (title && closing && /^={3,}$/.test(closing)) {
53+
result.push(`## ${title}`);
54+
i += 2;
55+
continue;
56+
}
57+
58+
result.push(line.replace(/=/g, '\\='));
59+
continue;
60+
}
61+
62+
result.push(line);
63+
}
64+
65+
return result.join('\n');
66+
}
67+
1568
const FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---/;
1669

1770
/**

‎console-ui-next/src/locales/en-US.json‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,16 @@
649649
"version": "Version",
650650
"latestVersion": "Latest",
651651
"template": "Template",
652+
"versionDiff": "Version Diff",
653+
"diffBeforeVersion": "Base version",
654+
"diffAfterVersion": "Target version",
655+
"diffSelectVersionPlaceholder": "Select version",
656+
"diffSwapVersions": "Swap versions",
657+
"diffModifiedContent": "Modified content",
658+
"diffTemplateFile": "Template",
659+
"diffSelectVersions": "Select a base version and target version to compare",
660+
"diffNoChanges": "No template changes between these versions",
661+
"diffSameVersion": "Select two different versions to compare",
652662
"variables": "Variables",
653663
"variableName": "Variable Name",
654664
"variableDefault": "Default Value",
@@ -955,6 +965,12 @@
955965
"deleteNode": "Delete {{name}}",
956966
"createFileIn": "New file in {{name}}",
957967
"createFolderIn": "New folder in {{name}}",
968+
"resourceRenameFile": "Rename file",
969+
"resourceCopyFile": "Copy file content",
970+
"resourceDownloadFile": "Download file",
971+
"resourceDeleteFile": "Delete file",
972+
"resourceCopySuccess": "File content copied",
973+
"resourceCopyFailed": "Failed to copy file content",
958974
"createFile": "Create File",
959975
"createFolder": "Create Folder",
960976
"createFileDesc": "Enter a file path and choose the resource type.",
@@ -1121,6 +1137,29 @@
11211137
"skillMd": "SKILL.md",
11221138
"resources": "Resources",
11231139
"noResources": "No resources",
1140+
"resourceRenameFile": "Rename file",
1141+
"resourceCopyFile": "Copy file content",
1142+
"resourceDownloadFile": "Download file",
1143+
"resourceDeleteFile": "Delete file",
1144+
"resourceCopySuccess": "File content copied",
1145+
"resourceCopyFailed": "Failed to copy file content",
1146+
"versionDiff": "Version Diff",
1147+
"diffBeforeVersion": "Base version",
1148+
"diffAfterVersion": "Target version",
1149+
"diffSelectVersionPlaceholder": "Select version",
1150+
"diffSwapVersions": "Swap versions",
1151+
"diffAddedFiles": "Added files",
1152+
"diffRemovedFiles": "Removed files",
1153+
"diffModifiedFiles": "Modified files",
1154+
"diffChangedFiles": "Changed files",
1155+
"diffSelectVersions": "Select a base version and target version to compare",
1156+
"diffNoChanges": "No file changes between these versions",
1157+
"diffSameVersion": "Select two different versions to compare",
1158+
"diffTextUnsupported": "Text diff is not available for this file",
1159+
"diffTextUnsupportedDesc": "Images, presentations, archives, and similar files cannot be compared as text. Only the version change status is shown.",
1160+
"diffStatusAdded": "Added",
1161+
"diffStatusRemoved": "Removed",
1162+
"diffStatusModified": "Modified",
11241163
"resourceName": "Resource Name",
11251164
"resourceType": "Resource Type",
11261165
"resourceContent": "Content",
@@ -1239,7 +1278,6 @@
12391278
"commitMsg": "Version commit message",
12401279
"commitMsgPlaceholder": "Optional: describe what changed in this draft version",
12411280
"commitMsgHint": "This is stored on the draft version only (shown in version history). It is not the skill description above.",
1242-
"commitMsgEditHint": "Set the version commit message in Basic info (right panel on large screens, above on small screens).",
12431281
"toggleEnable": "Enable/Disable Skill",
12441282
"pipelineStatus": "Review Pipeline",
12451283
"pipelineInProgress": "In Progress",
@@ -1324,7 +1362,7 @@
13241362
"streamContent": "Stream Output",
13251363
"selectResource": "Select a file to view its content",
13261364
"editMode": "Edit Mode",
1327-
"binaryFileHint": "This file is in binary format and cannot be previewed here",
1365+
"binaryFileHint": "Preview is not supported for this file",
13281366
"imagePreviewUnavailable": "Unable to preview this image file"
13291367
}
13301368
}

‎console-ui-next/src/locales/zh-CN.json‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,16 @@
649649
"version": "版本号",
650650
"latestVersion": "最新版本",
651651
"template": "模板内容",
652+
"versionDiff": "版本 Diff",
653+
"diffBeforeVersion": "基准版本",
654+
"diffAfterVersion": "目标版本",
655+
"diffSelectVersionPlaceholder": "请选择版本",
656+
"diffSwapVersions": "交换对比版本",
657+
"diffModifiedContent": "修改内容",
658+
"diffTemplateFile": "模板内容",
659+
"diffSelectVersions": "请选择基准版本和目标版本进行对比",
660+
"diffNoChanges": "两个版本没有模板内容差异",
661+
"diffSameVersion": "请选择两个不同版本进行对比",
652662
"variables": "变量列表",
653663
"variableName": "变量名",
654664
"variableDefault": "默认值",
@@ -955,6 +965,12 @@
955965
"deleteNode": "删除 {{name}}",
956966
"createFileIn": "在 {{name}} 中新建文件",
957967
"createFolderIn": "在 {{name}} 中新建文件夹",
968+
"resourceRenameFile": "重命名文件",
969+
"resourceCopyFile": "复制文件内容",
970+
"resourceDownloadFile": "下载文件",
971+
"resourceDeleteFile": "删除文件",
972+
"resourceCopySuccess": "文件内容已复制",
973+
"resourceCopyFailed": "复制文件内容失败",
958974
"createFile": "创建文件",
959975
"createFolder": "创建文件夹",
960976
"createFileDesc": "输入文件路径并选择资源类型。",
@@ -1121,6 +1137,29 @@
11211137
"skillMd": "SKILL.md",
11221138
"resources": "资源文件",
11231139
"noResources": "暂无资源",
1140+
"resourceRenameFile": "重命名文件",
1141+
"resourceCopyFile": "复制文件内容",
1142+
"resourceDownloadFile": "下载文件",
1143+
"resourceDeleteFile": "删除文件",
1144+
"resourceCopySuccess": "文件内容已复制",
1145+
"resourceCopyFailed": "复制文件内容失败",
1146+
"versionDiff": "版本 Diff",
1147+
"diffBeforeVersion": "基准版本",
1148+
"diffAfterVersion": "目标版本",
1149+
"diffSelectVersionPlaceholder": "请选择版本",
1150+
"diffSwapVersions": "交换对比版本",
1151+
"diffAddedFiles": "新增文件",
1152+
"diffRemovedFiles": "删除文件",
1153+
"diffModifiedFiles": "修改文件",
1154+
"diffChangedFiles": "变更文件",
1155+
"diffSelectVersions": "请选择基准版本和目标版本进行对比",
1156+
"diffNoChanges": "两个版本没有文件差异",
1157+
"diffSameVersion": "请选择两个不同版本进行对比",
1158+
"diffTextUnsupported": "该文件不支持文本 Diff",
1159+
"diffTextUnsupportedDesc": "图片、PPT、压缩包等文件无法以文本方式对比,当前仅展示版本间的变更状态。",
1160+
"diffStatusAdded": "新增",
1161+
"diffStatusRemoved": "删除",
1162+
"diffStatusModified": "修改",
11241163
"resourceName": "资源名称",
11251164
"resourceType": "资源类型",
11261165
"resourceContent": "内容",
@@ -1239,7 +1278,6 @@
12391278
"commitMsg": "版本提交说明",
12401279
"commitMsgPlaceholder": "可选:说明本草稿版本的变更内容",
12411280
"commitMsgHint": "仅保存在该草稿版本上(版本历史中展示),与上方的 Skill 描述无关。",
1242-
"commitMsgEditHint": "请在「基本信息」卡片中填写版本提交说明(宽屏在右侧,窄屏在 SKILL.md 上方)。",
12431281
"toggleEnable": "启用/禁用 Skill",
12441282
"pipelineStatus": "审核流水线",
12451283
"pipelineInProgress": "审核中",
@@ -1324,7 +1362,7 @@
13241362
"streamContent": "流式输出",
13251363
"selectResource": "选择一个文件查看内容",
13261364
"editMode": "编辑模式",
1327-
"binaryFileHint": "该文件为二进制格式,无法在此预览",
1365+
"binaryFileHint": "暂不支持预览该文件内容",
13281366
"imagePreviewUnavailable": "无法预览该图片文件"
13291367
}
13301368
}

0 commit comments

Comments
 (0)