fletchshot-mcp 0.1.4 → 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 +100 -33
- 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":"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"}
|
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
|
@@ -5,7 +5,8 @@
|
|
|
5
5
|
// 「捨てるもの」の線(docs/01_要件定義.md): 本サーバーはエージェントに撮らせる/操作させる機能ではなく、
|
|
6
6
|
// 人の承認(FletchShot上での編集 → 「エージェントに返す」操作)を必ず経由する入口だけを持つ。
|
|
7
7
|
// 画面監視・UI操作・自動返却は実装しない。
|
|
8
|
-
import { readFileSync, statSync } from "node:fs";
|
|
8
|
+
import { readFileSync, realpathSync, statSync } from "node:fs";
|
|
9
|
+
import { fileURLToPath } from "node:url";
|
|
9
10
|
import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
|
|
10
11
|
import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
|
|
11
12
|
import { z } from "zod";
|
|
@@ -14,6 +15,9 @@ import { AgentAnnotationInputSchema } from "./agentAnnotations.js";
|
|
|
14
15
|
import { writeDraft, openInFletchShot, FLETCHSHOT_BUNDLE_ID } from "./draft.js";
|
|
15
16
|
import { waitForReturn, DEFAULT_TIMEOUT_SECONDS, MAX_TIMEOUT_SECONDS } from "./waitForReturn.js";
|
|
16
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";
|
|
17
21
|
/** MCPのimage contentへ埋め込むPNGの上限(これを超えたらパスだけ返す)。プレビュー縮小後でも
|
|
18
22
|
* ほぼ超えない想定だが、保険として残す。 */
|
|
19
23
|
const MAX_INLINE_IMAGE_BYTES = 8 * 1024 * 1024;
|
|
@@ -63,23 +67,49 @@ function formatAnchorIssues(issues) {
|
|
|
63
67
|
})
|
|
64
68
|
.join("\n\n");
|
|
65
69
|
}
|
|
66
|
-
|
|
70
|
+
/**
|
|
71
|
+
* initialize応答のinstructionsに載せる、エージェント向けの短い使い方要約。
|
|
72
|
+
* 実測(docs/plans/2026-11-12-FR-39-エージェント下書き.md): 2回目以降の呼び出しは前回測った
|
|
73
|
+
* 座標の再利用でトークンが激減したが、初回はソースを読む・画素を測る・角度を計算するスクリプトを
|
|
74
|
+
* 書くなどでトークンを大量に消費していた。文字アンカーの存在と「測るな」を初回から伝えるのが目的。
|
|
75
|
+
* 英語(短く)にしているのは、エージェント側のモデルが英語でも問題なく読めるため。
|
|
76
|
+
*/
|
|
77
|
+
const SERVER_INSTRUCTIONS = `FletchShot MCP: capture a screenshot, draft annotations, let a human finish it in FletchShot.
|
|
78
|
+
Flow: capture (prefer mode:"window") -> open_draft -> wait_for_return.
|
|
79
|
+
|
|
80
|
+
Position annotations with a text anchor {text:"visible label"} wherever the target has visible text (arrow.from/to, text.at, number.at, rect/ellipse/mosaic all accept it). Do not read source code, zoom into the image, measure pixels, or reuse coordinates from an earlier call -- just pass the string you can read. A human adjusts the draft in FletchShot before returning it, so rough placement is fine.
|
|
81
|
+
|
|
82
|
+
Numeric {x,y} is only for targets with no visible text (icons, shapes). Coordinates are always the ORIGINAL image's pixels; if you're looking at the embedded preview image, multiply its coordinates by previewScaleFactor first.
|
|
83
|
+
|
|
84
|
+
Skip the finished image if you don't need to see it: wait_for_return({includeImage:false}) returns only the path and size.
|
|
85
|
+
|
|
86
|
+
Example: open_draft({imagePath, annotations:[{type:"arrow", to:{text:"Submit"}}, {type:"mosaic", text:"user@example.com"}]})`;
|
|
87
|
+
export const server = new McpServer({ name: "fletchshot-mcp", version: "0.1.6" }, { instructions: SERVER_INSTRUCTIONS });
|
|
88
|
+
/** captureの戻り値テキストに足す「次の一手」の案内。実撮影なしでテストできるよう純粋関数に分離。 */
|
|
89
|
+
export function captureNextStepHint(previewScaleFactor) {
|
|
90
|
+
return (`次は open_draft。位置は {text:"…"} の文字アンカーで指定でき、座標計算は不要。` +
|
|
91
|
+
`文字のない対象はプレビュー座標×${previewScaleFactor.toFixed(3)}で元画像ピクセルに変換して渡すこと。`);
|
|
92
|
+
}
|
|
93
|
+
/** open_draftの戻り値テキストに足す「次の一手」の案内。実際の下書き作成なしでテストできるよう分離。 */
|
|
94
|
+
export function openDraftNextStepHint() {
|
|
95
|
+
return ("人が直して「エージェントに返す」(⌘↩)を押すまで待つには wait_for_return を呼ぶこと。" +
|
|
96
|
+
"仕上がりを見る必要がなければ wait_for_return({includeImage:false}) でパス・サイズだけ" +
|
|
97
|
+
"受け取り、トークンを節約できる。");
|
|
98
|
+
}
|
|
67
99
|
// --- 1. capture -----------------------------------------------------------
|
|
68
100
|
server.registerTool("capture", {
|
|
69
101
|
title: "Capture a screenshot",
|
|
70
|
-
description: "
|
|
102
|
+
description: "おすすめ: mode=\"window\"でアプリ名/ウィンドウ名の部分一致を指定し、対象ウィンドウ単体だけを" +
|
|
71
103
|
"撮る(一致なし・複数一致なら撮らずに候補一覧を返すので、app/titleを変えて絞り込み直すこと)。" +
|
|
72
104
|
"mode=\"screen\"は画面全体。mode=\"region\"は画面座標の矩形を遅延つきで撮る" +
|
|
73
105
|
"(メニュー・ポップオーバー用。ウィンドウ単体では撮れないため、全画面を遅延撮影して切り抜く。" +
|
|
74
|
-
"呼び出す前に「N
|
|
75
|
-
"
|
|
76
|
-
"
|
|
77
|
-
"
|
|
106
|
+
"呼び出す前に「N秒以内にメニューを開いてください」と人に伝えること。メニュー撮影は裏の" +
|
|
107
|
+
"ウィンドウが写り込むことがあるため、関係ない部分にはopen_draftでmosaic注釈を重ねるとよい)。" +
|
|
108
|
+
"戻り値のwidthPx/heightPx/scaleは元画像の値(open_draftの座標は常にこの元画像ピクセル基準)。" +
|
|
109
|
+
"埋め込む画像は長辺最大" +
|
|
78
110
|
String(DEFAULT_PREVIEW_MAX_LONG_EDGE_PX) +
|
|
79
111
|
"pxに縮小したプレビュー(トークン節約のため)で、previewWidthPx/previewHeightPx/" +
|
|
80
|
-
"previewScaleFactor
|
|
81
|
-
"対象はopen_draftの文字アンカー({text:\"...\"})で指定でき、拡大しての画素確認や座標計測の" +
|
|
82
|
-
"スクリプトは不要。文字のない対象はおおまかな座標で構わない(人がFletchShot上で微調整する)。",
|
|
112
|
+
"previewScaleFactorも返す。",
|
|
83
113
|
inputSchema: {
|
|
84
114
|
mode: z.enum(["window", "screen", "region"]),
|
|
85
115
|
app: z.string().optional().describe("window: アプリ名の部分一致(大小文字無視)"),
|
|
@@ -105,7 +135,7 @@ server.registerTool("capture", {
|
|
|
105
135
|
content: [{ type: "text", text: "mode=\"window\" には app か title の少なくとも一方が必要です" }],
|
|
106
136
|
};
|
|
107
137
|
}
|
|
108
|
-
result = captureWindowByMatch(args.app, args.title);
|
|
138
|
+
result = await captureWindowByMatch(args.app, args.title);
|
|
109
139
|
}
|
|
110
140
|
else if (args.mode === "screen") {
|
|
111
141
|
result = captureScreen();
|
|
@@ -148,8 +178,8 @@ server.registerTool("capture", {
|
|
|
148
178
|
{
|
|
149
179
|
type: "text",
|
|
150
180
|
text: `撮影しました: ${meta.path}\n元画像: 幅${meta.widthPx}px 高さ${meta.heightPx}px 倍率${meta.scale}x\n` +
|
|
151
|
-
`埋め込みはプレビュー(幅${preview.widthPx}px 高さ${preview.heightPx}px
|
|
152
|
-
|
|
181
|
+
`埋め込みはプレビュー(幅${preview.widthPx}px 高さ${preview.heightPx}px)。\n` +
|
|
182
|
+
captureNextStepHint(preview.scaleFactor),
|
|
153
183
|
},
|
|
154
184
|
...previewImageContent,
|
|
155
185
|
],
|
|
@@ -171,15 +201,17 @@ server.registerTool("capture", {
|
|
|
171
201
|
// --- 2. open_draft ----------------------------------------------------------
|
|
172
202
|
server.registerTool("open_draft", {
|
|
173
203
|
title: "Open an annotation draft in FletchShot",
|
|
174
|
-
description: "
|
|
175
|
-
"
|
|
176
|
-
"
|
|
177
|
-
"
|
|
178
|
-
"
|
|
179
|
-
"
|
|
180
|
-
"
|
|
181
|
-
"
|
|
182
|
-
"
|
|
204
|
+
description: "おすすめ: 位置は「文字アンカー」{text:\"対象の文字列\"}で指定する(arrow.from/to・text.at・" +
|
|
205
|
+
"number.at・rect/ellipse/mosaicの範囲すべてで使える)。macOSのVision文字認識で画像内から対象" +
|
|
206
|
+
"文字列を探して自動で座標・範囲を決めるので、文字が写っている対象は画素を測ったり画像を拡大" +
|
|
207
|
+
"したりせず、見えている文字列をそのままtextに渡せばよい(例: {type:\"arrow\", to:{text:\"スレッド\"}})。" +
|
|
208
|
+
"同じ文字列が複数あって絞れない場合はisErrorで候補一覧(occurrence番号つき)を返すので、" +
|
|
209
|
+
"occurrenceを指定して呼び直すこと。" +
|
|
210
|
+
"文字のない対象(アイコンや図形など)は「画像の左上原点・ピクセル」の数値座標({x,y}または" +
|
|
211
|
+
"[x,y])でおおまかに指定すればよく、人がFletchShot上で微調整する前提で構わない。数値座標は" +
|
|
212
|
+
"常に元画像ピクセル基準(captureが返すwidthPx/heightPx基準)であり、プレビュー画像上で見た" +
|
|
213
|
+
"座標はそのままでは使えない——previewScaleFactorを掛けて元画像ピクセルに変換してから渡すこと" +
|
|
214
|
+
"(プレビュー座標×previewScaleFactor=元画像ピクセル)。" +
|
|
183
215
|
"勘所: (1) arrow.toを文字アンカーにすると、矢頭が文字を隠さないよう文字の矢印の根元側に近い端を" +
|
|
184
216
|
"少し外側から指す位置へ自動配置する(fromを省略すると文字の外側の空いていそうな位置から自動で" +
|
|
185
217
|
"矢印を引く)。(2) text.at/number.atを文字アンカーにすると対象に重ねず近くに自動で置く。" +
|
|
@@ -200,7 +232,7 @@ server.registerTool("open_draft", {
|
|
|
200
232
|
},
|
|
201
233
|
}, async (args) => {
|
|
202
234
|
try {
|
|
203
|
-
const result = writeDraft(args.imagePath, args.annotations, args.outputPath);
|
|
235
|
+
const result = await writeDraft(args.imagePath, args.annotations, args.outputPath);
|
|
204
236
|
if (result.status === "anchor_error") {
|
|
205
237
|
return {
|
|
206
238
|
isError: true,
|
|
@@ -221,7 +253,7 @@ server.registerTool("open_draft", {
|
|
|
221
253
|
{
|
|
222
254
|
type: "text",
|
|
223
255
|
text: `下書きを作りました: ${result.draftPath}(注釈${result.annotationCount}件)\n${openNote}\n` +
|
|
224
|
-
|
|
256
|
+
openDraftNextStepHint(),
|
|
225
257
|
},
|
|
226
258
|
],
|
|
227
259
|
structuredContent: {
|
|
@@ -240,15 +272,15 @@ server.registerTool("open_draft", {
|
|
|
240
272
|
// --- 3. wait_for_return ------------------------------------------------------
|
|
241
273
|
server.registerTool("wait_for_return", {
|
|
242
274
|
title: "Wait for the human to return the finished draft",
|
|
243
|
-
description:
|
|
275
|
+
description: "おすすめ: 仕上がり画像そのものを見る必要がない(受け取ったことの確認だけで十分な)場合は" +
|
|
276
|
+
"includeImage:falseで呼ぶと、パスとサイズだけを返してトークンを節約できる。" +
|
|
277
|
+
`open_draftで開いた下書き(draftPath)を、人が「エージェントに返す」を押すまで待つ。` +
|
|
244
278
|
`既定のタイムアウトは${DEFAULT_TIMEOUT_SECONDS}秒(上限${MAX_TIMEOUT_SECONDS}秒)。` +
|
|
245
279
|
"返されると同じパスが焼き込み済みのPNG(モザイク等も反映済み・注釈は編集不可の見た目)に" +
|
|
246
280
|
"置き換わっている。時間切れの場合は timeout を返すので、必要なら timeoutSeconds を" +
|
|
247
|
-
"
|
|
281
|
+
"増やして呼び直すこと。includeImage未指定(既定true)の場合、埋め込む画像は長辺最大" +
|
|
248
282
|
String(DEFAULT_PREVIEW_MAX_LONG_EDGE_PX) +
|
|
249
|
-
"pxに縮小したプレビュー(captureと同様。widthPx/heightPxは元画像、previewScaleFactorで換算)。"
|
|
250
|
-
"画像そのものが要らない場合(受け取ったことの確認だけで十分なとき)はincludeImage:falseで" +
|
|
251
|
-
"パスとサイズだけを返させ、トークンを節約できる。",
|
|
283
|
+
"pxに縮小したプレビュー(captureと同様。widthPx/heightPxは元画像、previewScaleFactorで換算)。",
|
|
252
284
|
inputSchema: {
|
|
253
285
|
draftPath: z.string(),
|
|
254
286
|
timeoutSeconds: z.number().positive().optional(),
|
|
@@ -321,12 +353,47 @@ server.registerTool("wait_for_return", {
|
|
|
321
353
|
},
|
|
322
354
|
};
|
|
323
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
|
+
}
|
|
324
368
|
async function main() {
|
|
325
369
|
const transport = new StdioServerTransport();
|
|
370
|
+
// MCPのinitializeハンドシェイクが終わった直後にコンパイルを始める(client.initialize応答後、
|
|
371
|
+
// クライアントからのinitializedノーティフィケーションを受けて呼ばれる)。何らかの理由で
|
|
372
|
+
// initializedが来ない/遅い場合に備え、接続自体の直後にも一度発火させる(二重発火してもensureCompiled
|
|
373
|
+
// は同じキャッシュキーをPromiseで共有するだけなので無害)。
|
|
374
|
+
server.server.oninitialized = () => warmUpSwift();
|
|
326
375
|
await server.connect(transport);
|
|
376
|
+
warmUpSwift();
|
|
377
|
+
}
|
|
378
|
+
// テスト(node --test)がサーバー定義を読み込むためにこのファイルをimportしても、stdioに
|
|
379
|
+
// 接続しにいかないようにする(bin経由でこのファイル自体が直接実行されたときだけmain()を呼ぶ)。
|
|
380
|
+
// npx・npm i -g は node_modules/.bin/fletchshot-mcp というシンボリックリンク経由で起動するので、
|
|
381
|
+
// process.argv[1] はリンクのパスになる。実体のパス同士で比べないと main() が呼ばれず即終了する。
|
|
382
|
+
function isMainModule() {
|
|
383
|
+
const entry = process.argv[1];
|
|
384
|
+
if (entry === undefined)
|
|
385
|
+
return false;
|
|
386
|
+
try {
|
|
387
|
+
return realpathSync(entry) === realpathSync(fileURLToPath(import.meta.url));
|
|
388
|
+
}
|
|
389
|
+
catch {
|
|
390
|
+
return false;
|
|
391
|
+
}
|
|
392
|
+
}
|
|
393
|
+
if (isMainModule()) {
|
|
394
|
+
main().catch((err) => {
|
|
395
|
+
console.error("fletchshot-mcp failed to start:", err);
|
|
396
|
+
process.exit(1);
|
|
397
|
+
});
|
|
327
398
|
}
|
|
328
|
-
main().catch((err) => {
|
|
329
|
-
console.error("fletchshot-mcp failed to start:", err);
|
|
330
|
-
process.exit(1);
|
|
331
|
-
});
|
|
332
399
|
//# sourceMappingURL=index.js.map
|