@0xmaxma/claude-gateway 1.8.4 → 1.8.6

package/mcp/tools/share-file/module.ts

@@ -0,0 +1,169 @@
+import type { ToolModule, McpToolDefinition, McpToolResult, ToolVisibility } from '../../types';
+import {
+  ShareClientError,
+  createShares,
+  revokeShare,
+  shareBridgeEnabled,
+  type ShareRef,
+} from '../shared/share-client';
+
+/**
+ * Standalone share_file MCP tool (#70, plan §15) — explicit create/revoke of
+ * short-lived public URLs for a file in the agent's media directory. There is
+ * deliberately NO list action (shares are unenumerable, §10). generate_image
+ * auto-normalizes refs through the same gateway API, so normal image editing
+ * never needs this tool; it exists for explicit workflows (e.g. handing a
+ * temporary URL to an external service).
+ *
+ * #444: was `share_image` back when the bridge could only carry images. The
+ * old name stays registered as a thin alias — it is baked into agent
+ * workspaces (AGENTS.md, skills, memories) that we do not get to rewrite.
+ */
+export class ShareFileModule implements ToolModule {
+  id = 'share-file';
+  toolVisibility: ToolVisibility = 'all-configured';
+
+  isEnabled(): boolean {
+    return shareBridgeEnabled();
+  }
+
+  getTools(): McpToolDefinition[] {
+    return shareFileToolDefs;
+  }
+
+  async handleTool(name: string, args: Record<string, unknown>): Promise<McpToolResult> {
+    if (name !== 'share_file' && name !== LEGACY_TOOL_NAME) {
+      return { content: [{ type: 'text', text: `Unknown tool: ${name}` }], isError: true };
+    }
+    const legacy = name === LEGACY_TOOL_NAME;
+    const action = typeof args.action === 'string' ? args.action : 'create';
+    switch (action) {
+      case 'create':
+        return this.handleCreate(args, legacy);
+      case 'revoke':
+        return this.handleRevoke(args);
+      default:
+        return {
+          content: [{ type: 'text', text: `share_file: unknown action "${action}" (expected create | revoke)` }],
+          isError: true,
+        };
+    }
+  }
+
+  private async handleCreate(args: Record<string, unknown>, legacy: boolean): Promise<McpToolResult> {
+    const single = typeof args.path === 'string' && args.path.trim() ? [args.path.trim()] : [];
+    const many = Array.isArray(args.paths)
+      ? (args.paths.filter((p) => typeof p === 'string' && p.trim()) as string[])
+      : [];
+    if (single.length && many.length) {
+      return { content: [{ type: 'text', text: 'share_file: pass either "path" or "paths", not both.' }], isError: true };
+    }
+    const paths = single.length ? single : many;
+    if (!paths.length) {
+      return { content: [{ type: 'text', text: 'share_file: action="create" requires "path" or "paths".' }], isError: true };
+    }
+    const refs: ShareRef[] = paths.map((p) =>
+      p.startsWith('artifact:') ? { artifact_id: p.slice('artifact:'.length) } : { path: p },
+    );
+    const opts: { purpose?: string; ttlSeconds?: number; allowDocuments: boolean } = {
+      // share_file is the agent's explicit "publish this file" verb, so it opts
+      // into the full share allowlist (images + PDF). The legacy share_image
+      // name does NOT: an instruction written against it meant "share an
+      // image", and widening it would retroactively change what an existing
+      // call site's live token can serve — a share minted on chart.png would
+      // start serving a PDF if the file were later overwritten, where before it
+      // failed closed with a 404. The narrow image consumers (line_image,
+      // generate_image ref normalization) stay strict for the same reason.
+      allowDocuments: !legacy,
+    };
+    if (typeof args.purpose === 'string' && args.purpose.trim()) opts.purpose = args.purpose.trim();
+    if (typeof args.ttl_seconds === 'number' && args.ttl_seconds > 0) opts.ttlSeconds = args.ttl_seconds;
+    try {
+      const items = await createShares(refs, opts);
+      return { content: [{ type: 'text', text: JSON.stringify({ items }, null, 2) }] };
+    } catch (err) {
+      return this.mapError(err, legacy);
+    }
+  }
+
+  private async handleRevoke(args: Record<string, unknown>): Promise<McpToolResult> {
+    const shareId = typeof args.share_id === 'string' ? args.share_id.trim() : '';
+    if (!shareId) {
+      return { content: [{ type: 'text', text: 'share_file: action="revoke" requires "share_id".' }], isError: true };
+    }
+    try {
+      await revokeShare(shareId);
+      return { content: [{ type: 'text', text: JSON.stringify({ revoked: true, share_id: shareId }) }] };
+    } catch (err) {
+      return this.mapError(err);
+    }
+  }
+
+  private mapError(err: unknown, legacy = false): McpToolResult {
+    if (err instanceof ShareClientError) {
+      // Without this the agent hits a dead end: it asked the image-only name to
+      // share a PDF and gets a bare 415 with no hint that a wider tool exists.
+      const hint =
+        legacy && err.code === 'unsupported_file_type'
+          ? ' — share_image is image-only; call share_file for documents.'
+          : '';
+      return { content: [{ type: 'text', text: `share_file: ${err.code}: ${err.message}${hint}` }], isError: true };
+    }
+    return {
+      content: [{ type: 'text', text: `share_file: gateway unavailable: ${(err as Error).message}` }],
+      isError: true,
+    };
+  }
+}
+
+const LEGACY_TOOL_NAME = 'share_image';
+
+const shareFileInputSchema = {
+  type: 'object',
+  properties: {
+    action: { type: 'string', enum: ['create', 'revoke'], description: 'create (default) | revoke' },
+    path: { type: 'string', description: 'One media path (e.g. "media/session-1/report.pdf") or "artifact:<id>" to share.' },
+    paths: { type: 'array', items: { type: 'string' }, description: 'Multiple media paths / artifact refs (max 5).' },
+    ttl_seconds: { type: 'number', description: 'Optional lifetime in seconds (default 1800).' },
+    purpose: { type: 'string', description: 'Optional purpose tag (default "codex_ref").' },
+    share_id: { type: 'string', description: 'Share id to revoke (required for action="revoke").' },
+  },
+  required: [],
+};
+
+// The alias is image-only, so it must not advertise the PDF example: an agent
+// reading its schema would be told a document is acceptable and get a 415.
+// Same shape, image wording — a separate object costs nothing, since both defs
+// are serialized in full either way.
+const shareImageInputSchema = {
+  ...shareFileInputSchema,
+  properties: {
+    ...shareFileInputSchema.properties,
+    path: { type: 'string', description: 'One media path (e.g. "media/session-1/chart.png") or "artifact:<id>" to share.' },
+    paths: { type: 'array', items: { type: 'string' }, description: 'Multiple media image paths / artifact refs (max 5).' },
+  },
+};
+
+const shareFileToolDefs: McpToolDefinition[] = [
+  {
+    name: 'share_file',
+    description:
+      'Create or revoke a SHORT-LIVED public URL for a file in this agent\'s media directory (PNG, JPEG, WebP or PDF). ' +
+      'action="create" takes "path" (one media path or artifact:<id>) or "paths" (up to 5) and returns ' +
+      '{ share_id, url, expires_at } per file — the URL needs no auth and expires automatically (default 30 min). ' +
+      'action="revoke" takes "share_id" and invalidates the URL immediately. ' +
+      'You normally do NOT need this for image editing: generate_image converts local/artifact references ' +
+      'to share URLs automatically. There is no list action.',
+    inputSchema: shareFileInputSchema,
+  },
+  {
+    // Deprecated #444 alias, kept so agent instructions written against the old
+    // name keep working — and kept IMAGE-ONLY, which is what those instructions
+    // meant and what the name still promises. Description is deliberately one
+    // line: it must not cost a second copy of the real tool's context budget.
+    name: LEGACY_TOOL_NAME,
+    description:
+      'Deprecated image-only alias for share_file — use share_file instead, which also shares PDFs.',
+    inputSchema: shareImageInputSchema,
+  },
+];

