fletchshot-mcp 0.1.5 → 0.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/src/index.js CHANGED
@@ -15,6 +15,9 @@ import { AgentAnnotationInputSchema } from "./agentAnnotations.js";
15
15
  import { writeDraft, openInFletchShot, FLETCHSHOT_BUNDLE_ID } from "./draft.js";
16
16
  import { waitForReturn, DEFAULT_TIMEOUT_SECONDS, MAX_TIMEOUT_SECONDS } from "./waitForReturn.js";
17
17
  import { makePreview, DEFAULT_PREVIEW_MAX_LONG_EDGE_PX } from "./preview.js";
18
+ import { WINDOW_LIST_SCRIPT_NAME, WINDOW_LIST_SWIFT } from "./windowList.js";
19
+ import { VISION_OCR_SCRIPT_NAME, VISION_OCR_SWIFT } from "./vision.js";
20
+ import { warmUpSwiftCache, DEFAULT_COMPILE_TIMEOUT_MS } from "./swiftRunner.js";
18
21
  /** MCPのimage contentへ埋め込むPNGの上限(これを超えたらパスだけ返す)。プレビュー縮小後でも
19
22
  * ほぼ超えない想定だが、保険として残す。 */
20
23
  const MAX_INLINE_IMAGE_BYTES = 8 * 1024 * 1024;
@@ -81,7 +84,7 @@ Numeric {x,y} is only for targets with no visible text (icons, shapes). Coordina
81
84
  Skip the finished image if you don't need to see it: wait_for_return({includeImage:false}) returns only the path and size.
82
85
 
