@pentoshi/clai 5.1.0 → 5.1.2

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 (150) hide show
  1. package/CHANGELOG.md +49 -0
  2. package/MCP.md +4 -3
  3. package/REA.md +4 -0
  4. package/dist/agent/events.d.ts +4 -1
  5. package/dist/agent/evidence/tool-budgets.js +3 -3
  6. package/dist/agent/evidence/tool-budgets.js.map +1 -1
  7. package/dist/agent/subagents/tools.d.ts +1 -1
  8. package/dist/agent/turn/loop/round-request.js +1 -0
  9. package/dist/agent/turn/loop/round-request.js.map +1 -1
  10. package/dist/agent/turn/loop/stream-request.d.ts +1 -0
  11. package/dist/agent/turn/loop/stream-request.js +1 -0
  12. package/dist/agent/turn/loop/stream-request.js.map +1 -1
  13. package/dist/agent/turn/tool-watchdog.js +4 -0
  14. package/dist/agent/turn/tool-watchdog.js.map +1 -1
  15. package/dist/app/adapters/agent-event-adapter.js +2 -0
  16. package/dist/app/adapters/agent-event-adapter.js.map +1 -1
  17. package/dist/app/adapters/in-memory-clipboard-adapter.js +21 -17
  18. package/dist/app/adapters/in-memory-clipboard-adapter.js.map +1 -1
  19. package/dist/app/controllers/cancel-coordinator.d.ts +1 -0
  20. package/dist/app/controllers/cancel-coordinator.js +7 -2
  21. package/dist/app/controllers/cancel-coordinator.js.map +1 -1
  22. package/dist/app/controllers/session-controller.d.ts +3 -0
  23. package/dist/app/controllers/session-controller.js +39 -22
  24. package/dist/app/controllers/session-controller.js.map +1 -1
  25. package/dist/app/controllers/session-turn-request.d.ts +2 -1
  26. package/dist/app/controllers/session-turn-request.js +11 -3
  27. package/dist/app/controllers/session-turn-request.js.map +1 -1
  28. package/dist/app/controllers/turn-controller.d.ts +3 -0
  29. package/dist/app/controllers/turn-controller.js +23 -7
  30. package/dist/app/controllers/turn-controller.js.map +1 -1
  31. package/dist/attachments/clipboard-image.d.ts +1 -1
  32. package/dist/attachments/clipboard-image.js +70 -54
  33. package/dist/attachments/clipboard-image.js.map +1 -1
  34. package/dist/attachments/image-prepare.d.ts +2 -2
  35. package/dist/attachments/image-prepare.js +102 -303
  36. package/dist/attachments/image-prepare.js.map +1 -1
  37. package/dist/attachments/image-transcoder.d.ts +14 -0
  38. package/dist/attachments/image-transcoder.js +85 -0
  39. package/dist/attachments/image-transcoder.js.map +1 -0
  40. package/dist/attachments/labels.d.ts +6 -0
  41. package/dist/attachments/labels.js +30 -0
  42. package/dist/attachments/labels.js.map +1 -0
  43. package/dist/attachments/read-image.d.ts +1 -0
  44. package/dist/attachments/read-image.js +31 -0
  45. package/dist/attachments/read-image.js.map +1 -0
  46. package/dist/attachments/service.d.ts +2 -1
  47. package/dist/attachments/service.js +8 -5
  48. package/dist/attachments/service.js.map +1 -1
  49. package/dist/classic/app/ClassicApp.js +1 -0
  50. package/dist/classic/app/ClassicApp.js.map +1 -1
  51. package/dist/classic/app/wiring-interactions.js +1 -2
  52. package/dist/classic/app/wiring-interactions.js.map +1 -1
  53. package/dist/classic/bootstrap/start-classic.js +6 -12
  54. package/dist/classic/bootstrap/start-classic.js.map +1 -1
  55. package/dist/classic/chrome/composer-controller.d.ts +3 -4
  56. package/dist/classic/chrome/composer-controller.js +12 -51
  57. package/dist/classic/chrome/composer-controller.js.map +1 -1
  58. package/dist/classic/chrome/composer-paste.d.ts +25 -0
  59. package/dist/classic/chrome/composer-paste.js +77 -0
  60. package/dist/classic/chrome/composer-paste.js.map +1 -0
  61. package/dist/classic/chrome/context-limit-editor.js +1 -1
  62. package/dist/classic/chrome/context-limit-editor.js.map +1 -1
  63. package/dist/classic/chrome/queue-rows.js +2 -1
  64. package/dist/classic/chrome/queue-rows.js.map +1 -1
  65. package/dist/classic/chrome/status-rows.d.ts +2 -0
  66. package/dist/classic/chrome/status-rows.js +11 -21
  67. package/dist/classic/chrome/status-rows.js.map +1 -1
  68. package/dist/classic/input/cancel-ladder.d.ts +1 -0
  69. package/dist/classic/input/cancel-ladder.js +21 -23
  70. package/dist/classic/input/cancel-ladder.js.map +1 -1
  71. package/dist/index.js +1 -1
  72. package/dist/index.js.map +1 -1
  73. package/dist/llm/generation-metrics.d.ts +3 -0
  74. package/dist/llm/generation-metrics.js.map +1 -1
  75. package/dist/llm/generation-progress.d.ts +21 -0
  76. package/dist/llm/generation-progress.js +93 -0
  77. package/dist/llm/generation-progress.js.map +1 -0
  78. package/dist/llm/operation-usage.d.ts +2 -0
  79. package/dist/llm/operation-usage.js +22 -3
  80. package/dist/llm/operation-usage.js.map +1 -1
  81. package/dist/llm/routing/attempt-stream.js +2 -0
  82. package/dist/llm/routing/attempt-stream.js.map +1 -1
  83. package/dist/mcp/manager.d.ts +3 -0
  84. package/dist/mcp/manager.js +43 -51
  85. package/dist/mcp/manager.js.map +1 -1
  86. package/dist/mcp/transport-http.js +1 -1
  87. package/dist/mcp/transport-http.js.map +1 -1
  88. package/dist/mcp/transport-stdio.js +1 -1
  89. package/dist/mcp/transport-stdio.js.map +1 -1
  90. package/dist/prompts/embedded.js +1 -1
  91. package/dist/prompts/embedded.js.map +1 -1
  92. package/dist/prompts/system.agent.md +1 -1
  93. package/dist/rea/runtime.js +7 -2
  94. package/dist/rea/runtime.js.map +1 -1
  95. package/dist/rea/timeouts.d.ts +1 -0
  96. package/dist/rea/timeouts.js +19 -0
  97. package/dist/rea/timeouts.js.map +1 -0
  98. package/dist/session-runtime/start-runtime.js +6 -1
  99. package/dist/session-runtime/start-runtime.js.map +1 -1
  100. package/dist/store/history.d.ts +1 -1
  101. package/dist/store/history.js +29 -35
  102. package/dist/store/history.js.map +1 -1
  103. package/dist/tools/image.js +4 -18
  104. package/dist/tools/image.js.map +1 -1
  105. package/dist/tui-v2/app/App.js +36 -91
  106. package/dist/tui-v2/app/App.js.map +1 -1
  107. package/dist/tui-v2/bootstrap/start-tui-v2.js +6 -12
  108. package/dist/tui-v2/bootstrap/start-tui-v2.js.map +1 -1
  109. package/dist/tui-v2/components/queue/queue-panel.js +2 -1
  110. package/dist/tui-v2/components/queue/queue-panel.js.map +1 -1
  111. package/dist/tui-v2/components/status/context-limit-chip.js +2 -2
  112. package/dist/tui-v2/components/status/context-limit-chip.js.map +1 -1
  113. package/dist/tui-v2/components/status/status-line.d.ts +0 -1
  114. package/dist/tui-v2/components/status/status-line.js +8 -8
  115. package/dist/tui-v2/components/status/status-line.js.map +1 -1
  116. package/dist/tui-v2/composer/composer-editor.js +3 -2
  117. package/dist/tui-v2/composer/composer-editor.js.map +1 -1
  118. package/dist/tui-v2/composer/composer-image-paste.d.ts +1 -20
  119. package/dist/tui-v2/composer/composer-image-paste.js +1 -76
  120. package/dist/tui-v2/composer/composer-image-paste.js.map +1 -1
  121. package/dist/tui-v2/input/escape-cancellation.d.ts +3 -3
  122. package/dist/tui-v2/input/escape-cancellation.js +4 -4
  123. package/dist/tui-v2/input/escape-cancellation.js.map +1 -1
  124. package/dist/types.d.ts +1 -0
  125. package/dist/ui/mentions/expand.d.ts +2 -2
  126. package/dist/ui/mentions/expand.js +5 -57
  127. package/dist/ui/mentions/expand.js.map +1 -1
  128. package/dist/ui/mentions.d.ts +4 -4
  129. package/dist/ui/mentions.js +21 -22
  130. package/dist/ui/mentions.js.map +1 -1
  131. package/dist/ui-core/bootstrap/shutdown-services.js +1 -0
  132. package/dist/ui-core/bootstrap/shutdown-services.js.map +1 -1
  133. package/dist/ui-core/composer/composer-image-paste.d.ts +3 -2
  134. package/dist/ui-core/composer/composer-image-paste.js +49 -46
  135. package/dist/ui-core/composer/composer-image-paste.js.map +1 -1
  136. package/dist/ui-core/composer/paste-placeholder.d.ts +3 -0
  137. package/dist/ui-core/composer/paste-placeholder.js +27 -4
  138. package/dist/ui-core/composer/paste-placeholder.js.map +1 -1
  139. package/dist/ui-core/ports/clipboard-osc52.js +3 -0
  140. package/dist/ui-core/ports/clipboard-osc52.js.map +1 -1
  141. package/dist/ui-core/rendering/context-limit.js +2 -2
  142. package/dist/ui-core/rendering/context-limit.js.map +1 -1
  143. package/dist/ui-core/rendering/footer-metrics.d.ts +6 -0
  144. package/dist/ui-core/rendering/footer-metrics.js +21 -0
  145. package/dist/ui-core/rendering/footer-metrics.js.map +1 -0
  146. package/dist/ui-core/rendering/status-segments.js +1 -1
  147. package/dist/ui-core/rendering/status-segments.js.map +1 -1
  148. package/dist/version.generated.d.ts +2 -2
  149. package/dist/version.generated.js +2 -2
  150. package/package.json +1 -1
