@thenavidm/apple-photos-mcp-cli 1.1.1 → 2.0.0

package/lib/tools/kit.d.ts

@@ -1,30 +1,25 @@
-/** Shared plumbing every tool uses. One spec feeds both the MCP server and the CLI. */
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { z, type ZodRawShape } from "zod";
+/**
+ * Shared plumbing every tool uses. One spec feeds the MCP server and the CLI,
+ * through Slipway, and the HQ connector, which imports `ALL_TOOLS` for its
+ * schemas and so keeps this shape: name, title, description, a Zod shape with
+ * `confirm` on the one destructive tool, and a risk.
+ */
+import { z, type Risk, type Tool } from "@thenavidm/slipway";
 import type { PythonBridge } from "../bridge.js";
 import type { Config } from "../config.js";
-import { needsConfirm, type Risk, type WriteGuard } from "../safety.js";
+export type { Risk };
+/** What every tool runs with: the engine and the settings it was started with. */
 export type ToolContext = {
     bridge: PythonBridge;
     config: Config;
-    guard: WriteGuard;
-};
-export type ToolResult = {
-    content: {
-        type: string;
-        text?: string;
-        data?: string;
-        mimeType?: string;
-    }[];
-    isError?: boolean;
 };
-export declare function ok(data: unknown): ToolResult;
-export declare function fail(error: unknown): ToolResult;
 export declare const confirmArg: {
     confirm: z.ZodOptional<z.ZodBoolean>;
 };
