pi-cc-extensions 0.7.2 → 0.7.4

package/README.md

@@ -85,7 +85,7 @@
 2. 从 `[Session] ...` 或 `[SubAgent] ...` 补全项中选择要引用的上下文。
 3. 提交时以 `@session:<session-id>` 引用其当前有效上下文。
 
-Session 模糊查询默认显示 5 个候选；若已加载 `pi-subagents`，也可直接引用现有 SubAgent。一次提示词可以引用多个 Session；扩展会自动去重，并限制注入规模以避免上下文无限膨胀。更多细节见 [`extensions/session-reference/README.md`](./extensions/session-reference/README.md)。
+Session 模糊查询默认显示 3 个候选，并与文件候选按 1:2 交错排列；路径型查询优先显示文件。若已加载 `pi-subagents`，也可直接引用现有 SubAgent。一次提示词可以引用多个 Session；扩展会自动去重，并限制注入规模以避免上下文无限膨胀。更多细节见 [`extensions/session-reference/README.md`](./extensions/session-reference/README.md)。
 
 ### SubAgent `@` 补全
 
@@ -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

@@ -17,9 +17,9 @@ type AgentInfo = {
 	filePath: string;
 };
 
-const MAX_SUGGESTIONS = 10;
+const MAX_SUGGESTIONS = 2;
 // 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/README.md

@@ -11,8 +11,8 @@
 ## 行为
 
 - 搜索全部 pi 历史 Session；当前 Workspace 的 Session 优先。
-- Session 模糊查询默认最多显示 5 个候选。
-- 与 pi 原有 `@` 文件补全并存。
+- Session 模糊查询默认最多显示 3 个候选。
+- 与 pi 原有 `@` 文件补全并存：普通查询按 1:2 交错排列 Session 与文件，路径型查询优先显示文件。
 - 若已加载 `pi-subagents`，`@` 补全会同时显示现有 SubAgent，并引用其当前有效上下文。
 - 支持一个 prompt 引用多个 Session，并自动去重；单次最多注入前 5 个。
 - 跳过历史 Session 中嵌套的 Session 引用，避免递归膨胀。

package/extensions/session-reference/index.ts

@@ -22,8 +22,8 @@ import {
 	type ReferenceSource,
 } from "./core.ts";
 
-const MAX_SESSION_SUGGESTIONS = 5;
-const MAX_FILE_SUGGESTIONS = 10;
+const MAX_SESSION_SUGGESTIONS = 3;
+const MAX_FILE_SUGGESTIONS = 7;
 const MAX_REFERENCED_SESSIONS = 5;
 const MENTION_PATTERN = /(?:^|[\t ])@([^\s@]*)$/;
 const SUBAGENT_MANAGER_KEY = Symbol.for("pi-subagents:manager");
@@ -166,6 +166,31 @@ function filterSessions(references: SessionReference[], query: string, currentCw
 	return matches.slice(0, MAX_SESSION_SUGGESTIONS).map((reference) => sessionItem(reference, currentCwd));
 }
 
+function isPathLikeQuery(query: string): boolean {
+	return /[\\/*?]/.test(query) || /\.[A-Za-z0-9_-]{1,12}$/.test(query);
+}
+
+function mergeSessionAndFileItems(
+	sessionItems: AutocompleteItem[],
+	fileItems: AutocompleteItem[],
+	query: string,
+): AutocompleteItem[] {
+	const sessions = sessionItems.slice(0, MAX_SESSION_SUGGESTIONS);
+	const files = fileItems.slice(0, MAX_FILE_SUGGESTIONS);
+	if (isPathLikeQuery(query)) return [...files, ...sessions];
+
+	const merged: AutocompleteItem[] = [];
+	let sessionIndex = 0;
+	let fileIndex = 0;
+	while (sessionIndex < sessions.length || fileIndex < files.length) {
+		for (let count = 0; count < 2 && fileIndex < files.length; count++) {
+			merged.push(files[fileIndex++]!);
+		}
+		if (sessionIndex < sessions.length) merged.push(sessions[sessionIndex++]!);
+	}
+	return merged;
+}
+
 function liveSubagentReferences(agentIds: Set<string>, currentSessionId: string): SessionReference[] {
 	const manager = getSubagentManager();
 	if (!manager) return [];
@@ -215,7 +240,7 @@ function mergeReferences(sessions: SessionInfo[], subagents: SessionReference[])
 	return [...bySessionId.values()];
 }
 
-function createAutocompleteProvider(
+export function createAutocompleteProvider(
 	current: AutocompleteProvider,
 	getReferences: () => Promise<SessionReference[]>,
 	currentCwd: string,
@@ -236,9 +261,11 @@ function createAutocompleteProvider(
 			if (options.signal.aborted) return null;
 
 			const sessionItems = filterSessions(references, query, currentCwd);
-			const fileItems = (baseSuggestions?.items ?? []).slice(0, MAX_FILE_SUGGESTIONS);
-			const items = [...sessionItems, ...fileItems];
-			if (items.length === 0) return null;
+			const fileItems = baseSuggestions?.prefix === `@${query}`
+				? baseSuggestions.items
+				: [];
+			const items = mergeSessionAndFileItems(sessionItems, fileItems, query);
+			if (items.length === 0) return baseSuggestions;
 			return { prefix: `@${query}`, items };
 		},
 
@@ -263,6 +290,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 +318,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 +349,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 +440,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.4",
   "description": "Personal extensions for the Pi coding agent",
   "type": "module",
   "keywords": [