dsh-locator 0.8.2 → 0.10.0

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.
Files changed (58) hide show
  1. package/CHANGELOG.md +47 -0
  2. package/README-es.md +30 -5
  3. package/README-hi.md +31 -5
  4. package/README-pt.md +31 -5
  5. package/README.en.md +31 -5
  6. package/README.md +31 -5
  7. package/bin/darwin-arm64/indexd +0 -0
  8. package/bin/darwin-x64/indexd +0 -0
  9. package/bin/linux-arm64/indexd +0 -0
  10. package/bin/linux-x64/indexd +0 -0
  11. package/bin/win32-arm64/indexd.exe +0 -0
  12. package/bin/win32-x64/indexd.exe +0 -0
  13. package/client.js +1198 -117
  14. package/lib/combined.d.ts +20 -3
  15. package/lib/combined.d.ts.map +1 -1
  16. package/lib/combined.js +85 -15
  17. package/lib/combined.js.map +1 -1
  18. package/lib/content-search-worker.d.ts +8 -3
  19. package/lib/content-search-worker.d.ts.map +1 -1
  20. package/lib/content-search-worker.js +54 -27
  21. package/lib/content-search-worker.js.map +1 -1
  22. package/lib/content-search.d.ts +127 -7
  23. package/lib/content-search.d.ts.map +1 -1
  24. package/lib/content-search.js +571 -36
  25. package/lib/content-search.js.map +1 -1
  26. package/lib/content.d.ts +83 -5
  27. package/lib/content.d.ts.map +1 -1
  28. package/lib/content.js +351 -87
  29. package/lib/content.js.map +1 -1
  30. package/lib/export.d.ts +61 -0
  31. package/lib/export.d.ts.map +1 -1
  32. package/lib/export.js +217 -52
  33. package/lib/export.js.map +1 -1
  34. package/lib/find.d.ts.map +1 -1
  35. package/lib/find.js +73 -16
  36. package/lib/find.js.map +1 -1
  37. package/lib/http.d.ts +38 -2
  38. package/lib/http.d.ts.map +1 -1
  39. package/lib/http.js +279 -82
  40. package/lib/http.js.map +1 -1
  41. package/lib/reveal.d.ts +69 -3
  42. package/lib/reveal.d.ts.map +1 -1
  43. package/lib/reveal.js +140 -11
  44. package/lib/reveal.js.map +1 -1
  45. package/lib/tools.d.ts +30 -0
  46. package/lib/tools.d.ts.map +1 -1
  47. package/lib/tools.js +65 -3
  48. package/lib/tools.js.map +1 -1
  49. package/package.json +1 -1
  50. package/src/combined.ts +107 -17
  51. package/src/content-search-worker.ts +52 -24
  52. package/src/content-search.ts +710 -36
  53. package/src/content.ts +349 -73
  54. package/src/export.ts +240 -50
  55. package/src/find.ts +83 -16
  56. package/src/http.ts +271 -83
  57. package/src/reveal.ts +148 -10
  58. package/src/tools.ts +83 -6
package/lib/reveal.js CHANGED
@@ -1,26 +1,151 @@
1
1
  /**
2
- * Reveal one indexed path in the platform file manager.
2
+ * Reveal/open one indexed path safely.
3
+ *
4
+ * Both operations are authorized against the indexed roots on the **real**
5
+ * path: the target and every root are canonicalized with `realpath`, so a
6
+ * symlink cannot be used to point the file manager or the platform opener at
7
+ * something outside the configured roots. A target that does not exist is
8
+ * authorized through its nearest existing ancestor, whose real path must still
9
+ * live inside a root. Opening with the default application is additionally
10
+ * refused for executable and script file types (extension or Unix executable
11
+ * bit), because a document viewer route must never launch a program.
3
12
  * @module dsh-locator/reveal
4
13
  */
5
14
  import { spawn } from 'node:child_process';
