@yuiseki/gyazocli 0.2.0 → 0.3.0

package/README.md

@@ -135,7 +135,8 @@ Configured in a client:
   `id_or_url` (required) and `sort` (`added`, `created` or `captured`).
 
 All of them are read-only, and all of them return metadata rather than image
-bytes: URLs, timestamp, OCR text, title, source application and page, and
+bytes. A capture that carries coordinates gets a `location: {latitude,
+longitude}`, and OCR text is reported wherever the response carries it: URLs, timestamp, OCR text, title, source application and page, and
 location when the capture carries one. Use the URLs in a result to show the
 capture itself. Handing base64 image data to a model turned out not to work
 well in practice, and describing a capture does.

package/dist/index.js

@@ -26,7 +26,7 @@ program
     .name('gyazo')
     .description('Gyazo Memory CLI for AI Secretary')
     .option('--mcp-server', 'run as a Model Context Protocol server over stdio')
-    .version('0.2.0');
+    .version('0.3.0');
 (0, config_1.registerConfigCommand)(program);
 (0, list_1.registerListCommand)(program);
 (0, get_1.registerGetCommand)(program);

package/dist/mcp.js

@@ -35,31 +35,74 @@ function serverVersion() {
     // level below it, so this holds both in the repository and once installed.
     return require('../package.json').version;
 }
+/** null and undefined both mean the capture does not carry the field. */
+function present(value) {
+    return value !== null && value !== undefined;
+}
 /**
- * The fields worth handing to a model: enough to cite a capture and to open it,
- * without the parts of the API response it cannot act on. Absent fields stay
- * absent rather than becoming null.
- *
- * Metadata only, on purpose. Handing image bytes to a model as base64 was the
- * ambitious part of the upstream design and it did not hold up in use, so a
- * capture is described here and its URLs are given for anything that wants the
- * pixels.
+ * Where a capture was taken. This lives under `metadata`, and the top-level
+ * `exif_normalized` is null in every response this CLI reads, which is why
+ * coordinates were missing from all of the tool output until now. The
+ * top-level shape is still read, in case an endpoint starts filling it.
+ */
+function readLocation(image) {
+    const source = image?.metadata?.exif_normalized ?? image?.exif_normalized;
+    const latitude = source?.latitude;
+    const longitude = source?.longitude;
+    if (typeof latitude !== 'number' || typeof longitude !== 'number') {
+        return undefined;
+    }
+    return { latitude, longitude };
+}
+/**
+ * The OCR text, from wherever this response carries it. Same mistake as the
+ * coordinates: the responses that have OCR keep it under `metadata`, and the
+ * top-level field comes back null.
  */
+function readOcr(image) {
+    const ocr = present(image?.ocr) ? image.ocr : image?.metadata?.ocr;
+    return present(ocr) && present(ocr.description) ? ocr : undefined;
+}
 function toMetadata(image) {
+    const location = readLocation(image);
+    const ocr = readOcr(image);
     return {
         image_id: image.image_id,
         permalink_url: image.permalink_url,
         url: image.url,
-        ...(image.thumb_url !== undefined ? { thumb_url: image.thumb_url } : {}),
-        ...(image.type !== undefined ? { mimeType: `image/${image.type}` } : {}),
+        ...(present(image.thumb_url) ? { thumb_url: image.thumb_url } : {}),
+        ...(present(image.type) ? { mimeType: `image/${image.type}` } : {}),
         created_at: image.created_at,
-        ...(image.alt_text !== undefined ? { alt_text: image.alt_text } : {}),
-        ...(image.ocr !== undefined ? { ocr: image.ocr } : {}),
-        ...(image.metadata !== undefined ? { metadata: image.metadata } : {}),
-        ...(image.exif_normalized !== undefined ? { exif_normalized: image.exif_normalized } : {}),
+        ...(present(image.alt_text) && image.alt_text !== '' ? { alt_text: image.alt_text } : {}),
+        ...(ocr !== undefined ? { ocr } : {}),
+        ...(location !== undefined ? { location } : {}),
+        ...(present(image.metadata) ? { metadata: image.metadata } : {}),
     };
 }
 const NO_IMAGES = { content: [{ type: 'text', text: 'No images found' }] };
+/**
+ * Every call, with how long it took, on stderr. stdout belongs to the
+ * protocol, and the host that starts this server is where its stderr ends up,
+ * which is the only place an operator can see that one tool is slow.
+ */
+function logged(name, handler) {
+    return async (args) => {
+        const startedAt = Date.now();
+        const given = Object.entries((args || {}))
+            .filter(([, value]) => value !== undefined && value !== false)
+            .map(([key, value]) => `${key}=${JSON.stringify(value)}`)
+            .join(' ');
+        try {
+            const result = await handler(args);
+            console.error(`[gyazo-mcp] ${name} ok ${Date.now() - startedAt}ms ${given}`.trimEnd());
+            return result;
+        }
+        catch (error) {
+            console.error(`[gyazo-mcp] ${name} failed ${Date.now() - startedAt}ms ${given}`.trimEnd(), `- ${error?.message || error}`);
+            throw error;
+        }
+    };
+}
 function asJsonResult(payload) {
     return { content: [{ type: 'text', text: JSON.stringify(payload, null, 2) }] };
 }
@@ -108,7 +151,7 @@ function createMcpServer() {
                 .describe('Number of results per page (max: 100)'),
         },
         annotations: { readOnlyHint: true, openWorldHint: true },