@@ -1,20 +1 @@
1
- import type { AppServices } from "../../ui-core/bootstrap/composition-root.js";
2
- interface ComposerEditor {
3
- readonly plainText: string;
4
- readonly cursorOffset: number;
5
- insertText(text: string): void;
6
- focus(): void;
7
- }
8
- interface EditorRef {
9
- readonly current: ComposerEditor | null;
10
- }
11
- interface PreventableEvent {
12
- preventDefault(): void;
13
- }
14
- interface ComposerImagePaste {
15
- handleChord(chord: string, overlayKind: string, key: PreventableEvent): boolean;
16
- handlePaste(text: string, event: PreventableEvent): boolean;
17
- handleDroppedImages(text: string, event: PreventableEvent): boolean;
18
- }
19
- export declare function createComposerImagePaste(services: AppServices, editorRef: EditorRef, refresh: () => void): ComposerImagePaste;
20
- export {};
1
+ export { createComposerImagePaste } from "../../ui-core/composer/composer-image-paste.js";
@@ -1,77 +1,2 @@
1
- import { captureClipboardImage } from "../../attachments/clipboard-image.js";
2
- import { formatAttachmentReference, stabilizeDroppedImagesInText, } from "../../ui/mentions.js";
3
- import { notify } from "../../ui-core/notify.js";
4
- const activePastes = new WeakSet();
5
- export function createComposerImagePaste(services, editorRef, refresh) {
6
- const pasteImage = () => {
7
- if (activePastes.has(services))
8
- return;
9
- activePastes.add(services);
10
- setImmediate(() => {
11
- const result = captureClipboardImage();
12
- activePastes.delete(services);
13
- if (!result.ok) {
14
- notify(services, result.reason, {
15
- key: "image-paste",
16
- level: "warn",
17
- durationMs: 2600,
18
- });
19
- return;
20
- }
21
- const editor = editorRef.current;
22
- if (!editor)
23
- return;
24
- const before = editor.plainText[editor.cursorOffset - 1] ?? "";
25
- const leadingSpace = before && !/\s/.test(before) ? " " : "";
26
- const reference = formatAttachmentReference(result.path);
27
- editor.insertText(`${leadingSpace}${reference} `);
28
- services.focus.focusRegion("composer");
29
- editor.focus();
30
- notify(services, "Image attached from clipboard", {
31
- key: "image-paste",
32
- durationMs: 1600,
33
- });
34
- queueMicrotask(refresh);
35
- });
36
- };
37
- return {
38
- handleChord(chord, overlayKind, key) {
39
- if (overlayKind !== "none" || chord !== "ctrl+v")
40
- return false;
41
- key.preventDefault();
42
- services.focus.focusRegion("composer");
43
- editorRef.current?.focus();
44
- pasteImage();
45
- return true;
46
- },
47
- handlePaste(text, event) {
48
- if (text.trim())
49
- return false;
50
- event.preventDefault();
51
- pasteImage();
52
- return true;
53
- },
54
- handleDroppedImages(text, event) {
55
- if (!text.trim())
56
- return false;
57
- const { text: rewritten, images } = stabilizeDroppedImagesInText(text);
58
- if (images.length === 0)
59
- return false;
60
- event.preventDefault();
61
- const editor = editorRef.current;
62
- if (!editor)
63
- return true;
64
- const before = editor.plainText[editor.cursorOffset - 1] ?? "";
65
- const leadingSpace = before && !/\s/.test(before) ? " " : "";
66
- editor.insertText(`${leadingSpace}${rewritten} `);
67
- services.focus.focusRegion("composer");
68
- editor.focus();
69
- notify(services, images.length > 1
70
- ? `${images.length} images attached`
71
- : "Image attached", { key: "image-paste", durationMs: 1600 });
72
- queueMicrotask(refresh);
73
- return true;
74
- },
75
- };
76
- }
1
+ export { createComposerImagePaste } from "../../ui-core/composer/composer-image-paste.js";
77
2
  //# sourceMappingURL=composer-image-paste.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"composer-image-paste.js","sourceRoot":"","sources":["../../../src/tui-v2/composer/composer-image-paste.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"composer-image-paste.js","sourceRoot":"","sources":["../../../src/tui-v2/composer/composer-image-paste.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC"}