6
- import { dirname, isAbsolute, relative, resolve } from 'node:path';
7
- /** Whether target is one of the roots or lives below one of them. */
8
- export function withinRoots(target, roots) {
9
- if (!isAbsolute(target))
15
+ import { realpathSync } from 'node:fs';
16
+ import { basename, dirname, extname, isAbsolute, join, relative, resolve, sep } from 'node:path';
17
+ const WINDOWS = process.platform === 'win32';
18
+ /** Compare paths case-insensitively on Windows, where the filesystem does. */
19
+ function comparable(path) {
20
+ return WINDOWS ? path.toLowerCase() : path;
21
+ }
22
+ /** Filesystem errors that mean "this path does not exist (yet)". */
23
+ function isMissing(error) {
24
+ if (typeof error !== 'object' || error === null || !('code' in error))
10
25
  return false;
26
+ const code = error.code;
27
+ return code === 'ENOENT' || code === 'ENOTDIR';
28
+ }
29
+ /**
30
+ * Canonical real path of `target`, or of its nearest existing ancestor with the
31
+ * missing suffix appended when `target` itself is absent.
32
+ *
33
+ * `realpath` resolves every symlink in an existing component, so the result is
34
+ * the only value that may be compared against canonical roots. Returns
35
+ * undefined for a relative path, a filesystem error other than ENOENT/ENOTDIR
36
+ * (for example EACCES), or a path whose root has no existing ancestor.
37
+ * @param target - absolute path to canonicalize.
38
+ * @returns the canonical target and whether it exists.
39
+ */
40
+ export function realPathOf(target) {
41
+ if (typeof target !== 'string' || target === '' || !isAbsolute(target))
42
+ return undefined;
11
43
  const absolute = resolve(target);
44
+ const missing = [];
45
+ let current = absolute;
46
+ for (;;) {
47
+ try {
48
+ const real = realpathSync.native(current);
49
+ return { path: missing.length === 0 ? real : join(real, ...missing.reverse()), exists: missing.length === 0 };
50
+ }
51
+ catch (error) {
52
+ if (!isMissing(error))
53
+ return undefined;
54
+ const parent = dirname(current);
55
+ if (parent === current)
56
+ return undefined;
57
+ missing.push(basename(current));
58
+ current = parent;
59
+ }
60
+ }
61
+ }
62
+ /** Whether canonical `target` is `root` itself or lives below it. */
63
+ function isUnder(root, target) {
64
+ const rel = relative(comparable(root), comparable(target));
65
+ if (rel === '')
66
+ return true;
67
+ if (isAbsolute(rel))
68
+ return false;
69
+ return rel !== '..' && !rel.startsWith(`..${sep}`);
70
+ }
71
+ /** Canonical (real) forms of the configured roots; unusable roots are dropped, never widened. */
72
+ function realRoots(roots) {
73
+ const canonical = [];
12
74
  for (const root of roots) {
13
- const base = resolve(root);
14
- const rel = relative(base, absolute);
15
- if (rel === '' || (!rel.startsWith('..') && !isAbsolute(rel)))
16
- return true;
75
+ const resolved = realPathOf(root);
76
+ if (resolved !== undefined)
77
+ canonical.push(resolved.path);
78
+ }
79
+ return canonical;
80
+ }
81
+ /**
82
+ * Authorize `target` against the indexed roots on canonical paths.
83
+ *
84
+ * The target and the roots are both resolved with `realpath`; a symlink that
85
+ * points outside a root is denied even though its lexical path looked inside.
86
+ * A missing target is still authorized when its nearest existing ancestor is
87
+ * inside a root, which keeps the containment check meaningful for paths that
88
+ * appear between the search and the reveal.
89
+ * @param target - requested absolute path.
90
+ * @param roots - configured indexed roots (any form: they are canonicalized).
91
+ * @returns the canonical path plus whether it exists, or undefined when the
92
+ * request must be refused.
93
+ */
94
+ export function resolveWithinRoots(target, roots) {
95
+ const real = realPathOf(target);
96
+ if (real === undefined)
97
+ return undefined;
98
+ for (const root of realRoots(roots)) {
99
+ if (isUnder(root, real.path))
100
+ return real;
101
+ }
102
+ return undefined;
103
+ }
104
+ /** Whether target is one of the roots or lives below one of them (canonical paths). */
105
+ export function withinRoots(target, roots) {
106
+ return resolveWithinRoots(target, roots) !== undefined;
107
+ }
108
+ /**
109
+ * Extensions that name a program or a script, not a document. Opening one with
110
+ * the platform's default handler can execute code (Windows ShellExecute,
111
+ * `.desktop` launchers, shell script interpreters), so the open route refuses
112
+ * them outright instead of relying on the handler's own judgement.
113
+ */
114
+ export const EXECUTABLE_EXTENSIONS = new Set([
115
+ '.exe', '.com', '.msi', '.msix', '.scr', '.pif', '.cpl',
116
+ '.bat', '.cmd', '.ps1', '.psm1', '.psd1',
117
+ '.sh', '.bash', '.zsh', '.fish', '.ksh', '.csh', '.command', '.run',
118
+ '.desktop', '.app', '.appimage', '.lnk', '.url',
119
+ '.vbs', '.vbe', '.js', '.jse', '.wsf', '.wsh', '.hta',
120
+ '.jar', '.reg', '.dll', '.so', '.dylib',
121
+ '.service', '.workflow', '.terminal',
122
+ ]);
123
+ /**
124
+ * Why opening `target` with the default application is unsafe, if it is.
125
+ *
126
+ * Extension matching is case-insensitive and uses the **real** path, so a
127
+ * harmless-looking symlink name cannot disguise a script. On Unix an
128
+ * executable permission bit is refused too, which covers extensionless
129
+ * binaries and scripts.
130
+ * @param target - canonical path about to be opened.
131
+ * @param mode - the target's `stat.mode`, when known.
132
+ * @returns a human-readable refusal, or undefined when the open may proceed.
133
+ */
134
+ export function executableFileRejection(target, mode) {
135
+ const extension = extname(target).toLowerCase();
136
+ if (EXECUTABLE_EXTENSIONS.has(extension)) {
137
+ return `refusing to open an executable or script file (${extension})`;
17
138
  }
18
- return false;
139
+ if (!WINDOWS && mode !== undefined && (mode & 0o111) !== 0) {
140
+ return 'refusing to open an executable file (executable permission set)';
141
+ }
142
+ return undefined;
19
143
  }
20
144
  /**
21
145
  * Ask the platform to reveal a path in its file manager. Uses an argument
22
146
  * vector, not a shell, so a path can never be interpreted as a command. The
23
147
  * child is detached: the opener outlives the plugin call.
148
+ * @param target - canonical path inside the indexed roots.
24
149
  */
25
150
  export async function revealInFileManager(target) {
26
151
  const absolute = resolve(target);
@@ -30,7 +155,11 @@ export async function revealInFileManager(target) {
30
155
  return spawnDetached('open', ['-R', absolute]);
31
156
  return spawnDetached('xdg-open', [dirname(absolute)]);
32
157
  }
33
- /** Open a path with its default application. */
158
+ /**
159
+ * Open a path with its default application.
160
+ * @param target - canonical path inside the indexed roots; callers must have
161
+ * rejected {@link executableFileRejection} first.
162
+ */
34
163
  export async function openWithDefaultApp(target) {
35
164
  const absolute = resolve(target);
36
165
  if (process.platform === 'win32')
package/lib/reveal.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"reveal.js","sourceRoot":"","sources":["../src/reveal.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAElE,qEAAqE;AACrE,MAAM,UAAU,WAAW,CAAC,MAAc,EAAE,KAAwB;IAClE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAA;IACrC,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAChC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;QAC1B,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QACpC,IAAI,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAAE,OAAO,IAAI,CAAA;IAC5E,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,MAAc;IACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAChC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;QAAE,OAAO,aAAa,CAAC,cAAc,EAAE,CAAC,WAAW,QAAQ,EAAE,CAAC,CAAC,CAAA;IAC/F,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ;QAAE,OAAO,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;IACjF,OAAO,aAAa,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;AACvD,CAAC;AAED,gDAAgD;AAChD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,MAAc;IACrD,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAChC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;QAAE,OAAO,aAAa,CAAC,cAAc,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAClF,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ;QAAE,OAAO,aAAa,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC3E,OAAO,aAAa,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;AAC9C,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,OAAe,EAAE,IAAc;IAC1D,MAAM,IAAI,OAAO,CAAO,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;QAC1F,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAC3B,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;YACvB,KAAK,CAAC,KAAK,EAAE,CAAA;YACb,cAAc,EAAE,CAAA;QAClB,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC"}
1
+ {"version":3,"file":"reveal.js","sourceRoot":"","sources":["../src/reveal.ts"],"names":[],"mappings":"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"}
package/lib/tools.d.ts CHANGED
@@ -3,6 +3,36 @@
3
3
  * @module dsh-locator/tools
4
4
  */
5
5
  import type { LocatorRuntime } from './runtime.ts';
6
+ /** Validated rebuild scope: only narrowing of the configured roots/excludes is allowed. */
7
+ export interface RebuildScope {
8
+ roots?: string[];
9
+ excludes?: string[];
10
+ }
11
+ /** Validation result for one `locator_rebuild` argument pair. */
12
+ export type RebuildScopeResult = {
13
+ ok: true;
14
+ roots?: string[];
15
+ excludes?: string[];
16
+ } | {
17
+ ok: false;
18
+ error: string;
19
+ };
20
+ /**
21
+ * Restrict a `locator_rebuild` request to the configured scope.
22
+ *
23
+ * Root replacement is the dangerous knob: letting the model pick an arbitrary
24
+ * absolute path would turn a search tool into a disk-indexer for directories
25
+ * the operator never configured. A requested root must therefore canonicalize
26
+ * (symlinks resolved) to a configured root or a directory below one; requested
27
+ * excludes must be draw from the configured exclude list. Everything is passed
28
+ * through the same canonicalization as `/reveal`/`/open`.
29
+ * @param roots - requested replacement roots, if any.
30
+ * @param excludes - requested replacement excludes, if any.
31
+ * @param configuredRoots - the plugin's configured (resolved) roots.
32
+ * @param configuredExcludes - the plugin's configured excludes.
33
+ * @returns the canonical narrowed scope, or the first refusal.
34
+ */
35
+ export declare function validateRebuildArguments(roots: readonly string[] | undefined, excludes: readonly string[] | undefined, configuredRoots: readonly string[], configuredExcludes: readonly string[]): RebuildScopeResult;
6
36
  /** Build the locator_search tool. */
7
37
  export declare function makeSearchTool(rt: LocatorRuntime): import("@deepseek-ai/dsh-tools").ToolDefinition;
8
38
  /** Build the locator_status tool. */
@@ -1 +1 @@
1
- {"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAa,MAAM,cAAc,CAAA;AA2E7D,qCAAqC;AACrC,wBAAgB,cAAc,CAAC,EAAE,EAAE,cAAc,mDA8GhD;AAED,qCAAqC;AACrC,wBAAgB,cAAc,CAAC,EAAE,EAAE,cAAc,mDA+DhD;AAED,sCAAsC;AACtC,wBAAgB,eAAe,CAAC,EAAE,EAAE,cAAc,mDAgCjD"}
1
+ {"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAa,MAAM,cAAc,CAAA;AAkE7D,2FAA2F;AAC3F,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,iEAAiE;AACjE,MAAM,MAAM,kBAAkB,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GACnD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhC;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EACpC,QAAQ,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EACvC,eAAe,EAAE,SAAS,MAAM,EAAE,EAClC,kBAAkB,EAAE,SAAS,MAAM,EAAE,GACpC,kBAAkB,CAsCpB;AAYD,qCAAqC;AACrC,wBAAgB,cAAc,CAAC,EAAE,EAAE,cAAc,mDA8GhD;AAED,qCAAqC;AACrC,wBAAgB,cAAc,CAAC,EAAE,EAAE,cAAc,mDA+DhD;AAED,sCAAsC;AACtC,wBAAgB,eAAe,CAAC,EAAE,EAAE,cAAc,mDAqCjD"}
package/lib/tools.js CHANGED
@@ -3,6 +3,7 @@
3
3
  * @module dsh-locator/tools
4
4
  */
5
5
  import { defineTool } from '@deepseek-ai/dsh-tools';
6
+ import { resolveWithinRoots } from "./reveal.js";
6
7
  const HIT_SCHEMA = {
7
8
  type: 'object',
8
9
  additionalProperties: false,
@@ -62,6 +63,63 @@ const REBUILD_OUTPUT = {
62
63
  error: { type: 'string' },
63
64
  },
64
65
  };
66
+ /**
67
+ * Restrict a `locator_rebuild` request to the configured scope.
68
+ *
69
+ * Root replacement is the dangerous knob: letting the model pick an arbitrary
70
+ * absolute path would turn a search tool into a disk-indexer for directories
71
+ * the operator never configured. A requested root must therefore canonicalize
72
+ * (symlinks resolved) to a configured root or a directory below one; requested
73
+ * excludes must be draw from the configured exclude list. Everything is passed
74
+ * through the same canonicalization as `/reveal`/`/open`.
75
+ * @param roots - requested replacement roots, if any.
76
+ * @param excludes - requested replacement excludes, if any.
77
+ * @param configuredRoots - the plugin's configured (resolved) roots.
78
+ * @param configuredExcludes - the plugin's configured excludes.
79
+ * @returns the canonical narrowed scope, or the first refusal.
80
+ */
81
+ export function validateRebuildArguments(roots, excludes, configuredRoots, configuredExcludes) {
82
+ let narrowedRoots;
83
+ if (roots !== undefined) {
84
+ if (!Array.isArray(roots) || roots.length === 0) {
85
+ return { ok: false, error: 'roots must be a non-empty array of directory paths' };
86
+ }
87
+ narrowedRoots = [];
88
+ for (const root of roots) {
89
+ if (typeof root !== 'string' || root.trim() === '') {
90
+ return { ok: false, error: 'roots must contain non-empty directory paths' };
91
+ }
92
+ const resolved = resolveWithinRoots(root.trim(), configuredRoots);
93
+ if (resolved === undefined) {
94
+ return { ok: false, error: `root is outside the configured roots: ${root}` };
95
+ }
96
+ if (!narrowedRoots.includes(resolved.path))
97
+ narrowedRoots.push(resolved.path);
98
+ }
99
+ }
100
+ let narrowedExcludes;
101
+ if (excludes !== undefined) {
102
+ if (!Array.isArray(excludes))
103
+ return { ok: false, error: 'excludes must be an array of configured globs' };
104
+ const allowed = new Set(configuredExcludes);
105
+ narrowedExcludes = [];
106
+ for (const exclude of excludes) {
107
+ if (typeof exclude !== 'string' || exclude.trim() === '') {
108
+ return { ok: false, error: 'excludes must contain non-empty globs' };
109
+ }
110
+ if (!allowed.has(exclude)) {
111
+ return { ok: false, error: `exclude is not one of the configured excludes: ${exclude}` };
112
+ }
113
+ if (!narrowedExcludes.includes(exclude))
114
+ narrowedExcludes.push(exclude);
115
+ }
116
+ }
117
+ return {
118
+ ok: true,
119
+ ...(narrowedRoots === undefined ? {} : { roots: narrowedRoots }),
120
+ ...(narrowedExcludes === undefined ? {} : { excludes: narrowedExcludes }),
121
+ };
122
+ }
65
123
  const SEARCH_DESCRIPTION = [
66
124
  'Search a persistent local file-name index in milliseconds (dsh-locator).',
67
125
  '',
@@ -235,11 +293,12 @@ export function makeRebuildTool(rt) {
235
293
  name: 'locator_rebuild',
236
294
  description: [
237
295
  'Rebuild the local file index from scratch (dsh-locator). Runs in the background; locator_search keeps answering from the old index until the new one is ready.',
296
+ 'The rebuild is always confined to the configured scope: replacement `roots` must resolve inside the roots the plugin was configured with, and replacement `excludes` must come from the configured exclude list. To index a different directory, change the plugin configuration instead.',
238
297
  'Use it after changing indexed roots, after the index looks stale and the watcher is inactive, or when the user explicitly asks to rescan. It can take minutes for a large home directory and costs disk I/O, so do not call it routinely.',
239
298
  ].join('\n'),
240
299
  parameters: {
241
- roots: { type: 'array', items: { type: 'string' }, description: 'Replacement root directories (defaults to the current roots).' },
242
- excludes: { type: 'array', items: { type: 'string' }, description: 'Replacement exclusion globs.' },
300
+ roots: { type: 'array', items: { type: 'string' }, description: 'Replacement root directories (defaults to the current roots). Each must be a configured root or inside one.' },
301
+ excludes: { type: 'array', items: { type: 'string' }, description: 'Replacement exclusion globs (defaults to the current excludes). Each must already be configured.' },
243
302
  },
244
303
  output: {
245
304
  schema: REBUILD_OUTPUT,
@@ -251,9 +310,12 @@ export function makeRebuildTool(rt) {
251
310
  },
252
311
  },
253
312
  async execute(args) {
313
+ const scope = validateRebuildArguments(args.roots, args.excludes, rt.roots, rt.config.excludes);
314
+ if (!scope.ok)
315
+ return { ok: false, error: scope.error };
254
316
  try {
255
317
  rt.start();
256
- const result = await rt.rebuild(args.roots === undefined ? undefined : args.roots, args.excludes === undefined ? undefined : args.excludes);
318
+ const result = await rt.rebuild(scope.roots, scope.excludes);
257
319
  return { ok: true, started: result.started };
258
320
  }
259
321
  catch (error) {
package/lib/tools.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tools.js","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAGnD,MAAM,UAAU,GAAG;IACjB,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,KAAK;IAC3B,UAAU,EAAE;QACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QACxC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QACxC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QACzB,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,yCAAyC,EAAE;QAClF,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,6BAA6B,EAAE;QACxE,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACvB,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;KACzB;CACO,CAAA;AAEV,MAAM,aAAa,GAAG;IACpB,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,KAAK;IAC3B,UAAU,EAAE;QACV,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QACvC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACzB,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC1B,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC7B,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC3B,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC9B,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC7B,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC1B,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE;QAC1C,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC1B;CACO,CAAA;AAEV,MAAM,aAAa,GAAG;IACpB,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,KAAK;IAC3B,UAAU,EAAE;QACV,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QACvC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC5B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC5B,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;QACnD,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC5B,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC1B,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QACzB,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC7B,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC7B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC5B,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC1B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC1B;CACO,CAAA;AAEV,MAAM,cAAc,GAAG;IACrB,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,KAAK;IAC3B,UAAU,EAAE;QACV,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QACvC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC5B,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC1B;CACO,CAAA;AAEV,MAAM,kBAAkB,GAAG;IACzB,0EAA0E;IAC1E,EAAE;IACF,6MAA6M;IAC7M,EAAE;IACF,kaAAka;IACla,EAAE;IACF,iZAAiZ;CAClZ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAEZ,qCAAqC;AACrC,MAAM,UAAU,cAAc,CAAC,EAAkB;IAC/C,OAAO,UAAU,CAAC;QAChB,IAAI,EAAE,gBAAgB;QACtB,WAAW,EAAE,kBAAkB;QAC/B,UAAU,EAAE;YACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,qEAAqE,EAAE;YAC7H,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,+CAA+C,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE;YACxH,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,6CAA6C,EAAE;YACvF,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,WAAW,EAAE,0BAA0B,EAAE;YACjH,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,kBAAkB,EAAE;YAC1D,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,mEAAmE,EAAE;YAC5G,aAAa,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,oBAAoB,EAAE;YACrE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,gDAAgD,EAAE;YAC7F,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,oBAAoB,EAAE;YACjE,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,0BAA0B,EAAE;SACvE;QACD,MAAM,EAAE;YACN,MAAM,EAAE,aAAa;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACvB,MAAM,CAAC,GAAG,KAUT,CAAA;gBACD,IAAI,CAAC,CAAC,CAAC,EAAE;oBAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,0BAA0B,CAAC,CAAC,KAAK,IAAI,eAAe,EAAE,EAAE,CAAC,CAAA;gBAClG,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE,CAAA;gBACzB,MAAM,KAAK,GAAG;oBACZ,kBAAkB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,YAAY;wBAClF,GAAG,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,aAAa,MAAM,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;wBACvE,OAAO,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK;wBACtC,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,oDAAoD,CAAC,CAAC,CAAC,EAAE,CAAC;iBACpF,CAAA;gBACD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;oBACvB,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;oBACjC,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAA;oBACvD,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,GAAG,MAAM,GAAG,IAAI,EAAE,CAAC,CAAA;gBAC3C,CAAC;gBACD,IAAI,CAAC,CAAC,SAAS,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,EAAE,CAAC;oBAC/D,KAAK,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,0DAA0D,CAAC,CAAA;gBACtH,CAAC;gBACD,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACnD,CAAC;YACD,gBAAgB,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACjC,MAAM,CAAC,GAAG,KAAiF,CAAA;gBAC3F,IAAI,CAAC,CAAC,CAAC,EAAE;oBAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,CAAA;gBAC3E,OAAO;oBACL,KAAK,EAAE,OAAO;oBACd,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;oBACpE,SAAS,EAAE,CAAC,CAAC,SAAS,KAAK,IAAI;oBAC/B,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;iBACpB,CAAA;YACH,CAAC;SACF;QACD,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;YACxB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;gBAAE,OAAO,SAAS,CAAA;YACxC,OAAO;gBACL,IAAI,EAAE,QAAiB;gBACvB,KAAK,EAAE,OAAgB;gBACvB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB,CAAA;QACH,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,IAAI;YAChB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YAC9D,IAAI,CAAC;gBACH,EAAE,CAAC,KAAK,EAAE,CAAA;gBACV,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC;oBAC7B,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,KAAK;oBACL,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC;oBACrC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,MAAM;oBACzB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,KAAK;oBACxB,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,KAAK;oBAC1B,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,KAAK;oBAC1C,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,KAAK;oBAClC,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,KAAK;oBAClC,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,KAAK;iBACjC,CAAC,CAAA;gBACF,OAAO;oBACL,EAAE,EAAE,IAAa;oBACjB,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,MAAM,EAAE,MAAM,CAAC,MAAM;oBACrB,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ,KAAK,IAAI;oBAClC,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,GAAG;oBAC3B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBAC5B,IAAI,EAAE,GAAG,CAAC,IAAI;wBACd,IAAI,EAAE,GAAG,CAAC,IAAI;wBACd,IAAI,EAAE,GAAG,CAAC,IAAI;wBACd,KAAK,EAAE,GAAG,CAAC,KAAK;wBAChB,QAAQ,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE;wBAC3C,GAAG,EAAE,GAAG,CAAC,GAAG;wBACZ,GAAG,EAAE,GAAG,CAAC,GAAG;qBACb,CAAC,CAAC;iBACJ,CAAA;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,EAAE,EAAE,EAAE,KAAc,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAA;YAC3E,CAAC;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,qCAAqC;AACrC,MAAM,UAAU,cAAc,CAAC,EAAkB;IAC/C,OAAO,UAAU,CAAC;QAChB,IAAI,EAAE,gBAAgB;QACtB,WAAW,EAAE;YACX,4KAA4K;YAC5K,kJAAkJ;SACnJ,CAAC,IAAI,CAAC,IAAI,CAAC;QACZ,UAAU,EAAE,EAAE;QACd,MAAM,EAAE;YACN,MAAM,EAAE,aAAa;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACvB,MAAM,CAAC,GAAG,KAgBT,CAAA;gBACD,IAAI,CAAC,CAAC,CAAC,EAAE;oBAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,wCAAwC,CAAC,CAAC,KAAK,IAAI,eAAe,EAAE,EAAE,CAAC,CAAA;gBAChH,MAAM,KAAK,GAAG;oBACZ,mBAAmB,MAAM,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,aAAa,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,WAAW,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,QAAQ;oBAChH,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ,EAAE;oBACpD,cAAc,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,kDAAkD,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC5L,YAAY,CAAC,CAAC,QAAQ,IAAI,EAAE,EAAE;oBAC9B,aAAa,CAAC,CAAC,MAAM,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,QAAQ,IAAI,EAAE,GAAG,EAAE;iBACtG,CAAA;gBACD,IAAI,CAAC,CAAC,OAAO,KAAK,SAAS;oBAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;gBAClE,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS;oBAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;gBAC5D,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACnD,CAAC;SACF;QACD,KAAK,CAAC,OAAO;YACX,EAAE,CAAC,KAAK,EAAE,CAAA;YACV,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAA;YACxB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,YAAY,EAAE,CAAA;YACtC,OAAO;gBACL,EAAE,EAAE,MAAM,CAAC,KAAK,KAAK,SAAS;gBAC9B,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACvF,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;gBAChC,OAAO,EAAE,MAAM,EAAE,OAAO,IAAI,CAAC;gBAC7B,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;gBACzB,IAAI,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC;gBACvB,QAAQ,EAAE,MAAM,EAAE,QAAQ,IAAI,KAAK;gBACnC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,KAAK;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ,KAAK,SAAS;gBACvC,QAAQ,EAAE,MAAM,EAAE,QAAQ,IAAI,EAAE,CAAC,QAAQ;gBACzC,MAAM,EAAE,EAAE,CAAC,MAAM;gBACjB,GAAG,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpE,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;aAC/D,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,sCAAsC;AACtC,MAAM,UAAU,eAAe,CAAC,EAAkB;IAChD,OAAO,UAAU,CAAC;QAChB,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE;YACX,gKAAgK;YAChK,2OAA2O;SAC5O,CAAC,IAAI,CAAC,IAAI,CAAC;QACZ,UAAU,EAAE;YACV,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,+DAA+D,EAAE;YACjI,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,8BAA8B,EAAE;SACpG;QACD,MAAM,EAAE;YACN,MAAM,EAAE,cAAc;YACtB,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACvB,MAAM,CAAC,GAAG,KAA2D,CAAA;gBACrE,IAAI,CAAC,CAAC,CAAC,EAAE;oBAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,2BAA2B,CAAC,CAAC,KAAK,IAAI,eAAe,EAAE,EAAE,CAAC,CAAA;gBACnG,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,iGAAiG,EAAE,CAAC,CAAA;YACpI,CAAC;SACF;QACD,KAAK,CAAC,OAAO,CAAC,IAAI;YAChB,IAAI,CAAC;gBACH,EAAE,CAAC,KAAK,EAAE,CAAA;gBACV,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAC7B,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EACjD,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CACxD,CAAA;gBACD,OAAO,EAAE,EAAE,EAAE,IAAa,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAA;YACvD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,EAAE,EAAE,EAAE,KAAc,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAA;YACxD,CAAC;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAc;IACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IACrF,MAAM,MAAM,GAAG,KAAgC,CAAA;IAC/C,OAAO,CACL,MAAM,CAAC,KAAK,KAAK,OAAO;QACxB,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QAC3B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC;QACpD,OAAO,MAAM,CAAC,SAAS,KAAK,SAAS;QACrC,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CACjC,CAAA;AACH,CAAC;AAED,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AAC/D,CAAC;AAED,SAAS,KAAK,CAAC,KAAa,EAAE,GAAW,EAAE,GAAW;IACpD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AACxD,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,IAAI,KAAK,GAAG,IAAI;QAAE,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAA;IAC7C,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IACtC,IAAI,KAAK,GAAG,KAAK,GAAG,IAAI,CAAA;IACxB,IAAI,IAAI,GAAG,CAAC,CAAA;IACZ,OAAO,KAAK,IAAI,IAAI,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChD,KAAK,IAAI,IAAI,CAAA;QACb,IAAI,EAAE,CAAA;IACR,CAAC;IACD,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAA;AACvE,CAAC"}
1
+ {"version":3,"file":"tools.js","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dsh-locator",
3
- "version": "0.8.2",
3
+ "version": "0.10.0",
4
4
  "description": "Whole-disk, millisecond file search for DeepSeek Harness without Everything: a self-built cross-platform index, an Everything-style query language, agent tools and a Web search panel (Ctrl+Shift+F). Windows, macOS and Linux.",
5
5
  "author": "PerryLink contributors",
6
6
  "repository": {
package/src/combined.ts CHANGED
@@ -4,12 +4,21 @@
4
4
  *
5
5
  * The name index and the content index live in different stores, so this module
6
6
  * owns the orchestration and the merge rules as pure, injectable functions:
7
- * scope gating, the lazy-build guard for empty queries, per-group degradation
8
- * and de-duplication of a path that appears both as a body hit and a name hit.
7
+ * scope gating, the lazy-build guard for empty queries, per-group degradation,
8
+ * match-option routing (content vs name engine), page counts and de-duplication
9
+ * of a path that appears both as a body hit and a name hit.
9
10
  * @module dsh-locator/combined
10
11
  */
11
12
 
12
13
  import type { ContentHit, ContentState } from './content.ts'
14
+ import { checkContentQuery, decodeExtendedForNames } from './content-search.ts'
15
+ import type {
16
+ ContentCount,
17
+ ContentCountMode,
18
+ ContentMatchMode,
19
+ ContentSearchOptions,
20
+ ContentSearchResult,
21
+ } from './content-search.ts'
13
22
  import type { SearchArgs, SearchHit, SearchResult } from './runtime.ts'
14
23
 
15
24
  /** Which groups a combined request asked for; every scope is on by default. */
@@ -27,6 +36,15 @@ export interface CombinedRequest {
27
36
  sort: string
28
37
  desc: boolean
29
38
  scopes: CombinedScopes
39
+ /** How the query text is interpreted (`normal` by default). */
40
+ matchMode: ContentMatchMode
41
+ caseSensitive: boolean
42
+ wholeWord: boolean
43
+ /** Restrict the content group to one session (null means every document). */
44
+ sessionId: string | null
45
+ /** How much counting work the groups may spend. */
46
+ count: ContentCountMode
47
+ countLimit: number
30
48
  }
31
49
 
32
50
  /** One name-index group: files or directories. */
@@ -37,7 +55,10 @@ export interface NameGroup {
37
55
  truncated: boolean
38
56
  /** Rows dropped because the same path already appears in the content group. */
39
57
  deduped: number
58
+ /** The name engine always returns an exact total. */
59
+ count: ContentCount
40
60
  tookMs: number
61
+ warnings?: string[]
41
62
  error?: string
42
63
  }
43
64
 
@@ -47,6 +68,9 @@ export interface ContentGroup {
47
68
  returned: number
48
69
  /** True when the group was cut off by its page limit. */
49
70
  capped: boolean
71
+ /** Exact or bounded match count; `unknown` when counting was skipped. */
72
+ count: ContentCount
73
+ warnings: string[]
50
74
  building: boolean
51
75
  files: number
52
76
  sessions: number
@@ -71,7 +95,7 @@ export interface CombinedResponse {
71
95
  /** Dependencies required to run a combined search; the HTTP layer supplies them. */
72
96
  export interface CombinedDeps {
73
97
  search(args: SearchArgs): Promise<SearchResult>
74
- contentSearch?: (query: string, limit: number) => Promise<ContentHit[]>
98
+ contentSearch?: (query: string, limit: number, options: ContentSearchOptions) => Promise<ContentSearchResult>
75
99
  contentStatus?: () => ContentState
76
100
  ensure?: () => void
77
101
  maxResults: number
@@ -109,6 +133,12 @@ export function readCombinedRequest(body: Record<string, unknown>, maxResults: n
109
133
  sort: sortKey(body.sort),
110
134
  desc: body.desc === true,
111
135
  scopes: readScopes(body),
136
+ matchMode: matchMode(body.matchMode),
137
+ caseSensitive: body.caseSensitive === true,
138
+ wholeWord: body.wholeWord === true,
139
+ sessionId: typeof body.sessionId === 'string' && body.sessionId.trim() !== '' ? body.sessionId : null,
140
+ count: countMode(body.count),
141
+ countLimit: clamp(body.countLimit, 1, 5000, 1000),
112
142
  }
113
143
  }
114
144
 
@@ -153,9 +183,10 @@ export async function runCombinedSearch(deps: CombinedDeps, request: CombinedReq
153
183
  const { scopes, query } = request
154
184
  const contentEnabled = deps.contentSearch !== undefined
155
185
  const wantsContent = scopes.content && contentEnabled
156
- // Two characters are the floor for the content store: one-character queries
157
- // fall back to an unindexed LIKE scan and are not worth a build or a query.
158
- const askContent = wantsContent && query.trim().length >= 2
186
+ // Any non-empty query is evaluated against the content store; short or
187
+ // over-limit queries are rejected by the same validator the store uses, so
188
+ // the panel can show `content-query-too-short` without starting a build.
189
+ const askContent = wantsContent && query.trim() !== ''
159
190
 
160
191
  const contentPromise = wantsContent ? contentGroup(deps, request, askContent) : Promise.resolve(undefined)
161
192
  const filesPromise = scopes.files ? nameGroup(deps, request, true) : Promise.resolve(undefined)
@@ -188,16 +219,40 @@ export async function runCombinedSearch(deps: CombinedDeps, request: CombinedReq
188
219
  /** Page through a directory-shaped name query. */
189
220
  async function nameGroup(deps: CombinedDeps, request: CombinedRequest, files: boolean): Promise<NameGroup> {
190
221
  const started = Date.now()
222
+ const empty = (error?: string, warnings?: string[]): NameGroup => ({
223
+ hits: [],
224
+ returned: 0,
225
+ total: 0,
226
+ truncated: false,
227
+ deduped: 0,
228
+ count: { value: 0, kind: 'exact' },
229
+ tookMs: Date.now() - started,
230
+ ...(warnings === undefined || warnings.length === 0 ? {} : { warnings }),
231
+ ...(error === undefined ? {} : { error }),
232
+ })
233
+ // The name engine understands everything except Notepad++-style escapes:
234
+ // decode them here and drop control characters (file names cannot contain
235
+ // them) instead of searching for a literal backslash sequence.
236
+ let nameQuery = request.query
237
+ let warnings: string[] = []
238
+ if (request.matchMode === 'extended') {
239
+ const decoded = decodeExtendedForNames(request.query)
240
+ warnings = decoded.warnings
241
+ if (!decoded.ok) return empty(decoded.error ?? 'invalid-escape', warnings)
242
+ nameQuery = decoded.text
243
+ // An all-control-escape query must not degrade into "match everything".
244
+ if (nameQuery.trim() === '') return empty(undefined, [...new Set([...warnings, 'name-extended-empty'])])
245
+ }
191
246
  try {
192
247
  const result = await deps.search({
193
- query: request.query,
248
+ query: nameQuery,
194
249
  limit: request.limit,
195
250
  offset: 0,
196
251
  sort: request.sort,
197
252
  desc: request.desc,
198
- regex: false,
199
- caseSensitive: false,
200
- wholeWord: false,
253
+ regex: request.matchMode === 'regex',
254
+ caseSensitive: request.caseSensitive,
255
+ wholeWord: request.wholeWord,
201
256
  filesOnly: files,
202
257
  dirsOnly: !files,
203
258
  })
@@ -207,23 +262,27 @@ async function nameGroup(deps: CombinedDeps, request: CombinedRequest, files: bo
207
262
  total: result.total,
208
263
  truncated: result.truncated,
209
264
  deduped: 0,
265
+ count: { value: result.total, kind: 'exact' },
210
266
  tookMs: result.tookNs / 1e6,
267
+ ...(warnings.length === 0 ? {} : { warnings: [...new Set(warnings)] }),
211
268
  }
212
269
  } catch (error) {
213
- return { hits: [], returned: 0, total: 0, truncated: false, deduped: 0, tookMs: Date.now() - started, error: messageOf(error) }
270
+ return { ...empty(messageOf(error)), tookMs: Date.now() - started }
214
271
  }
215
272
  }
216
273
 
217
274
  /** Query the content store, or report its state without starting a build. */
218
275
  async function contentGroup(deps: CombinedDeps, request: CombinedRequest, ask: boolean): Promise<ContentGroup> {
219
276
  const started = Date.now()
220
- const empty = (): ContentGroup => {
277
+ const empty = (warnings: string[] = []): ContentGroup => {
221
278
  let state: ContentState | undefined
222
279
  try { state = deps.contentStatus?.() } catch { state = undefined }
223
280
  return {
224
281
  hits: [],
225
282
  returned: 0,
226
283
  capped: false,
284
+ count: { value: 0, kind: 'unknown' },
285
+ warnings,
227
286
  building: state?.building ?? false,
228
287
  files: state?.files ?? 0,
229
288
  sessions: state?.sessions ?? 0,
@@ -232,21 +291,45 @@ async function contentGroup(deps: CombinedDeps, request: CombinedRequest, ask: b
232
291
  tookMs: 0,
233
292
  }
234
293
  }
294
+ // 0.9.0 never scans the whole corpus from a panel keystroke: the content
295
+ // group pauses itself in regex mode while the name groups still run.
296
+ if (request.matchMode === 'regex') {
297
+ return { ...empty(['content-regex-paused']), error: 'content-regex-not-supported' }
298
+ }
235
299
  if (!ask || deps.contentSearch === undefined) return empty()
300
+ // Reject sub-trigram / over-limit / control-character queries here, before
301
+ // deps.ensure() can start a lazy content build the store cannot answer. The
302
+ // store performs the same check; sharing it keeps the error codes identical.
303
+ const check = checkContentQuery(request.query, request.matchMode)
304
+ if (!check.ok) {
305
+ return { ...empty(check.warnings), error: check.error ?? 'content-query-invalid', tookMs: Date.now() - started }
306
+ }
307
+ if (check.terms.length === 0) return empty()
308
+ const options: ContentSearchOptions = {
309
+ matchMode: request.matchMode,
310
+ caseSensitive: request.caseSensitive,
311
+ wholeWord: request.wholeWord,
312
+ count: request.count,
313
+ countLimit: request.countLimit,
314
+ ...(request.sessionId === null ? {} : { sessionId: request.sessionId }),
315
+ }
236
316
  try {
237
317
  deps.ensure?.()
238
- const hits = await deps.contentSearch(request.query, request.contentLimit)
318
+ const result = await deps.contentSearch(request.query, request.contentLimit, options)
239
319
  const state = deps.contentStatus?.()
240
320
  return {
241
- hits,
242
- returned: hits.length,
243
- capped: hits.length >= request.contentLimit,
321
+ hits: result.hits,
322
+ returned: result.hits.length,
323
+ capped: result.hits.length >= request.contentLimit,
324
+ count: result.count,
325
+ warnings: result.warnings,
244
326
  building: state?.building ?? false,
245
327
  files: state?.files ?? 0,
246
328
  sessions: state?.sessions ?? 0,
247
329
  messages: state?.messages ?? 0,
248
330
  truncated: state?.truncated ?? false,
249
331
  tookMs: Date.now() - started,
332
+ ...(result.error === undefined ? {} : { error: result.error }),
250
333
  }
251
334
  } catch (error) {
252
335
  return { ...empty(), error: messageOf(error), tookMs: Date.now() - started }
@@ -258,6 +341,14 @@ function clamp(value: unknown, min: number, max: number, fallback: number): numb
258
341
  return Math.min(max, Math.max(min, Math.trunc(value)))
259
342
  }
260
343
 
344
+ function matchMode(value: unknown): ContentMatchMode {
345
+ return value === 'extended' || value === 'regex' ? value : 'normal'
346
+ }
347
+
348
+ function countMode(value: unknown): ContentCountMode {
349
+ return value === 'bounded' || value === 'none' ? value : 'exact'
350
+ }
351
+
261
352
  function sortKey(value: unknown): string {
262
353
  return value === 'name' || value === 'path' || value === 'size' || value === 'mtime' || value === 'ext' ? value : 'mtime'
263
354
  }
@@ -265,4 +356,3 @@ function sortKey(value: unknown): string {
265
356
  function messageOf(error: unknown): string {
266
357
  return error instanceof Error ? error.message : String(error)
267
358
  }
268
-