@heyhuynhgiabuu/pi-pretty 0.6.15 → 0.6.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -122
- package/README.md +2 -0
- package/dist/collapsed-hint.d.ts +7 -0
- package/dist/collapsed-hint.d.ts.map +1 -0
- package/dist/collapsed-hint.js +17 -0
- package/dist/collapsed-hint.js.map +1 -0
- package/dist/config.d.ts +2 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +3 -1
- package/dist/config.js.map +1 -1
- package/dist/expand.d.ts +13 -0
- package/dist/expand.d.ts.map +1 -0
- package/dist/expand.js +24 -0
- package/dist/expand.js.map +1 -0
- package/dist/find-glob.d.ts +9 -0
- package/dist/find-glob.d.ts.map +1 -0
- package/dist/find-glob.js +29 -0
- package/dist/find-glob.js.map +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/render.d.ts.map +1 -1
- package/dist/render.js +15 -10
- package/dist/render.js.map +1 -1
- package/dist/tools/bash.d.ts.map +1 -1
- package/dist/tools/bash.js +13 -12
- package/dist/tools/bash.js.map +1 -1
- package/dist/tools/find.d.ts +2 -2
- package/dist/tools/find.d.ts.map +1 -1
- package/dist/tools/find.js +90 -45
- package/dist/tools/find.js.map +1 -1
- package/dist/tools/grep.d.ts.map +1 -1
- package/dist/tools/grep.js +8 -4
- package/dist/tools/grep.js.map +1 -1
- package/dist/tools/ls.d.ts.map +1 -1
- package/dist/tools/ls.js +8 -4
- package/dist/tools/ls.js.map +1 -1
- package/dist/tools/multi-grep.d.ts.map +1 -1
- package/dist/tools/multi-grep.js +12 -8
- package/dist/tools/multi-grep.js.map +1 -1
- package/dist/tools/read.d.ts.map +1 -1
- package/dist/tools/read.js +15 -11
- package/dist/tools/read.js.map +1 -1
- package/dist/types.d.ts +1 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +5 -4
- package/src/collapsed-hint.ts +14 -0
- package/src/config.ts +3 -0
- package/src/expand.ts +24 -0
- package/src/find-glob.ts +21 -0
- package/src/index.ts +2 -0
- package/src/render.ts +17 -10
- package/src/tools/bash.ts +15 -12
- package/src/tools/find.ts +132 -73
- package/src/tools/grep.ts +14 -5
- package/src/tools/ls.ts +13 -5
- package/src/tools/multi-grep.ts +17 -9
- package/src/tools/read.ts +20 -11
- package/src/types.ts +1 -0
package/dist/tools/bash.js
CHANGED
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
4
4
|
exports.registerBashTool = registerBashTool;
|
|
5
5
|
const config_js_1 = require("../config.js");
|
|
6
6
|
const metrics_js_1 = require("./metrics.js");
|
|
7
|
+
const collapsed_hint_js_1 = require("../collapsed-hint.js");
|
|
7
8
|
const render_js_1 = require("../render.js");
|
|
8
9
|
const tui_text_js_1 = require("../tui-text.js");
|
|
9
10
|
const helpers_js_1 = require("../helpers.js");
|
|
@@ -46,13 +47,13 @@ function registerBashTool(pi, _cwd, _fffService, sdkTool, TextComp) {
|
|
|
46
47
|
const t = typeof args.timeout === "number" ? ` ${theme.fg("muted", `(timeout ${args.timeout}s)`)}` : "";
|
|
47
48
|
const tw = (0, config_js_1.termWidth)() || 80;
|
|
48
49
|
const rawCmd = String(args.command ?? "");
|
|
50
|
+
const headerBudget = ctx.expanded ? tw : Math.max(8, tw - 20);
|
|
49
51
|
const cmd = rawCmd.length === 0
|
|
50
52
|
? theme.fg("toolOutput", "...")
|
|
51
|
-
: rawCmd.length >
|
|
52
|
-
? rawCmd.slice(0, Math.max(1,
|
|
53
|
+
: !ctx.expanded && rawCmd.length > headerBudget
|
|
54
|
+
? rawCmd.slice(0, Math.max(1, headerBudget)) + "…"
|
|
53
55
|
: rawCmd;
|
|
54
|
-
|
|
55
|
-
text.setText((0, render_js_1.fillToolBackground)(`\n ${theme.fg("toolTitle", theme.bold(`$ ${cmd}`))}${t}`, ctx.isError ? config_js_1.BG_ERROR : undefined, toolWidth));
|
|
56
|
+
text.setText((0, render_js_1.fillToolBackground)(`\n${config_js_1.TOOL_RESULT_INDENT}${theme.fg("toolTitle", theme.bold(`$ ${cmd}`))}${t}`, ctx.isError ? config_js_1.BG_ERROR : undefined, ctx.expanded ? undefined : tw));
|
|
56
57
|
return text;
|
|
57
58
|
},
|
|
58
59
|
renderResult(result, _opt, theme, ctx) {
|
|
@@ -78,18 +79,18 @@ function registerBashTool(pi, _cwd, _fffService, sdkTool, TextComp) {
|
|
|
78
79
|
const { summary } = (0, render_js_1.renderBashOutput)(output, d.exitCode);
|
|
79
80
|
const lineCount = output.split("\n").length;
|
|
80
81
|
const info = lineCount > 1
|
|
81
|
-
?
|
|
82
|
+
? `${config_js_1.TOOL_RESULT_INDENT}${config_js_1.FG_DIM}(${lineCount} lines)${config_js_1.RST} ${(0, render_js_1.renderToolMetrics)(result)}`
|
|
82
83
|
: ` ${(0, render_js_1.renderToolMetrics)(result)}`;
|
|
83
|
-
const header =
|
|
84
|
+
const header = `${config_js_1.TOOL_RESULT_INDENT}${summary}${info}`;
|
|
84
85
|
const rw = (0, config_js_1.termWidth)();
|
|
85
86
|
const renderFn = (w) => {
|
|
87
|
+
if (!ctx.expanded) {
|
|
88
|
+
return (0, render_js_1.fillToolBackground)([header, (0, collapsed_hint_js_1.collapsedExpandFooter)()].join("\n"), bg, w);
|
|
89
|
+
}
|
|
86
90
|
if (!output.trim())
|
|
87
91
|
return (0, render_js_1.fillToolBackground)(header, bg, w);
|
|
88
|
-
const
|
|
89
|
-
const
|
|
90
|
-
const out = [header, rule(w), ...show.map((l) => ` ${l}`)];
|
|
91
|
-
if (lineCount > max)
|
|
92
|
-
out.push(`${config_js_1.FG_DIM} \u2026 ${lineCount - max} more lines${config_js_1.RST}`);
|
|
92
|
+
const show = output.split("\n");
|
|
93
|
+
const out = [header, rule(w), ...show.map((l) => `${config_js_1.TOOL_RESULT_INDENT}${l}`)];
|
|
93
94
|
return (0, render_js_1.fillToolBackground)(out.join("\n"), bg, w);
|
|
94
95
|
};
|
|
95
96
|
text.setText(renderFn(rw));
|
|
@@ -113,7 +114,7 @@ function registerBashTool(pi, _cwd, _fffService, sdkTool, TextComp) {
|
|
|
113
114
|
return text;
|
|
114
115
|
}
|
|
115
116
|
const fc = result.content?.[0];
|
|
116
|
-
text.setText((0, render_js_1.fillToolBackground)(
|
|
117
|
+
text.setText((0, render_js_1.fillToolBackground)(`${config_js_1.TOOL_RESULT_INDENT}${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "done")}`));
|
|
117
118
|
return text;
|
|
118
119
|
},
|
|
119
120
|
});
|
package/dist/tools/bash.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bash.js","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":";AAAA,mEAAmE;;
|
|
1
|
+
{"version":3,"file":"bash.js","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/find.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type ExtensionAPI } from "@earendil-works/pi-coding-agent";
|
|
2
|
-
import type { SdkToolDef,
|
|
3
|
-
export declare function registerFindTool(pi: ExtensionAPI, cwd: string, fffService:
|
|
2
|
+
import type { SdkToolDef, FffServiceWithCursor } from "../types.js";
|
|
3
|
+
export declare function registerFindTool(pi: ExtensionAPI, cwd: string, fffService: FffServiceWithCursor | null | undefined, sdkTool: SdkToolDef, TextComp?: new (t?: string, x?: number, y?: number) => {
|
|
4
4
|
setText(v: string): void;
|
|
5
5
|
}): void;
|
|
6
6
|
//# sourceMappingURL=find.d.ts.map
|
package/dist/tools/find.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../src/tools/find.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../src/tools/find.ts"],"names":[],"mappings":"AAGA,OAAO,EAEN,KAAK,YAAY,EAGjB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,UAAU,EAAe,oBAAoB,EAAyC,MAAM,aAAa,CAAC;AAqExH,wBAAgB,gBAAgB,CAC/B,EAAE,EAAE,YAAY,EAChB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,oBAAoB,GAAG,IAAI,GAAG,SAAS,EACnD,OAAO,EAAE,UAAU,EACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK;IAAE,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACjF,IAAI,CA8IN"}
|
package/dist/tools/find.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
/* pi-pretty: find tool -- FFF-backed file search with SDK fallback. */
|
|
2
|
+
/* pi-pretty: find tool -- FFF-backed file search with SDK (fd) fallback. */
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.registerFindTool = registerFindTool;
|
|
5
5
|
const node_path_1 = require("node:path");
|
|
@@ -9,6 +9,55 @@ const metrics_js_1 = require("./metrics.js");
|
|
|
9
9
|
const render_js_1 = require("../render.js");
|
|
10
10
|
const tui_text_js_1 = require("../tui-text.js");
|
|
11
11
|
const notices_js_1 = require("../notices.js");
|
|
12
|
+
const find_glob_js_1 = require("../find-glob.js");
|
|
13
|
+
function getText(result) {
|
|
14
|
+
return (result.content ?? [])
|
|
15
|
+
.filter((c) => c.type === "text")
|
|
16
|
+
.map((c) => c.text ?? "")
|
|
17
|
+
.join("\n");
|
|
18
|
+
}
|
|
19
|
+
function buildGlobPattern(pattern, path, basePath) {
|
|
20
|
+
const raw = pattern.startsWith("/") ? pattern.slice(1) : pattern;
|
|
21
|
+
const normalized = (0, find_glob_js_1.normalizeFindGlobPattern)(raw);
|
|
22
|
+
let cleanPath = path ?? "";
|
|
23
|
+
if (cleanPath && (0, node_path_1.isAbsolute)(cleanPath) && basePath) {
|
|
24
|
+
cleanPath = (0, node_path_1.relative)(basePath, cleanPath) || "";
|
|
25
|
+
}
|
|
26
|
+
cleanPath = cleanPath.replace(/\/$/, "");
|
|
27
|
+
if (cleanPath) {
|
|
28
|
+
if (normalized.startsWith("**/")) {
|
|
29
|
+
return `${cleanPath}/${normalized}`;
|
|
30
|
+
}
|
|
31
|
+
if (normalized.includes("/")) {
|
|
32
|
+
return `${cleanPath}/${normalized}`;
|
|
33
|
+
}
|
|
34
|
+
return `${cleanPath}/**/${normalized}`;
|
|
35
|
+
}
|
|
36
|
+
return normalized.startsWith("**/") || normalized.includes("/") ? normalized : `**/${normalized}`;
|
|
37
|
+
}
|
|
38
|
+
function appendFindNotices(result, extra) {
|
|
39
|
+
if (extra.length === 0)
|
|
40
|
+
return result;
|
|
41
|
+
const d = result.details;
|
|
42
|
+
if (!d || d._type !== "findResult")
|
|
43
|
+
return result;
|
|
44
|
+
const prev = Array.isArray(d.notices) ? d.notices : [];
|
|
45
|
+
return { ...result, details: { ...d, notices: [...prev, ...extra] } };
|
|
46
|
+
}
|
|
47
|
+
async function sdkFindAsFindResult(sdkTool, tid, params, sig, ctx, pattern, extraNotices) {
|
|
48
|
+
const result = (await sdkTool.execute(tid, params, sig, undefined, ctx));
|
|
49
|
+
const tc = getText(result);
|
|
50
|
+
const prev = result.details?.notices ?? [];
|
|
51
|
+
const notices = [...(Array.isArray(prev) ? prev : []), ...extraNotices];
|
|
52
|
+
result.details = {
|
|
53
|
+
_type: "findResult",
|
|
54
|
+
text: tc,
|
|
55
|
+
pattern,
|
|
56
|
+
matchCount: tc ? tc.trim().split("\n").filter(Boolean).length : 0,
|
|
57
|
+
notices,
|
|
58
|
+
};
|
|
59
|
+
return result;
|
|
60
|
+
}
|
|
12
61
|
function registerFindTool(pi, cwd, fffService, sdkTool, TextComp) {
|
|
13
62
|
const TC = (0, tui_text_js_1.resolveTextCtor)(TextComp);
|
|
14
63
|
const home = process.env.HOME ?? "";
|
|
@@ -22,20 +71,13 @@ function registerFindTool(pi, cwd, fffService, sdkTool, TextComp) {
|
|
|
22
71
|
const pattern = String(params.pattern ?? "");
|
|
23
72
|
const path = params.path ? String(params.path) : undefined;
|
|
24
73
|
const limit = params.limit;
|
|
25
|
-
const glob = params.glob;
|
|
26
74
|
const fff = fffService?.isAvailable ? fffService.getFinder() : null;
|
|
27
75
|
if (fff) {
|
|
28
76
|
try {
|
|
29
77
|
const effectiveLimit = Math.max(1, typeof limit === "number" ? limit : 100);
|
|
30
78
|
const basePathResult = fff.getBasePath();
|
|
31
79
|
const basePath = basePathResult.ok ? basePathResult.value : null;
|
|
32
|
-
|
|
33
|
-
if (cleanPath && (0, node_path_1.isAbsolute)(cleanPath) && basePath) {
|
|
34
|
-
cleanPath = (0, node_path_1.relative)(basePath, cleanPath) || "";
|
|
35
|
-
}
|
|
36
|
-
cleanPath = cleanPath.replace(/\/$/, "");
|
|
37
|
-
const cleanPattern = pattern.startsWith("/") ? pattern.slice(1) : pattern;
|
|
38
|
-
const globPattern = cleanPath ? `${cleanPath}/**/${cleanPattern}` : `**/${cleanPattern}`;
|
|
80
|
+
const globPattern = buildGlobPattern(pattern, path, basePath);
|
|
39
81
|
const searchResult = fff.glob(globPattern, { pageSize: effectiveLimit });
|
|
40
82
|
if (searchResult.ok) {
|
|
41
83
|
const items = searchResult.value.items.slice(0, effectiveLimit);
|
|
@@ -44,8 +86,19 @@ function registerFindTool(pi, cwd, fffService, sdkTool, TextComp) {
|
|
|
44
86
|
notices.push(notices_js_1.NOTICE_PARTIAL_FILE_INDEX);
|
|
45
87
|
if (items.length >= effectiveLimit)
|
|
46
88
|
notices.push(`${effectiveLimit} limit reached`);
|
|
47
|
-
if (searchResult.value.totalMatched > items.length)
|
|
89
|
+
if (searchResult.value.totalMatched > items.length) {
|
|
48
90
|
notices.push(`${searchResult.value.totalMatched} total matches`);
|
|
91
|
+
}
|
|
92
|
+
if (items.length === 0 && (0, find_glob_js_1.isLikelyGlobPattern)(pattern)) {
|
|
93
|
+
return sdkFindAsFindResult(sdkTool, tid, params, sig, ctx, pattern, [
|
|
94
|
+
"FFF glob returned no matches; results from SDK find (fd).",
|
|
95
|
+
...notices,
|
|
96
|
+
]);
|
|
97
|
+
}
|
|
98
|
+
if (items.length > 0)
|
|
99
|
+
notices.push("Search engine: FFF glob.");
|
|
100
|
+
else if (notices.length === 0)
|
|
101
|
+
notices.push("Search engine: FFF glob (no matches).");
|
|
49
102
|
const paths = items.map((i) => i.relativePath).join("\n");
|
|
50
103
|
return {
|
|
51
104
|
content: [{ type: "text", text: paths }],
|
|
@@ -63,69 +116,61 @@ function registerFindTool(pi, cwd, fffService, sdkTool, TextComp) {
|
|
|
63
116
|
/* fall through to SDK */
|
|
64
117
|
}
|
|
65
118
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
_type: "findResult",
|
|
70
|
-
text: tc,
|
|
71
|
-
pattern,
|
|
72
|
-
matchCount: tc ? tc.trim().split("\n").filter(Boolean).length : 0,
|
|
73
|
-
};
|
|
74
|
-
return result;
|
|
119
|
+
return sdkFindAsFindResult(sdkTool, tid, params, sig, ctx, pattern, [
|
|
120
|
+
fff ? "FFF find unavailable; results from SDK find (fd)." : "Search engine: SDK find (fd).",
|
|
121
|
+
]);
|
|
75
122
|
}),
|
|
76
123
|
renderCall(args, theme, ctx) {
|
|
77
124
|
(0, config_js_1.resolveBaseBackground)(theme);
|
|
125
|
+
const a = args;
|
|
78
126
|
const text = ctx.lastComponent ?? new TC("", 0, 0);
|
|
79
|
-
const pattern =
|
|
80
|
-
const
|
|
81
|
-
const limit =
|
|
82
|
-
const glob = args.glob;
|
|
127
|
+
const pattern = a.pattern == null ? "" : String(a.pattern);
|
|
128
|
+
const pathArg = a.path == null ? "<missing>" : (0, helpers_js_1.shortPath)(cwd, home, String(a.path));
|
|
129
|
+
const limit = a.limit;
|
|
83
130
|
const findLabel = theme.fg("toolTitle", theme.bold("find"));
|
|
84
131
|
const patternPart = pattern ? theme.fg("accent", pattern) : "";
|
|
85
132
|
const inPart = theme.fg("dim", " in ");
|
|
86
|
-
const pathPart = theme.fg("toolOutput",
|
|
133
|
+
const pathPart = theme.fg("toolOutput", pathArg);
|
|
87
134
|
const limitPart = limit !== undefined && limit !== null ? theme.fg("dim", ` limit ${limit}`) : "";
|
|
88
135
|
const out = `${findLabel} ${patternPart}${inPart}${pathPart}${limitPart}`;
|
|
89
|
-
text.setText((0, render_js_1.fillToolBackground)(
|
|
136
|
+
text.setText((0, render_js_1.fillToolBackground)(`\n${config_js_1.TOOL_RESULT_INDENT}${out}`, ctx.isError ? config_js_1.BG_ERROR : undefined));
|
|
90
137
|
return text;
|
|
91
138
|
},
|
|
92
139
|
renderResult(result, _opt, theme, ctx) {
|
|
93
140
|
(0, config_js_1.resolveBaseBackground)(theme);
|
|
141
|
+
const r = result;
|
|
94
142
|
const text = ctx.lastComponent ?? new TC("", 0, 0);
|
|
95
143
|
if (ctx.isError) {
|
|
96
|
-
text.setText((0, render_js_1.renderToolError)(getText(
|
|
144
|
+
text.setText((0, render_js_1.renderToolError)(getText(r) || "Error", theme));
|
|
97
145
|
return text;
|
|
98
146
|
}
|
|
99
|
-
const d =
|
|
147
|
+
const d = r.details;
|
|
100
148
|
if (d?._type === "findResult") {
|
|
101
149
|
if (!d.text.trim()) {
|
|
102
|
-
const
|
|
103
|
-
|
|
104
|
-
|
|
150
|
+
const noticeStr = d.notices?.length
|
|
151
|
+
? `\n${config_js_1.TOOL_RESULT_INDENT}${theme.fg("warning", `[${d.notices.join(". ")}]`)}`
|
|
152
|
+
: "";
|
|
153
|
+
text.setText((0, render_js_1.fillToolBackground)(`\n${config_js_1.TOOL_RESULT_INDENT}${theme.fg("dim", "0 files")}${noticeStr}\n`));
|
|
154
|
+
return text;
|
|
155
|
+
}
|
|
156
|
+
if (!ctx.expanded) {
|
|
157
|
+
text.setText((0, render_js_1.fillToolBackground)(`${config_js_1.TOOL_RESULT_INDENT}${config_js_1.FG_DIM}${d.matchCount} files — ctrl+o to expand${config_js_1.RST}${(0, render_js_1.renderToolMetrics)(r)}\n`));
|
|
105
158
|
return text;
|
|
106
159
|
}
|
|
107
160
|
const rendered = (0, render_js_1.renderFindResults)(d.text, theme)
|
|
108
161
|
.split("\n")
|
|
109
|
-
.map((l) =>
|
|
162
|
+
.map((l) => `${config_js_1.TOOL_RESULT_INDENT}${l}`)
|
|
110
163
|
.join("\n");
|
|
111
|
-
const
|
|
112
|
-
|
|
113
|
-
|
|
164
|
+
const noticeStr = d.notices?.length
|
|
165
|
+
? `\n${config_js_1.TOOL_RESULT_INDENT}${theme.fg("warning", `[${d.notices.join(". ")}]`)}`
|
|
166
|
+
: "";
|
|
167
|
+
text.setText((0, render_js_1.fillToolBackground)(`\n${config_js_1.TOOL_RESULT_INDENT}${theme.fg("dim", `${d.matchCount} files`)}${(0, render_js_1.renderToolMetrics)(r)}\n${rendered}${noticeStr}\n`));
|
|
114
168
|
return text;
|
|
115
169
|
}
|
|
116
|
-
const fc =
|
|
117
|
-
text.setText((0, render_js_1.fillToolBackground)(
|
|
170
|
+
const fc = r.content?.[0];
|
|
171
|
+
text.setText((0, render_js_1.fillToolBackground)(`\n${config_js_1.TOOL_RESULT_INDENT}${theme.fg("dim", fc?.text?.slice(0, 120) ?? "0 files")}\n`));
|
|
118
172
|
return text;
|
|
119
173
|
},
|
|
120
174
|
});
|
|
121
175
|
}
|
|
122
|
-
function appendNotices(text, notices) {
|
|
123
|
-
return notices.length ? `${text}\n\n[${notices.join(". ")}]` : text;
|
|
124
|
-
}
|
|
125
|
-
function getText(result) {
|
|
126
|
-
return ((result.content ?? [])
|
|
127
|
-
.filter((c) => c.type === "text")
|
|
128
|
-
.map((c) => c.text ?? "")
|
|
129
|
-
.join("\n") ?? "");
|
|
130
|
-
}
|
|
131
176
|
//# sourceMappingURL=find.js.map
|
package/dist/tools/find.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../src/tools/find.ts"],"names":[],"mappings":";AAAA,
|
|
1
|
+
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../src/tools/find.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/grep.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../src/tools/grep.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,KAAK,YAAY,EAGjB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,UAAU,EAAe,oBAAoB,EAAyC,MAAM,aAAa,CAAC;AAaxH,wBAAgB,gBAAgB,CAC/B,EAAE,EAAE,YAAY,EAChB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,oBAAoB,GAAG,IAAI,GAAG,SAAS,EACnD,OAAO,EAAE,UAAU,EACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK;IAAE,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACjF,IAAI,
|
|
1
|
+
{"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../src/tools/grep.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,KAAK,YAAY,EAGjB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,UAAU,EAAe,oBAAoB,EAAyC,MAAM,aAAa,CAAC;AAaxH,wBAAgB,gBAAgB,CAC/B,EAAE,EAAE,YAAY,EAChB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,oBAAoB,GAAG,IAAI,GAAG,SAAS,EACnD,OAAO,EAAE,UAAU,EACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK;IAAE,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACjF,IAAI,CA+IN"}
|
package/dist/tools/grep.js
CHANGED
|
@@ -105,7 +105,7 @@ function registerGrepTool(pi, cwd, fffService, sdkTool, TextComp) {
|
|
|
105
105
|
out += theme.fg("dim", ` (literal)`);
|
|
106
106
|
if (caseInsensitive)
|
|
107
107
|
out += theme.fg("dim", ` (case-insensitive)`);
|
|
108
|
-
text.setText((0, render_js_1.fillToolBackground)(`\n
|
|
108
|
+
text.setText((0, render_js_1.fillToolBackground)(`\n${config_js_1.TOOL_RESULT_INDENT}${out}`, ctx.isError ? config_js_1.BG_ERROR : undefined));
|
|
109
109
|
return text;
|
|
110
110
|
},
|
|
111
111
|
renderResult(result, _opt, theme, ctx) {
|
|
@@ -121,7 +121,11 @@ function registerGrepTool(pi, cwd, fffService, sdkTool, TextComp) {
|
|
|
121
121
|
const d = result.details;
|
|
122
122
|
if (d?._type === "grepResult" && d.text) {
|
|
123
123
|
const lines = d.text.split("\n");
|
|
124
|
-
|
|
124
|
+
if (!ctx.expanded) {
|
|
125
|
+
text.setText((0, render_js_1.fillToolBackground)(`${config_js_1.TOOL_RESULT_INDENT}${config_js_1.FG_DIM}${lines.length} lines — ctrl+o to expand${config_js_1.RST}\n`, ctx.isError ? config_js_1.BG_ERROR : undefined));
|
|
126
|
+
return text;
|
|
127
|
+
}
|
|
128
|
+
const maxShow = lines.length;
|
|
125
129
|
const show = lines.slice(0, maxShow);
|
|
126
130
|
const remaining = lines.length - maxShow;
|
|
127
131
|
const out = [];
|
|
@@ -133,13 +137,13 @@ function registerGrepTool(pi, cwd, fffService, sdkTool, TextComp) {
|
|
|
133
137
|
if (remaining > 0) {
|
|
134
138
|
out.push(theme.fg("muted", `… (${remaining} more ${remaining === 1 ? "line" : "lines"}, to expand)`));
|
|
135
139
|
}
|
|
136
|
-
const body = out.map((l) =>
|
|
140
|
+
const body = out.map((l) => `${config_js_1.TOOL_RESULT_INDENT}${l}`).join("\n") + "\n\n";
|
|
137
141
|
text.setText((0, render_js_1.fillToolBackground)(body, ctx.isError ? config_js_1.BG_ERROR : undefined));
|
|
138
142
|
return text;
|
|
139
143
|
}
|
|
140
144
|
const fc = result.content?.[0];
|
|
141
145
|
const fallback = fc && "text" in fc ? String(fc.text).slice(0, 120) : "no matches";
|
|
142
|
-
text.setText((0, render_js_1.fillToolBackground)(
|
|
146
|
+
text.setText((0, render_js_1.fillToolBackground)(`${config_js_1.TOOL_RESULT_INDENT}${theme.fg("dim", fallback)}`, ctx.isError ? config_js_1.BG_ERROR : undefined));
|
|
143
147
|
return text;
|
|
144
148
|
},
|
|
145
149
|
});
|
package/dist/tools/grep.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grep.js","sourceRoot":"","sources":["../../src/tools/grep.ts"],"names":[],"mappings":";AAAA,uEAAuE;;AAqBvE,
|
|
1
|
+
{"version":3,"file":"grep.js","sourceRoot":"","sources":["../../src/tools/grep.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/ls.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ls.d.ts","sourceRoot":"","sources":["../../src/tools/ls.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,KAAK,YAAY,EAGjB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,UAAU,EAAmE,MAAM,aAAa,CAAC;AAS/G,wBAAgB,cAAc,CAC7B,EAAE,EAAE,YAAY,EAChB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,UAAU,EACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK;IAAE,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACjF,IAAI,
|
|
1
|
+
{"version":3,"file":"ls.d.ts","sourceRoot":"","sources":["../../src/tools/ls.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,KAAK,YAAY,EAGjB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,UAAU,EAAmE,MAAM,aAAa,CAAC;AAS/G,wBAAgB,cAAc,CAC7B,EAAE,EAAE,YAAY,EAChB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,UAAU,EACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK;IAAE,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACjF,IAAI,CA2EN"}
|
package/dist/tools/ls.js
CHANGED
|
@@ -40,7 +40,7 @@ function registerLsTool(pi, cwd, _fffService, sdkTool, TextComp) {
|
|
|
40
40
|
out += ` ${theme.fg("accent", path)}`;
|
|
41
41
|
if (limit !== undefined && limit !== null)
|
|
42
42
|
out += theme.fg("toolOutput", ` (limit ${limit})`);
|
|
43
|
-
text.setText((0, render_js_1.fillToolBackground)(
|
|
43
|
+
text.setText((0, render_js_1.fillToolBackground)(`\n${config_js_1.TOOL_RESULT_INDENT}${out}`, ctx.isError ? config_js_1.BG_ERROR : undefined));
|
|
44
44
|
return text;
|
|
45
45
|
},
|
|
46
46
|
renderResult(result, _opt, theme, ctx) {
|
|
@@ -52,15 +52,19 @@ function registerLsTool(pi, cwd, _fffService, sdkTool, TextComp) {
|
|
|
52
52
|
}
|
|
53
53
|
const d = result.details;
|
|
54
54
|
if (d?._type === "lsResult" && d.text) {
|
|
55
|
+
if (!ctx.expanded) {
|
|
56
|
+
text.setText((0, render_js_1.fillToolBackground)(`${config_js_1.TOOL_RESULT_INDENT}${config_js_1.FG_DIM}${d.entryCount} entries — ctrl+o to expand${config_js_1.RST}${(0, render_js_1.renderToolMetrics)(result)}\n`));
|
|
57
|
+
return text;
|
|
58
|
+
}
|
|
55
59
|
const rendered = (0, render_js_1.renderTree)(d.text, d.path)
|
|
56
60
|
.split("\n")
|
|
57
|
-
.map((l) =>
|
|
61
|
+
.map((l) => `${config_js_1.TOOL_RESULT_INDENT}${l}`)
|
|
58
62
|
.join("\n");
|
|
59
|
-
text.setText((0, render_js_1.fillToolBackground)(
|
|
63
|
+
text.setText((0, render_js_1.fillToolBackground)(`\n${config_js_1.TOOL_RESULT_INDENT}${config_js_1.FG_DIM}${d.entryCount} entries${config_js_1.RST}${(0, render_js_1.renderToolMetrics)(result)}\n${rendered}\n`));
|
|
60
64
|
return text;
|
|
61
65
|
}
|
|
62
66
|
const fc = result.content?.[0];
|
|
63
|
-
text.setText((0, render_js_1.fillToolBackground)(
|
|
67
|
+
text.setText((0, render_js_1.fillToolBackground)(`${config_js_1.TOOL_RESULT_INDENT}${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "done")}`));
|
|
64
68
|
return text;
|
|
65
69
|
},
|
|
66
70
|
});
|
package/dist/tools/ls.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ls.js","sourceRoot":"","sources":["../../src/tools/ls.ts"],"names":[],"mappings":";AAAA,iEAAiE;;AAiBjE,
|
|
1
|
+
{"version":3,"file":"ls.js","sourceRoot":"","sources":["../../src/tools/ls.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-grep.d.ts","sourceRoot":"","sources":["../../src/tools/multi-grep.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,KAAK,YAAY,EAGjB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EACX,UAAU,EAEV,oBAAoB,EAKpB,MAAM,aAAa,CAAC;AASrB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAUrD,wBAAgB,qBAAqB,CACpC,EAAE,EAAE,YAAY,EAChB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,oBAAoB,GAAG,IAAI,GAAG,SAAS,EACnD,WAAW,CAAC,EAAE,UAAU,EACxB,eAAe,GAAE,iBAAgC,EACjD,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK;IAAE,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACjF,IAAI,
|
|
1
|
+
{"version":3,"file":"multi-grep.d.ts","sourceRoot":"","sources":["../../src/tools/multi-grep.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,KAAK,YAAY,EAGjB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EACX,UAAU,EAEV,oBAAoB,EAKpB,MAAM,aAAa,CAAC;AASrB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAUrD,wBAAgB,qBAAqB,CACpC,EAAE,EAAE,YAAY,EAChB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,oBAAoB,GAAG,IAAI,GAAG,SAAS,EACnD,WAAW,CAAC,EAAE,UAAU,EACxB,eAAe,GAAE,iBAAgC,EACjD,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK;IAAE,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACjF,IAAI,CAwRN"}
|
package/dist/tools/multi-grep.js
CHANGED
|
@@ -225,7 +225,7 @@ function registerMultiGrepTool(pi, cwd, fffService, sdkGrepTool, ripgrepFallback
|
|
|
225
225
|
out += theme.fg("dim", ` (literal)`);
|
|
226
226
|
if (limit !== undefined)
|
|
227
227
|
out += theme.fg("dim", ` limit ${limit}`);
|
|
228
|
-
text.setText((0, render_js_1.fillToolBackground)(`\n
|
|
228
|
+
text.setText((0, render_js_1.fillToolBackground)(`\n${config_js_1.TOOL_RESULT_INDENT}${out}`, ctx.isError ? config_js_1.BG_ERROR : undefined));
|
|
229
229
|
return text;
|
|
230
230
|
},
|
|
231
231
|
renderResult(result, _opt, theme, ctx) {
|
|
@@ -238,7 +238,11 @@ function registerMultiGrepTool(pi, cwd, fffService, sdkGrepTool, ripgrepFallback
|
|
|
238
238
|
const d = result.details;
|
|
239
239
|
if (d?._type === "grepResult" && d.text) {
|
|
240
240
|
const lines = d.text.split("\n");
|
|
241
|
-
|
|
241
|
+
if (!ctx.expanded) {
|
|
242
|
+
text.setText((0, render_js_1.fillToolBackground)(`${config_js_1.TOOL_RESULT_INDENT}${config_js_1.FG_DIM}${lines.length} lines — ctrl+o to expand${config_js_1.RST}${(0, render_js_1.renderToolMetrics)(result)}\n`));
|
|
243
|
+
return text;
|
|
244
|
+
}
|
|
245
|
+
const maxShow = lines.length;
|
|
242
246
|
const show = lines.slice(0, maxShow);
|
|
243
247
|
const nw = Math.max(3, 5);
|
|
244
248
|
let hlRe = null;
|
|
@@ -255,26 +259,26 @@ function registerMultiGrepTool(pi, cwd, fffService, sdkGrepTool, ripgrepFallback
|
|
|
255
259
|
if (file !== currentFile) {
|
|
256
260
|
if (currentFile)
|
|
257
261
|
out.push("");
|
|
258
|
-
out.push(
|
|
262
|
+
out.push(`${config_js_1.TOOL_RESULT_INDENT}${theme.fg("accent", theme.bold(file))}`);
|
|
259
263
|
currentFile = file;
|
|
260
264
|
}
|
|
261
265
|
let display = content;
|
|
262
266
|
if (hlRe)
|
|
263
267
|
display = content.replace(hlRe, (m) => `${config_js_1.RST}${theme.fg("warning", theme.bold(m))}${config_js_1.RST}`);
|
|
264
268
|
const padded = `${config_js_1.FG_LNUM}${String(lineNo).padStart(nw)}${config_js_1.RST} ${config_js_1.FG_RULE}│${config_js_1.RST} ${display}${config_js_1.RST}`;
|
|
265
|
-
out.push(
|
|
269
|
+
out.push(`${config_js_1.TOOL_RESULT_INDENT}${padded}`);
|
|
266
270
|
}
|
|
267
271
|
else if (line.trim()) {
|
|
268
|
-
out.push(
|
|
272
|
+
out.push(`${config_js_1.TOOL_RESULT_INDENT}${config_js_1.FG_DIM}${line.trim()}${config_js_1.RST}`);
|
|
269
273
|
}
|
|
270
274
|
}
|
|
271
275
|
const preview = out.join("\n");
|
|
272
|
-
const more = lines.length > maxShow ? `\n${config_js_1.FG_DIM}
|
|
273
|
-
text.setText((0, render_js_1.fillToolBackground)(
|
|
276
|
+
const more = lines.length > maxShow ? `\n${config_js_1.TOOL_RESULT_INDENT}${config_js_1.FG_DIM}... ${lines.length - maxShow} more lines${config_js_1.RST}` : "";
|
|
277
|
+
text.setText((0, render_js_1.fillToolBackground)(`${config_js_1.TOOL_RESULT_INDENT}${config_js_1.FG_DIM}${d.matchCount} matches${config_js_1.RST}${(0, render_js_1.renderToolMetrics)(result)}\n${preview}${more}`));
|
|
274
278
|
return text;
|
|
275
279
|
}
|
|
276
280
|
const fc = result.content?.[0];
|
|
277
|
-
text.setText((0, render_js_1.fillToolBackground)(
|
|
281
|
+
text.setText((0, render_js_1.fillToolBackground)(`${config_js_1.TOOL_RESULT_INDENT}${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "no matches")}`));
|
|
278
282
|
return text;
|
|
279
283
|
},
|
|
280
284
|
});
|