@@ -1,7 +1,7 @@
1
- export type EscapeCancellationAction = "dismiss" | "arm" | "cancel-all" | "none";
1
+ export type EscapeCancellationAction = "dismiss" | "arm" | "cancel-foreground" | "none";
2
2
  export declare function escapeCancellationAction(input: {
3
3
  readonly dismissed: boolean;
4
4
  readonly doublePress: boolean;
5
- readonly hasCancelableWork: boolean;
5
+ readonly hasForegroundWork: boolean;
6
6
  }): EscapeCancellationAction;
7
- export declare function preserveEscapeArmAfterTurn(hasCancelableWork: boolean): boolean;
7
+ export declare function preserveEscapeArmAfterTurn(hasForegroundWork: boolean): boolean;
@@ -1,11 +1,11 @@
1
1
  export function escapeCancellationAction(input) {
2
2
  if (input.dismissed)
3
3
  return "dismiss";
4
- if (!input.hasCancelableWork)
4
+ if (!input.hasForegroundWork)
5
5
  return "none";
6
- return input.doublePress ? "cancel-all" : "arm";
6
+ return input.doublePress ? "cancel-foreground" : "arm";
7
7
  }
8
- export function preserveEscapeArmAfterTurn(hasCancelableWork) {
9
- return hasCancelableWork;
8
+ export function preserveEscapeArmAfterTurn(hasForegroundWork) {
9
+ return hasForegroundWork;
10
10
  }
11
11
  //# sourceMappingURL=escape-cancellation.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"escape-cancellation.js","sourceRoot":"","sources":["../../../src/tui-v2/input/escape-cancellation.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,wBAAwB,CAAC,KAIxC;IACC,IAAI,KAAK,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IACtC,IAAI,CAAC,KAAK,CAAC,iBAAiB;QAAE,OAAO,MAAM,CAAC;IAC5C,OAAO,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,iBAA0B;IAE1B,OAAO,iBAAiB,CAAC;AAC3B,CAAC"}
1
+ {"version":3,"file":"escape-cancellation.js","sourceRoot":"","sources":["../../../src/tui-v2/input/escape-cancellation.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,wBAAwB,CAAC,KAIxC;IACC,IAAI,KAAK,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IACtC,IAAI,CAAC,KAAK,CAAC,iBAAiB;QAAE,OAAO,MAAM,CAAC;IAC5C,OAAO,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,iBAA0B;IAE1B,OAAO,iBAAiB,CAAC;AAC3B,CAAC"}
package/dist/types.d.ts CHANGED
@@ -224,6 +224,7 @@ export interface CompletionRequest {
224
224
  onToolCallDelta?: ((delta: ToolCallStreamDelta) => void) | undefined;
225
225
  onReasoningArtifactReplayDecision?: ReasoningArtifactReplayObserver | undefined;
226
226
  onStreamEvent?: import("./llm/stream-events.js").ProviderStreamEventSink | undefined;
227
+ onGenerationProgress?: ((metrics: import("./llm/generation-metrics.js").GenerationProgress) => void) | undefined;
227
228
  }
228
229
  export interface UsageCharge {
229
230
  readonly amount: number;
@@ -17,10 +17,10 @@ export interface MentionExpansion {
17
17
  export interface ExpandMentionsOptions {
18
18
  visionCapable?: boolean | undefined;
19
19
  budget?: ImageBudget | undefined;
20
+ signal?: AbortSignal | undefined;
20
21
  }
21
22
  export declare function normalizeDroppedPath(token: string): string;
22
23
  export declare function classifyPath(absPath: string): AttachmentKind;
23
24
  export declare function extractMentionTokens(line: string): string[];
24
25
  export declare function tokenToPath(token: string, baseDir: string): string;
25
- export declare function expandMentions(line: string, baseDir?: string, vision?: boolean | ExpandMentionsOptions): MentionExpansion;
26
- export declare function stabilizeImagePaths(paths: string[], baseDir?: string): string[];
26
+ export declare function expandMentions(line: string, baseDir?: string, vision?: boolean | ExpandMentionsOptions): Promise<MentionExpansion>;
@@ -1,11 +1,9 @@
1
1
  import { imageBudgetFor } from "../../attachments/image-content.js";
2
2
  import { prepareImageForModel } from "../../attachments/image-prepare.js";
3
3
  import { safeCwd } from "../../os/cwd.js";
4
- import { scratchDirFor } from "../../prompts/index.js";
5
4
  import { expandHome } from "./file-suggestions.js";
6
- import { createHash } from "node:crypto";
7
- import { copyFileSync, existsSync, mkdirSync, statSync } from "node:fs";
8
- import { basename, dirname, extname, isAbsolute, join, resolve } from "node:path";
5
+ import { existsSync, statSync } from "node:fs";
6
+ import { extname, isAbsolute, resolve } from "node:path";
9
7
  import { fileURLToPath } from "node:url";
10
8
  import { findReaMentions } from "../../rea/workflow.js";
11
9
  const TEXT_EXTENSIONS = new Set([
@@ -185,7 +183,7 @@ export function tokenToPath(token, baseDir) {
185
183
  path = expandHome(path);
186
184
  return isAbsolute(path) ? path : resolve(baseDir, path);
187
185
  }
188
- export function expandMentions(line, baseDir = safeCwd(), vision = false) {
186
+ export async function expandMentions(line, baseDir = safeCwd(), vision = false) {
189
187
  const options = typeof vision === "boolean" ? { visionCapable: vision } : vision;
190
188
  const visionCapable = options.visionCapable === true;
191
189
  const budget = options.budget ?? imageBudgetFor("");
@@ -202,16 +200,10 @@ export function expandMentions(line, baseDir = safeCwd(), vision = false) {
202
200
  attachments.push({ raw: token, path: absPath, kind: "text" });
203
201
  }
204
202
  else if (kind === "image") {
205
- const stablePath = stabilizeImagePaths([absPath], baseDir)[0] ?? absPath;
206
- let prepared = prepareImageForModel(stablePath, budget, baseDir);
207
- if (!prepared.ok && stablePath !== absPath) {
208
- const original = prepareImageForModel(absPath, budget, baseDir);
209
- if (original.ok)
210
- prepared = original;
211
- }
203
+ const prepared = await prepareImageForModel(absPath, budget, baseDir, options.signal);
212
204
  attachments.push({
213
205
  raw: token,
214
- path: prepared.ok ? prepared.path : stablePath,
206
+ path: absPath,
215
207
  kind: "image",
216
208
  sendable: prepared.ok,
217
209
  note: !prepared.ok
@@ -265,48 +257,4 @@ export function expandMentions(line, baseDir = safeCwd(), vision = false) {
265
257
  contextBlock: "",
266
258
  };
267
259
  }
268
- export function stabilizeImagePaths(paths, baseDir = safeCwd()) {
269
- const output = [];
270
- const attachmentDir = join(scratchDirFor(baseDir), "attachments");
271
- for (const source of paths) {
272
- let info;
273
- try {
274
- info = statSync(source);
275
- }
276
- catch {
277
- output.push(source);
278
- continue;
279
- }
280
- if (!info.isFile()) {
281
- output.push(source);
282
- continue;
283
- }
284
- if (resolve(dirname(source)) === resolve(attachmentDir)) {
285
- output.push(source);
286
- continue;
287
- }
288
- try {
289
- mkdirSync(attachmentDir, { recursive: true });
290
- const extension = extname(source).toLowerCase();
291
- const stem = basename(source, extension)
292
- .replace(/[^\w.-]+/g, "_")
293
- .replace(/_+/g, "_")
294
- .slice(0, 100) || "image";
295
- const id = createHash("sha1")
296
- .update(`${resolve(source)}|${Math.round(info.mtimeMs)}|${info.size}`)
297
- .digest("hex")
298
- .slice(0, 12);
299
- const destination = join(attachmentDir, `${id}-${stem}${extension || ".img"}`);
300
- if (!existsSync(destination) ||
301
- statSync(destination).size !== info.size) {
302
- copyFileSync(source, destination);
303
- }
304
- output.push(destination);
305
- }
306
- catch {
307
- output.push(source);
308
- }
309
- }
310
- return output;
311
- }
312
260
  //# sourceMappingURL=expand.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"expand.js","sourceRoot":"","sources":["../../../src/ui/mentions/expand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC;IAC9B,MAAM;IACN,KAAK;IACL,WAAW;IACX,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,cAAc;IACd,KAAK;IACL,MAAM;IACN,MAAM;IACN,MAAM;IACN,KAAK;IACL,MAAM;IACN,MAAM;IACN,MAAM;IACN,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,OAAO;IACP,KAAK;IACL,MAAM;IACN,IAAI;IACJ,IAAI;IACJ,MAAM;IACN,KAAK;IACL,MAAM;IACN,KAAK;IACL,MAAM;IACN,QAAQ;IACR,QAAQ;IACR,MAAM;IACN,KAAK;IACL,MAAM;IACN,KAAK;IACL,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,OAAO;IACP,OAAO;IACP,OAAO;IACP,MAAM;IACN,SAAS;IACT,QAAQ;IACR,MAAM;IACN,UAAU;IACV,MAAM;IACN,QAAQ;IACR,OAAO;IACP,MAAM;IACN,aAAa;IACb,SAAS;IACT,aAAa;IACb,YAAY;IACZ,eAAe;IACf,eAAe;CAChB,CAAC,CAAC;AAEH,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;IAC/B,MAAM;IACN,MAAM;IACN,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IACN,OAAO;CACR,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC;IAC7B,MAAM;IACN,MAAM;IACN,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;CACP,CAAC,CAAC;AA+BH,MAAM,UAAU,oBAAoB,CAAC,KAAa;IAChD,IAAI,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC9B,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,UAAU,CAAC;IAC/C,IACE,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC;QACzB,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;QACxB,UAAU,CAAC,MAAM,IAAI,CAAC,CAAC;QACzB,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC;YACzB,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;YACxB,UAAU,CAAC,MAAM,IAAI,CAAC,CAAC,EACzB,CAAC;QACD,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;SAAM,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAChE,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,IAAI,CAAC;YACH,OAAO,aAAa,CAAC,UAAU,CAAC,CAAC;QACnC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,UAAU,CAAC;QACpB,CAAC;IACH,CAAC;IACD,MAAM,WAAW,GACf,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACjE,IAAI,CAAC,WAAW;QAAE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAClE,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAe;IAC1C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3C,IAAI,EAA+B,CAAC;IACpC,IAAI,CAAC;QACH,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,EAAE,CAAC,WAAW,EAAE;QAAE,OAAO,WAAW,CAAC;IACzC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,OAAO,QAAQ,CAAC;IAClC,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;IAC3C,IAAI,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,OAAO,CAAC;IAC9C,IAAI,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,UAAU,CAAC;IAC/C,IAAI,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC;IAC1D,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7E,MAAM,SAAS,GAAG,eAAe,CAAC;IAClC,IAAI,KAA6B,CAAC;IAClC,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC/C,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,SAAS;QACpC,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC;YAAE,SAAS;QACnE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,MAAM,WAAW,GAAG,wBAAwB,CAAC;IAC7C,OAAO,CAAC,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACjD,IAAI,KAAK,CAAC,CAAC,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAa,EAAE,OAAe;IACxD,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/C,IAAI,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC;IAC3C,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IACxB,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,IAAY,EACZ,UAAkB,OAAO,EAAE,EAC3B,SAA0C,KAAK;IAE/C,MAAM,OAAO,GACX,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACnE,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,KAAK,IAAI,CAAC;IACrD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAiB,EAAE,CAAC;IACrC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC5C,IAAI,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC;YAAE,SAAS;QACrC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEvB,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACpB,WAAW,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAChE,CAAC;aAAM,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,mBAAmB,CAAC,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC;YACzE,IAAI,QAAQ,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YACjE,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;gBAC3C,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;gBAChE,IAAI,QAAQ,CAAC,EAAE;oBAAE,QAAQ,GAAG,QAAQ,CAAC;YACvC,CAAC;YACD,WAAW,CAAC,IAAI,CAAC;gBACf,GAAG,EAAE,KAAK;gBACV,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU;gBAC9C,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,QAAQ,CAAC,EAAE;gBACrB,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE;oBAChB,CAAC,CAAC,QAAQ,CAAC,WAAW;wBACpB,CAAC,CAAC,kBAAkB,QAAQ,CAAC,MAAM,EAAE;wBACrC,CAAC,CAAC,kBAAkB,QAAQ,CAAC,MAAM,sCAAsC;oBAC3E,CAAC,CAAC,aAAa;wBACb,CAAC,CAAC,oGAAoG;wBACtG,CAAC,CAAC,mGAAmG;aAC1G,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;YACxD,WAAW,CAAC,IAAI,CAAC;gBACf,GAAG,EAAE,KAAK;gBACV,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,KAAK;oBACT,CAAC,CAAC,4GAA4G;oBAC9G,CAAC,CAAC,0GAA0G;aAC/G,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;YAChC,WAAW,CAAC,IAAI,CAAC;gBACf,GAAG,EAAE,KAAK;gBACV,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,WAAW;gBACjB,IAAI,EACF,gHAAgH;aACnH,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9B,WAAW,CAAC,IAAI,CAAC;gBACf,GAAG,EAAE,KAAK;gBACV,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,gBAAgB;aACvB,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,IAAI,CAAC;gBACf,GAAG,EAAE,KAAK;gBACV,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,yBAAyB;aAChC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,EAAE,IAAI;QACV,WAAW;QACX,YAAY,EAAE,EAAE;KACjB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,KAAe,EACf,UAAkB,OAAO,EAAE;IAE3B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC;IAClE,KAAK,MAAM,MAAM,IAAI,KAAK,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC;QACT,IAAI,CAAC;YACH,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpB,SAAS;QACX,CAAC;QACD,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YACxD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpB,SAAS;QACX,CAAC;QACD,IAAI,CAAC;YACH,SAAS,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9C,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;YAChD,MAAM,IAAI,GACR,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;iBACxB,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC;iBACzB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;iBACnB,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,OAAO,CAAC;YAC9B,MAAM,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC;iBAC1B,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;iBACrE,MAAM,CAAC,KAAK,CAAC;iBACb,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAChB,MAAM,WAAW,GAAG,IAAI,CACtB,aAAa,EACb,GAAG,EAAE,IAAI,IAAI,GAAG,SAAS,IAAI,MAAM,EAAE,CACtC,CAAC;YACF,IACE,CAAC,UAAU,CAAC,WAAW,CAAC;gBACxB,QAAQ,CAAC,WAAW,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EACxC,CAAC;gBACD,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;YACpC,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"expand.js","sourceRoot":"","sources":["../../../src/ui/mentions/expand.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,8 @@
1
1
  import { type ImageBudget } from "../attachments/image-content.js";
2
2
  import type { ChatImage } from "../types.js";
3
- import { extractMentionTokens, normalizeDroppedPath, stabilizeImagePaths } from "./mentions/expand.js";
3
+ import { extractMentionTokens, normalizeDroppedPath } from "./mentions/expand.js";
4
4
  export { expandMentions } from "./mentions/expand.js";
5
- export { extractMentionTokens, normalizeDroppedPath, stabilizeImagePaths };
5
+ export { extractMentionTokens, normalizeDroppedPath };
6
6
  export type { Attachment, AttachmentKind, ExpandMentionsOptions, MentionExpansion } from "./mentions/expand.js";
7
7
  export { findFileSuggestions } from "./mentions/file-suggestions.js";
8
8
  export type { FileSuggestion } from "./mentions/file-suggestions.js";
@@ -23,5 +23,5 @@ export declare function stabilizeDroppedImagesInText(text: string, baseDir?: str
23
23
  images: string[];
24
24
  };
25
25
  export declare function imageAttachmentPaths(line: string, baseDir?: string): string[];
26
- export declare function loadImagePaths(paths: readonly string[], budget?: ImageBudget, baseDir?: string): ChatImage[];
27
- export declare function loadImageAttachments(line: string, baseDir?: string): ChatImage[];
26
+ export declare function loadImagePaths(paths: readonly string[], budget?: ImageBudget, baseDir?: string, signal?: AbortSignal): Promise<ChatImage[]>;
27
+ export declare function loadImageAttachments(line: string, baseDir?: string): Promise<ChatImage[]>;
@@ -1,13 +1,14 @@
1
- import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
1
+ import { existsSync, readdirSync, statSync } from "node:fs";
2
+ import { readImageBytes } from "../attachments/read-image.js";
2
3
  import { basename, dirname, extname, isAbsolute, join, resolve, } from "node:path";
3
4
  import { pathToFileURL } from "node:url";
4
5
  import { detectModelImageMediaType, imageBudgetFor, } from "../attachments/image-content.js";
5
6
  import { prepareImageForModel } from "../attachments/image-prepare.js";
6
7
  import { safeCwd } from "../os/cwd.js";
7
8
  import { expandHome } from "./mentions/file-suggestions.js";
8
- import { classifyPath, extractMentionTokens, normalizeDroppedPath, stabilizeImagePaths, tokenToPath } from "./mentions/expand.js";
9
+ import { classifyPath, extractMentionTokens, normalizeDroppedPath, tokenToPath } from "./mentions/expand.js";
9
10
  export { expandMentions } from "./mentions/expand.js";
10
- export { extractMentionTokens, normalizeDroppedPath, stabilizeImagePaths };
11
+ export { extractMentionTokens, normalizeDroppedPath };
11
12
  export { findFileSuggestions } from "./mentions/file-suggestions.js";
12
13
  const IMAGE_MEDIA_TYPES = {
13
14
  ".png": "image/png",
@@ -29,7 +30,7 @@ export function formatAttachmentReference(path, baseDir = safeCwd()) {
29
30
  const absolute = isAbsolute(normalized)
30
31
  ? normalized
31
32
  : resolve(baseDir, normalized);
32
- return pathToFileURL(absolute).href;
33
+ return pathToFileURL(absolute).href.replace(/[()]/g, (character) => `%${character.charCodeAt(0).toString(16).toUpperCase()}`);
33
34
  }
34
35
  export function getMentionQuery(line, cursor) {
35
36
  const upto = line.slice(0, cursor);
@@ -130,7 +131,9 @@ function scanExistingPaths(line, baseDir) {
130
131
  if (resolved) {
131
132
  if (!seen.has(resolved)) {
132
133
  seen.add(resolved);
133
- results.push({ raw: rawSpan, resolved });
134
+ const quote = line[startIdx - 1];
135
+ const raw = (quote === '"' || quote === "'") && rawSpan.endsWith(quote) ? quote + rawSpan : rawSpan;
136
+ results.push({ raw, resolved });
134
137
  }
135
138
  startRe.lastIndex = startIdx + rawSpan.length;
136
139
  break;
@@ -156,9 +159,7 @@ export function stabilizeDroppedFilesInText(text, baseDir = safeCwd()) {
156
159
  const images = [];
157
160
  for (const match of matches) {
158
161
  const isImage = Boolean(imageMediaType(match.resolved));
159
- const stable = isImage
160
- ? stabilizeImagePaths([match.resolved], baseDir)[0] ?? match.resolved
161
- : match.resolved;
162
+ const stable = match.resolved;
162
163
  rewritten = rewritten.replace(match.raw, formatAttachmentReference(stable, baseDir));
163
164
  files.push(stable);
164
165
  if (isImage)
@@ -177,7 +178,7 @@ export function stabilizeDroppedImagesInText(text, baseDir = safeCwd()) {
177
178
  let rewritten = text;
178
179
  const images = [];
179
180
  for (const match of matches) {
180
- const stable = stabilizeImagePaths([match.resolved], baseDir)[0] ?? match.resolved;
181
+ const stable = match.resolved;
181
182
  rewritten = rewritten.replace(match.raw, formatAttachmentReference(stable));
182
183
  images.push(stable);
183
184
  }
@@ -196,9 +197,9 @@ export function imageAttachmentPaths(line, baseDir = safeCwd()) {
196
197
  if (classifyPath(absPath) === "image")
197
198
  paths.push(absPath);
198
199
  }
199
- return stabilizeImagePaths(paths, baseDir);
200
+ return paths;
200
201
  }
201
- export function loadImagePaths(paths, budget = imageBudgetFor(""), baseDir = safeCwd()) {
202
+ export async function loadImagePaths(paths, budget = imageBudgetFor(""), baseDir = safeCwd(), signal) {
202
203
  const images = [];
203
204
  const seen = new Set();
204
205
  let totalBytes = 0;
@@ -208,25 +209,23 @@ export function loadImagePaths(paths, budget = imageBudgetFor(""), baseDir = saf
208
209
  seen.add(path);
209
210
  if (images.length >= budget.maxCount)
210
211
  break;
211
- const prepared = prepareImageForModel(path, budget, baseDir);
212
+ signal?.throwIfAborted();
213
+ const prepared = await prepareImageForModel(path, budget, baseDir, signal);
212
214
  if (!prepared.ok)
213
215
  continue;
214
216
  if (totalBytes + prepared.byteLength > budget.maxTotalBytes)
215
217
  continue;
216
218
  try {
217
- const buffer = readFileSync(prepared.path);
218
- const mediaType = detectModelImageMediaType(buffer);
219
- if (!mediaType)
219
+ const limit = Math.min(budget.hardMaxBytes, budget.maxTotalBytes - totalBytes);
220
+ const bytes = await readImageBytes(prepared.path, limit, signal);
221
+ const mediaType = detectModelImageMediaType(bytes);
222
+ if (!mediaType || mediaType !== prepared.mediaType)
220
223
  continue;
221
- totalBytes += buffer.length;
222
- images.push({
223
- mediaType,
224
- dataBase64: buffer.toString("base64"),
225
- path: prepared.path,
226
- });
224
+ totalBytes += bytes.length;
225
+ images.push({ mediaType, dataBase64: bytes.toString("base64"), path: prepared.path });
227
226
  }
228
227
  catch {
229
- continue;
228
+ signal?.throwIfAborted();
230
229
  }
231
230
  }
232
231
  return images;
@@ -1 +1 @@
1
- {"version":3,"file":"mentions.js","sourceRoot":"","sources":["../../src/ui/mentions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mentions.js","sourceRoot":"","sources":["../../src/ui/mentions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EACL,QAAQ,EACR,OAAO,EACP,OAAO,EACP,UAAU,EACV,IAAI,EACJ,OAAO,GACR,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACL,yBAAyB,EACzB,cAAc,GAEf,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC7G,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,CAAC;AAEtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,MAAM,iBAAiB,GAA2B;IAChD,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,YAAY;IACrB,MAAM,EAAE,WAAW;IACnB,OAAO,EAAE,YAAY;IACrB,MAAM,EAAE,WAAW;IACnB,OAAO,EAAE,YAAY;IACrB,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,cAAc;IACtB,OAAO,EAAE,YAAY;CACtB,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,OAAe;IAC5C,OAAO,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,IAAY,EACZ,UAAkB,OAAO,EAAE;IAE3B,MAAM,UAAU,GAAG,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,CAAC;QACrC,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACjC,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,EAAE,CACjE,IAAI,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CACzD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,IAAY,EACZ,MAAc;IAEd,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACnC,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,EAAE,KAAK,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3B,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACjC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAClC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;AACrC,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAW;IACtC,IAAI,CAAC;QACH,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE;YAAE,OAAO,GAAG,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;IACT,CAAC;IACD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACzB,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,IAAI,OAAiB,CAAC;IACtB,IAAI,CAAC;QACH,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC;YACtC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAClC,IAAI,CAAC;gBACH,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE;oBAAE,OAAO,SAAS,CAAC;YACrD,CAAC;YAAC,MAAM,CAAC;YACT,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IACpC,OAAO,IAAI;SACR,SAAS,CAAC,KAAK,CAAC;SAChB,OAAO,CAAC,qDAAqD,EAAE,GAAG,CAAC,CAAC;AACzE,CAAC;AAOD,MAAM,mBAAmB,GAAG,MAAM,CAAC;AACnC,MAAM,wBAAwB,GAAG,KAAK,CAAC;AACvC,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B,SAAS,cAAc,CAAC,IAAY;IAClC,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;IACtB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACb,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAAE,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI,CAAC;YAAE,MAAM;QAClB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACb,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC5C,CAAC,IAAI,CAAC,CAAC;gBACP,SAAS;YACX,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAAE,MAAM;YACpC,CAAC,IAAI,CAAC,CAAC;QACT,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAY,EAAE,OAAe;IACtD,IAAI,IAAI,CAAC,MAAM,GAAG,mBAAmB;QAAE,OAAO,EAAE,CAAC;IACjD,MAAM,OAAO,GAAkB,EAAE,CAAC;IAClC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,OAAO,GAAG,wEAAwE,CAAC;IACzF,IAAI,CAAyB,CAAC;IAC9B,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAClB,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EACnC,QAAQ,GAAG,wBAAwB,CACpC,CAAC;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACvC,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QAClC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACzC,IAAI,EAAE,MAAM,GAAG,eAAe;gBAAE,OAAO,EAAE,CAAC;YAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC3C,MAAM,SAAS,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAChD,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;YACvC,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACzE,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,QAAQ,EAAE,CAAC;gBACb,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACxB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBACnB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;oBACjC,MAAM,GAAG,GAAG,CAAC,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;oBACpG,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAClC,CAAC;gBACD,OAAO,CAAC,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;gBAC9C,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,IAAY,EACZ,OAAe;IAEf,OAAO,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AACzE,CAAC;AAED,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAE9B,MAAM,UAAU,2BAA2B,CACzC,IAAY,EACZ,UAAkB,OAAO,EAAE;IAE3B,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACjE,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC/E,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,YAAY,GAAG,iBAAiB,EAAE,CAAC;QAC1D,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACzC,CAAC;IACD,IAAI,SAAS,GAAG,IAAI,CAAC;IACrB,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC;QAC9B,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,yBAAyB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACrF,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnB,IAAI,OAAO;YAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,IAAY,EACZ,UAAkB,OAAO,EAAE;IAE3B,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAChE,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CACxC,CAAC;IACF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACtD,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC/E,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,YAAY,GAAG,iBAAiB,EAAE,CAAC;QAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IAC9B,CAAC;IACD,IAAI,SAAS,GAAG,IAAI,CAAC;IACrB,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC;QAC9B,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5E,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,IAAY,EACZ,UAAkB,OAAO,EAAE;IAE3B,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,UAAU,GAAG;QACjB,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;KAClE,CAAC;IACF,KAAK,MAAM,OAAO,IAAI,UAAU,EAAE,CAAC;QACjC,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;YAAE,SAAS;QAChC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAClB,IAAI,YAAY,CAAC,OAAO,CAAC,KAAK,OAAO;YAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,KAAwB,EACxB,SAAsB,cAAc,CAAC,EAAE,CAAC,EACxC,UAAkB,OAAO,EAAE,EAC3B,MAAoB;IAEpB,MAAM,MAAM,GAAgB,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAS;QAC7B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACf,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ;YAAE,MAAM;QAC5C,MAAM,EAAE,cAAc,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAC3E,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,SAAS;QAC3B,IAAI,UAAU,GAAG,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,aAAa;YAAE,SAAS;QACtE,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,aAAa,GAAG,UAAU,CAAC,CAAC;YAC/E,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACjE,MAAM,SAAS,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,CAAC,SAAS,IAAI,SAAS,KAAK,QAAQ,CAAC,SAAS;gBAAE,SAAS;YAC7D,UAAU,IAAI,KAAK,CAAC,MAAM,CAAC;YAC3B,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QACxF,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,EAAE,cAAc,EAAE,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,IAAY,EACZ,UAAkB,OAAO,EAAE;IAE3B,OAAO,cAAc,CACnB,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,EACnC,cAAc,CAAC,EAAE,CAAC,EAClB,OAAO,CACR,CAAC;AACJ,CAAC"}
@@ -5,6 +5,7 @@ export async function shutdownServices(services, cleanupBudgetMs = SHUTDOWN_CLEA
5
5
  services.overlay.cancelBlockingPrompt();
6
6
  const deadline = Date.now() + cleanupBudgetMs;
7
7
  const cleanup = Promise.allSettled([
8
+ services.cancel.cancelAll(),
8
9
  services.mcp.closeAll(),
9
10
  services.ports.interactiveSessions.closeAll("app-shutdown").then((result) => {
10
11
  for (const failure of result.failures) {
@@ -1 +1 @@
1
- {"version":3,"file":"shutdown-services.js","sourceRoot":"","sources":["../../../src/ui-core/bootstrap/shutdown-services.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,CAAC;AAEhD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,QAAqB,EACrB,eAAe,GAAG,0BAA0B;IAE5C,QAAQ,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC;IACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,eAAe,CAAC;IAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;QACjC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE;QACvB,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1E,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACtC,OAAO,CAAC,IAAI,CAAC,sCAAsC,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACzF,CAAC;QACH,CAAC,CAAC;KACH,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IACpC,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,GAAG,QAAQ,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;QACtD,MAAM,SAAS,GAAG,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAC1E,MAAM,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9F,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"shutdown-services.js","sourceRoot":"","sources":["../../../src/ui-core/bootstrap/shutdown-services.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,CAAC;AAEhD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,QAAqB,EACrB,eAAe,GAAG,0BAA0B;IAE5C,QAAQ,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC;IACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,eAAe,CAAC;IAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;QACjC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE;QAC3B,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE;QACvB,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1E,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACtC,OAAO,CAAC,IAAI,CAAC,sCAAsC,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACzF,CAAC;QACH,CAAC,CAAC;KACH,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IACpC,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,GAAG,QAAQ,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;QACtD,MAAM,SAAS,GAAG,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAC1E,MAAM,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9F,CAAC;AACH,CAAC"}
@@ -1,4 +1,5 @@
1
- import type { AppServices } from "../../ui-core/bootstrap/composition-root.js";
1
+ import type { AppServices } from "../bootstrap/composition-root.js";
2
+ import { type PasteRegistry } from "./paste-placeholder.js";
2
3
  interface ComposerEditor {
3
4
  readonly plainText: string;
4
5
  readonly cursorOffset: number;
@@ -16,5 +17,5 @@ interface ComposerImagePaste {
16
17
  handlePaste(text: string, event: PreventableEvent): boolean;
17
18
  handleDroppedImages(text: string, event: PreventableEvent): boolean;
18
19
  }
19
- export declare function createComposerImagePaste(services: AppServices, editorRef: EditorRef, refresh: () => void): ComposerImagePaste;
20
+ export declare function createComposerImagePaste(services: AppServices, editorRef: EditorRef, refresh: () => void, registry?: PasteRegistry): ComposerImagePaste;
20
21
  export {};
@@ -1,75 +1,78 @@
1
1
  import { captureClipboardImage } from "../../attachments/clipboard-image.js";
2
- import { formatAttachmentReference, stabilizeDroppedImagesInText, } from "../../ui/mentions.js";
3
- import { notify } from "../../ui-core/notify.js";
2
+ import { formatAttachmentReference, stabilizeDroppedFilesInText } from "../../ui/mentions.js";
3
+ import { notify } from "../notify.js";
4
+ import { isLargePaste } from "./paste-placeholder.js";
4
5
  const activePastes = new WeakSet();
5
- export function createComposerImagePaste(services, editorRef, refresh) {
6
- const pasteImage = () => {
6
+ export function createComposerImagePaste(services, editorRef, refresh, registry) {
7
+ const insert = (text, attachment = true) => {
8
+ const editor = editorRef.current;
9
+ if (!editor)
10
+ return;
11
+ const before = editor.plainText[editor.cursorOffset - 1] ?? "";
12
+ const leadingSpace = before && !/\s/.test(before) ? " " : "";
13
+ editor.insertText(attachment ? `${leadingSpace}${registry?.compactAttachments(text) ?? text} ` : text);
14
+ services.focus.focusRegion("composer");
15
+ editor.focus();
16
+ queueMicrotask(refresh);
17
+ };
18
+ const pasteClipboard = (readText) => {
7
19
  if (activePastes.has(services))
8
20
  return;
9
21
  activePastes.add(services);
10
- setImmediate(() => {
11
- const result = captureClipboardImage();
12
- activePastes.delete(services);
13
- if (!result.ok) {
14
- notify(services, result.reason, {
15
- key: "image-paste",
16
- level: "warn",
17
- durationMs: 2600,
18
- });
22
+ const editor = editorRef.current;
23
+ const generation = registry?.generation;
24
+ const current = () => editor !== null && editorRef.current === editor && generation === registry?.generation;
25
+ void (async () => {
26
+ const text = readText ? await services.ports.clipboard.readText?.().catch(() => undefined) : undefined;
27
+ if (!current())
28
+ return;
29
+ if (text && text.length > 0) {
30
+ const normalized = text.replace(/\r\n?/g, "\n");
31
+ const dropped = stabilizeDroppedFilesInText(normalized);
32
+ const value = dropped.files.length > 0 ? dropped.text
33
+ : registry && isLargePaste(normalized) ? registry.register(normalized).token : normalized;
34
+ insert(value, dropped.files.length > 0);
19
35
  return;
20
36
  }
21
- const editor = editorRef.current;
22
- if (!editor)
37
+ const result = await captureClipboardImage();
38
+ if (!current())
23
39
  return;
24
- const before = editor.plainText[editor.cursorOffset - 1] ?? "";
25
- const leadingSpace = before && !/\s/.test(before) ? " " : "";
26
- const reference = formatAttachmentReference(result.path);
27
- editor.insertText(`${leadingSpace}${reference} `);
28
- services.focus.focusRegion("composer");
29
- editor.focus();
30
- notify(services, "Image attached from clipboard", {
31
- key: "image-paste",
32
- durationMs: 1600,
33
- });
34
- queueMicrotask(refresh);
35
- });
40
+ if (!result.ok) {
41
+ notify(services, result.reason, { key: "image-paste", level: "warn", durationMs: 2600 });
42
+ return;
43
+ }
44
+ insert(formatAttachmentReference(result.path));
45
+ notify(services, "Image attached from clipboard", { key: "image-paste", durationMs: 1600 });
46
+ })().catch(() => {
47
+ if (current())
48
+ notify(services, "Clipboard image could not be read.", { key: "image-paste", level: "warn" });
49
+ }).finally(() => { activePastes.delete(services); });
36
50
  };
37
51
  return {
38
52
  handleChord(chord, overlayKind, key) {
39
53
  if (overlayKind !== "none" || chord !== "ctrl+v")
40
54
  return false;
41
55
  key.preventDefault();
42
- services.focus.focusRegion("composer");
43
- editorRef.current?.focus();
44
- pasteImage();
56
+ pasteClipboard(true);
45
57
  return true;
46
58
  },
47
59
  handlePaste(text, event) {
48
- if (text.trim())
60
+ if (text.length > 0)
49
61
  return false;
50
62
  event.preventDefault();
51
- pasteImage();
63
+ pasteClipboard(false);
52
64
  return true;
53
65
  },
54
66
  handleDroppedImages(text, event) {
55
67
  if (!text.trim())
56
68
  return false;
57
- const { text: rewritten, images } = stabilizeDroppedImagesInText(text);
58
- if (images.length === 0)
69
+ const dropped = stabilizeDroppedFilesInText(text);
70
+ if (dropped.files.length === 0)
59
71
  return false;
60
72
  event.preventDefault();
61
- const editor = editorRef.current;
62
- if (!editor)
63
- return true;
64
- const before = editor.plainText[editor.cursorOffset - 1] ?? "";
65
- const leadingSpace = before && !/\s/.test(before) ? " " : "";
66
- editor.insertText(`${leadingSpace}${rewritten} `);
67
- services.focus.focusRegion("composer");
68
- editor.focus();
69
- notify(services, images.length > 1
70
- ? `${images.length} images attached`
71
- : "Image attached", { key: "image-paste", durationMs: 1600 });
72
- queueMicrotask(refresh);
73
+ insert(dropped.text);
74
+ notify(services, dropped.files.length > 1 ? `${dropped.files.length} files attached`
75
+ : dropped.images.length ? "Image attached" : "File attached", { key: "image-paste", durationMs: 1600 });
73
76
  return true;
74
77
  },
75
78
  };