pi-cc-extensions 0.7.3 → 0.7.5

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 [];
@@ -236,9 +261,11 @@ export 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 };
 		},
 

package/package.json

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