pi-cc-extensions 0.7.2 → 0.7.3

package/README.md

@@ -95,7 +95,7 @@ Session 模糊查询默认显示 5 个候选；若已加载 `pi-subagents`，也
 2. 从补全列表中选择 SubAgent。
 3. 提交后自动注入委托指令；提示词中提到的每个 SubAgent 都会分别交由 Agent 工具处理。
 
-该补全不会占用 `@session:` 的历史 Session 引用语法；修改 SubAgent 定义后执行 `/reload` 即可重新加载。
+该补全不会占用 `@session:` 的历史 Session 引用语法；与 `@bacnh85/pi-fff` 同时启用时，SubAgent、Session 和 FFF 文件候选会合并显示。修改 SubAgent 定义后执行 `/reload` 即可重新加载。
 
 ## 安装
 

package/extensions/agent-autocomplete.ts

@@ -19,7 +19,7 @@ type AgentInfo = {
 
 const MAX_SUGGESTIONS = 10;
 // Match `@name` but NOT `@session:` (reserved by session-reference extension).
-const AGENT_NAME_PATTERN = /(?:^|[\t ])@([^\s:@][^\s:]*)$/;
+const AGENT_NAME_PATTERN = /(?:^|[\t ])@((?:[^\s:@][^\s:]*)?)$/;
 
 function getAgentDir(): string {
 	const override = process.env.PI_CODING_AGENT_DIR;
@@ -58,11 +58,12 @@ function loadAgents(): AgentInfo[] {
 		});
 }
 
-function createAgentAutocompleteProvider(
+export function createAgentAutocompleteProvider(
 	current: AutocompleteProvider,
 	getAgents: () => AgentInfo[],
 ): AutocompleteProvider {
 	return {
+		triggerCharacters: ["@"],
 		async getSuggestions(
 			lines: string[],
 			cursorLine: number,
@@ -84,11 +85,15 @@ function createAgentAutocompleteProvider(
 				return current.getSuggestions(lines, cursorLine, cursorCol, options);
 			}
 
-			const matches = query.trim()
-				? fuzzyFilter(agents, query, (a) => `${a.name} ${a.displayName} ${a.description}`)
-				: agents;
+			const [baseSuggestions, matches] = await Promise.all([
+				current.getSuggestions(lines, cursorLine, cursorCol, options),
+				Promise.resolve(query.trim()
+					? fuzzyFilter(agents, query, (a) => `${a.name} ${a.displayName} ${a.description}`)
+					: agents),
+			]);
+			if (options.signal.aborted) return null;
 
-			const items: AutocompleteItem[] = matches
+			const agentItems: AutocompleteItem[] = matches
 				.slice(0, MAX_SUGGESTIONS)
 				.map((agent) => ({
 					value: `@${agent.name}`,
@@ -96,11 +101,18 @@ function createAgentAutocompleteProvider(
 					description: agent.description
 						+ (agent.model ? ` · ${agent.model}` : ""),
 				}));
-
-			if (items.length === 0) {
-				return current.getSuggestions(lines, cursorLine, cursorCol, options);
-			}
-
+			const baseItems = baseSuggestions?.prefix === `@${query}`
+				? baseSuggestions.items
+				: [];
+			const seen = new Set<string>();
+			const items = [...agentItems, ...baseItems].filter((item) => {
+				const key = `${item.value}\0${item.label}`;
+				if (seen.has(key)) return false;
+				seen.add(key);
+				return true;
+			});
+
+			if (items.length === 0) return baseSuggestions;
 			return { items, prefix: `@${query}` };
 		},
 
@@ -122,6 +134,7 @@ function createAgentAutocompleteProvider(
 
 export default function agentAutocompleteExtension(pi: ExtensionAPI): void {
 	let cachedAgents: AgentInfo[] | undefined;
+	let sessionGeneration = 0;
 
 	const getAgents = (): AgentInfo[] => {
 		if (!cachedAgents) {
@@ -136,11 +149,22 @@ export default function agentAutocompleteExtension(pi: ExtensionAPI): void {
 	});
 
 	pi.on("session_start", (_event, ctx) => {
+		const generation = ++sessionGeneration;
 		const agents = getAgents();
 		if (agents.length === 0 || ctx.mode !== "tui") return;
-		ctx.ui.addAutocompleteProvider((current) =>
-			createAgentAutocompleteProvider(current, getAgents),
-		);
+
+		// Register after other session_start handlers have installed their wrappers.
+		// pi-fff handles every @ prefix and otherwise shadows providers loaded before it.
+		setTimeout(() => {
+			if (generation !== sessionGeneration) return;
+			ctx.ui.addAutocompleteProvider((current) =>
+				createAgentAutocompleteProvider(current, getAgents),
+			);
+		}, 0);
+	});
+
+	pi.on("session_shutdown", () => {
+		sessionGeneration++;
 	});
 
 	// Inject instruction when user types @agent-name (not @session:) in prompt.

package/extensions/session-reference/index.ts

@@ -215,7 +215,7 @@ function mergeReferences(sessions: SessionInfo[], subagents: SessionReference[])
 	return [...bySessionId.values()];
 }
 
-function createAutocompleteProvider(
+export function createAutocompleteProvider(
 	current: AutocompleteProvider,
 	getReferences: () => Promise<SessionReference[]>,
 	currentCwd: string,
@@ -263,6 +263,7 @@ function samePath(left: string | undefined, right: string): boolean {
 
 export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 	let getAvailableReferences: (() => Promise<SessionReference[]>) | undefined;
+	let sessionGeneration = 0;
 	const subagentIds = new Set<string>();
 	// pi-subagents emits "subagent:async-started" and "subagent:async-complete" events.
 	// We track records locally so @[SubAgent] suggestions work even without a global manager.
@@ -290,6 +291,7 @@ export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 	});
 
 	pi.on("session_start", (_event, ctx) => {
+		const generation = ++sessionGeneration;
 		subagentIds.clear();
 		let loadErrorShown = false;
 		const currentSessionId = ctx.sessionManager.getSessionId();
@@ -320,7 +322,14 @@ export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 		getAvailableReferences = getReferences;
 		if (ctx.mode === "tui") {
 			void getReferences();
-			ctx.ui.addAutocompleteProvider((current) => createAutocompleteProvider(current, getReferences, ctx.cwd));
+			// Register after other session_start handlers. pi-fff claims every @
+			// prefix, so a provider installed before it would never see session mentions.
+			setTimeout(() => {
+				if (generation !== sessionGeneration) return;
+				ctx.ui.addAutocompleteProvider((current) =>
+					createAutocompleteProvider(current, getReferences, ctx.cwd),
+				);
+			}, 0);
 		}
 	});
 
@@ -404,6 +413,7 @@ export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 	});
 
 	pi.on("session_shutdown", () => {
+		sessionGeneration++;
 		for (const unsubscribe of unsubscribeSubagentEvents) unsubscribe();
 		subagentIds.clear();
 		getAvailableReferences = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-cc-extensions",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "Personal extensions for the Pi coding agent",
   "type": "module",
   "keywords": [