@takara-ai/miru-code 1.9.0 → 1.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 (59) hide show
  1. package/README.md +43 -48
  2. package/docs/coverage-badge.json +6 -0
  3. package/grammars/manifest.json +10 -2
  4. package/grammars/tree-sitter-astro.wasm +0 -0
  5. package/grammars/tree-sitter-php.wasm +0 -0
  6. package/grammars/tree-sitter-php_only.wasm +0 -0
  7. package/grammars/tree-sitter-sql.wasm +0 -0
  8. package/grammars/tree-sitter-svelte.wasm +0 -0
  9. package/grammars/tree-sitter-vue.wasm +0 -0
  10. package/package.json +10 -2
  11. package/src/agents.ts +4 -4
  12. package/src/auth/device.ts +26 -21
  13. package/src/auth/providers.ts +26 -11
  14. package/src/benchmark/compare.ts +3 -10
  15. package/src/benchmark/grep.ts +64 -37
  16. package/src/benchmark/locate-compare.ts +8 -1
  17. package/src/benchmark/rg-literal.ts +9 -4
  18. package/src/cache.ts +3 -3
  19. package/src/chunking/ast.ts +21 -3
  20. package/src/chunking/grammars.ts +8 -3
  21. package/src/chunking/structural.ts +13 -24
  22. package/src/cli-mode.ts +18 -0
  23. package/src/cli.ts +10 -45
  24. package/src/credentials.ts +8 -13
  25. package/src/embeddings/openai.ts +6 -3
  26. package/src/embeddings/sagemaker.ts +18 -3
  27. package/src/embeddings/validate.ts +10 -7
  28. package/src/git.ts +6 -2
  29. package/src/help.ts +5 -4
  30. package/src/index/bm25.ts +66 -6
  31. package/src/index/create.ts +5 -9
  32. package/src/index/files.ts +5 -1
  33. package/src/index/incremental.ts +48 -8
  34. package/src/index/sparse.ts +14 -2
  35. package/src/installer/agents.ts +85 -65
  36. package/src/installer/benchmark-mode.ts +40 -11
  37. package/src/installer/config.ts +105 -42
  38. package/src/installer/installer.ts +59 -34
  39. package/src/installer/legacy-hooks.ts +131 -0
  40. package/src/installer/prompt.ts +20 -22
  41. package/src/installer/search-policy.ts +8 -8
  42. package/src/mcp/index-cache.ts +16 -3
  43. package/src/mcp/server.ts +42 -22
  44. package/src/mcp/stdio.ts +17 -2
  45. package/src/miru-index.ts +54 -18
  46. package/src/prompt.ts +51 -14
  47. package/src/ranking/boosting.ts +5 -6
  48. package/src/ranking/location.ts +6 -10
  49. package/src/ranking/penalties.ts +14 -22
  50. package/src/search.ts +4 -12
  51. package/src/setup.ts +25 -13
  52. package/src/snippet.ts +8 -26
  53. package/src/spinner.ts +26 -16
  54. package/src/tokenizer/bert-wordpiece.ts +0 -6
  55. package/src/utils.ts +0 -4
  56. package/src/version.ts +4 -4
  57. package/src/installer/hooks/install.ts +0 -549
  58. package/src/installer/hooks/opencode-plugin.ts +0 -54
  59. package/src/installer/hooks/search-guard.ts +0 -272