-    }, async ({ query, page, per }) => {
+    }, logged('gyazo_search', async ({ query, page, per }) => {
         const images = await (0, api_1.searchImages)(query, page, per);
         if (!images || images.length === 0) {
             return NO_IMAGES;
@@ -121,7 +164,7 @@ function createMcpServer() {
                 },
             ],
         };
-    });
+    }));
     server.registerTool('gyazo_image', {
         title: 'Describe one Gyazo capture',
         description: 'Fetch the metadata of one capture on Gyazo: its URLs, timestamp, OCR text, ' +
@@ -135,7 +178,7 @@ function createMcpServer() {
                 'https://gyazo.com/<id> permalink, or a direct image URL all work.'),
         },
         annotations: { readOnlyHint: true, openWorldHint: true },
-    }, async ({ id_or_url }) => {
+    }, logged('gyazo_image', async ({ id_or_url }) => {
         const imageId = (0, ids_1.normalizeImageId)(id_or_url);
         if (!imageId) {
             throw new Error(`'${id_or_url}' is not a Gyazo image ID or URL. Pass a 32-character ID or a ` +
@@ -147,7 +190,7 @@ function createMcpServer() {
             return NO_IMAGES;
         }
         return asMetadataResult(image);
-    });
+    }));
     server.registerTool('gyazo_latest_image', {
         title: 'Describe the most recent Gyazo capture',
         description: 'Fetch the metadata of the capture the user uploaded most recently. Useful when ' +
@@ -157,14 +200,14 @@ function createMcpServer() {
         // are dropped rather than refused.
         inputSchema: {},
         annotations: { readOnlyHint: true, openWorldHint: true },
-    }, async () => {
+    }, logged('gyazo_latest_image', async () => {
         const images = await (0, api_1.listImages)(1, 1);
         const latest = images && images[0];
         if (!latest) {
             return NO_IMAGES;
         }
         return asMetadataResult(latest);
-    });
+    }));
     server.registerTool('gyazo_list', {
         title: 'List Gyazo captures',
         description: 'List the captures the user uploaded, newest first, taking the same options as ' +
@@ -209,7 +252,7 @@ function createMcpServer() {
                 .describe('Answer from the local cache where possible. Set false to force a fetch'),
         },
         annotations: { readOnlyHint: true, openWorldHint: true },
-    }, async (args) => {
+    }, logged('gyazo_list', async (args) => {
         const { page, limit, today, photos, uploaded, max_pages: maxPages, use_cache: useCache } = args;
         if (photos && uploaded) {
             throw new Error('photos and uploaded cannot be used together.');
@@ -236,7 +279,7 @@ function createMcpServer() {
             alias,
         });
         return asMetadataListResult(images);
-    });
+    }));
     server.registerTool('gyazo_summary', {
         title: 'Summarise a stretch of Gyazo captures',
         description: 'What a day or a range adds up to: how many captures each day, and which ' +
@@ -267,12 +310,12 @@ function createMcpServer() {
                 .describe('Answer from the local cache where possible. Set false to force a fetch'),
         },
         annotations: { readOnlyHint: true, openWorldHint: true },
-    }, async (args) => {
+    }, logged('gyazo_summary', async (args) => {
         const { today, limit, max_pages: maxPages, use_cache: useCache } = args;
         const targetDate = requireDate(args.date, today) || (0, dates_1.buildRecentWeekRangeUntilYesterday)();
         const dailySummaries = await (0, analytics_1.buildSummary)({ targetDate, maxPages, useCache });
         return asJsonResult((0, analytics_1.toSummaryJson)(targetDate.dateKey, dailySummaries, limit));
-    });
+    }));
     server.registerTool('gyazo_collection', {
         title: 'Read a Gyazo collection',
         description: 'The metadata of a collection and of the captures in it. A collection ID looks ' +
@@ -290,7 +333,7 @@ function createMcpServer() {
                 'captured (when the photo was taken)'),
         },
         annotations: { readOnlyHint: true, openWorldHint: true },
-    }, async ({ id_or_url, sort }) => {
+    }, logged('gyazo_collection', async ({ id_or_url, sort }) => {
         const collectionId = (0, ids_1.normalizeCollectionId)(id_or_url);
         if (!collectionId) {
             throw new Error(`'${id_or_url}' is not a Gyazo collection ID or URL. Pass a 32-character ID or a ` +
@@ -311,7 +354,7 @@ function createMcpServer() {
             ...(collection?.user !== undefined ? { user: collection.user } : {}),
             images: images.map(toMetadata),
         });
-    });
+    }));
     return server;
 }
 async function runMcpServer() {

package/docs/ADR/003-cli-structure.md

@@ -13,7 +13,7 @@ Adopt and document the existing top-level command structure.
 
 ### 1. Program Metadata
 - Binary name: `gyazo`
-- Version: `0.2.0`
+- Version: `0.3.0`
 - Description: `Gyazo Memory CLI for AI Secretary`
 
 ### 2. Commands

package/docs/ADR/004-mcp-server.md

@@ -74,7 +74,13 @@ exiting ones are now thin wrappers over them.
 
 - The result payload is the fields a model can act on: `image_id`,
   `permalink_url`, `url`, `thumb_url`, `mimeType`, `created_at`, `alt_text`,
-  `ocr`, `metadata`, `exif_normalized`. Absent fields stay absent.
+  `ocr`, `location`, `metadata`. Absent fields stay absent, and a null field
+  counts as absent.
+- `location` and `ocr` are read from under `metadata`, which is where Gyazo
+  puts them. The top-level `exif_normalized` and `ocr` are null in every
+  response this CLI receives, and reading those was why coordinates never
+  appeared in any payload. Fixtures written from the shape the code expected
+  hid it; they now come from real responses.
 - No `uri` field, unlike upstream: it points at an MCP resource, and this
   server does not serve resources yet.
 - `gyazo_latest_image` takes no arguments, while upstream declared a `name`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuiseki/gyazocli",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Gyazo Memory CLI for AI Secretary",
   "repository": {
     "type": "git",