-export type ToolSpec<S extends ZodRawShape> = {
+export type ToolSpec<S extends z.ZodRawShape> = {
     name: string;
+    /** The CLI command, when the name with dashes is one the CLI already uses. */
+    command?: string;
     title: string;
     description: string;
     schema: S;
@@ -36,17 +31,24 @@ export type ToolSpec<S extends ZodRawShape> = {
     python?: string;
     summary?: (args: z.infer<z.ZodObject<S>>) => string;
 };
-export declare function defineTool<S extends ZodRawShape>(spec: ToolSpec<S>): ToolSpec<S>;
-export type AnyToolSpec = Omit<ToolSpec<ZodRawShape>, "summary"> & {
+export declare function defineTool<S extends z.ZodRawShape>(spec: ToolSpec<S>): ToolSpec<S>;
+export type AnyToolSpec = Omit<ToolSpec<z.ZodRawShape>, "summary"> & {
     summary?: (args: never) => string;
 };
 /**
- * Every tool runs the same way: guard, then hand the arguments to Python.
+ * A failure as the Slipway error that carries its exit code, as 1.1 gave them:
+ * an engine that never started is setup, 10; macOS refusing access is 4; a
+ * request over a cap is 2; refs that resolve to nothing are 3; anything else
+ * the engine reports is 5.
+ */
+export declare function toSlipway(error: unknown): unknown;
+/**
+ * Every tool runs the same way: hand the arguments to Python.
  *
  * There is no per-tool handler, because there is nothing per-tool to do. The
- * Python server already implements all thirteen; this layer exists to give them
- * a second surface, an install story and a schema HQ can import.
+ * Python server already implements all thirteen; this layer gives them a
+ * second surface, an install story and a schema HQ can import.
  */
 export declare function runTool(spec: AnyToolSpec, args: Record<string, unknown>, ctx: ToolContext): Promise<unknown>;
-export declare function register(server: McpServer, contextFor: () => ToolContext, spec: AnyToolSpec): void;
-export { needsConfirm };
+/** The specs as Slipway tools. `confirm` is Slipway's own, so it leaves each schema here. */
+export declare function slipwayTools(specs: readonly AnyToolSpec[]): Tool<ToolContext>[];

package/lib/tools/kit.js

@@ -1,22 +1,11 @@
-/** Shared plumbing every tool uses. One spec feeds both the MCP server and the CLI. */
-import { z } from "zod";
-import { PhotosError, ToolError } from "../errors.js";
-import { annotationsFor, needsConfirm } from "../safety.js";
-export function ok(data) {
-    // Content parts that are already MCP-shaped pass straight through. That is
-    // what keeps look_at_photos working: it returns images interleaved with
-    // captions, and serialising them into a text blob deletes the pictures,
-    // leaving a tool whose whole purpose is seeing that returns filenames.
-    if (Array.isArray(data) && data.every((p) => p && typeof p === "object" && "type" in p)) {
-        return { content: data };
-    }
-    const text = typeof data === "string" ? data : JSON.stringify(data, null, 2);
-    return { content: [{ type: "text", text }] };
-}
-export function fail(error) {
-    const payload = error instanceof PhotosError ? error.toJSON() : { error: error?.message ?? String(error) };
-    return { content: [{ type: "text", text: JSON.stringify(payload, null, 2) }], isError: true };
-}
+/**
+ * Shared plumbing every tool uses. One spec feeds the MCP server and the CLI,
+ * through Slipway, and the HQ connector, which imports `ALL_TOOLS` for its
+ * schemas and so keeps this shape: name, title, description, a Zod shape with
+ * `confirm` on the one destructive tool, and a risk.
+ */
+import { ApiError, AuthError, NotConfiguredError, NotFoundError, SlipwayError, UsageError, content, toolkit, z } from "@thenavidm/slipway";
+import { BridgeError, PhotosError, ToolError } from "../errors.js";
 export const confirmArg = {
     confirm: z
         .boolean()
@@ -27,29 +16,51 @@ export function defineTool(spec) {
     return spec;
 }
 /**
- * Every tool runs the same way: guard, then hand the arguments to Python.
+ * A failure as the Slipway error that carries its exit code, as 1.1 gave them:
+ * an engine that never started is setup, 10; macOS refusing access is 4; a
+ * request over a cap is 2; refs that resolve to nothing are 3; anything else
+ * the engine reports is 5.
+ */
+export function toSlipway(error) {
+    if (error instanceof SlipwayError || !(error instanceof Error))
+        return error;
+    const text = error.message.toLowerCase();
+    const options = error instanceof PhotosError && error.detail ? { details: { detail: error.detail.slice(0, 500) } } : {};
+    if (error instanceof BridgeError && /could not start/.test(text))
+        return new NotConfiguredError(error.message, options);
+    if (/operation not permitted|permission denied|not authori[sz]ed|full disk access|-1743/.test(text))
+        return new AuthError(error.message, options);
+    if (/at most|too many/.test(text))
+        return new UsageError(error.message, options);
+    if (/not found|none of those refs resolved|no such/.test(text))
+        return new NotFoundError(error.message, options);
+    return new ApiError(error.message, options);
+}
+/**
+ * Every tool runs the same way: hand the arguments to Python.
  *
  * There is no per-tool handler, because there is nothing per-tool to do. The
- * Python server already implements all thirteen; this layer exists to give them
- * a second surface, an install story and a schema HQ can import.
+ * Python server already implements all thirteen; this layer gives them a
+ * second surface, an install story and a schema HQ can import.
  */
 export async function runTool(spec, args, ctx) {
-    if (spec.risk !== "read") {
-        const summary = spec.summary?.(args) ?? spec.name;
-        ctx.guard.check(spec.name, spec.risk, args.confirm, summary);
-    }
     // Only undefined and null are dropped. An empty string is a real value here:
     // clearing a caption is `set_photo_description --description ""`, and
     // stripping it made the engine reject the call for a missing required
     // argument the caller had plainly supplied.
     const payload = Object.fromEntries(Object.entries(args).filter(([, v]) => v !== undefined && v !== null));
+    // Slipway lets an irreversible call reach this point only once it is
+    // confirmed, and the engine asks for the same confirmation in its own words.
+    if (spec.risk === "destructive")
+        payload.confirm = true;
     const result = await ctx.bridge.call(spec.python ?? spec.name, payload, spec.timeoutMs);
     if (result.isError)
         throw new ToolError(result.text || `${spec.name} failed.`);
-    // Anything that is not plain text — images from look_at_photos — is returned
-    // as content parts rather than squashed into a string.
+    // Anything that is not plain text, the images from look_at_photos, goes back
+    // as content parts, and the CLI prints the same parts as JSON, which is what
+    // the HQ agent hands back to the hosted connector.
     if (result.content.some((part) => part.type !== "text"))
-        return result.content;
+        return content(result.content, result.content);
     let parsed;
     try {
         parsed = JSON.parse(result.text);
@@ -68,20 +79,33 @@ export async function runTool(spec, args, ctx) {
     }
     return parsed;
 }
-export function register(server, contextFor, spec) {
-    server.registerTool(spec.name, {
-        title: spec.title,
-        description: spec.description,
-        inputSchema: spec.schema,
-        annotations: { title: spec.title, ...annotationsFor(spec.risk, { idempotent: spec.idempotent }) },
-    }, (async (args) => {
-        try {
-            return ok(await runTool(spec, args, contextFor()));
-        }
-        catch (error) {
-            return fail(error);
-        }
-    }));
+const kit = toolkit();
+/** The specs as Slipway tools. `confirm` is Slipway's own, so it leaves each schema here. */
+export function slipwayTools(specs) {
+    return specs.map((spec) => {
+        const { confirm: _confirm, ...shape } = spec.schema;
+        return kit.defineTool({
+            name: spec.name,
+            ...(spec.command ? { command: spec.command } : {}),
+            title: spec.title,
+            description: spec.description,
+            input: z.object(shape),
+            risk: spec.risk,
+            ...(spec.idempotent === undefined ? {} : { idempotent: spec.idempotent }),
+            // Everything stays on this Mac: no network, no upload, nothing leaves.
+            openWorld: false,
+            // 1.1's words for the one destructive tool's refusal.
+            ...(spec.risk === "destructive" ? { consequence: "cannot be undone from here" } : {}),
+            ...(spec.summary ? { summary: spec.summary } : {}),
+            handler: async (args, ctx) => {
+                try {
+                    return await runTool(spec, args, ctx);
+                }
+                catch (error) {
+                    throw toSlipway(error);
+                }
+            },
+        });
+    });
 }
-export { needsConfirm };
 //# sourceMappingURL=kit.js.map

package/lib/tools/kit.js.map

@@ -1 +1 @@
-{"version":3,"file":"kit.js","sourceRoot":"","sources":["../../src-ts/tools/kit.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"kit.js","sourceRoot":"","sources":["../../src-ts/tools/kit.ts"],"names":[],"mappings":"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"}

package/lib/version.d.ts

@@ -0,0 +1,2 @@
+/** The package's own version, read once, so the engine handshake and the server agree with npm. */
+export declare const VERSION: string;

package/lib/version.js

@@ -0,0 +1,4 @@
+import { createRequire } from "node:module";
+/** The package's own version, read once, so the engine handshake and the server agree with npm. */
+export const VERSION = createRequire(import.meta.url)("../package.json").version;
+//# sourceMappingURL=version.js.map

package/lib/version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src-ts/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,mGAAmG;AACnG,MAAM,CAAC,MAAM,OAAO,GAAY,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,iBAAiB,CAAyB,CAAC,OAAO,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thenavidm/apple-photos-mcp-cli",
-  "version": "1.1.1",
+  "version": "2.0.0",
   "description": "Apple Photos MCP server and CLI for Claude Code and AI agents. 13 tools to search, look at, organise and export your own Photos library, entirely on your Mac.",
   "type": "module",
   "main": "./lib/index.js",
@@ -10,7 +10,7 @@
     "apple-photos-mcp-cli": "lib/npx.js"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "scripts": {
     "build": "tsc",
@@ -20,8 +20,7 @@
     "build:mcpb": "bash desktop-extension/build.sh"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.18.0",
-    "zod": "^3.23.8"
+    "@thenavidm/slipway": "^0.1.24"
   },
   "devDependencies": {
     "@types/node": "^22.10.0",

package/lib/cli.d.ts

@@ -1,105 +0,0 @@
-/**
- * The CLI adapter.
- *
- * `register()` in tools/kit.ts turns a `ToolSpec` into an MCP tool. This turns
- * the same spec into a shell command, from the same `ALL_TOOLS` array, through
- * the same handler and the same `WriteGuard`. Nothing is described twice, so a
- * tool added tomorrow is a command tomorrow and the two surfaces cannot drift.
- *
- * The command IS the tool name. `submit_imagine` runs as `submit-imagine`, and
- * the underscore form works too. Inventing a prettier command tree would mean a
- * hand-written mapping, which is exactly the drift this avoids, and it would
- * force anyone reading the SKILL.md to learn two vocabularies for one action.
- *
- * Zod is the only schema: every flag, its placeholder, its help text and its
- * validation come from the shape the MCP tool already declares.
- */
-import { type ZodRawShape } from "zod";
-import { type AnyToolSpec } from "./tools/kit.js";
-/** How a value reaches the parser, once the Zod wrappers are peeled off. */
-type FlagKind = "string" | "number" | "boolean" | "enum" | "json";
-type Flag = {
-    key: string;
-    flag: string;
-    kind: FlagKind;
-    required: boolean;
-    repeatable: boolean;
-    choices?: string[];
-    help: string;
-};
-export declare function flagsFor(shape: ZodRawShape): Flag[];
-/** Shorthands for this repo's arguments. Kept small on purpose. */
-export declare const FLAG_ALIASES: Record<string, string>;
-/**
- * Parse argv against a tool's flags.
- *
- * Zod does the real validation afterwards, so this only has to get values into
- * the right JavaScript types and catch the mistakes Zod would otherwise report
- * in terms of a schema the person at the terminal never sees.
- */
-export declare function parseArgs(argv: string[], flags: Flag[]): Record<string, unknown>;
-/**
- * Keep only the named fields.
- *
- * These endpoints are verbose: one explore page is tens of kilobytes of JSON,
- * most of it layout hints. An agent piping that into its own context pays for
- * every byte. `--select id,status,images` cuts it to what was asked for.
- * Dotted paths descend, and arrays are traversed element-wise.
- */
-export declare function selectFields(data: unknown, paths: string[]): unknown;
-/** Errors are JSON on stderr, always, so a caller parses one shape. */
-export declare function emitError(error: unknown): void;
-/**
- * The name this was invoked as, so examples are copy-pasteable.
- *
- * The package puts two binaries on the same file. Printing `apple-photos-mcp` at
- * someone who typed `apple-photos-cli` hands them a command that works but is not
- * the one in their fingers.
- */
-export declare function binName(): string;
-/**
- * Words people use mapped onto words these tools use.
- *
- * Without this, "save my photos to disk" matches four browsing tools and never
- * export-originals, because nothing in that phrase appears in its name or
- * description. Every target below has to be vocabulary a tool actually
- * contains; a test asserts it.
- */
-export declare const SYNONYMS: Record<string, string[]>;
-/**
- * Resolve a capability described in words to the command that does it.
- *
- * An agent that knows what it wants but not what this tool calls it would
- * otherwise read the full tool list to find out, which is the cost the CLI
- * exists to avoid. Scoring is deliberately dumb: name and title carry the most
- * weight, because a tool called `download_job` should win "download my images"
- * without any cleverness.
- */
-export declare function whichCommand(query: string): {
-    tool: AnyToolSpec;
-    score: number;
-}[];
-/**
- * The house contract, so a script branches on the number the same way for
- * every one of these CLIs: 0 ok, 2 usage or a refused write, 3 not found,
- * 4 access refused, 5 the engine failed, 10 nothing set up yet.
- */
-export declare const EXIT: {
-    readonly ok: 0;
-    readonly usage: 2;
-    readonly notFound: 3;
-    readonly auth: 4;
-    readonly api: 5;
-    readonly rateLimited: 7;
-    readonly config: 10;
-};
-/**
- * There is no account here, so "auth" is macOS refusing access: Full Disk
- * Access for the library, or Automation for Photos itself. The engine reports
- * its failures as text, so its words decide once the class has said what it
- * can.
- */
-export declare function exitCodeFor(error: unknown): number;
-export declare function isCliCommand(argv: string[]): boolean;
-export declare function runCli(argv: string[]): Promise<number>;
-export {};