package/src/mcp/stdio.ts CHANGED
@@ -45,6 +45,21 @@ export class StdioTransport {
45
45
  private buffer = "";
46
46
  private started = false;
47
47
  private abortController: AbortController | null = null;
48
+ private readonly inputStream: () => ReadableStream<Uint8Array<ArrayBufferLike>>;
49
+ private readonly writeText: (text: string) => Promise<unknown>;
50
+
51
+ constructor(
52
+ options: {
53
+ inputStream?: () => ReadableStream<Uint8Array<ArrayBufferLike>>;
54
+ writeText?: (text: string) => Promise<unknown>;
55
+ stdin?: { stream: () => ReadableStream<Uint8Array<ArrayBufferLike>> };
56
+ bunWrite?: (destination: typeof Bun.stdout, text: string) => Promise<unknown>;
57
+ } = {},
58
+ ) {
59
+ this.inputStream = options.inputStream ?? (() => (options.stdin ?? Bun.stdin).stream());
60
+ this.writeText =
61
+ options.writeText ?? ((text) => (options.bunWrite ?? Bun.write)(Bun.stdout, text));
62
+ }
48
63
 
49
64
  onmessage?: (message: JsonRpcMessage) => void | Promise<void>;
50
65
  onerror?: (error: Error) => void;
@@ -56,7 +71,7 @@ export class StdioTransport {
56
71
  }
57
72
  this.started = true;
58
73
  this.abortController = new AbortController();
59
- const reader = Bun.stdin.stream().getReader();
74
+ const reader = this.inputStream().getReader();
60
75
  const decoder = new TextDecoder();
61
76
 
62
77
  try {
@@ -85,7 +100,7 @@ export class StdioTransport {
85
100
 
86
101
  async send(message: JsonRpcMessage): Promise<void> {
87
102
  const line = `${JSON.stringify(message)}\n`;
88
- await Bun.write(Bun.stdout, line);
103
+ await this.writeText(line);
89
104
  }
90
105
 
91
106
  private async append(chunk: string): Promise<void> {
package/src/miru-index.ts CHANGED
@@ -26,6 +26,31 @@ import { chunkKey, chunkToDict, defaultContentTypes } from "./types.ts";
26
26
  import { computeSourceCacheKey, isGitUrl } from "./utils.ts";
27
27
  import { indexCacheEpoch } from "./version.ts";
28
28
 
29
+ interface FactoryDependencies {
30
+ getValidatedCache: typeof getValidatedCache;
31
+ resolveEmbeddingModel: typeof resolveEmbeddingModel;
32
+ getEmbeddingBackend: (model: string) => EmbeddingBackend;
33
+ createIndexFromPath: typeof createIndexFromPath;
34
+ cloneGitRepository: typeof cloneGitRepository;
35
+ findIndexCachePath: typeof findIndexCachePath;
36
+ loadCachedIndex: typeof loadCachedIndex;
37
+ saveBuiltIndex: (index: MiruIndex, path: string) => Promise<void>;
38
+ }
39
+
40
+ function factoryDependencies(overrides: Partial<FactoryDependencies> = {}): FactoryDependencies {
41
+ return {
42
+ getValidatedCache,
43
+ resolveEmbeddingModel,
44
+ getEmbeddingBackend,
45
+ createIndexFromPath,
46
+ cloneGitRepository,
47
+ findIndexCachePath,
48
+ loadCachedIndex,
49
+ saveBuiltIndex: (index, path) => index.save(path),
50
+ ...overrides,
51
+ };
52
+ }
53
+
29
54
  /**
30
55
  * In-memory search index over a codebase: BM25 keyword scores plus semantic
31
56
  * embeddings, with optional disk cache for reuse across runs.
@@ -171,18 +196,20 @@ export class MiruIndex {
171
196
  content: ContentType[] = defaultContentTypes(),
172
197
  embeddingModel?: string,
173
198
  ref?: string | null,
199
+ dependencies?: Partial<FactoryDependencies>,
174
200
  ): Promise<MiruIndex> {
201
+ const deps = factoryDependencies(dependencies);
175
202
  const cacheKey = computeSourceCacheKey(url, ref);
176
- const model = embeddingModel ?? resolveEmbeddingModel();
177
- const cached = await getValidatedCache(cacheKey, model, content);
203
+ const model = embeddingModel ?? deps.resolveEmbeddingModel();
204
+ const cached = await deps.getValidatedCache(cacheKey, model, content);
178
205
  if (cached) {
179
- return MiruIndex.loadFromDisk(cached, model);
206
+ return MiruIndex.loadFromDisk(cached, model, deps);
180
207
  }
181
208
 
182
- const cloneDir = await cloneGitRepository(url, ref);
209
+ const cloneDir = await deps.cloneGitRepository(url, ref);
183
210
  try {
184
- const embeddings = getEmbeddingBackend(model);
185
- const { bm25, semantic, chunks } = await createIndexFromPath(
211
+ const embeddings = deps.getEmbeddingBackend(model);
212
+ const { bm25, semantic, chunks } = await deps.createIndexFromPath(
186
213
  cloneDir,
187
214
  embeddings,
188
215
  content,
@@ -198,7 +225,7 @@ export class MiruIndex {
198
225
  root: null,
199
226
  content,
200
227
  });
201
- await index.save(findIndexCachePath(cacheKey));
228
+ await deps.saveBuiltIndex(index, deps.findIndexCachePath(cacheKey));
202
229
  return index;
203
230
  } finally {
204
231
  await rm(cloneDir, { recursive: true, force: true });
@@ -211,11 +238,12 @@ export class MiruIndex {
211
238
  content: ContentType[] = defaultContentTypes(),
212
239
  embeddingModel?: string,
213
240
  ref?: string | null,
241
+ dependencies?: Partial<FactoryDependencies>,
214
242
  ): Promise<MiruIndex> {
215
243
  if (isGitUrl(source)) {
216
- return MiruIndex.fromGit(source, content, embeddingModel, ref);
244
+ return MiruIndex.fromGit(source, content, embeddingModel, ref, dependencies);
217
245
  }
218
- return MiruIndex.fromPath(source, content, embeddingModel);
246
+ return MiruIndex.fromPath(source, content, embeddingModel, dependencies);
219
247
  }
220
248
 
221
249
  /**
@@ -229,7 +257,9 @@ export class MiruIndex {
229
257
  path: string,
230
258
  content: ContentType[] = defaultContentTypes(),
231
259
  embeddingModel?: string,
260
+ dependencies?: Partial<FactoryDependencies>,
232
261
  ): Promise<MiruIndex> {
262
+ const deps = factoryDependencies(dependencies);
233
263
  const resolved = resolve(path);
234
264
  try {
235
265
  const st = await Bun.file(resolved).stat();
@@ -243,14 +273,14 @@ export class MiruIndex {
243
273
  throw new Error(`Path does not exist: ${path}`);
244
274
  }
245
275
 
246
- const model = embeddingModel ?? resolveEmbeddingModel();
247
- const cached = await getValidatedCache(resolved, model, content);
276
+ const model = embeddingModel ?? deps.resolveEmbeddingModel();
277
+ const cached = await deps.getValidatedCache(resolved, model, content);
248
278
  if (cached) {
249
- return MiruIndex.loadFromDisk(cached, model);
279
+ return MiruIndex.loadFromDisk(cached, model, deps);
250
280
  }
251
281
 
252
- const embeddings = getEmbeddingBackend(model);
253
- const { bm25, semantic, chunks } = await createIndexFromPath(
282
+ const embeddings = deps.getEmbeddingBackend(model);
283
+ const { bm25, semantic, chunks } = await deps.createIndexFromPath(
254
284
  resolved,
255
285
  embeddings,
256
286
  content,
@@ -274,15 +304,20 @@ export class MiruIndex {
274
304
  * Validates embedding model compatibility via cache metadata. Sets
275
305
  * `loadedFromDisk` so callers can avoid redundant cache writes.
276
306
  */
277
- static async loadFromDisk(path: string, embeddingModel?: string): Promise<MiruIndex> {
278
- const model = embeddingModel ?? resolveEmbeddingModel();
279
- const { bm25, semantic, chunks, metadata } = await loadCachedIndex(path);
307
+ static async loadFromDisk(
308
+ path: string,
309
+ embeddingModel?: string,
310
+ dependencies?: Partial<FactoryDependencies>,
311
+ ): Promise<MiruIndex> {
312
+ const deps = factoryDependencies(dependencies);
313
+ const model = embeddingModel ?? deps.resolveEmbeddingModel();
314
+ const { bm25, semantic, chunks, metadata } = await deps.loadCachedIndex(path);
280
315
  const content = (metadata.content_type as ContentType[]) ?? defaultContentTypes();
281
316
  const root = metadata.root_path ? String(metadata.root_path) : null;
282
317
  const storedFileMtimes = (metadata.file_mtimes as Record<string, number>) ?? {};
283
318
 
284
319
  return new MiruIndex({
285
- embeddings: getEmbeddingBackend(model),
320
+ embeddings: deps.getEmbeddingBackend(model),
286
321
  bm25Index: bm25,
287
322
  semanticIndex: semantic,
288
323
  chunks,
@@ -387,6 +422,7 @@ export class MiruIndex {
387
422
  embeddings: this.embeddings,
388
423
  chunks: this.chunksInternal,
389
424
  semanticIndex: this.semanticIndex,
425
+ bm25: this.bm25Index,
390
426
  relativePaths,
391
427
  });
392
428
 
package/src/prompt.ts CHANGED
@@ -62,22 +62,49 @@ export function applyHiddenPromptChar(
62
62
  }
63
63
 
64
64
  /** Visible-input prompt (not for secrets — use promptHidden for those). */
65
- export async function promptText(message: string, defaultValue = ""): Promise<string> {
66
- const rl = readline.createInterface({ input, output });
65
+ export async function promptText(
66
+ message: string,
67
+ defaultValue = "",
68
+ createInterface: typeof createPromptInterface = createPromptInterface,
69
+ ): Promise<string> {
70
+ const rl = createInterface({ input, output });
71
+ return promptTextWith(
72
+ message,
73
+ defaultValue,
74
+ (question) => rl.question(question),
75
+ () => rl.close(),
76
+ );
77
+ }
78
+
79
+ export function createPromptInterface(
80
+ options: { input: typeof input; output: typeof output },
81
+ factory: typeof readline.createInterface = readline.createInterface,
82
+ ): Pick<readline.Interface, "question" | "close"> {
83
+ return factory(options);
84
+ }
85
+
86
+ export async function promptTextWith(
87
+ message: string,
88
+ defaultValue: string,
89
+ ask: (question: string) => Promise<string>,
90
+ close: () => void = () => {},
91
+ ): Promise<string> {
67
92
  try {
68
93
  const suffix = defaultValue ? ` (${defaultValue})` : "";
69
- const answer = (await rl.question(`${message}${suffix}: `)).trim();
94
+ const answer = (await ask(`${message}${suffix}: `)).trim();
70
95
  return answer || defaultValue;
71
96
  } finally {
72
- rl.close();
97
+ close();
73
98
  }
74
99
  }
75
100
 
76
101
  export async function promptHidden(
77
102
  message: string,
78
- stream: NodeJS.WriteStream = output,
103
+ stream: { write(text: string): unknown } = output,
104
+ io: { input?: HiddenPromptInput; exit?: (code: number) => void } = {},
79
105
  ): Promise<string> {
80
- if (!input.isTTY) {
106
+ const inputStream = io.input ?? input;
107
+ if (!inputStream.isTTY) {
81
108
  throw new Error(
82
109
  "Cannot prompt for API key: stdin is not a TTY. Run `miru setup --key YOUR_KEY` or set TAKARA_API_KEY.",
83
110
  );
@@ -85,9 +112,9 @@ export async function promptHidden(
85
112
 
86
113
  return new Promise((resolve, reject) => {
87
114
  stream.write(message);
88
- input.setRawMode?.(true);
89
- input.resume();
90
- input.setEncoding("utf8");
115
+ inputStream.setRawMode?.(true);
116
+ inputStream.resume();
117
+ inputStream.setEncoding("utf8");
91
118
 
92
119
  let state = createHiddenPromptState();
93
120
 
@@ -100,7 +127,7 @@ export async function promptHidden(
100
127
  cleanup();
101
128
  stream.write("\n");
102
129
  reject(new Error("Setup cancelled."));
103
- process.exit(130);
130
+ (io.exit ?? process.exit)(130);
104
131
  }
105
132
 
106
133
  if (result.submit) {
@@ -117,11 +144,21 @@ export async function promptHidden(
117
144
  };
118
145
 
119
146
  const cleanup = () => {
120
- input.setRawMode?.(false);
121
- input.pause();
122
- input.removeListener("data", onData);
147
+ inputStream.setRawMode?.(false);
148
+ inputStream.pause();
149
+ inputStream.removeListener("data", onData);
123
150
  };
124
151
 
125
- input.on("data", onData);
152
+ inputStream.on("data", onData);
126
153
  });
127
154
  }
155
+
156
+ interface HiddenPromptInput {
157
+ isTTY?: boolean;
158
+ setRawMode?: (mode: boolean) => void;
159
+ resume(): void;
160
+ pause(): void;
161
+ setEncoding(encoding: "utf8"): unknown;
162
+ on(event: "data", listener: (chunk: string) => void): unknown;
163
+ removeListener(event: "data", listener: (chunk: string) => void): unknown;
164
+ }
@@ -209,12 +209,11 @@ function boostSymbolDefinitions(
209
209
  const stem = basename(chunk.file_path)
210
210
  .replace(/\.[^.]+$/, "")
211
211
  .toLowerCase();
212
- if (![...names].some((n) => stemMatches(stem, n.toLowerCase()))) {
213
- continue;
214
- }
215
- const tier = definitionTier(chunk, names, boostUnit);
216
- if (tier) {
217
- boosted.set(key, tier);
212
+ if ([...names].some((n) => stemMatches(stem, n.toLowerCase()))) {
213
+ const tier = definitionTier(chunk, names, boostUnit);
214
+ if (tier) {
215
+ boosted.set(key, tier);
216
+ }
218
217
  }
219
218
  }
220
219
  }
@@ -222,16 +222,12 @@ export function boostExactStemMatches(
222
222
  if (GENERIC_STEM_DENY.has(keyword)) {
223
223
  continue;
224
224
  }
225
- if (preferImplementation && stem === keyword && !IMPLEMENTATION_HINTS.has(stem)) {
226
- continue;
227
- }
228
- const keywordNorm = keyword.replace(/[-_]/g, "");
229
- if (stem === keyword || stemNorm === keywordNorm) {
230
- boosted.set(key, (boosted.get(key) ?? 0) + boost);
231
- break;
232
- }
233
- const parts = keyword.split("-").filter((p) => p.length > 2);
234
- if (parts.length > 1 && parts.some((p) => p === stem)) {
225
+ if (!(preferImplementation && stem === keyword && !IMPLEMENTATION_HINTS.has(stem))) {
226
+ const keywordNorm = keyword.replace(/[-_]/g, "");
227
+ if (stem === keyword || stemNorm === keywordNorm) {
228
+ boosted.set(key, (boosted.get(key) ?? 0) + boost);
229
+ break;
230
+ }
235
231
  }
236
232
  }
237
233
  }
@@ -72,7 +72,7 @@ export function rerankTopk(
72
72
  const ranked = [...penalised.entries()].sort((a, b) => b[1] - a[1]);
73
73
 
74
74
  const fileSelected = new Map<string, number>();
75
- const selected: { score: number; key: string }[] = [];
75
+ const selected: { score: number; key: string; chunk: Chunk }[] = [];
76
76
  let minSelected = Infinity;
77
77
 
78
78
  for (const [key, penScore] of ranked) {
@@ -81,31 +81,23 @@ export function rerankTopk(
81
81
  continue;
82
82
  }
83
83
 
84
- if (selected.length >= topK && penScore <= minSelected) {
85
- break;
86
- }
87
-
88
- const already = fileSelected.get(chunk.file_path) ?? 0;
89
- let effScore = penScore;
90
- if (already >= FILE_SATURATION_THRESHOLD) {
91
- const excess = already - FILE_SATURATION_THRESHOLD + 1;
92
- effScore *= tuning.fileSaturationDecay ** excess;
93
- }
84
+ if (selected.length < topK || penScore > minSelected) {
85
+ const already = fileSelected.get(chunk.file_path) ?? 0;
86
+ let effScore = penScore;
87
+ if (already >= FILE_SATURATION_THRESHOLD) {
88
+ const excess = already - FILE_SATURATION_THRESHOLD + 1;
89
+ effScore *= tuning.fileSaturationDecay ** excess;
90
+ }
94
91
 
95
- selected.push({ score: effScore, key });
96
- fileSelected.set(chunk.file_path, already + 1);
92
+ selected.push({ score: effScore, key, chunk });
93
+ fileSelected.set(chunk.file_path, already + 1);
97
94
 
98
- if (selected.length >= topK) {
99
- minSelected = Math.min(...selected.map((s) => s.score));
95
+ if (selected.length >= topK) {
96
+ minSelected = Math.min(...selected.map((s) => s.score));
97
+ }
100
98
  }
101
99
  }
102
100
 
103
101
  selected.sort((a, b) => b.score - a.score);
104
- return selected.slice(0, topK).flatMap(({ key, score }) => {
105
- const chunk = chunksByKey.get(key);
106
- if (!chunk) {
107
- return [];
108
- }
109
- return [[chunk, score] as [Chunk, number]];
110
- });
102
+ return selected.slice(0, topK).map(({ chunk, score }) => [chunk, score]);
111
103
  }
package/src/search.ts CHANGED
@@ -137,11 +137,9 @@ export async function hybridSearch(options: {
137
137
 
138
138
  const allKeys = new Set([...normalizedSemantic.keys(), ...normalizedBm25.keys()]);
139
139
  const sortedKeys = [...allKeys].sort((a, b) => {
140
- const ca = chunksByKey.get(a);
141
- const cb = chunksByKey.get(b);
142
- if (!ca || !cb) {
143
- return 0;
144
- }
140
+ // Every score key was produced from a chunk in this query.
141
+ const ca = chunksByKey.get(a) as Chunk;
142
+ const cb = chunksByKey.get(b) as Chunk;
145
143
  return ca.start_line - cb.start_line;
146
144
  });
147
145
 
@@ -164,13 +162,7 @@ export async function hybridSearch(options: {
164
162
  return [...combinedScores.entries()]
165
163
  .sort((a, b) => b[1] - a[1])
166
164
  .slice(0, topK)
167
- .flatMap(([key, score]) => {
168
- const chunk = chunksByKey.get(key);
169
- if (!chunk) {
170
- return [];
171
- }
172
- return [{ chunk, score }];
173
- });
165
+ .map(([key, score]) => ({ chunk: chunksByKey.get(key) as Chunk, score }));
174
166
  }
175
167
 
176
168
  export async function searchSemanticOnly(options: {
package/src/setup.ts CHANGED
@@ -123,25 +123,27 @@ export function parseSetupCliArgs(rest: string[]): {
123
123
  return { args };
124
124
  }
125
125
 
126
- async function promptSageMakerArn(): Promise<string> {
127
- while (true) {
128
- const arn = await promptText("SageMaker endpoint ARN");
129
- if (!arn) {
126
+ async function promptSageMakerArn(promptTextImpl: typeof promptText = promptText): Promise<string> {
127
+ let arn = "";
128
+ while (!arn) {
129
+ const candidate = await promptTextImpl("SageMaker endpoint ARN");
130
+ if (!candidate) {
130
131
  fail("Endpoint ARN cannot be empty.");
131
132
  continue;
132
133
  }
133
134
  try {
134
- parseSageMakerEndpointArn(arn);
135
- return arn;
135
+ parseSageMakerEndpointArn(candidate);
136
+ arn = candidate;
136
137
  } catch (err) {
137
138
  fail(err instanceof Error ? err.message : String(err));
138
139
  }
139
140
  }
141
+ return arn;
140
142
  }
141
143
 
142
- async function promptAwsProfile(): Promise<string> {
144
+ async function promptAwsProfile(promptTextImpl: typeof promptText = promptText): Promise<string> {
143
145
  while (true) {
144
- const profile = await promptText(
146
+ const profile = await promptTextImpl(
145
147
  "AWS profile name (must already exist in ~/.aws)",
146
148
  process.env.AWS_PROFILE || "miru",
147
149
  );
@@ -152,11 +154,20 @@ async function promptAwsProfile(): Promise<string> {
152
154
  }
153
155
  }
154
156
 
157
+ export interface SageMakerSetupDependencies {
158
+ promptText?: typeof promptText;
159
+ canPromptForCredentials?: typeof canPromptForCredentials;
160
+ validateConnection?: typeof validateSageMakerConnection;
161
+ }
162
+
155
163
  /**
156
164
  * Miru only ever inherits AWS credentials — it never creates, writes, or rotates an
157
165
  * AWS profile. Set one up yourself first (e.g. `aws configure --profile miru`).
158
166
  */
159
- export async function runSageMakerSetup(options: RunSetupOptions = {}): Promise<RunSetupResult> {
167
+ export async function runSageMakerSetup(
168
+ options: RunSetupOptions = {},
169
+ dependencies: SageMakerSetupDependencies = {},
170
+ ): Promise<RunSetupResult> {
160
171
  writeStdout("");
161
172
  printBrandBanner(process.stderr);
162
173
  divider("─", 48, process.stderr);
@@ -168,18 +179,19 @@ export async function runSageMakerSetup(options: RunSetupOptions = {}): Promise<
168
179
  );
169
180
  writeStdout("");
170
181
 
171
- const arnInput = options.sagemakerArn ?? (await promptSageMakerArn());
182
+ const promptTextImpl = dependencies.promptText ?? promptText;
183
+ const arnInput = options.sagemakerArn ?? (await promptSageMakerArn(promptTextImpl));
172
184
  const parsed = parseSageMakerEndpointArn(arnInput);
173
185
 
174
186
  let profile = options.profile;
175
187
  if (!profile) {
176
- if (!canPromptForCredentials()) {
188
+ if (!(dependencies.canPromptForCredentials ?? canPromptForCredentials)()) {
177
189
  throw new Error(
178
190
  "An AWS profile name is required. Pass --profile <name>, or run " +
179
191
  "`miru setup --sagemaker` interactively.",
180
192
  );
181
193
  }
182
- profile = await promptAwsProfile();
194
+ profile = await promptAwsProfile(promptTextImpl);
183
195
  }
184
196
 
185
197
  await beginModeSwitch("sagemaker");
@@ -197,7 +209,7 @@ export async function runSageMakerSetup(options: RunSetupOptions = {}): Promise<
197
209
  truncate: true,
198
210
  truncationDirection: "Right",
199
211
  };
200
- const result = await validateSageMakerConnection(config);
212
+ const result = await (dependencies.validateConnection ?? validateSageMakerConnection)(config);
201
213
  if (!result.valid) {
202
214
  spinner.stop();
203
215
  throw new Error(result.message);
package/src/snippet.ts CHANGED
@@ -79,7 +79,7 @@ const RUBY_OR_ELIXIR_BODY_RE = /^\s*def\w*\b|^\s*defmodule\b/;
79
79
  const MAX_DECLARATION_LOOKBACK = 40;
80
80
  const INDENTED_BLOCK_LANGUAGES = new Set(["python", "haskell", "ocaml"]);
81
81
  const END_BLOCK_LANGUAGES = new Set(["ruby", "elixir"]);
82
- const TAG_LANGUAGES = new Set(["html", "embeddedtemplate", "xml", "vue", "svelte"]);
82
+ const TAG_LANGUAGES = new Set(["html", "embeddedtemplate", "xml", "vue", "svelte", "astro"]);
83
83
  const BRACE_BLOCK_LANGUAGES = new Set([
84
84
  "bash",
85
85
  "c",
@@ -192,16 +192,14 @@ function completeHtmlTag(
192
192
  for (let i = Math.max(0, start - MAX_DECLARATION_LOOKBACK); i <= anchor; i++) {
193
193
  const line = lines[i] ?? "";
194
194
  for (const match of line.matchAll(HTML_TAG_RE)) {
195
- const name = match[1]?.toLowerCase();
196
- if (!name) {
197
- continue;
198
- }
195
+ const name = (match[1] as string).toLowerCase();
199
196
  if (match[0].startsWith("</")) {
200
- for (let j = openTags.length - 1; j >= 0; j--) {
201
- if (openTags[j]?.name === name) {
202
- openTags.splice(j, 1);
203
- break;
204
- }
197
+ const matchingIndex = openTags.reduce(
198
+ (last, tag, index) => (tag.name === name ? index : last),
199
+ -1,
200
+ );
201
+ if (matchingIndex >= 0) {
202
+ openTags.splice(matchingIndex, 1);
205
203
  }
206
204
  } else if (!match[0].endsWith("/>") && !HTML_VOID_TAGS.has(name)) {
207
205
  openTags.push({ name, start: i });
@@ -374,10 +372,6 @@ function compactSupportingSnippet(snippet: SnippetResult, maxLines: number): Sni
374
372
  /** Pick the 0-based line index inside `content` that best matches the query. */
375
373
  export function anchorLineOffset(content: string, query: string): number {
376
374
  const lines = content.split("\n");
377
- if (lines.length === 0) {
378
- return 0;
379
- }
380
-
381
375
  const terms = queryMatchTerms(query);
382
376
  let bestIndex = Math.floor(lines.length / 2);
383
377
  let bestScore = -1;
@@ -401,18 +395,6 @@ export function trimChunkToSnippet(
401
395
  anchorLine?: number,
402
396
  ): SnippetResult {
403
397
  const lines = chunk.content.split("\n");
404
- if (lines.length === 0) {
405
- return {
406
- chunk,
407
- meta: {
408
- truncated: false,
409
- anchor_line: chunk.start_line,
410
- full_start_line: chunk.start_line,
411
- full_end_line: chunk.end_line,
412
- },
413
- };
414
- }
415
-
416
398
  const queryAnchorOffset = anchorLineOffset(chunk.content, query);
417
399
  const anchorOffset =
418
400
  anchorLine == null
package/src/spinner.ts CHANGED
@@ -8,11 +8,14 @@ export class Spinner {
8
8
  private frame = 0;
9
9
  private belowLines = 0;
10
10
 
11
- constructor(private readonly message: string) {}
11
+ constructor(
12
+ private readonly message: string,
13
+ private readonly stderr: SpinnerOutput = process.stderr,
14
+ ) {}
12
15
 
13
16
  start(): void {
14
- if (!process.stderr.isTTY) {
15
- process.stderr.write(`${this.message}...\n`);
17
+ if (!this.stderr.isTTY) {
18
+ this.stderr.write(`${this.message}...\n`);
16
19
  return;
17
20
  }
18
21
  this.draw();
@@ -20,17 +23,17 @@ export class Spinner {
20
23
  }
21
24
 
22
25
  follow(line: string): void {
23
- if (!process.stderr.isTTY) {
24
- process.stderr.write(`${line}\n`);
26
+ if (!this.stderr.isTTY) {
27
+ this.stderr.write(`${line}\n`);
25
28
  return;
26
29
  }
27
- const cols = process.stderr.columns || 80;
30
+ const cols = this.stderr.columns || 80;
28
31
  const rows = line.split("\n").reduce((count, part) => {
29
32
  return count + Math.max(1, Math.ceil(displayWidth(part) / cols));
30
33
  }, 0);
31
- process.stderr.write(`\n${line}`);
34
+ this.stderr.write(`\n${line}`);
32
35
  this.belowLines += rows;
33
- process.stderr.write(`\x1b[${this.belowLines}A`);
36
+ this.stderr.write(`\x1b[${this.belowLines}A`);
34
37
  }
35
38
 
36
39
  stop(finalMessage?: string): void {
@@ -38,19 +41,19 @@ export class Spinner {
38
41
  clearInterval(this.timer);
39
42
  this.timer = null;
40
43
  }
41
- if (process.stderr.isTTY) {
42
- process.stderr.write("\r\x1b[K");
44
+ if (this.stderr.isTTY) {
45
+ this.stderr.write("\r\x1b[K");
43
46
  if (finalMessage) {
44
- process.stderr.write(finalMessage);
47
+ this.stderr.write(finalMessage);
45
48
  }
46
49
  if (this.belowLines > 0) {
47
- process.stderr.write(`\x1b[${this.belowLines}B`);
50
+ this.stderr.write(`\x1b[${this.belowLines}B`);
48
51
  }
49
52
  if (finalMessage || this.belowLines > 0) {
50
- process.stderr.write("\n");
53
+ this.stderr.write("\n");
51
54
  }
52
55
  } else if (finalMessage) {
53
- process.stderr.write(`${finalMessage}\n`);
56
+ this.stderr.write(`${finalMessage}\n`);
54
57
  }
55
58
  }
56
59
 
@@ -68,16 +71,23 @@ export class Spinner {
68
71
 
69
72
  private draw(): void {
70
73
  const glyph = FRAMES[this.frame++ % FRAMES.length];
71
- process.stderr.write(`\r${dim(glyph)} ${this.message}`);
74
+ this.stderr.write(`\r${dim(glyph)} ${this.message}`);
72
75
  }
73
76
  }
74
77
 
78
+ interface SpinnerOutput {
79
+ isTTY?: boolean;
80
+ columns?: number;
81
+ write(text: string): unknown;
82
+ }
83
+
75
84
  export async function withSpinner<T>(
76
85
  message: string,
77
86
  fn: () => Promise<T>,
78
87
  options?: { successMessage?: string; failMessage?: string },
88
+ output: SpinnerOutput = process.stderr,
79
89
  ): Promise<T> {
80
- const spinner = new Spinner(message);
90
+ const spinner = new Spinner(message, output);
81
91
  spinner.start();
82
92
  try {
83
93
  const result = await fn();
@@ -99,9 +99,6 @@ function whitespaceTokenize(text: string): string[] {
99
99
 
100
100
  function splitOnPunctuation(text: string): string[] {
101
101
  const chars = [...text];
102
- if (chars.length === 0) {
103
- return [];
104
- }
105
102
 
106
103
  const output: string[][] = [];
107
104
  let startNewWord = true;
@@ -138,9 +135,6 @@ function wordpieceTokenize(
138
135
  prefix: string,
139
136
  maxInputCharsPerWord: number,
140
137
  ): string[] {
141
- if (token.length === 0) {
142
- return [];
143
- }
144
138
  if (token.length > maxInputCharsPerWord) {
145
139
  return [unkToken];
146
140
  }