fletchshot-mcp 0.1.5 → 0.1.6
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/agentAnnotations.js +136 -74
- package/dist/src/agentAnnotations.js.map +1 -1
- package/dist/src/capture.js +2 -2
- package/dist/src/capture.js.map +1 -1
- package/dist/src/draft.js +2 -2
- package/dist/src/draft.js.map +1 -1
- package/dist/src/index.js +24 -3
- package/dist/src/index.js.map +1 -1
- package/dist/src/swiftRunner.js +300 -0
- package/dist/src/swiftRunner.js.map +1 -0
- package/dist/src/vision.js +71 -72
- package/dist/src/vision.js.map +1 -1
- package/dist/src/waitForReturn.js +13 -0
- package/dist/src/waitForReturn.js.map +1 -1
- package/dist/src/windowList.js +21 -32
- package/dist/src/windowList.js.map +1 -1
- package/package.json +1 -1
|
@@ -82,14 +82,124 @@ export const AgentAnnotationInputSchema = z.discriminatedUnion("type", [
|
|
|
82
82
|
AgentMosaicInputSchema,
|
|
83
83
|
AgentNumberInputSchema,
|
|
84
84
|
]);
|
|
85
|
-
function
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
85
|
+
function queryKey(annotationIndex, field) {
|
|
86
|
+
return `${annotationIndex}:${field}`;
|
|
87
|
+
}
|
|
88
|
+
/**
|
|
89
|
+
* inputs中の文字アンカーのクエリを(Visionを呼ばずに)すべて洗い出す。rect/ellipse/mosaicの
|
|
90
|
+
* 「x/y/w/hとtextを同時に指定/どちらも指定しない」という構造的な誤りは、ここでVisionとは無関係の
|
|
91
|
+
* issueとして先に確定させる(classifyBucketは従来通りbucket===1側に落ちるが、hasCoordsが
|
|
92
|
+
* falseのままだとx/y/w/hがundefinedになるため、ここで検出しないと後段で不正な値を使ってしまう)。
|
|
93
|
+
*/
|
|
94
|
+
function collectAnchorQueries(inputs) {
|
|
95
|
+
const queries = [];
|
|
96
|
+
const structuralIssues = [];
|
|
97
|
+
inputs.forEach((input, annotationIndex) => {
|
|
98
|
+
switch (input.type) {
|
|
99
|
+
case "arrow":
|
|
100
|
+
if (isTextAnchorPoint(input.to)) {
|
|
101
|
+
queries.push({ annotationIndex, field: "arrow.to", text: input.to.text, occurrence: input.to.occurrence });
|
|
102
|
+
}
|
|
103
|
+
if (input.from !== undefined && isTextAnchorPoint(input.from)) {
|
|
104
|
+
queries.push({
|
|
105
|
+
annotationIndex,
|
|
106
|
+
field: "arrow.from",
|
|
107
|
+
text: input.from.text,
|
|
108
|
+
occurrence: input.from.occurrence,
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
return;
|
|
112
|
+
case "text":
|
|
113
|
+
case "number":
|
|
114
|
+
if (isTextAnchorPoint(input.at)) {
|
|
115
|
+
queries.push({
|
|
116
|
+
annotationIndex,
|
|
117
|
+
field: `${input.type}.at`,
|
|
118
|
+
text: input.at.text,
|
|
119
|
+
occurrence: input.at.occurrence,
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
return;
|
|
123
|
+
case "rect":
|
|
124
|
+
case "ellipse":
|
|
125
|
+
case "mosaic": {
|
|
126
|
+
const hasText = input.text !== undefined;
|
|
127
|
+
const hasCoords = input.x !== undefined && input.y !== undefined && input.w !== undefined && input.h !== undefined;
|
|
128
|
+
if (hasText === hasCoords) {
|
|
129
|
+
structuralIssues.push({
|
|
130
|
+
annotationIndex,
|
|
131
|
+
field: `${input.type}.region`,
|
|
132
|
+
query: input.text ?? "",
|
|
133
|
+
status: "no_match",
|
|
134
|
+
candidates: [],
|
|
135
|
+
});
|
|
136
|
+
return;
|
|
137
|
+
}
|
|
138
|
+
if (hasText) {
|
|
139
|
+
queries.push({
|
|
140
|
+
annotationIndex,
|
|
141
|
+
field: `${input.type}.region`,
|
|
142
|
+
text: input.text,
|
|
143
|
+
occurrence: input.occurrence,
|
|
144
|
+
});
|
|
145
|
+
}
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
});
|
|
150
|
+
return { queries, structuralIssues };
|
|
151
|
+
}
|
|
152
|
+
/**
|
|
153
|
+
* inputs中のすべての文字アンカーを画像ピクセル座標の矩形へ解決する(Vision呼び出しをここに集約)。
|
|
154
|
+
* 2026-11-13改訂: 以前は「行の一覧」と「部分文字列の精密な枠」を文字アンカーの数だけ別々のswift
|
|
155
|
+
* プロセスで求めていた(N件ならswift起動1+N回)。ここでは
|
|
156
|
+
* 1. listTextLines()を1回だけ呼ぶ(文字アンカーが1つも無ければ呼ばない)
|
|
157
|
+
* 2. 各クエリをpickTextAnchor()(Vision不要の純粋関数)でlines基準に解決する。完全一致は
|
|
158
|
+
* line.boxをそのまま使えるのでVisionの追加呼び出しは不要
|
|
159
|
+
* 3. 部分一致(精密な枠が必要なもの)だけをまとめて、boxForTextRanges()を最大1回だけ呼ぶ
|
|
160
|
+
* という2段構成にして、1回のopen_draftあたりのswift起動を最大2回(厳密一致のみ・解決失敗・
|
|
161
|
+
* 文字アンカー無しのときは1回)に抑える。
|
|
162
|
+
*/
|
|
163
|
+
async function resolveTextAnchorBoxes(imagePath, inputs, recognizer) {
|
|
164
|
+
const { queries, structuralIssues } = collectAnchorQueries(inputs);
|
|
165
|
+
const issues = [...structuralIssues];
|
|
166
|
+
if (queries.length === 0) {
|
|
167
|
+
if (issues.length > 0)
|
|
168
|
+
return { ok: false, issues };
|
|
169
|
+
return { ok: true, boxes: new Map(), lines: [] };
|
|
89
170
|
}
|
|
90
|
-
const
|
|
91
|
-
const
|
|
92
|
-
|
|
171
|
+
const lines = await recognizer.listTextLines(imagePath);
|
|
172
|
+
const boxes = new Map();
|
|
173
|
+
const pending = [];
|
|
174
|
+
for (const q of queries) {
|
|
175
|
+
const pick = pickTextAnchor(lines, q.text, q.occurrence);
|
|
176
|
+
if (pick.status !== "resolved") {
|
|
177
|
+
issues.push({
|
|
178
|
+
annotationIndex: q.annotationIndex,
|
|
179
|
+
field: q.field,
|
|
180
|
+
query: q.text,
|
|
181
|
+
occurrence: q.occurrence,
|
|
182
|
+
status: pick.status,
|
|
183
|
+
candidates: pick.candidates,
|
|
184
|
+
});
|
|
185
|
+
continue;
|
|
186
|
+
}
|
|
187
|
+
const m = pick.match;
|
|
188
|
+
const key = queryKey(q.annotationIndex, q.field);
|
|
189
|
+
if (m.exact) {
|
|
190
|
+
boxes.set(key, m.line.box);
|
|
191
|
+
}
|
|
192
|
+
else {
|
|
193
|
+
pending.push({ key, lineIndex: m.lineIndex, utf16Start: m.utf16Start, utf16Length: m.utf16Length });
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
if (pending.length > 0) {
|
|
197
|
+
const rangeBoxes = await recognizer.boxForTextRanges(imagePath, pending.map((p) => ({ lineIndex: p.lineIndex, utf16Start: p.utf16Start, utf16Length: p.utf16Length })));
|
|
198
|
+
pending.forEach((p, i) => boxes.set(p.key, rangeBoxes[i]));
|
|
199
|
+
}
|
|
200
|
+
if (issues.length > 0)
|
|
201
|
+
return { ok: false, issues };
|
|
202
|
+
return { ok: true, boxes, lines };
|
|
93
203
|
}
|
|
94
204
|
/**
|
|
95
205
|
* 自動配置(arrow.fromの省略時・text.at/number.atの文字アンカー時)が重なりを避ける対象の領域。
|
|
@@ -122,30 +232,16 @@ function classifyBucket(input) {
|
|
|
122
232
|
* (Vision文字認識を使った場合は)認識できた他の文字列の枠を避けるよう、bucket 1→2→3→4の順に
|
|
123
233
|
* 処理する(classifyBucket参照)。出力順は入力の順序を保つ。
|
|
124
234
|
*/
|
|
125
|
-
export function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer = swiftTextRecognizer, scale = 1) {
|
|
126
|
-
const
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
// 自動配置の重なり回避に使う「認識できた他の文字列の枠」。Visionを一度も呼んでいなければ
|
|
134
|
-
// (=この下書きに文字アンカーが1つも無ければ)空のまま——自動配置のためだけに新たにOCRを
|
|
135
|
-
// 走らせて速度NFRを損なうことはしない(他の理由で既に呼んでいればその結果を再利用する)。
|
|
136
|
-
const ocrLineBoxes = () => (lines ?? []).map((l) => l.box);
|
|
235
|
+
export async function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer = swiftTextRecognizer, scale = 1) {
|
|
236
|
+
const pre = await resolveTextAnchorBoxes(imagePath, inputs, recognizer);
|
|
237
|
+
if (!pre.ok)
|
|
238
|
+
return { ok: false, issues: pre.issues };
|
|
239
|
+
const { boxes, lines } = pre;
|
|
240
|
+
// 自動配置の重なり回避に使う「認識できた他の文字列の枠」。文字アンカーが1つも無ければ
|
|
241
|
+
// (resolveTextAnchorBoxesがVisionを呼んでいない)空のまま。
|
|
242
|
+
const ocrLineBoxes = lines.map((l) => l.box);
|
|
137
243
|
const resolvedByIndex = new Array(inputs.length);
|
|
138
244
|
const occupied = [];
|
|
139
|
-
const reportFailure = (annotationIndex, field, anchor, result) => {
|
|
140
|
-
issues.push({
|
|
141
|
-
annotationIndex,
|
|
142
|
-
field,
|
|
143
|
-
query: anchor.text,
|
|
144
|
-
occurrence: anchor.occurrence,
|
|
145
|
-
status: result.status,
|
|
146
|
-
candidates: result.candidates,
|
|
147
|
-
});
|
|
148
|
-
};
|
|
149
245
|
for (const bucket of [1, 2, 3, 4]) {
|
|
150
246
|
inputs.forEach((input, annotationIndex) => {
|
|
151
247
|
if (classifyBucket(input) !== bucket)
|
|
@@ -155,12 +251,7 @@ export function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer =
|
|
|
155
251
|
let toBox;
|
|
156
252
|
let toPoint;
|
|
157
253
|
if (isTextAnchorPoint(input.to)) {
|
|
158
|
-
|
|
159
|
-
if ("issue" in r) {
|
|
160
|
-
reportFailure(annotationIndex, "arrow.to", input.to, r.issue);
|
|
161
|
-
return;
|
|
162
|
-
}
|
|
163
|
-
toBox = r.box;
|
|
254
|
+
toBox = boxes.get(queryKey(annotationIndex, "arrow.to"));
|
|
164
255
|
}
|
|
165
256
|
else {
|
|
166
257
|
toPoint = input.to;
|
|
@@ -168,18 +259,15 @@ export function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer =
|
|
|
168
259
|
let fromPoint;
|
|
169
260
|
if (input.from !== undefined) {
|
|
170
261
|
if (isTextAnchorPoint(input.from)) {
|
|
171
|
-
const
|
|
172
|
-
if (
|
|
173
|
-
|
|
174
|
-
return;
|
|
175
|
-
}
|
|
176
|
-
fromPoint = boxCenter(r.box);
|
|
262
|
+
const fromBox = boxes.get(queryKey(annotationIndex, "arrow.from"));
|
|
263
|
+
if (fromBox)
|
|
264
|
+
fromPoint = boxCenter(fromBox);
|
|
177
265
|
}
|
|
178
266
|
else {
|
|
179
267
|
fromPoint = input.from;
|
|
180
268
|
}
|
|
181
269
|
}
|
|
182
|
-
const avoid = [...occupied, ...ocrLineBoxes
|
|
270
|
+
const avoid = [...occupied, ...ocrLineBoxes];
|
|
183
271
|
if (toBox) {
|
|
184
272
|
const reference = fromPoint ?? defaultFromPoint(toBox, bounds, avoid, scale);
|
|
185
273
|
toPoint = dockPointOnBox(toBox, reference, scale);
|
|
@@ -199,12 +287,8 @@ export function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer =
|
|
|
199
287
|
let at;
|
|
200
288
|
const footprintSize = estimateTextFootprintSize(input.text, input.width, scale);
|
|
201
289
|
if (isTextAnchorPoint(input.at)) {
|
|
202
|
-
const
|
|
203
|
-
|
|
204
|
-
reportFailure(annotationIndex, "text.at", input.at, r.issue);
|
|
205
|
-
return;
|
|
206
|
-
}
|
|
207
|
-
at = defaultLabelPoint(r.box, bounds, footprintSize, "topLeft", [...occupied, ...ocrLineBoxes()], scale);
|
|
290
|
+
const box = boxes.get(queryKey(annotationIndex, "text.at"));
|
|
291
|
+
at = defaultLabelPoint(box, bounds, footprintSize, "topLeft", [...occupied, ...ocrLineBoxes], scale);
|
|
208
292
|
}
|
|
209
293
|
else {
|
|
210
294
|
at = input.at;
|
|
@@ -217,12 +301,8 @@ export function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer =
|
|
|
217
301
|
let at;
|
|
218
302
|
const stampSize = NUMBER_STAMP_DIAMETER_PX * scale;
|
|
219
303
|
if (isTextAnchorPoint(input.at)) {
|
|
220
|
-
const
|
|
221
|
-
|
|
222
|
-
reportFailure(annotationIndex, "number.at", input.at, r.issue);
|
|
223
|
-
return;
|
|
224
|
-
}
|
|
225
|
-
at = defaultLabelPoint(r.box, bounds, { w: stampSize, h: stampSize }, "center", [...occupied, ...ocrLineBoxes()], scale);
|
|
304
|
+
const box = boxes.get(queryKey(annotationIndex, "number.at"));
|
|
305
|
+
at = defaultLabelPoint(box, bounds, { w: stampSize, h: stampSize }, "center", [...occupied, ...ocrLineBoxes], scale);
|
|
226
306
|
}
|
|
227
307
|
else {
|
|
228
308
|
at = input.at;
|
|
@@ -235,26 +315,10 @@ export function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer =
|
|
|
235
315
|
case "ellipse":
|
|
236
316
|
case "mosaic": {
|
|
237
317
|
const hasText = input.text !== undefined;
|
|
238
|
-
const hasCoords = input.x !== undefined && input.y !== undefined && input.w !== undefined && input.h !== undefined;
|
|
239
|
-
if (hasText === hasCoords) {
|
|
240
|
-
issues.push({
|
|
241
|
-
annotationIndex,
|
|
242
|
-
field: `${input.type}.region`,
|
|
243
|
-
query: input.text ?? "",
|
|
244
|
-
status: "no_match",
|
|
245
|
-
candidates: [],
|
|
246
|
-
});
|
|
247
|
-
return;
|
|
248
|
-
}
|
|
249
318
|
let region;
|
|
250
319
|
if (hasText) {
|
|
251
|
-
const
|
|
252
|
-
|
|
253
|
-
if ("issue" in r) {
|
|
254
|
-
reportFailure(annotationIndex, `${input.type}.region`, anchor, r.issue);
|
|
255
|
-
return;
|
|
256
|
-
}
|
|
257
|
-
region = expandBoxWithMargin(r.box, input.margin ?? DEFAULT_REGION_MARGIN_PX);
|
|
320
|
+
const box = boxes.get(queryKey(annotationIndex, `${input.type}.region`));
|
|
321
|
+
region = expandBoxWithMargin(box, input.margin ?? DEFAULT_REGION_MARGIN_PX);
|
|
258
322
|
}
|
|
259
323
|
else {
|
|
260
324
|
region = { x: input.x, y: input.y, w: input.w, h: input.h };
|
|
@@ -271,8 +335,6 @@ export function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer =
|
|
|
271
335
|
}
|
|
272
336
|
});
|
|
273
337
|
}
|
|
274
|
-
if (issues.length > 0)
|
|
275
|
-
return { ok: false, issues };
|
|
276
338
|
return { ok: true, annotations: resolvedByIndex };
|
|
277
339
|
}
|
|
278
340
|
//# sourceMappingURL=agentAnnotations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentAnnotations.js","sourceRoot":"","sources":["../../src/agentAnnotations.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agentAnnotations.js","sourceRoot":"","sources":["../../src/agentAnnotations.ts"],"names":[],"mappings":"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"}
|
package/dist/src/capture.js
CHANGED
|
@@ -77,8 +77,8 @@ export function captureScreen() {
|
|
|
77
77
|
return { status: "captured", meta: readCaptureMeta(path) };
|
|
78
78
|
}
|
|
79
79
|
/** mode: "window"(アプリ名/タイトルの部分一致で1件に絞れたときだけ撮る) */
|
|
80
|
-
export function captureWindowByMatch(app, title) {
|
|
81
|
-
const all = listWindows();
|
|
80
|
+
export async function captureWindowByMatch(app, title) {
|
|
81
|
+
const all = await listWindows();
|
|
82
82
|
const matches = findWindows(all, app, title);
|
|
83
83
|
if (matches.length === 0) {
|
|
84
84
|
return { status: "no_match", candidates: all };
|
package/dist/src/capture.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../src/capture.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../src/capture.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,2CAA2C;AAC3C,EAAE;AACF,0EAA0E;AAC1E,mDAAmD;AACnD,gBAAgB;AAChB,EAAE;AACF,yDAAyD;AACzD,yDAAyD;AACzD,mDAAmD;AACnD,+DAA+D;AAC/D,wEAAwE;AACxE,gDAAgD;AAChD,iDAAiD;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxF,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,WAAW,EAAmB,MAAM,iBAAiB,CAAC;AAE5E,MAAM,4BAA4B,GAAG;;;CAGpC,CAAC;AAEF;;;GAGG;AACH,SAAS,0BAA0B;IACjC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAC5C,aAAa,CAAC,UAAU,EAAE,4BAA4B,EAAE,MAAM,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACvF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAC1C,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,SAAS,CAAC;IAC5C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,+BAA+B,GACnC,sDAAsD;IACtD,oDAAoD;IACpD,wCAAwC,CAAC;AAE3C,MAAM,6BAA6B,GACjC,mDAAmD;IACnD,wBAAwB,CAAC;AAE3B,MAAM,UAAU,UAAU;IACxB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,yBAAyB,CAAC,CAAC;IACtD,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACpC,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,cAAc;IACrB,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC7D,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpD,OAAO,IAAI,CAAC,UAAU,EAAE,EAAE,WAAW,KAAK,IAAI,IAAI,MAAM,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAc;IACtC,MAAM,MAAM,GAAG,SAAS,CAAC,eAAe,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IACvF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,0BAA0B,EAAE,CAAC;QAC7C,MAAM,IAAI,GAAG,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,6BAA6B,CAAC;QACjG,MAAM,IAAI,KAAK,CAAC,+BAA+B,MAAM,CAAC,MAAM,MAAM,MAAM,CAAC,MAAM,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC,CAAC;IAC1G,CAAC;AACH,CAAC;AASD,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAChC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC3D,CAAC;AAOD,qBAAqB;AACrB,MAAM,UAAU,aAAa;IAC3B,MAAM,IAAI,GAAG,cAAc,EAAE,CAAC;IAC9B,gBAAgB,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC/B,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;AAC7D,CAAC;AAED,kDAAkD;AAClD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,GAAY,EAAE,KAAc;IACrE,MAAM,GAAG,GAAG,MAAM,WAAW,EAAE,CAAC;IAChC,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAC7C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC;IACjD,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;IACtD,CAAC;IACD,MAAM,IAAI,GAAG,cAAc,EAAE,CAAC;IAC9B,gBAAgB,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;IAClE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;AAC7D,CAAC;AAED,0DAA0D;AAC1D,MAAM,UAAU,aAAa,CAC3B,CAAS,EACT,CAAS,EACT,CAAS,EACT,CAAS,EACT,YAAoB;IAEpB,MAAM,IAAI,GAAG,cAAc,EAAE,CAAC;IAC9B,gBAAgB,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;IACxF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;AAC7D,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;AAC7B,CAAC"}
|
package/dist/src/draft.js
CHANGED
|
@@ -36,9 +36,9 @@ export function readImageGeometry(imagePath) {
|
|
|
36
36
|
* 下書きPNGを作って書き出す(openは呼ばない。テストしやすいよう分離)。
|
|
37
37
|
* recognizerは文字アンカー解決に使うVision呼び出しの差し替え口(テスト用。既定はswiftTextRecognizer)。
|
|
38
38
|
*/
|
|
39
|
-
export function writeDraft(imagePath, annotations, outputPath, recognizer = swiftTextRecognizer) {
|
|
39
|
+
export async function writeDraft(imagePath, annotations, outputPath, recognizer = swiftTextRecognizer) {
|
|
40
40
|
const { geo, widthPx, buf } = readImageGeometry(imagePath);
|
|
41
|
-
const resolution = resolveAnnotationAnchors(imagePath, annotations, { width: widthPx, height: geo.heightPx }, recognizer, geo.scale);
|
|
41
|
+
const resolution = await resolveAnnotationAnchors(imagePath, annotations, { width: widthPx, height: geo.heightPx }, recognizer, geo.scale);
|
|
42
42
|
if (!resolution.ok) {
|
|
43
43
|
return { status: "anchor_error", issues: resolution.issues };
|
|
44
44
|
}
|
package/dist/src/draft.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"draft.js","sourceRoot":"","sources":["../../src/draft.ts"],"names":[],"mappings":"AAAA,yBAAyB;AACzB,EAAE;AACF,8EAA8E;AAC9E,gCAAgC;AAChC,4CAA4C;AAC5C,wDAAwD;AACxD,+DAA+D;AAC/D,2BAA2B;AAC3B,qEAAqE;AACrE,mBAAmB;AACnB,sEAAsE;AACtE,iFAAiF;AACjF,6CAA6C;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAsB,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,wBAAwB,EAA+C,MAAM,uBAAuB,CAAC;AAC9G,OAAO,EAAE,mBAAmB,EAAuB,MAAM,aAAa,CAAC;AAEvE,MAAM,CAAC,MAAM,oBAAoB,GAAG,2BAA2B,CAAC;AAEhE,MAAM,UAAU,gBAAgB,CAAC,SAAiB;IAChD,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC;IACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IACtC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,SAAS,GAAG,EAAE,CAAC,CAAC;AAC1C,CAAC;AAaD,MAAM,UAAU,iBAAiB,CAC/B,SAAiB;IAEjB,MAAM,GAAG,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAChC,OAAO,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;AACnE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,UAAU,
|
|
1
|
+
{"version":3,"file":"draft.js","sourceRoot":"","sources":["../../src/draft.ts"],"names":[],"mappings":"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"}
|
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.
|
|
87
|
+
export const server = new McpServer({ name: "fletchshot-mcp", version: "0.1.6" }, { 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,
|
|
@@ -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()を呼ぶ)。
|
package/dist/src/index.js.map
CHANGED
|
@@ -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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"}
|
package/dist/src/vision.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
// macOS Vision フレームワーク(VNRecognizeTextRequest)による文字認識。「文字アンカー」
|
|
2
2
|
// ({text:"..."} での座標指定)の裏側として、画像内の文字列とその位置(画像ピクセル・左上原点)を
|
|
3
|
-
// 取得する。
|
|
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
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
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
|
|
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>
|
|
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 "
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
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
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
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 =
|
|
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()
|
|
168
|
-
*
|
|
169
|
-
* 同じ画像に対してOCRをもう一度実行するため、呼び出しは必要な場合(部分一致のとき)だけに限る。
|
|
165
|
+
* listTextLines() が返した行のうち、複数の部分文字列範囲の精密な枠を1回のVision実行でまとめて取る。
|
|
166
|
+
* 戻り値はrangesと同じ順序・同じ長さの配列。rangesが空なら呼び出しすら行わない(空配列を返す)。
|
|
170
167
|
*/
|
|
171
|
-
export function
|
|
172
|
-
|
|
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,
|
|
174
|
+
export const swiftTextRecognizer = { listTextLines, boxForTextRanges };
|
|
176
175
|
//# sourceMappingURL=vision.js.map
|
package/dist/src/vision.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vision.js","sourceRoot":"","sources":["../../src/vision.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,yDAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"vision.js","sourceRoot":"","sources":["../../src/vision.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,yDAAyD;AACzD,6DAA6D;AAC7D,EAAE;AACF,gDAAgD;AAChD,kFAAkF;AAClF,iBAAiB;AACjB,iGAAiG;AACjG,qFAAqF;AACrF,qCAAqC;AACrC,wFAAwF;AACxF,4DAA4D;AAC5D,sEAAsE;AACtE,gFAAgF;AAChF,8DAA8D;AAC9D,qDAAqD;AACrD,mCAAmC;AACnC,EAAE;AACF,mDAAmD;AACnD,0DAA0D;AAC1D,oBAAoB;AACpB,EAAE;AACF,iEAAiE;AACjE,iDAAiD;AACjD,0CAA0C;AAC1C,qEAAqE;AACrE,uDAAuD;AACvD,8DAA8D;AAC9D,mDAAmD;AACnD,mDAAmD;AAEnD,OAAO,EACL,cAAc,EACd,qBAAqB,IAAI,yBAAyB,GACnD,MAAM,kBAAkB,CAAC;AAwB1B,MAAM,gBAAgB,GACpB,oEAAoE;IACpE,iEAAiE;IACjE,aAAa,CAAC;AAEhB,MAAM,oBAAoB,GACxB,iDAAiD;IACjD,cAAc,CAAC;AAEjB,iFAAiF;AACjF,MAAM,CAAC,MAAM,qBAAqB,GAAG,yBAAyB,CAAC;AAE/D,gCAAgC;AAChC,uDAAuD;AACvD,2DAA2D;AAC3D,iGAAiG;AACjG,gFAAgF;AAChF,4EAA4E;AAC5E,+EAA+E;AAC/E,8DAA8D;AAC9D,+DAA+D;AAC/D,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAC;AAC5C,MAAM,CAAC,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoG/B,CAAC;AAEF,KAAK,UAAU,WAAW,CAAC,IAAc,EAAE,KAAc;IACvD,OAAO,cAAc,CAAC,sBAAsB,EAAE,gBAAgB,EAAE,IAAI,EAAE;QACpE,KAAK,EAAE,cAAc;QACrB,eAAe,EAAE,gBAAgB;QACjC,kBAAkB,EAAE,oBAAoB;QACxC,aAAa,EAAE,MAAM;QACrB,KAAK;KACN,CAAC,CAAC;AACL,CAAC;AAED,+CAA+C;AAC/C,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,SAAiB;IACnD,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAe,CAAC;AAC/C,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,SAAiB,EAAE,MAAsB;IAC9E,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7E,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAe,CAAC;AACvC,CAAC;AAQD,MAAM,CAAC,MAAM,mBAAmB,GAAmB,EAAE,aAAa,EAAE,gBAAgB,EAAE,CAAC"}
|
|
@@ -5,6 +5,13 @@
|
|
|
5
5
|
// 指したままになりうる——手順2で確かめた「atomicで通った」という結果に基づく)。
|
|
6
6
|
// パスの更新日時をポーリングし、更新後に目印 `fletchshotDraft` が読めなくなっていたら
|
|
7
7
|
// 「返された」と判断する。
|
|
8
|
+
//
|
|
9
|
+
// 取りこぼし対策(2026-11-13 報告): 上記の「更新日時が変わったか」判定は、wait_for_return を
|
|
10
|
+
// 呼び始める前(=initialMtimeMsを取る前)に人が既に「エージェントに返す」を押していた場合、
|
|
11
|
+
// 変化が無い(=まだ下書きのまま)と誤判定して永遠に待ち続ける(実例: 14:13:34 下書きを開く →
|
|
12
|
+
// 14:13:38 人が返す → 14:13:42 wait_for_return 開始 → 取りこぼし)。open_draft が書くファイルには
|
|
13
|
+
// 必ず目印 `fletchshotDraft` があるため、待ち始めた時点でファイルが存在し目印が無ければ、
|
|
14
|
+
// その時点で既に返されていたとみなし、ポーリングに入る前に即「返された」と判定する。
|
|
8
15
|
import { readFileSync, statSync } from "node:fs";
|
|
9
16
|
import { parseChunks, readCommentText } from "./png.js";
|
|
10
17
|
import { DRAFT_MARKER_KEY } from "./annotations.js";
|
|
@@ -48,6 +55,12 @@ export async function waitForReturn(options) {
|
|
|
48
55
|
catch {
|
|
49
56
|
initialMtimeMs = undefined;
|
|
50
57
|
}
|
|
58
|
+
// 取りこぼし対策: 待ち始めた時点で既にファイルが存在し、目印(fletchshotDraft)が無ければ、
|
|
59
|
+
// ループに入る前に即「返された」と判定する(読み取りの一瞬の失敗はhasDraftMarker内で
|
|
60
|
+
// 「まだある」扱いにしているので、ここでfalseになるのは実際に目印が読めなかった場合だけ)。
|
|
61
|
+
if (initialMtimeMs !== undefined && !hasDraftMarker(draftPath)) {
|
|
62
|
+
return { status: "returned", path: draftPath };
|
|
63
|
+
}
|
|
51
64
|
while (Date.now() < deadline) {
|
|
52
65
|
let mtimeMs;
|
|
53
66
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waitForReturn.js","sourceRoot":"","sources":["../../src/waitForReturn.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,EAAE;AACF,oFAAoF;AACpF,uDAAuD;AACvD,8CAA8C;AAC9C,sDAAsD;AACtD,eAAe;
|
|
1
|
+
{"version":3,"file":"waitForReturn.js","sourceRoot":"","sources":["../../src/waitForReturn.ts"],"names":[],"mappings":"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"}
|
package/dist/src/windowList.js
CHANGED
|
@@ -12,14 +12,15 @@
|
|
|
12
12
|
// (画面収録の許可はターミナル側に必要。追加のpip/npm等のインストールは不要だが、Xcode Command Line
|
|
13
13
|
// Toolsの`swift`コマンドが必要——開発者機では通常インストール済み。無い場合はwindowモードのみ使えず、
|
|
14
14
|
// screen/regionモードは影響を受けない)。
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
import {
|
|
15
|
+
//
|
|
16
|
+
// swift呼び出し本体(コンパイルキャッシュ・診断メッセージ)はvision.tsと共通のswiftRunner.tsに
|
|
17
|
+
// 寄せている(2026-11-13改訂。詳細はswiftRunner.tsのコメント参照)。
|
|
18
|
+
import { runSwiftScript, SwiftUnavailableError as SwiftUnavailableErrorBase } from "./swiftRunner.js";
|
|
19
19
|
// layer 0(通常ウィンドウ)のみ・オーナー名/ウィンドウ名/ID/boundsを拾う。
|
|
20
20
|
// NSWindow由来の値はCGWindowListCopyWindowInfoの仕様上すべて揃うとは限らないため、
|
|
21
21
|
// 読めないフィールドは安全側(空文字・0)にフォールバックする。
|
|
22
|
-
const
|
|
22
|
+
export const WINDOW_LIST_SCRIPT_NAME = "winlist";
|
|
23
|
+
export const WINDOW_LIST_SWIFT = `
|
|
23
24
|
import CoreGraphics
|
|
24
25
|
import Foundation
|
|
25
26
|
|
|
@@ -56,34 +57,22 @@ for w in info {
|
|
|
56
57
|
let data = try! JSONEncoder().encode(out)
|
|
57
58
|
FileHandle.standardOutput.write(data)
|
|
58
59
|
`;
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
writeFileSync(path, WINDOW_LIST_SWIFT, "utf8");
|
|
66
|
-
cachedScriptPath = path;
|
|
67
|
-
return path;
|
|
68
|
-
}
|
|
69
|
-
export class SwiftUnavailableError extends Error {
|
|
70
|
-
constructor() {
|
|
71
|
-
super("ウィンドウ単体の撮影には `swift` コマンド(Xcode Command Line Tools)が必要です。" +
|
|
72
|
-
"`xcode-select --install` で導入するか、mode: \"screen\" / \"region\" を使ってください。");
|
|
73
|
-
this.name = "SwiftUnavailableError";
|
|
74
|
-
}
|
|
75
|
-
}
|
|
60
|
+
const UNAVAILABLE_HINT = "ウィンドウ単体の撮影には `swift` コマンド(Xcode Command Line Tools)が必要です。" +
|
|
61
|
+
"`xcode-select --install` で導入するか、mode: \"screen\" / \"region\" を使ってください。";
|
|
62
|
+
const COMPILE_TIMEOUT_HINT = "ウィンドウ一覧取得の準備(swiftのコンパイル)に時間がかかっています。今回は mode:\"screen\" / " +
|
|
63
|
+
"\"region\" を使ってください。次回以降は速くなります。";
|
|
64
|
+
/** windowList.ts用のSwiftUnavailableError(後方互換のため個別にexportする。中身はswiftRunner.tsと同じ)。 */
|
|
65
|
+
export const SwiftUnavailableError = SwiftUnavailableErrorBase;
|
|
76
66
|
/** 画面上の通常ウィンドウ(layer 0)の一覧を返す。swiftコマンドが無ければ SwiftUnavailableError。 */
|
|
77
|
-
export function listWindows() {
|
|
78
|
-
const
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
}
|
|
85
|
-
|
|
86
|
-
return parsed;
|
|
67
|
+
export async function listWindows() {
|
|
68
|
+
const out = await runSwiftScript(WINDOW_LIST_SCRIPT_NAME, WINDOW_LIST_SWIFT, [], {
|
|
69
|
+
label: "ウィンドウ一覧の取得",
|
|
70
|
+
unavailableHint: UNAVAILABLE_HINT,
|
|
71
|
+
compileTimeoutHint: COMPILE_TIMEOUT_HINT,
|
|
72
|
+
onCompileSlow: "interpreter",
|
|
73
|
+
execTimeoutMs: 30_000,
|
|
74
|
+
});
|
|
75
|
+
return JSON.parse(out || "[]");
|
|
87
76
|
}
|
|
88
77
|
/**
|
|
89
78
|
* アプリ名・ウィンドウ名の部分一致(大小文字無視)でウィンドウを絞り込む。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"windowList.js","sourceRoot":"","sources":["../../src/windowList.ts"],"names":[],"mappings":"AAAA,cAAc;AACd,EAAE;AACF,4FAA4F;AAC5F,mEAAmE;AACnE,sEAAsE;AACtE,+DAA+D;AAC/D,iDAAiD;AACjD,gEAAgE;AAChE,EAAE;AACF,yDAAyD;AACzD,4EAA4E;AAC5E,gEAAgE;AAChE,8DAA8D;AAC9D,6BAA6B;
|
|
1
|
+
{"version":3,"file":"windowList.js","sourceRoot":"","sources":["../../src/windowList.ts"],"names":[],"mappings":"AAAA,cAAc;AACd,EAAE;AACF,4FAA4F;AAC5F,mEAAmE;AACnE,sEAAsE;AACtE,+DAA+D;AAC/D,iDAAiD;AACjD,gEAAgE;AAChE,EAAE;AACF,yDAAyD;AACzD,4EAA4E;AAC5E,gEAAgE;AAChE,8DAA8D;AAC9D,6BAA6B;AAC7B,EAAE;AACF,+DAA+D;AAC/D,gDAAgD;AAEhD,OAAO,EAAE,cAAc,EAAE,qBAAqB,IAAI,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAYtG,gDAAgD;AAChD,4DAA4D;AAC5D,kCAAkC;AAClC,MAAM,CAAC,MAAM,uBAAuB,GAAG,SAAS,CAAC;AACjD,MAAM,CAAC,MAAM,iBAAiB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoChC,CAAC;AAEF,MAAM,gBAAgB,GACpB,2DAA2D;IAC3D,yEAAyE,CAAC;AAE5E,MAAM,oBAAoB,GACxB,6DAA6D;IAC7D,kCAAkC,CAAC;AAErC,qFAAqF;AACrF,MAAM,CAAC,MAAM,qBAAqB,GAAG,yBAAyB,CAAC;AAE/D,uEAAuE;AACvE,MAAM,CAAC,KAAK,UAAU,WAAW;IAC/B,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,uBAAuB,EAAE,iBAAiB,EAAE,EAAE,EAAE;QAC/E,KAAK,EAAE,YAAY;QACnB,eAAe,EAAE,gBAAgB;QACjC,kBAAkB,EAAE,oBAAoB;QACxC,aAAa,EAAE,aAAa;QAC5B,aAAa,EAAE,MAAM;KACtB,CAAC,CAAC;IACH,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAiB,CAAC;AACjD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,OAAqB,EAAE,GAAY,EAAE,KAAc;IAC7E,MAAM,SAAS,GAAG,GAAG,EAAE,WAAW,EAAE,CAAC;IACrC,MAAM,WAAW,GAAG,KAAK,EAAE,WAAW,EAAE,CAAC;IACzC,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QAC1B,IAAI,SAAS,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;YAAE,OAAO,KAAK,CAAC;QAC1E,IAAI,WAAW,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC;YAAE,OAAO,KAAK,CAAC;QAC7E,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "fletchshot-mcp",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.6",
|
|
4
4
|
"description": "FletchShot (macOS screenshot annotation app) agent draft MCP server: capture a screenshot, open it in FletchShot as an editable draft, and wait for a human to return the finished image.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|