83
86
  Example: open_draft({imagePath, annotations:[{type:"arrow", to:{text:"Submit"}}, {type:"mosaic", text:"user@example.com"}]})`;
84
- export const server = new McpServer({ name: "fletchshot-mcp", version: "0.1.5" }, { instructions: SERVER_INSTRUCTIONS });
87
+ export const server = new McpServer({ name: "fletchshot-mcp", version: "0.1.7" }, { instructions: SERVER_INSTRUCTIONS });
85
88
  /** captureの戻り値テキストに足す「次の一手」の案内。実撮影なしでテストできるよう純粋関数に分離。 */
86
89
  export function captureNextStepHint(previewScaleFactor) {
87
90
  return (`次は open_draft。位置は {text:"…"} の文字アンカーで指定でき、座標計算は不要。` +
@@ -132,7 +135,7 @@ server.registerTool("capture", {
132
135
  content: [{ type: "text", text: "mode=\"window\" には app か title の少なくとも一方が必要です" }],
133
136
  };
134
137
  }
135
- result = captureWindowByMatch(args.app, args.title);
138
+ result = await captureWindowByMatch(args.app, args.title);
136
139
  }
137
140
  else if (args.mode === "screen") {
138
141
  result = captureScreen();
@@ -229,7 +232,7 @@ server.registerTool("open_draft", {
229
232
  },
230
233
  }, async (args) => {
231
234
  try {
232
- const result = writeDraft(args.imagePath, args.annotations, args.outputPath);
235
+ const result = await writeDraft(args.imagePath, args.annotations, args.outputPath);
233
236
  if (result.status === "anchor_error") {
234
237
  return {
235
238
  isError: true,
@@ -243,7 +246,7 @@ server.registerTool("open_draft", {
243
246
  }
244
247
  const openResult = openInFletchShot(result.draftPath);
245
248
  const openNote = openResult.ok
246
- ? "FletchShotで開きました。"
249
+ ? "FletchShotで開きました。" + (openResult.versionWarning ? `\n注意: ${openResult.versionWarning}` : "")
247
250
  : `FletchShotを開けませんでした(${openResult.stderr})。手動で開いてください: open -b ${FLETCHSHOT_BUNDLE_ID} "${result.draftPath}"`;
248
251
  return {
249
252
  content: [
@@ -350,9 +353,27 @@ server.registerTool("wait_for_return", {
350
353
  },
351
354
  };
352
355
  });
356
+ /**
357
+ * 文字アンカー・ウィンドウ一覧で使うswiftスクリプトのコンパイルをバックグラウンドで始めておく
358
+ * (失敗しても無視。呼び出し元はawaitしない——メインの接続・以後のツール呼び出しを遅らせないため。
359
+ * 2026-11-13改訂: 初回の`swift <script>`インタプリタ実行が環境によっては数十秒〜1分かかることが
360
+ * 分かったため、エージェントが最初にopen_draft/captureを呼ぶより前にコンパイルを済ませておきたい)。
361
+ */
362
+ function warmUpSwift() {
363
+ warmUpSwiftCache([
364
+ { name: VISION_OCR_SCRIPT_NAME, source: VISION_OCR_SWIFT },
365
+ { name: WINDOW_LIST_SCRIPT_NAME, source: WINDOW_LIST_SWIFT },
366
+ ], DEFAULT_COMPILE_TIMEOUT_MS);
367
+ }
353
368
  async function main() {
354
369
  const transport = new StdioServerTransport();
370
+ // MCPのinitializeハンドシェイクが終わった直後にコンパイルを始める(client.initialize応答後、
371
+ // クライアントからのinitializedノーティフィケーションを受けて呼ばれる)。何らかの理由で
372
+ // initializedが来ない/遅い場合に備え、接続自体の直後にも一度発火させる(二重発火してもensureCompiled
373
+ // は同じキャッシュキーをPromiseで共有するだけなので無害)。
374
+ server.server.oninitialized = () => warmUpSwift();
355
375
  await server.connect(transport);
376
+ warmUpSwift();
356
377
  }
357
378
  // テスト(node --test)がサーバー定義を読み込むためにこのファイルをimportしても、stdioに
358
379
  // 接続しにいかないようにする(bin経由でこのファイル自体が直接実行されたときだけmain()を呼ぶ)。
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,300 @@
1
+ // `swift <script>` 呼び出し(vision.ts・windowList.ts)の共通基盤。
2
+ //
3
+ // 背景(2026-11-13 エージェント環境での報告): 文字アンカーの解決が2回とも
4
+ // 「文字認識(Vision)に失敗しました(swift終了コードnull)」で失敗した。従来の`spawnSync("swift",
5
+ // [script, ...])`はstatus/signal/error.code等を一切メッセージに出していなかったため、タイムアウト・
6
+ // クラッシュ・maxBuffer超過のどれかが分からず診断できなかった。
7
+ // さらに、同じスクリプト・同じ画像をそのエージェント環境で手動実行したところ55.5秒かかった
8
+ // (CPU時間は約8秒、残りは待ち時間——`swift <script>`はインタプリタとして毎回コンパイルし直すため、
9
+ // 初回のモジュールキャッシュ生成が重い環境では致命的に遅い)。
10
+ //
11
+ // 対策:
12
+ // 1. 初回だけ`swiftc -O`で実行ファイルにコンパイルし、スクリプト内容のハッシュ付きパスへキャッシュする
13
+ // (~/Library/Caches/fletchshot-mcp、書けなければtmpdir)。2回目以降はそのバイナリを直接実行する
14
+ // ため、インタプリタの再コンパイルが無くなる。同時に複数プロセスがコンパイルしても壊れないよう、
15
+ // 一時名で書いてrenameする。
16
+ // 2. コンパイルは非同期(`spawn`。Node公式ドキュメントのtimeout/killSignalオプションで打ち切る)で行い、
17
+ // サーバー起動時にバックグラウンドで始めておける(メインのツール呼び出しを遅らせない)。
18
+ // コンパイルが(長めの)タイムアウトに達した場合は、インタプリタへフォールバックしない
19
+ // (インタプリタも同程度に遅いと分かっているため)。その場で呼び出し元に「今回は別の手段で」と
20
+ // 案内し、裏のコンパイル自体は(killしていないので)完了まで走り続け、キャッシュを完成させる
21
+ // (次回以降の呼び出しは速くなる)。
22
+ // 3. 実行(コンパイル済みバイナリ or フォールバックのインタプリタ)は従来通り`spawnSync`。失敗時は
23
+ // status・signal・error.code(ETIMEDOUT/ENOENT/ENOBUFS等)・経過ミリ秒・stderr末尾・swiftのパスを
24
+ // メッセージに含める。
25
+ import { spawn, spawnSync } from "node:child_process";
26
+ import { existsSync, mkdirSync, mkdtempSync, renameSync, rmSync, writeFileSync } from "node:fs";
27
+ import { homedir, tmpdir } from "node:os";
28
+ import { join } from "node:path";
29
+ import { createHash, randomBytes } from "node:crypto";
30
+ /** コンパイルのタイムアウト(既定120秒)。初回のmoduleキャッシュ生成が重い環境向けに長めに取る。 */
31
+ export const DEFAULT_COMPILE_TIMEOUT_MS = 120_000;
32
+ export const DEFAULT_COMPILE_WAIT_MS = 20_000;
33
+ export class SwiftUnavailableError extends Error {
34
+ constructor(hint) {
35
+ super(hint);
36
+ this.name = "SwiftUnavailableError";
37
+ }
38
+ }
39
+ /** コンパイルが時間切れになったときのエラー(インタプリタへはフォールバックしない)。 */
40
+ export class SwiftCompileTimeoutError extends Error {
41
+ constructor(hint) {
42
+ super(hint);
43
+ this.name = "SwiftCompileTimeoutError";
44
+ }
45
+ }
46
+ const STDERR_TAIL_CHARS = 400;
47
+ /**
48
+ * 失敗時の診断メッセージを組み立てる純粋関数(swiftを実際には呼ばずテストできる)。
49
+ * status/signal/error.code(ETIMEDOUT/ENOBUFS等)・経過時間・stderr末尾・swiftのパスを並べる。
50
+ */
51
+ export function formatSwiftFailureMessage(label, diag) {
52
+ const head = `${label}に失敗しました(経過${Math.round(diag.elapsedMs)}ms、終了コード${diag.status ?? "null"}` +
53
+ (diag.signal ? `、signal=${diag.signal}` : "") +
54
+ (diag.errorCode ? `、error.code=${diag.errorCode}` : "") +
55
+ `)`;
56
+ const parts = [head];
57
+ if (diag.swiftPath)
58
+ parts.push(`swift: ${diag.swiftPath}`);
59
+ if (diag.errorCode === "ETIMEDOUT") {
60
+ parts.push("タイムアウトです。初回はswiftのコンパイル・モジュールキャッシュ生成に時間がかかることがあります" +
61
+ "(環境によっては数十秒〜1分以上)。もう一度同じ操作を試すか、それでも遅い場合は座標({x,y})で" +
62
+ "直接指定してください。");
63
+ }
64
+ else if (diag.errorCode === "ENOBUFS") {
65
+ parts.push("出力がmaxBufferの上限を超えました。画像が大きすぎるか、予期しない量の出力があります。");
66
+ }
67
+ if (diag.stderr) {
68
+ const tail = diag.stderr.length > STDERR_TAIL_CHARS ? diag.stderr.slice(-STDERR_TAIL_CHARS) : diag.stderr;
69
+ parts.push(`stderr(末尾): ${tail}`);
70
+ }
71
+ return parts.join("\n");
72
+ }
73
+ let cachedSwiftPath = null; // null = 未計算
74
+ /** `which swift`相当でswiftの実パスを調べる(診断メッセージ用のベストエフォート。取れなければundefined)。 */
75
+ export function findSwiftPath() {
76
+ if (cachedSwiftPath !== null)
77
+ return cachedSwiftPath;
78
+ try {
79
+ const result = spawnSync("which", ["swift"], { encoding: "utf8", timeout: 3_000 });
80
+ cachedSwiftPath = result.status === 0 && result.stdout.trim() ? result.stdout.trim() : undefined;
81
+ }
82
+ catch {
83
+ cachedSwiftPath = undefined;
84
+ }
85
+ return cachedSwiftPath;
86
+ }
87
+ function cacheDir() {
88
+ const primary = join(homedir(), "Library", "Caches", "fletchshot-mcp");
89
+ try {
90
+ mkdirSync(primary, { recursive: true });
91
+ return primary;
92
+ }
93
+ catch {
94
+ const fallback = join(tmpdir(), "fletchshot-mcp-cache");
95
+ mkdirSync(fallback, { recursive: true });
96
+ return fallback;
97
+ }
98
+ }
99
+ function scriptHash(source) {
100
+ return createHash("sha256").update(source).digest("hex").slice(0, 16);
101
+ }
102
+ const compilePromises = new Map();
103
+ /** テスト専用: キャッシュキーの組み立て(cacheKeyForTest)とin-memoryの重複排除Mapをクリアする。 */
104
+ export function _resetCompileCacheForTest() {
105
+ compilePromises.clear();
106
+ }
107
+ function cacheKey(name, source) {
108
+ return `${name}-${scriptHash(source)}`;
109
+ }
110
+ /** コンパイル済みバイナリのキャッシュパス(存在するかどうかは問わない)。テスト用に公開。 */
111
+ export function compiledBinaryPath(name, source) {
112
+ return join(cacheDir(), cacheKey(name, source));
113
+ }
114
+ /**
115
+ * nameのswiftスクリプトを`swiftc -O`でコンパイルし、キャッシュパスを返す。既にキャッシュがあれば
116
+ * コンパイルせずそれを使う。同一プロセス内の重複呼び出しはPromiseを共有して二重コンパイルしない
117
+ * (警告: 非同期spawnを使うのはこのコンパイル部分だけ。実行自体は従来通り同期のspawnSync)。
118
+ * 複数プロセスが同時にコンパイルしても、一時名で書いてrenameするため壊れない。
119
+ */
120
+ export function ensureCompiled(name, source, compileTimeoutMs) {
121
+ const key = cacheKey(name, source);
122
+ const existing = compilePromises.get(key);
123
+ if (existing)
124
+ return existing;
125
+ const promise = (async () => {
126
+ let dir;
127
+ try {
128
+ dir = cacheDir();
129
+ }
130
+ catch {
131
+ return { ok: false, reason: "unavailable" };
132
+ }
133
+ const finalPath = join(dir, key);
134
+ if (existsSync(finalPath))
135
+ return { ok: true, path: finalPath };
136
+ const tmpSuffix = `${process.pid}-${randomBytes(4).toString("hex")}`;
137
+ const tmpScriptPath = join(dir, `${key}.${tmpSuffix}.swift`);
138
+ const tmpBinaryPath = join(dir, `${key}.${tmpSuffix}.bin`);
139
+ try {
140
+ writeFileSync(tmpScriptPath, source, "utf8");
141
+ }
142
+ catch {
143
+ return { ok: false, reason: "unavailable" };
144
+ }
145
+ const outcome = await new Promise((resolve) => {
146
+ let settled = false;
147
+ const child = spawn("swiftc", ["-O", "-o", tmpBinaryPath, tmpScriptPath], {
148
+ timeout: compileTimeoutMs,
149
+ killSignal: "SIGTERM",
150
+ stdio: ["ignore", "ignore", "ignore"],
151
+ });
152
+ child.on("error", (err) => {
153
+ if (settled)
154
+ return;
155
+ settled = true;
156
+ if (err.code === "ENOENT") {
157
+ resolve({ ok: false, reason: "unavailable" });
158
+ }
159
+ else {
160
+ resolve({ ok: false, reason: "unavailable" });
161
+ }
162
+ });
163
+ child.on("close", (code, signal) => {
164
+ if (settled)
165
+ return;
166
+ settled = true;
167
+ if (signal) {
168
+ // timeoutによるkill(Node公式ドキュメント: timeout経過時はkillSignalが送られ、
169
+ // code===null・signal===killSignalになる)。
170
+ resolve({ ok: false, reason: "timeout" });
171
+ return;
172
+ }
173
+ if (code === 0 && existsSync(tmpBinaryPath)) {
174
+ resolve({ ok: true, path: tmpBinaryPath });
175
+ }
176
+ else {
177
+ resolve({ ok: false, reason: "unavailable" });
178
+ }
179
+ });
180
+ });
181
+ try {
182
+ if (outcome.ok) {
183
+ try {
184
+ renameSync(outcome.path, finalPath);
185
+ }
186
+ catch {
187
+ if (!existsSync(finalPath))
188
+ return { ok: false, reason: "unavailable" };
189
+ }
190
+ return { ok: true, path: finalPath };
191
+ }
192
+ return outcome;
193
+ }
194
+ finally {
195
+ try {
196
+ rmSync(tmpScriptPath, { force: true });
197
+ }
198
+ catch {
199
+ /* no-op */
200
+ }
201
+ try {
202
+ rmSync(tmpBinaryPath, { force: true });
203
+ }
204
+ catch {
205
+ /* no-op */
206
+ }
207
+ }
208
+ })();
209
+ compilePromises.set(key, promise);
210
+ // 失敗(時間切れ・swiftc不在など)を覚え続けると、同じサーバープロセスでは二度とコンパイルし直さず
211
+ // 「次回以降は速くなります」が嘘になる。成功したときだけ覚えておく。
212
+ void promise.then((outcome) => {
213
+ if (!outcome.ok && compilePromises.get(key) === promise)
214
+ compilePromises.delete(key);
215
+ });
216
+ return promise;
217
+ }
218
+ /**
219
+ * サーバー起動時にバックグラウンドでコンパイルを始めておく(失敗しても無視。呼び出し元を待たせない
220
+ * ようPromiseを返さない——呼び出し元は`void warmUpSwiftCache(...)`で発火だけする)。
221
+ */
222
+ export function warmUpSwiftCache(scripts, compileTimeoutMs) {
223
+ for (const { name, source } of scripts) {
224
+ ensureCompiled(name, source, compileTimeoutMs).catch(() => {
225
+ /* 背景タスクなので失敗は無視 */
226
+ });
227
+ }
228
+ }
229
+ /**
230
+ * name/sourceのswiftスクリプトをargsで実行し、stdoutを返す。
231
+ * コンパイル済みバイナリがあれば直接実行し、無ければコンパイルしてキャッシュする(ensureCompiled)。
232
+ * コンパイルが失敗(swiftc不在等)ならインタプリタ`swift <script>`にフォールバックするが、
233
+ * コンパイルがタイムアウトした場合はフォールバックせず SwiftCompileTimeoutError を投げる。
234
+ */
235
+ export async function runSwiftScript(name, source, args, options) {
236
+ const compileTimeoutMs = options.compileTimeoutMs ?? DEFAULT_COMPILE_TIMEOUT_MS;
237
+ const compileWaitMs = options.compileWaitMs ?? DEFAULT_COMPILE_WAIT_MS;
238
+ const onCompileSlow = options.onCompileSlow ?? "throw";
239
+ let waitTimer;
240
+ const waitLimit = new Promise((resolve) => {
241
+ waitTimer = setTimeout(() => resolve("slow"), compileWaitMs);
242
+ });
243
+ const raced = await Promise.race([ensureCompiled(name, source, compileTimeoutMs), waitLimit]);
244
+ clearTimeout(waitTimer);
245
+ const slow = raced === "slow" || (!raced.ok && raced.reason === "timeout");
246
+ if (slow && onCompileSlow === "throw") {
247
+ throw new SwiftCompileTimeoutError(options.compileTimeoutHint);
248
+ }
249
+ const outcome = slow ? { ok: false, reason: "unavailable" } : raced;
250
+ let command;
251
+ let cmdArgs;
252
+ let fallbackScriptDir;
253
+ if (outcome.ok) {
254
+ command = outcome.path;
255
+ cmdArgs = args;
256
+ }
257
+ else {
258
+ fallbackScriptDir = mkdtempSync(join(tmpdir(), `fletchshot-mcp-${name}-`));
259
+ const scriptPath = join(fallbackScriptDir, `${name}.swift`);
260
+ writeFileSync(scriptPath, source, "utf8");
261
+ command = "swift";
262
+ cmdArgs = [scriptPath, ...args];
263
+ }
264
+ const start = Date.now();
265
+ try {
266
+ const result = spawnSync(command, cmdArgs, {
267
+ encoding: "utf8",
268
+ timeout: options.execTimeoutMs,
269
+ maxBuffer: options.maxBuffer ?? 16 * 1024 * 1024,
270
+ input: options.input,
271
+ });
272
+ const elapsedMs = Date.now() - start;
273
+ const errorCode = result.error?.code;
274
+ if (errorCode === "ENOENT") {
275
+ throw new SwiftUnavailableError(options.unavailableHint);
276
+ }
277
+ if (result.status !== 0) {
278
+ throw new Error(formatSwiftFailureMessage(options.label, {
279
+ status: result.status,
280
+ signal: result.signal,
281
+ errorCode,
282
+ elapsedMs,
283
+ stderr: result.stderr,
284
+ swiftPath: findSwiftPath(),
285
+ }));
286
+ }
287
+ return result.stdout;
288
+ }
289
+ finally {
290
+ if (fallbackScriptDir) {
291
+ try {
292
+ rmSync(fallbackScriptDir, { recursive: true, force: true });
293
+ }
294
+ catch {
295
+ /* no-op */
296
+ }
297
+ }
298
+ }
299
+ }
300
+ //# sourceMappingURL=swiftRunner.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"swiftRunner.js","sourceRoot":"","sources":["../../src/swiftRunner.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,6 @@
1
1
  // macOS Vision フレームワーク(VNRecognizeTextRequest)による文字認識。「文字アンカー」
2
2
  // ({text:"..."} での座標指定)の裏側として、画像内の文字列とその位置(画像ピクセル・左上原点)を
3
- // 取得する。windowList.ts と同じ流儀で `swift <一時スクリプト>` を子プロセスとして呼ぶ
4
- // (CoreGraphics同様、追加のpip/npm等のインストールは不要。Xcode Command Line Toolsの`swift`が必要)。
3
+ // 取得する。swift呼び出し本体(コンパイルキャッシュ・診断メッセージ)はswiftRunner.tsに寄せている。
5
4
  //
6
5
  // 根拠(WebFetchでApple公式ドキュメントを確認。日付: 2026-11-13):
7
6
  // - VNRecognizeTextRequest.recognitionLanguages: macOS 10.15+。認識対象言語をISO言語コードの配列・
@@ -20,25 +19,34 @@
20
19
  // このファイルはVisionの生の結果(行ごとのテキストと枠)を返すだけで、「どの行が指定文字列と
21
20
  // 一致するか」等の判定ロジックは持たない(textAnchor.ts側の純粋関数に分離し、Visionを呼ばずに
22
21
  // 単体テストできるようにするため)。
23
- import { spawnSync } from "node:child_process";
24
- import { mkdtempSync, writeFileSync } from "node:fs";
25
- import { tmpdir } from "node:os";
26
- import { join } from "node:path";
27
- export class SwiftUnavailableError extends Error {
28
- constructor() {
29
- super("文字アンカー({text:\"...\"}での座標指定)の解決には `swift` コマンド(Xcode Command Line " +
30
- "Tools)が必要です。`xcode-select --install` で導入するか、座標を数値({x,y}や[x,y])で" +
31
- "直接指定してください。");
32
- this.name = "SwiftUnavailableError";
33
- }
34
- }
35
- // Vision実行用の一時swiftスクリプト。2モードを持つ:
36
- // list <imagePath> : 認識した全行を返す
37
- // range <imagePath> <lineIndex> <utf16Start> <utf16Len> : list時のn行目のうち、指定したUTF-16範囲
38
- // (部分文字列)だけの精密な枠を返す
39
- // range はTS側のUTF-16コードユニットのオフセットをそのまま受け取れる(JS文字列のindexはUTF-16
22
+ //
23
+ // 呼び出し回数(2026-11-13改訂): 以前は「行の一覧(list)」と「部分文字列の精密な枠(range、1件ずつ)」
24
+ // で毎回別のswiftプロセスを起動し、そのたびに画像を読み直してVisionを再実行していた
25
+ // (文字アンカーがN件あればswift起動1+N回・Vision実行1+N回)。
26
+ // agentAnnotations.ts側を2段構成(1. 全文字アンカーをlines基準でpickTextAnchorし、完全一致は
27
+ // line.boxをそのまま使う・部分一致だけをまとめる 2. 部分一致が1件以上あれば、まとめて1回だけ
28
+ // boxForTextRanges()を呼ぶ)に変えたことで、1回のopen_draftあたりのswift起動は最大2回
29
+ // (lines取得1回+必要なときだけranges取得1回)に減った。文字アンカーが完全一致のみ・
30
+ // 無し・解決失敗(no_match/ambiguous)のときはVision実行は1回のみで済む。
31
+ import { runSwiftScript, SwiftUnavailableError as SwiftUnavailableErrorBase, } from "./swiftRunner.js";
32
+ const UNAVAILABLE_HINT = "文字アンカー({text:\"...\"}での座標指定)の解決には `swift` コマンド(Xcode Command Line " +
33
+ "Tools)が必要です。`xcode-select --install` で導入するか、座標を数値({x,y}や[x,y])で" +
34
+ "直接指定してください。";
35
+ const COMPILE_TIMEOUT_HINT = "文字認識の準備(swiftのコンパイル)に時間がかかっています。今回は座標で指定してください。" +
36
+ "次回以降は速くなります。";
37
+ /** vision.ts用のSwiftUnavailableError(後方互換のため個別にexportする。中身はswiftRunner.tsと同じ)。 */
38
+ export const SwiftUnavailableError = SwiftUnavailableErrorBase;
39
+ // Vision実行用のswiftスクリプト。2モードを持つ:
40
+ // list <imagePath> : 認識した全行を返す
41
+ // ranges <imagePath>(標準入力にJSON配列) : 標準入力で受け取った複数の範囲リクエスト
42
+ // [{lineIndex, utf16Start, utf16Length}, ...] に対して、
43
+ // list時のn行目のうち指定したUTF-16範囲(部分文字列)の
44
+ // 精密な枠をまとめて返す。同じ画像に対して複数の部分一致が
45
+ // あっても、Visionの実行(画像読み込み含む)は1回で済む。
46
+ // rangesはTS側のUTF-16コードユニットのオフセットをそのまま受け取れる(JS文字列のindexはUTF-16
40
47
  // コードユニット基準のため、String.Index(utf16Offset:within:) で素直に対応づけられる)。
41
- const VISION_OCR_SWIFT = `
48
+ export const VISION_OCR_SCRIPT_NAME = "ocr";
49
+ export const VISION_OCR_SWIFT = `
42
50
  import Vision
43
51
  import CoreGraphics
44
52
  import ImageIO
@@ -46,6 +54,7 @@ import Foundation
46
54
 
47
55
  struct Box: Codable { var x: Double; var y: Double; var w: Double; var h: Double }
48
56
  struct Line: Codable { var text: String; var confidence: Double; var box: Box }
57
+ struct RangeRequest: Codable { var lineIndex: Int; var utf16Start: Int; var utf16Length: Int }
49
58
 
50
59
  func fail(_ message: String) -> Never {
51
60
  FileHandle.standardError.write((message + "\\n").data(using: .utf8)!)
@@ -69,7 +78,7 @@ func toPixelBox(_ normalized: CGRect, width: Int, height: Int) -> Box {
69
78
 
70
79
  let args = CommandLine.arguments
71
80
  guard args.count >= 3 else {
72
- fail("使い方: swift <script> list <imagePath> | swift <script> range <imagePath> <lineIndex> <utf16Start> <utf16Length>")
81
+ fail("使い方: swift <script> list <imagePath> | swift <script> ranges <imagePath> (標準入力にJSON配列)")
73
82
  }
74
83
  let mode = args[1]
75
84
  let imagePath = args[2]
@@ -107,70 +116,60 @@ case "list":
107
116
  }
108
117
  let data = try! JSONEncoder().encode(out)
109
118
  FileHandle.standardOutput.write(data)
110
- case "range":
111
- guard args.count >= 6,
112
- let lineIndex = Int(args[3]), let utf16Start = Int(args[4]), let utf16Length = Int(args[5])
113
- else { fail("range には <lineIndex> <utf16Start> <utf16Length> の3つの整数が必要です") }
114
- guard lineIndex >= 0 && lineIndex < observations.count,
115
- let candidate = observations[lineIndex].topCandidates(1).first
116
- else { fail("lineIndexが不正です(\\(lineIndex)、認識行数=\\(observations.count))") }
117
- let s = candidate.string
118
- guard let startU = s.utf16.index(s.utf16.startIndex, offsetBy: utf16Start, limitedBy: s.utf16.endIndex),
119
- let endU = s.utf16.index(startU, offsetBy: utf16Length, limitedBy: s.utf16.endIndex),
120
- let startIdx = String.Index(startU, within: s),
121
- let endIdx = String.Index(endU, within: s)
122
- else { fail("文字範囲が不正です(utf16Start=\\(utf16Start), utf16Length=\\(utf16Length))") }
123
- do {
124
- guard let rectObs = try candidate.boundingBox(for: startIdx..<endIdx) else {
125
- fail("部分文字列の枠を取得できませんでした")
119
+ case "ranges":
120
+ let stdinData = FileHandle.standardInput.readDataToEndOfFile()
121
+ guard let requests = try? JSONDecoder().decode([RangeRequest].self, from: stdinData) else {
122
+ fail("標準入力のJSON(範囲リクエスト配列)を解釈できませんでした")
123
+ }
124
+ var out: [Box] = []
125
+ for req in requests {
126
+ guard req.lineIndex >= 0 && req.lineIndex < observations.count,
127
+ let candidate = observations[req.lineIndex].topCandidates(1).first
128
+ else { fail("lineIndexが不正です(\\(req.lineIndex)、認識行数=\\(observations.count))") }
129
+ let s = candidate.string
130
+ guard let startU = s.utf16.index(s.utf16.startIndex, offsetBy: req.utf16Start, limitedBy: s.utf16.endIndex),
131
+ let endU = s.utf16.index(startU, offsetBy: req.utf16Length, limitedBy: s.utf16.endIndex),
132
+ let startIdx = String.Index(startU, within: s),
133
+ let endIdx = String.Index(endU, within: s)
134
+ else { fail("文字範囲が不正です(utf16Start=\\(req.utf16Start), utf16Length=\\(req.utf16Length))") }
135
+ do {
136
+ guard let rectObs = try candidate.boundingBox(for: startIdx..<endIdx) else {
137
+ fail("部分文字列の枠を取得できませんでした")
138
+ }
139
+ out.append(toPixelBox(rectObs.boundingBox, width: width, height: height))
140
+ } catch {
141
+ fail("boundingBox(for:)の取得に失敗しました: \\(error)")
126
142
  }
127
- let box = toPixelBox(rectObs.boundingBox, width: width, height: height)
128
- let data = try! JSONEncoder().encode(box)
129
- FileHandle.standardOutput.write(data)
130
- } catch {
131
- fail("boundingBox(for:)の取得に失敗しました: \\(error)")
132
143
  }
144
+ let data = try! JSONEncoder().encode(out)
145
+ FileHandle.standardOutput.write(data)
133
146
  default:
134
147
  fail("不明なmodeです: \\(mode)")
135
148
  }
136
149
  `;
137
- let cachedScriptPath;
138
- function scriptPath() {
139
- if (cachedScriptPath)
140
- return cachedScriptPath;
141
- const dir = mkdtempSync(join(tmpdir(), "fletchshot-mcp-vision-"));
142
- const path = join(dir, "ocr.swift");
143
- writeFileSync(path, VISION_OCR_SWIFT, "utf8");
144
- cachedScriptPath = path;
145
- return path;
146
- }
147
- function runSwift(args) {
148
- const result = spawnSync("swift", [scriptPath(), ...args], {
149
- encoding: "utf8",
150
- timeout: 30_000,
151
- maxBuffer: 32 * 1024 * 1024,
150
+ async function runOcrSwift(args, input) {
151
+ return runSwiftScript(VISION_OCR_SCRIPT_NAME, VISION_OCR_SWIFT, args, {
152
+ label: "文字認識(Vision)",
153
+ unavailableHint: UNAVAILABLE_HINT,
154
+ compileTimeoutHint: COMPILE_TIMEOUT_HINT,
155
+ execTimeoutMs: 45_000,
156
+ input,
152
157
  });
153
- if (result.error && result.error.code === "ENOENT") {
154
- throw new SwiftUnavailableError();
155
- }
156
- if (result.status !== 0) {
157
- throw new Error(`文字認識(Vision)に失敗しました(swift終了コード${result.status}): ${result.stderr || "(詳細なし)"}`);
158
- }
159
- return result.stdout;
160
158
  }
161
159
  /** 画像内でVisionが認識した全行(テキスト・信頼度・画像ピクセルの枠)を返す。 */
162
- export function listTextLines(imagePath) {
163
- const out = runSwift(["list", imagePath]);
160
+ export async function listTextLines(imagePath) {
161
+ const out = await runOcrSwift(["list", imagePath]);
164
162
  return JSON.parse(out || "[]");
165
163
  }
166
164
  /**
167
- * listTextLines() が返した行のうち lineIndex 行目の、UTF-16コードユニット範囲
168
- * [utf16Start, utf16Start+utf16Length) に対応する部分文字列の精密な枠を返す。
169
- * 同じ画像に対してOCRをもう一度実行するため、呼び出しは必要な場合(部分一致のとき)だけに限る。
165
+ * listTextLines() が返した行のうち、複数の部分文字列範囲の精密な枠を1回のVision実行でまとめて取る。
166
+ * 戻り値はrangesと同じ順序・同じ長さの配列。rangesが空なら呼び出しすら行わない(空配列を返す)。
170
167
  */
171
- export function boxForTextRange(imagePath, lineIndex, utf16Start, utf16Length) {
172
- const out = runSwift(["range", imagePath, String(lineIndex), String(utf16Start), String(utf16Length)]);
168
+ export async function boxForTextRanges(imagePath, ranges) {
169
+ if (ranges.length === 0)
170
+ return [];
171
+ const out = await runOcrSwift(["ranges", imagePath], JSON.stringify(ranges));
173
172
  return JSON.parse(out);
174
173
  }
175
- export const swiftTextRecognizer = { listTextLines, boxForTextRange };
174
+ export const swiftTextRecognizer = { listTextLines, boxForTextRanges };
176
175
  //# sourceMappingURL=vision.js.map