package/mcp/tools/shared/share-client.ts

@@ -1,6 +1,7 @@
 /**
- * Image share bridge client (#70) — the ONLY way MCP subprocesses touch the
- * share/artifact store. They call the authenticated local Gateway HTTP API
+ * File share bridge client (#70, widened past images in #444) — the ONLY way
+ * MCP subprocesses touch the share/artifact store. They call the authenticated
+ * local Gateway HTTP API
  * (GATEWAY_API_URL + GATEWAY_API_KEY, both already injected into the session
  * subprocess env) and NEVER open the SQLite DB themselves (plan §9/§10).
  *
@@ -53,7 +54,7 @@ export type CatalogItem = {
   desc?: string;
 };
 
-/** Error carrying the gateway's stable machine-readable code (e.g. image_ref_not_found). */
+/** Error carrying the gateway's stable machine-readable code (e.g. share_ref_not_found). */
 export class ShareClientError extends Error {
   readonly code: string;
   readonly status: number;
@@ -109,7 +110,7 @@ async function callGateway(
 /** Mint short-lived share URLs for local/artifact refs — order preserved. */
 export async function createShares(
   refs: ShareRef[],
-  opts: { purpose?: string; ttlSeconds?: number } = {},
+  opts: { purpose?: string; ttlSeconds?: number; allowDocuments?: boolean } = {},
 ): Promise<ShareItem[]> {
   const body: Record<string, unknown> = {
     agent_id: process.env.GATEWAY_AGENT_ID,
@@ -118,6 +119,9 @@ export async function createShares(
     refs,
   };
   if (opts.ttlSeconds !== undefined) body.ttl_seconds = opts.ttlSeconds;
+  // Opt-in only: image callers (line_image, generate_image refs) must keep
+  // getting a hard rejection for a non-image ref.
+  if (opts.allowDocuments) body.allow_documents = true;
   const { status, json } = await callGateway('POST', '/api/v1/shares', body);
   if (status !== 201) {
     const code = typeof json.code === 'string' ? json.code : 'share_failed';

package/mcp/tools/telegram/receiver-server.ts

@@ -884,12 +884,22 @@ const BOT_COMMANDS = [
 // reached only when the gateway call itself fails, so it is two fallbacks deep
 // and will drift — keep it roughly in step with DEFAULT_MODELS
 // (src/agent/runner.ts) and config.template.json gateway.models.
+//
+// `alias` is never read in this process: validModelRows() keeps only id and
+// label, and the picker's callback data is `model:<id>`. It is carried anyway
+// so this list stays diffable against the two registries it mirrors, and so
+// the cross-registry sync test can compare alias mappings — that test is the
+// only thing standing between this copy and the silent drift that already lost
+// it Opus 5 once. Do not drop the column to "clean up"; it would blind the
+// guard, not simplify it.
 const AVAILABLE_MODELS = [
-  { id: 'claude-fable-5[1m]',        label: 'Fable 5 (1M)',     alias: 'fable[1m]' },
+  { id: 'claude-fable-5-1[1m]',      label: 'Fable 5.1 (1M)',   alias: 'fable[1m]' },
+  { id: 'claude-fable-5[1m]',        label: 'Fable 5 (1M)',     alias: 'fable5[1m]' },
   { id: 'claude-opus-5[1m]',         label: 'Opus 5 (1M)',      alias: 'opus[1m]' },
   { id: 'claude-opus-4-8[1m]',       label: 'Opus 4.8 (1M)',    alias: 'opus48[1m]' },
   { id: 'claude-sonnet-5[1m]',       label: 'Sonnet 5 (1M)',    alias: 'sonnet[1m]' },
-  { id: 'claude-fable-5',            label: 'Fable 5',          alias: 'fable' },
+  { id: 'claude-fable-5-1',          label: 'Fable 5.1',        alias: 'fable' },
+  { id: 'claude-fable-5',            label: 'Fable 5',          alias: 'fable5' },
   { id: 'claude-opus-5',             label: 'Opus 5',           alias: 'opus' },
   { id: 'claude-opus-4-8',           label: 'Opus 4.8',         alias: 'opus48' },
   { id: 'claude-opus-4-6',           label: 'Opus 4.6',         alias: 'opus46' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xmaxma/claude-gateway",
-  "version": "1.8.4",
+  "version": "1.8.6",
   "description": "Multi-agent gateway for Claude",
   "repository": {
     "type": "git",

package/mcp/tools/share-image/module.ts

@@ -1,120 +0,0 @@
-import type { ToolModule, McpToolDefinition, McpToolResult, ToolVisibility } from '../../types';
-import {
-  ShareClientError,
-  createShares,
-  revokeShare,
-  shareBridgeEnabled,
-  type ShareRef,
-} from '../shared/share-client';
-
-/**
- * Standalone share_image MCP tool (#70, plan §15) — explicit create/revoke of
- * short-lived public image URLs. There is deliberately NO list action (shares
- * are unenumerable, §10). generate_image auto-normalizes refs through the same
- * gateway API, so normal image editing never needs this tool; it exists for
- * explicit workflows (e.g. handing a temporary URL to an external service).
- */
-export class ShareImageModule implements ToolModule {
-  id = 'share-image';
-  toolVisibility: ToolVisibility = 'all-configured';
-
-  isEnabled(): boolean {
-    return shareBridgeEnabled();
-  }
-
-  getTools(): McpToolDefinition[] {
-    return shareImageToolDefs;
-  }
-
-  async handleTool(name: string, args: Record<string, unknown>): Promise<McpToolResult> {
-    if (name !== 'share_image') {
-      return { content: [{ type: 'text', text: `Unknown tool: ${name}` }], isError: true };
-    }
-    const action = typeof args.action === 'string' ? args.action : 'create';
-    switch (action) {
-      case 'create':
-        return this.handleCreate(args);
-      case 'revoke':
-        return this.handleRevoke(args);
-      default:
-        return {
-          content: [{ type: 'text', text: `share_image: unknown action "${action}" (expected create | revoke)` }],
-          isError: true,
-        };
-    }
-  }
-
-  private async handleCreate(args: Record<string, unknown>): Promise<McpToolResult> {
-    const single = typeof args.path === 'string' && args.path.trim() ? [args.path.trim()] : [];
-    const many = Array.isArray(args.paths)
-      ? (args.paths.filter((p) => typeof p === 'string' && p.trim()) as string[])
-      : [];
-    if (single.length && many.length) {
-      return { content: [{ type: 'text', text: 'share_image: pass either "path" or "paths", not both.' }], isError: true };
-    }
-    const paths = single.length ? single : many;
-    if (!paths.length) {
-      return { content: [{ type: 'text', text: 'share_image: action="create" requires "path" or "paths".' }], isError: true };
-    }
-    const refs: ShareRef[] = paths.map((p) =>
-      p.startsWith('artifact:') ? { artifact_id: p.slice('artifact:'.length) } : { path: p },
-    );
-    const opts: { purpose?: string; ttlSeconds?: number } = {};
-    if (typeof args.purpose === 'string' && args.purpose.trim()) opts.purpose = args.purpose.trim();
-    if (typeof args.ttl_seconds === 'number' && args.ttl_seconds > 0) opts.ttlSeconds = args.ttl_seconds;
-    try {
-      const items = await createShares(refs, opts);
-      return { content: [{ type: 'text', text: JSON.stringify({ items }, null, 2) }] };
-    } catch (err) {
-      return this.mapError(err);
-    }
-  }
-
-  private async handleRevoke(args: Record<string, unknown>): Promise<McpToolResult> {
-    const shareId = typeof args.share_id === 'string' ? args.share_id.trim() : '';
-    if (!shareId) {
-      return { content: [{ type: 'text', text: 'share_image: action="revoke" requires "share_id".' }], isError: true };
-    }
-    try {
-      await revokeShare(shareId);
-      return { content: [{ type: 'text', text: JSON.stringify({ revoked: true, share_id: shareId }) }] };
-    } catch (err) {
-      return this.mapError(err);
-    }
-  }
-
-  private mapError(err: unknown): McpToolResult {
-    if (err instanceof ShareClientError) {
-      return { content: [{ type: 'text', text: `share_image: ${err.code}: ${err.message}` }], isError: true };
-    }
-    return {
-      content: [{ type: 'text', text: `share_image: gateway unavailable: ${(err as Error).message}` }],
-      isError: true,
-    };
-  }
-}
-
-const shareImageToolDefs: McpToolDefinition[] = [
-  {
-    name: 'share_image',
-    description:
-      'Create or revoke a SHORT-LIVED public URL for an image in this agent\'s media directory. ' +
-      'action="create" takes "path" (one media path or artifact:<id>) or "paths" (up to 5) and returns ' +
-      '{ share_id, url, expires_at } per image — the URL needs no auth and expires automatically (default 30 min). ' +
-      'action="revoke" takes "share_id" and invalidates the URL immediately. ' +
-      'You normally do NOT need this for image editing: generate_image converts local/artifact references ' +
-      'to share URLs automatically. There is no list action.',
-    inputSchema: {
-      type: 'object',
-      properties: {
-        action: { type: 'string', enum: ['create', 'revoke'], description: 'create (default) | revoke' },
-        path: { type: 'string', description: 'One media path (e.g. "media/session-1/image.png") or "artifact:<id>" to share.' },
-        paths: { type: 'array', items: { type: 'string' }, description: 'Multiple media paths / artifact refs (max 5).' },
-        ttl_seconds: { type: 'number', description: 'Optional lifetime in seconds (default 1800).' },
-        purpose: { type: 'string', description: 'Optional purpose tag (default "codex_ref").' },
-        share_id: { type: 'string', description: 'Share id to revoke (required for action="revoke").' },
-      },
-      required: [],
-    },
-  },
-];