autosnippet 1.3.4 → 1.3.6

package/README.md

@@ -95,7 +95,7 @@ asd ui
 
 ## 术语
 
-- **Snippet**：写入 Xcode 的代码片段，通过 trigger（补全键）或库面板使用。
+- **Snippet**：写入 Xcode 的代码片段，通过 trigger（补全键）或库面板使用；trigger 以配置的触发符开头（默认 **@**，可通过环境变量 `ASD_TRIGGER_SYMBOL` 更换）。
 - **Recipe（配方）**：存放在 `Knowledge/recipes/` 下的 Markdown 知识，供 AI 检索、Guard 审查与搜索。
 - **项目根**：含 `AutoSnippetRoot.boxspec.json` 的目录。
 

package/bin/create.js

@@ -22,6 +22,7 @@ const fs = require('fs');
 const path = require('path');
 const readline = require('readline');
 const cache = require('../lib/infra/cacheStore.js');
+const triggerSymbol = require('../lib/infra/triggerSymbol.js');
 const findPath = require('./findPath.js');
 const specRepository = require('../lib/snippet/specRepository.js');
 const snippetFactory = require('../lib/snippet/snippetFactory.js');
@@ -92,8 +93,8 @@ function updateCodeSnippets(specFile, word, key, value) {
 			let placeItem = placeholder.list[index];
 
 			const t = placeItem && placeItem.trigger ? String(placeItem.trigger) : '';
-			const raw = t.startsWith('@') ? t.slice(1) : t;
-			if (raw === word || t === word || t === ('@' + word)) {
+			const raw = triggerSymbol.stripTriggerPrefix(t);
+			if (raw === word || t === word || t === (triggerSymbol.TRIGGER_SYMBOL + word)) {
 				snippet = placeItem;
 				if (key) {
 					snippet[key] = value;
@@ -174,8 +175,8 @@ function createCodeSnippets(specFile, answers, updateSnippet, selectedFilePath)
 		snippet = {
 			identifier: identifier,
 			title: answers.title,
-			trigger: '#' + answers.completion_first,
-			completion: '#' + answers.completion_first + completionMoreStr,
+			trigger: triggerSymbol.TRIGGER_SYMBOL + answers.completion_first,
+			completion: triggerSymbol.TRIGGER_SYMBOL + answers.completion_first + completionMoreStr,
 			summary: answers.summary,
 			languageShort: 'objc',
 		};
@@ -418,11 +419,11 @@ async function createFromExtracted(projectRoot, rootSpecPath, extracted) {
 		console.error('❌ AI 结果不完整：需要 title / code');
 		return;
 	}
-	const trigger = (extracted.trigger || '').trim() || ('#' + extracted.title.replace(/\s+/g, ''));
-	const prefix = trigger.startsWith('@') || trigger.startsWith('#') ? '' : '#';
-	const normalizedTrigger = trigger.startsWith('@') || trigger.startsWith('#') ? trigger : prefix + trigger;
+	const trigger = (extracted.trigger || '').trim() || (triggerSymbol.TRIGGER_SYMBOL + extracted.title.replace(/\s+/g, ''));
+	const prefix = triggerSymbol.hasTriggerPrefix(trigger) ? '' : triggerSymbol.TRIGGER_SYMBOL;
+	const normalizedTrigger = triggerSymbol.hasTriggerPrefix(trigger) ? trigger : prefix + trigger;
 	const category = extracted.category || 'Utility';
-	const categoryPart = category ? (normalizedTrigger.startsWith('@') ? '@' : '#') + category : '';
+	const categoryPart = category ? triggerSymbol.getPrefixFromTrigger(normalizedTrigger) + category : '';
 	const isSwift = (extracted.language || '').toLowerCase() === 'swift';
 	const codeLines = extracted.code.split('\n').map(s => s.replace(/\r$/, ''));
 	let body = codeLines;

package/bin/share.js

@@ -22,6 +22,7 @@ const inquirer = require('inquirer');
 
 const specRepository = require('../lib/snippet/specRepository.js');
 const cache = require('../lib/infra/cacheStore.js');
+const triggerSymbol = require('../lib/infra/triggerSymbol.js');
 const config = require('../lib/infra/paths.js');
 
 function shareCodeSnippets(specFile) {
@@ -246,7 +247,7 @@ function shareTheSnippet(specFile, filePath, answers) {
 							array[0] = completion_first;
 							createFromLocal(specFile, filedir, array, answers.completion_more);
 						});
-					} else if (array[0].startsWith('#') || array[0].endsWith('@Moudle')) {
+					} else if (triggerSymbol.hasTriggerPrefix(array[0]) || array[0].endsWith('@Moudle')) {
 						console.log('这个文件已经是共享版本，不需要再处理。');
 					} else {
 						createFromLocal(specFile, filedir, array, answers.completion_more);
@@ -262,7 +263,7 @@ function shareTheSnippet(specFile, filePath, answers) {
 function createFromLocal(specFile, filedir, array, completion_more) {
 	const xcodeLang = array[3];
 	const languageShort = xcodeLang === 'Xcode.SourceCodeLanguage.Swift' ? 'swift' : 'objc';
-	const prefix = '#';
+	const prefix = triggerSymbol.TRIGGER_SYMBOL;
 	const snippet = {
 		identifier: 'AutoSnip_' + array[2],
 		title: array[5],

package/bin/ui.js

@@ -14,6 +14,7 @@ const targetScanner = require('../lib/spm/targetScanner');
 const candidateService = require('../lib/ai/candidateService');
 const headerResolution = require('../lib/ai/headerResolution');
 const markerLine = require('../lib/snippet/markerLine');
+const triggerSymbol = require('../lib/infra/triggerSymbol');
 
 /**
  * 检测当前进程是否已有控制 Chromium 系浏览器的权限（与 openChrome.applescript 所需一致）
@@ -177,7 +178,7 @@ function launch(projectRoot, port = 3000, options = {}) {
 			const searchMark = /\/\/\s*(?:autosnippet|as):search(\s|$)/;
 			let found = -1;
 			for (let i = 0; i < lines.length; i++) {
-				const t = lines[i].replace(/^[\s@#]+/, '').trim();
+				const t = triggerSymbol.stripTriggerPrefix(lines[i].trim()).trim();
 				if (searchMark.test(t) || t === '// as:search' || t.startsWith('// as:search ') || t.startsWith('// autosnippet:search')) {
 					found = i;
 					break;
@@ -608,12 +609,11 @@ function launch(projectRoot, port = 3000, options = {}) {
 			const { snippet } = req.body;
 			const rootSpecPath = path.join(projectRoot, 'AutoSnippetRoot.boxspec.json');
 
-			// ✅ 映射 Dashboard Snippet 格式到内部 specRepository 格式
-			const triggerBase = snippet.trigger || snippet.completionKey;
-			// 支持 # 作为新触发标识，但也兼容旧的 @
-			const triggerPrefix = triggerBase.startsWith('@') ? '@' : '#';
-			const normalizedTrigger = triggerBase.startsWith(triggerPrefix) ? triggerBase : triggerPrefix + triggerBase;
-			const categoryPart = snippet.category ? `${triggerPrefix}${snippet.category}` : '';
+			// ✅ 映射 Dashboard Snippet 格式到内部 specRepository 格式（Trigger 输入框绑定的是 completionKey，保存时优先用其值以同步用户编辑）
+			const triggerBase = snippet.completionKey ?? snippet.trigger ?? '';
+			const sym = triggerSymbol.TRIGGER_SYMBOL;
+			const normalizedTrigger = triggerSymbol.ensureTriggerPrefix(triggerBase);
+			const categoryPart = snippet.category ? `${sym}${snippet.category}` : '';
 			
 			// 处理 body：确保是数组；若前端误传了已转义内容则先还原，再清理触发符，最后只转义一次写入
 			const rawBody = snippet.body || snippet.content || [];
@@ -624,10 +624,11 @@ function launch(projectRoot, port = 3000, options = {}) {
 				if (firstLine === normalizedTrigger || firstLine === triggerBase || firstLine === normalizedTrigger.slice(1)) {
 					cleanedBody.shift();
 				}
-				while (cleanedBody.length && String(cleanedBody[0]).trim() === '#') cleanedBody.shift();
+				const symEsc = sym.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&');
+				while (cleanedBody.length && new RegExp('^' + symEsc + '$').test(String(cleanedBody[0]).trim())) cleanedBody.shift();
 				if (cleanedBody.length) {
 					firstLine = String(cleanedBody[0]).trim();
-					if (/^#\s*\/\/\s*as:(include|import)\s+/.test(firstLine)) cleanedBody[0] = firstLine.replace(/^#\s*/, '');
+					if (new RegExp('^' + symEsc + '\\s*\\/\\/\\s*as:(include|import)\\s+').test(firstLine)) cleanedBody[0] = firstLine.replace(new RegExp('^' + symEsc + '\\s*'), '');
 				}
 			}
 

package/lib/ai/providers/ClaudeProvider.js

@@ -88,7 +88,7 @@ class ClaudeProvider extends AiProvider {
 			- title_cn: Concise name (Chinese).
 			- summary_cn: Description (Chinese).
 			- summary_en: Description (English).
-			- trigger: Short shortcut (starts with #).
+			- trigger: Short shortcut (starts with @).
 			- category: One of the above.
 			- language: "swift" or "objectivec".
 			- tags: Array of tags.
@@ -128,7 +128,7 @@ class ClaudeProvider extends AiProvider {
 			- title: Concise name (English).
 			- summary_cn: Description in Chinese.
 			- summary_en: Description in English.
-			- trigger: Shortcut (starts with #).
+			- trigger: Shortcut (starts with @).
 			- category: [View, Service, Tool, Model, Network, Storage, UI, Utility].
 			- language: "swift" or "objectivec".
 			- code: Reusable usage example (with placeholders).

package/lib/ai/providers/GoogleGeminiProvider.js

@@ -93,7 +93,7 @@ class GoogleGeminiProvider extends AiProvider {
 			- title_cn: Concise name (Chinese).
 			- summary_cn: Description (Chinese).
 			- summary_en: Description (English).
-			- trigger: Short shortcut (starts with #).
+			- trigger: Short shortcut (starts with @).
 			- category: One of the above.
 			- language: "swift" or "objectivec".
 			- tags: Array of tags.
@@ -139,7 +139,7 @@ class GoogleGeminiProvider extends AiProvider {
 				- title: Concise name (English).
 				- summary_cn: Description in Chinese.
 				- summary_en: Description in English.
-				- trigger: Shortcut (starts with #).
+				- trigger: Shortcut (starts with @).
 				- category: [View, Service, Tool, Model, Network, Storage, UI, Utility].
 				- language: "swift" or "objectivec".
 				- code: Reusable usage example (with placeholders).

package/lib/ai/providers/MockProvider.js

@@ -21,7 +21,7 @@ class MockProvider extends AiProvider {
 			title_cn: '模拟代码片段标题',
 			summary_cn: '这是一个模拟的代码片段摘要。',
 			summary_en: 'This is a mock code snippet summary.',
-			trigger: '#mock',
+			trigger: '@mock',
 			category: 'Utility',
 			language: language,
 			tags: ['mock', 'test'],
@@ -36,7 +36,7 @@ class MockProvider extends AiProvider {
 			title: 'Mock Extracted Recipe',
 			summary_cn: '从文件中提取的模拟配方',
 			summary_en: 'Mock recipe extracted from files',
-			trigger: '#mock_skill',
+			trigger: '@mock_skill',
 			category: 'Tool',
 			language: 'swift',
 			code: '// Mock code',

package/lib/ai/providers/OpenAiProvider.js

@@ -104,7 +104,7 @@ class OpenAiProvider extends AiProvider {
 			- title_cn: Concise name (Chinese).
 			- summary_cn: Description (Chinese).
 			- summary_en: Description (English).
-			- trigger: Short shortcut (starts with #).
+			- trigger: Short shortcut (starts with @).
 			- category: One of the above.
 			- language: "swift" or "objectivec".
 			- tags: Array of tags.
@@ -144,7 +144,7 @@ class OpenAiProvider extends AiProvider {
 			- title: Concise name (English).
 			- summary_cn: Description in Chinese.
 			- summary_en: Description in English.
-			- trigger: Shortcut (starts with #).
+			- trigger: Shortcut (starts with @).
 			- category: [View, Service, Tool, Model, Network, Storage, UI, Utility].
 			- language: "swift" or "objectivec".
 			- code: Reusable usage example (with placeholders).

package/lib/infra/cacheStore.js

@@ -11,6 +11,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const triggerSymbol = require('./triggerSymbol.js');
 const paths = require('./paths.js');
 
 const SpecCache = 'SpecCache_';
@@ -37,7 +38,7 @@ async function updateCache(specFile, content) {
 
 			cache.list.forEach(element => {
 				const trigger = element && element.trigger ? String(element.trigger) : '';
-				const rawKey = trigger.startsWith('@') ? trigger.slice(1) : trigger;
+				const rawKey = triggerSymbol.stripTriggerPrefix(trigger);
 				if (element && rawKey) {
 					let key = rawKey;
 					keysCache.list.push(key);

package/lib/infra/triggerSymbol.js

@@ -0,0 +1,73 @@
+#!/usr/bin/env node
+
+/**
+ * Snippet 触发符配置：支持灵活更换默认符号（如 @）。
+ * - 默认使用 @，可通过环境变量 ASD_TRIGGER_SYMBOL 覆盖（单字符）。
+ * - 仅支持配置的触发符，统一由此模块提供，不做其它符号的差别处理。
+ */
+
+const DEFAULT_SYMBOL = '@';
+
+function fromEnv() {
+	const raw = process.env.ASD_TRIGGER_SYMBOL;
+	if (raw != null && String(raw).length === 1) return String(raw);
+	return DEFAULT_SYMBOL;
+}
+
+/** 当前触发符（可配置） */
+const TRIGGER_SYMBOL = fromEnv();
+
+/** 用于拆分的触发符集合（仅当前配置的符号） */
+const TRIGGER_SYMBOLS = [TRIGGER_SYMBOL];
+
+/** 用于按触发符拆分的正则（如 completion 拆 category） */
+const TRIGGER_SPLIT_REGEX = new RegExp('[' + TRIGGER_SYMBOLS.map(escapeRegExp).join('') + ']');
+
+function escapeRegExp(s) {
+	return s.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&');
+}
+
+/** str 是否以任一触发符开头 */
+function hasTriggerPrefix(str) {
+	if (!str || typeof str !== 'string') return false;
+	const s = String(str).trim();
+	return TRIGGER_SYMBOLS.some((sym) => s.startsWith(sym));
+}
+
+/** 去掉 str 开头的连续触发符 */
+function stripTriggerPrefix(str) {
+	if (!str || typeof str !== 'string') return String(str);
+	let s = String(str).trim();
+	while (s.length && TRIGGER_SYMBOLS.some((sym) => s.startsWith(sym))) {
+		s = s.slice(1).trimStart();
+	}
+	return s;
+}
+
+/** 若 str 不以任一触发符开头，则加上默认触发符 */
+function ensureTriggerPrefix(str) {
+	if (!str || typeof str !== 'string') return str;
+	const s = String(str).trim();
+	if (!s) return s;
+	return hasTriggerPrefix(s) ? s : TRIGGER_SYMBOL + s;
+}
+
+/** 若 str 已带触发符则返回该符号，否则返回默认触发符（用于 category 等） */
+function getPrefixFromTrigger(str) {
+	if (!str || typeof str !== 'string') return TRIGGER_SYMBOL;
+	const s = String(str).trim();
+	for (const sym of TRIGGER_SYMBOLS) {
+		if (s.startsWith(sym)) return sym;
+	}
+	return TRIGGER_SYMBOL;
+}
+
+module.exports = {
+	TRIGGER_SYMBOL,
+	TRIGGER_SYMBOLS,
+	TRIGGER_SPLIT_REGEX,
+	hasTriggerPrefix,
+	stripTriggerPrefix,
+	ensureTriggerPrefix,
+	getPrefixFromTrigger,
+};

package/lib/injection/directiveParser.js

@@ -7,15 +7,16 @@
  * - 提供“是否为指令行”的判断（用于移除标记行）
  */
 
+const triggerSymbol = require('../infra/triggerSymbol.js');
 const HEADER_MARK_INCLUDE = '// autosnippet:include ';
 const HEADER_MARK_IMPORT = '// autosnippet:import ';
 const HEADER_MARK_INCLUDE_SHORT = '// as:include ';
 const HEADER_MARK_IMPORT_SHORT = '// as:import ';
 
 function normalizeDirectiveLine(line) {
-	// 兼容前导 @ 或 #（Xcode 插入 snippet 时可能带触发符前缀），去掉后便于匹配 as:include / as:import
+	// 去掉前导触发符，便于匹配 as:include / as:import
 	const s = String(line || '').trim();
-	return s.replace(/^@+/, '').replace(/^#\s*/, '').trimStart();
+	return triggerSymbol.stripTriggerPrefix(s);
 }
 
 function parseDirectiveLine(line) {

package/lib/snippet/snippetFactory.js

@@ -23,6 +23,8 @@ function buildIdentifier(title, completionFirst, completionMoreStr) {
 	return 'AutoSnip_' + answersIdBuff.toString('base64').replace(/\//g, '');
 }
 
+const triggerSymbol = require('../infra/triggerSymbol.js');
+
 function fromText(answers, text, options = {}) {
 	if (!text || !String(text).trim()) return null;
 
@@ -33,7 +35,7 @@ function fromText(answers, text, options = {}) {
 	// 如果有 explicit category 且不在 completionMoreStr 中，则添加
 	let categoryPart = '';
 	if (answers.category) {
-		const cat = answers.category.startsWith('@') ? answers.category : '@' + answers.category;
+		const cat = triggerSymbol.hasTriggerPrefix(answers.category) ? answers.category : triggerSymbol.TRIGGER_SYMBOL + answers.category;
 		if (!completionMoreStr.includes(cat)) {
 			categoryPart = cat;
 		}
@@ -42,8 +44,7 @@ function fromText(answers, text, options = {}) {
 	const identifier = buildIdentifier(answers.title, answers.completion_first, completionMoreStr + categoryPart);
 	const isSwift = options && options.language === 'swift';
 
-	// 默认使用 # 替代 @，更像是一个 Tag/知识标识
-	const prefix = '#';
+	const prefix = triggerSymbol.TRIGGER_SYMBOL;
 	const snippet = {
 		identifier: identifier,
 		title: answers.title,

package/lib/snippet/specRepository.js

@@ -12,6 +12,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const triggerSymbol = require('../infra/triggerSymbol.js');
 const cacheStore = require('../infra/cacheStore.js');
 const paths = require('../infra/paths.js');
 const findPath = require('../../bin/findPath.js'); // Phase 1 先复用现有实现，后续再迁移
@@ -43,14 +44,11 @@ function applySpecDefaults(specObj, specFile) {
 }
 
 function parseCategoriesFromCompletion(completion) {
-	// completion 形如：#key#View#Tool 或 @key@View@Tool@Moudle
+	// completion 形如：@key@View@Tool（按配置的触发符拆分）
 	const s = String(completion || '');
-	if (!s.includes('@') && !s.includes('#')) return [];
-	
-	// 同时支持 @ 和 # 拆分
-	const parts = s.split(/[@#]/).map(p => p.trim()).filter(Boolean);
-	
-	// 去掉最后的 Moudle 标记（兼容旧版本）
+	if (!s.includes(triggerSymbol.TRIGGER_SYMBOL)) return [];
+
+	const parts = s.split(triggerSymbol.TRIGGER_SPLIT_REGEX).map(p => p.trim()).filter(Boolean);
 	return parts.filter(p => p !== 'Moudle');
 }
 
@@ -64,7 +62,7 @@ function normalizeTrigger(raw) {
 
 function rawKeyFromTrigger(trigger) {
 	const t = normalizeTrigger(trigger);
-	return (t.startsWith('@') || t.startsWith('#')) ? t.slice(1) : t;
+	return triggerSymbol.stripTriggerPrefix(t);
 }
 
 /** 去除 title 中多余的 category 前缀（如 [Service]），避免与 category 字段重复 */
@@ -170,7 +168,7 @@ async function augmentSnippetForAi(snippet, specFile) {
 	// ✅ skill 视角（不改变运行时：仅增强语义）
 	const categories = parseCategoriesFromCompletion(completion);
 	const tags = categories
-		.map((c) => c.startsWith('@') ? c.slice(1) : c)
+		.map((c) => triggerSymbol.stripTriggerPrefix(c))
 		.filter((c) => c && c !== rawKeyFromTrigger(snippet.trigger));
 
 	snippet.skill = snippet.skill && typeof snippet.skill === 'object' ? snippet.skill : {};

package/lib/watch/fileWatcher.js

@@ -11,6 +11,7 @@ const path = require('path');
 const open = require('open');
 const injection = require('../injection/injectionService.js');
 const cache = require('../infra/cacheStore.js');
+const triggerSymbol = require('../infra/triggerSymbol.js');
 
 const CMD_PATH = process.cwd();
 
@@ -23,8 +24,8 @@ const guardMarkShort = '// as:guard';
 const searchMarkShort = '// as:search';
 const searchMarkLong = '// autosnippet:search';
 const alinkMark = 'alink';
-const wellMark = '#';
-const atMark = '@';
+const wellMark = triggerSymbol.TRIGGER_SYMBOL;
+const atMark = triggerSymbol.TRIGGER_SYMBOL;
 
 // ObjC 头文件名常见包含 `+`（Category）、`-`、`.` 等字符
 const headerReg = /^@?\/\/\s*(?:autosnippet|as):include\s+<([A-Za-z0-9_]+)\/([A-Za-z0-9_+.-]+\.h)>(\s+.+)?$/;
@@ -181,8 +182,7 @@ function processFileChange(specFile, updateFile, relativePath, options) {
 				const lineArray = data.split('\n');
 				lineArray.forEach(element => {
 					const lineVal = element.trim();
-					let normalizedLineVal = lineVal.startsWith(atMark) ? lineVal.slice(1).trimStart() : lineVal;
-					if (normalizedLineVal.startsWith('#')) normalizedLineVal = normalizedLineVal.slice(1).trimStart();
+					let normalizedLineVal = triggerSymbol.stripTriggerPrefix(lineVal);
 					if (currImportReg.test(lineVal)) {
 						importArray.push(lineVal);
 					}
@@ -281,14 +281,18 @@ function checkAnotherFile(specFile, updateFile, headerLine, importArray, isSwift
 }
 
 function openLink(specFile, inputWord) {
-	if (inputWord.includes(wellMark)) {
-		const wellKey = inputWord.split(wellMark);
-
-		if (wellKey.length > 1 && wellKey[1] === alinkMark) {
-			cache.getLinkCache(specFile).then(function (linkCache) {
-				if (linkCache) {
-					const completionKey = wellKey[0].replace(atMark, '');
-					let link = decodeURI(linkCache[completionKey]);
+	const sym = triggerSymbol.TRIGGER_SYMBOL;
+	let completionKey = null;
+	if (inputWord.includes(sym)) {
+		const parts = inputWord.split(sym).map(p => p.trim()).filter(Boolean);
+		if (parts.length >= 2 && parts[parts.length - 1] === alinkMark) {
+			completionKey = parts[parts.length - 2];
+		}
+	}
+	if (completionKey != null) {
+		cache.getLinkCache(specFile).then(function (linkCache) {
+			if (linkCache) {
+				let link = decodeURI(linkCache[completionKey]);
 
 					if (!link.startsWith('http')) {
 						const specSlashIndex = specFile.lastIndexOf('/');
@@ -301,7 +305,6 @@ function openLink(specFile, inputWord) {
 					}
 				}
 			});
-		}
 	}
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "autosnippet",
-	"version": "1.3.4",
+	"version": "1.3.6",
 	"description": "A iOS module management tool.",
 	"main": "index.js",
 	"scripts": {