postfast-mcp 0.13.1 → 0.14.0
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/.claude-plugin/marketplace.json +1 -1
- package/.claude-plugin/plugin.json +2 -2
- package/dist/core/app.d.ts +0 -8
- package/dist/core/app.js +1 -25
- package/dist/core/app.js.map +1 -1
- package/dist/core/backend-port.d.ts +5 -0
- package/dist/core/build-tools.d.ts +26 -11
- package/dist/core/build-tools.js +73 -16
- package/dist/core/build-tools.js.map +1 -1
- package/dist/core/confirm-token.d.ts +12 -6
- package/dist/core/confirm-token.js +24 -9
- package/dist/core/confirm-token.js.map +1 -1
- package/dist/core/index.d.ts +1 -0
- package/dist/core/index.js +1 -0
- package/dist/core/index.js.map +1 -1
- package/dist/core/instructions.js +3 -3
- package/dist/core/instructions.js.map +1 -1
- package/dist/core/scope-challenge.d.ts +46 -0
- package/dist/core/scope-challenge.js +73 -0
- package/dist/core/scope-challenge.js.map +1 -0
- package/dist/core/shared.d.ts +2 -0
- package/dist/core/shared.js +2 -0
- package/dist/core/shared.js.map +1 -1
- package/dist/core/tool-def.d.ts +11 -1
- package/dist/core/tools/accounts.js +7 -0
- package/dist/core/tools/accounts.js.map +1 -1
- package/dist/core/tools/app.js +5 -0
- package/dist/core/tools/app.js.map +1 -1
- package/dist/core/tools/inbox-confirm.d.ts +6 -7
- package/dist/core/tools/inbox-confirm.js +171 -83
- package/dist/core/tools/inbox-confirm.js.map +1 -1
- package/dist/core/tools/inbox.js +16 -6
- package/dist/core/tools/inbox.js.map +1 -1
- package/dist/core/tools/posts.js +6 -0
- package/dist/core/tools/posts.js.map +1 -1
- package/dist/core/tools/tiktok.js +1 -0
- package/dist/core/tools/tiktok.js.map +1 -1
- package/dist/core/tools/uploads.js +2 -0
- package/dist/core/tools/uploads.js.map +1 -1
- package/dist/core/tools/workspaces.js +2 -0
- package/dist/core/tools/workspaces.js.map +1 -1
- package/dist/stdio/index.js +1 -1
- package/package.json +1 -1
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
{
|
|
12
12
|
"name": "postfast",
|
|
13
13
|
"description": "Schedule, manage, and analyze social media posts via PostFast. Supports Facebook, Instagram, X, TikTok, LinkedIn, YouTube, BlueSky, Threads, Pinterest, Telegram, and Google Business Profile.",
|
|
14
|
-
"version": "0.
|
|
14
|
+
"version": "0.14.0",
|
|
15
15
|
"author": {
|
|
16
16
|
"name": "PostFast",
|
|
17
17
|
"email": "me@peturgeorgievv.com"
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "postfast",
|
|
3
3
|
"description": "Schedule, manage, and analyze social media posts via PostFast. Supports Facebook, Instagram, X, TikTok, LinkedIn, YouTube, BlueSky, Threads, Pinterest, Telegram, and Google Business Profile. Needs POSTFAST_API_KEY set before Claude Code starts; in PostFast, open API in the sidebar and click Generate API Key.",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.14.0",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "PostFast",
|
|
7
7
|
"email": "me@peturgeorgievv.com"
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"mcpServers": {
|
|
14
14
|
"postfast": {
|
|
15
15
|
"command": "npx",
|
|
16
|
-
"args": ["-y", "postfast-mcp@0.
|
|
16
|
+
"args": ["-y", "postfast-mcp@0.14.0"],
|
|
17
17
|
"env": {
|
|
18
18
|
"POSTFAST_API_KEY": "${POSTFAST_API_KEY}"
|
|
19
19
|
}
|
package/dist/core/app.d.ts
CHANGED
|
@@ -32,11 +32,3 @@ export declare const APP_ICON: ToolIcon;
|
|
|
32
32
|
export declare function appViewHtml(): string;
|
|
33
33
|
/** Registers the view as the app's UI resource. */
|
|
34
34
|
export declare function registerAppResource(server: McpServer, app: AppOptions): void;
|
|
35
|
-
/**
|
|
36
|
-
* Lists icons on the named tools in tools/list. McpServer has no field for
|
|
37
|
-
* tool icons, so this wraps its tools/list handler and adds `icons` to those
|
|
38
|
-
* tools only; every other field stays the SDK's own output. If the SDK keeps
|
|
39
|
-
* its handlers elsewhere, the icons are skipped with a log and the host falls
|
|
40
|
-
* back to the app's own logo.
|
|
41
|
-
*/
|
|
42
|
-
export declare function listToolIcons(server: McpServer, icons: Map<string, ToolIcon[]>): void;
|
package/dist/core/app.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { readFileSync } from 'node:fs';
|
|
2
|
+
import { LOOPBACK_HOSTS } from './shared.js';
|
|
2
3
|
/** Versioned: a change an open view can't handle ships under a new URI. */
|
|
3
4
|
export const APP_RESOURCE_URI = 'ui://postfast/app-v1';
|
|
4
5
|
export const APP_RESOURCE_MIME_TYPE = 'text/html;profile=mcp-app';
|
|
5
|
-
const LOOPBACK_HOSTS = new Set(['localhost', '127.0.0.1', '[::1]']);
|
|
6
6
|
/** Throws unless every option is a bare origin: https, or http on a loopback host. */
|
|
7
7
|
export function assertAppOptions(app) {
|
|
8
8
|
for (const key of ['mediaOrigin', 'domain', 'webAppUrl']) {
|
|
@@ -80,28 +80,4 @@ export function registerAppResource(server, app) {
|
|
|
80
80
|
contents: [{ uri: APP_RESOURCE_URI, mimeType: APP_RESOURCE_MIME_TYPE, text, _meta }],
|
|
81
81
|
}));
|
|
82
82
|
}
|
|
83
|
-
/**
|
|
84
|
-
* Lists icons on the named tools in tools/list. McpServer has no field for
|
|
85
|
-
* tool icons, so this wraps its tools/list handler and adds `icons` to those
|
|
86
|
-
* tools only; every other field stays the SDK's own output. If the SDK keeps
|
|
87
|
-
* its handlers elsewhere, the icons are skipped with a log and the host falls
|
|
88
|
-
* back to the app's own logo.
|
|
89
|
-
*/
|
|
90
|
-
export function listToolIcons(server, icons) {
|
|
91
|
-
const handlers = server.server._requestHandlers;
|
|
92
|
-
const list = handlers instanceof Map ? handlers.get('tools/list') : undefined;
|
|
93
|
-
if (!list) {
|
|
94
|
-
console.error('[postfast-mcp/core] tool icons not listed: no tools/list handler to wrap');
|
|
95
|
-
return;
|
|
96
|
-
}
|
|
97
|
-
handlers.set('tools/list', async (request, extra) => {
|
|
98
|
-
const result = (await list(request, extra));
|
|
99
|
-
for (const tool of result.tools ?? []) {
|
|
100
|
-
const toolIcons = icons.get(tool.name);
|
|
101
|
-
if (toolIcons)
|
|
102
|
-
tool.icons = toolIcons;
|
|
103
|
-
}
|
|
104
|
-
return result;
|
|
105
|
-
});
|
|
106
|
-
}
|
|
107
83
|
//# sourceMappingURL=app.js.map
|
package/dist/core/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/core/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/core/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,6 +66,11 @@ export interface ListInboxItemsArgs {
|
|
|
66
66
|
export interface InboxReplyArgs {
|
|
67
67
|
itemId: string;
|
|
68
68
|
text: string;
|
|
69
|
+
/**
|
|
70
|
+
* Sends with the same key go out once: the backend returns the first send's
|
|
71
|
+
* result for a repeat. Set by the remote reply tools from their confirm token.
|
|
72
|
+
*/
|
|
73
|
+
idempotencyKey?: string;
|
|
69
74
|
}
|
|
70
75
|
export interface SetInboxItemStateArgs {
|
|
71
76
|
itemId: string;
|
|
@@ -2,6 +2,7 @@ import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
|
|
|
2
2
|
import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
|
|
3
3
|
import { type AppOptions } from './app.js';
|
|
4
4
|
import type { BackendPort } from './backend-port.js';
|
|
5
|
+
import { type ScopeChallengeOptions } from './scope-challenge.js';
|
|
5
6
|
import type { Binding, ResolvedTool } from './tool-def.js';
|
|
6
7
|
export interface ConfirmGateOptions {
|
|
7
8
|
/** HMAC key for confirm tokens; at least 32 characters. */
|
|
@@ -22,11 +23,12 @@ export interface BuildToolsOptions {
|
|
|
22
23
|
*/
|
|
23
24
|
port?: BackendPort;
|
|
24
25
|
/**
|
|
25
|
-
* Remote only. The key that signs
|
|
26
|
-
*
|
|
27
|
-
*
|
|
28
|
-
*
|
|
29
|
-
*
|
|
26
|
+
* Remote only. The key that signs and checks the confirm tokens of the
|
|
27
|
+
* comment tools: preview_comment_reply → reply_to_comment,
|
|
28
|
+
* preview_private_reply → send_private_reply and preview_comment_deletion →
|
|
29
|
+
* delete_comment. The remote catalogue holds every post and reply for the
|
|
30
|
+
* user's yes either way; without a key those six tools are left out (logged
|
|
31
|
+
* once), so comment replies and deletions are unavailable.
|
|
30
32
|
*/
|
|
31
33
|
confirmGate?: ConfirmGateOptions;
|
|
32
34
|
/**
|
|
@@ -53,15 +55,28 @@ export declare function buildTools(options: BuildToolsOptions): ResolvedTool[];
|
|
|
53
55
|
export declare function toolResult(data: unknown): CallToolResult;
|
|
54
56
|
/** A business/tool error the model should see and react to (not a protocol error). */
|
|
55
57
|
export declare function toolError(message: string): CallToolResult;
|
|
56
|
-
/**
|
|
57
|
-
|
|
58
|
+
/**
|
|
59
|
+
* Run a handler, converting thrown errors into `isError` tool results.
|
|
60
|
+
* `onError` may answer an error with a result of its own; when it returns
|
|
61
|
+
* nothing, the error's message is the result.
|
|
62
|
+
*/
|
|
63
|
+
export declare function runTool(fn: () => Promise<unknown>, toResult?: (data: unknown) => CallToolResult, onError?: (err: unknown) => CallToolResult | undefined): Promise<CallToolResult>;
|
|
58
64
|
export interface RegisterToolsOptions extends BuildToolsOptions {
|
|
59
65
|
port: BackendPort;
|
|
66
|
+
/**
|
|
67
|
+
* Remote only. When a tool's port call throws InsufficientScopeError (the
|
|
68
|
+
* backend refused the token's scopes), the result becomes an OAuth
|
|
69
|
+
* insufficient_scope challenge naming this metadata URL and the tool's
|
|
70
|
+
* scopes, so a client can ask the user for them and retry. Without it the
|
|
71
|
+
* error stays an ordinary tool error.
|
|
72
|
+
*/
|
|
73
|
+
scopeChallenge?: ScopeChallengeOptions;
|
|
60
74
|
}
|
|
61
75
|
/**
|
|
62
|
-
* Register the resolved catalog for a binding on an MCP server.
|
|
63
|
-
*
|
|
64
|
-
*
|
|
65
|
-
* methods registers
|
|
76
|
+
* Register the resolved catalog for a binding on an MCP server. On the remote
|
|
77
|
+
* binding every tool lists its `securitySchemes`. With `app`, also registers
|
|
78
|
+
* the view as a UI resource and lists the app tools' icons, but only when a
|
|
79
|
+
* registered tool opens the view (a port without the app methods registers
|
|
80
|
+
* neither).
|
|
66
81
|
*/
|
|
67
82
|
export declare function registerCatalogTools(server: McpServer, options: RegisterToolsOptions): void;
|
package/dist/core/build-tools.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { APP_RESOURCE_URI, assertAppOptions,
|
|
1
|
+
import { APP_RESOURCE_URI, assertAppOptions, registerAppResource, } from './app.js';
|
|
2
|
+
import { assertScopeChallengeOptions, insufficientScopeResult, isInsufficientScopeError, } from './scope-challenge.js';
|
|
2
3
|
import { workspaceIdField } from './shared.js';
|
|
3
4
|
import { ALL_TOOLS } from './tools/index.js';
|
|
4
5
|
let warnedNoConfirmSecret = false;
|
|
@@ -12,7 +13,7 @@ export function buildTools(options) {
|
|
|
12
13
|
const secret = remote ? confirmGate?.secret : undefined;
|
|
13
14
|
if (remote && !secret && !warnedNoConfirmSecret) {
|
|
14
15
|
warnedNoConfirmSecret = true;
|
|
15
|
-
console.error('[postfast-mcp/core] no confirmGate secret:
|
|
16
|
+
console.error('[postfast-mcp/core] no confirmGate secret: the comment reply, private reply and deletion tools are left out, so comment replies and deletions are unavailable');
|
|
16
17
|
}
|
|
17
18
|
const appOn = remote && !!app;
|
|
18
19
|
if (appOn)
|
|
@@ -40,6 +41,8 @@ export function buildTools(options) {
|
|
|
40
41
|
const inputSchema = typeof def.inputSchema === 'function' ? def.inputSchema(binding) : def.inputSchema;
|
|
41
42
|
const annotations = remote && def.remoteAnnotations ? def.remoteAnnotations : def.annotations;
|
|
42
43
|
const ctx = contextFor(def);
|
|
44
|
+
// Remote only: the hosted connector is the one clients sign in to with OAuth.
|
|
45
|
+
const securitySchemes = remote && def.scopes ? [{ type: 'oauth2', scopes: [...def.scopes] }] : undefined;
|
|
43
46
|
return {
|
|
44
47
|
name: def.name,
|
|
45
48
|
title: def.title,
|
|
@@ -48,8 +51,9 @@ export function buildTools(options) {
|
|
|
48
51
|
? { ...inputSchema, workspaceId: workspaceIdField }
|
|
49
52
|
: inputSchema,
|
|
50
53
|
annotations: { title: def.title, ...annotations },
|
|
51
|
-
_meta: def._meta,
|
|
54
|
+
_meta: securitySchemes ? { ...def._meta, securitySchemes } : def._meta,
|
|
52
55
|
...(def.icons ? { icons: def.icons } : {}),
|
|
56
|
+
...(securitySchemes ? { securitySchemes } : {}),
|
|
53
57
|
portMethod: def.portMethod,
|
|
54
58
|
// Hand the confirm secret and app options to run(), also for hosts that call tool.run() themselves.
|
|
55
59
|
run: Object.keys(ctx).length
|
|
@@ -88,23 +92,66 @@ export function toolError(message) {
|
|
|
88
92
|
isError: true,
|
|
89
93
|
};
|
|
90
94
|
}
|
|
91
|
-
/**
|
|
92
|
-
|
|
95
|
+
/**
|
|
96
|
+
* Run a handler, converting thrown errors into `isError` tool results.
|
|
97
|
+
* `onError` may answer an error with a result of its own; when it returns
|
|
98
|
+
* nothing, the error's message is the result.
|
|
99
|
+
*/
|
|
100
|
+
export async function runTool(fn, toResult = toolResult, onError) {
|
|
93
101
|
try {
|
|
94
102
|
return toResult(await fn());
|
|
95
103
|
}
|
|
96
104
|
catch (err) {
|
|
97
|
-
return toolError(err.message || 'Tool execution failed.');
|
|
105
|
+
return onError?.(err) ?? toolError(err.message || 'Tool execution failed.');
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
/**
|
|
109
|
+
* The challenge for a tool whose call the backend refused for scope, or
|
|
110
|
+
* undefined when one cannot help: the tool needs no scope, or the token
|
|
111
|
+
* already has every scope the tool declares (asking again would loop).
|
|
112
|
+
*/
|
|
113
|
+
function scopeChallengeFor(tool, options, authInfo) {
|
|
114
|
+
const scopes = tool.securitySchemes?.flatMap((scheme) => scheme.scopes) ?? [];
|
|
115
|
+
const granted = Array.isArray(authInfo?.scopes) ? authInfo.scopes : undefined;
|
|
116
|
+
if (!scopes.length || (granted && scopes.every((scope) => granted.includes(scope)))) {
|
|
117
|
+
return undefined;
|
|
98
118
|
}
|
|
119
|
+
return insufficientScopeResult({ ...options, scopes, grantedScopes: granted });
|
|
99
120
|
}
|
|
100
121
|
/**
|
|
101
|
-
*
|
|
102
|
-
*
|
|
103
|
-
*
|
|
104
|
-
*
|
|
122
|
+
* Adds fields McpServer has no option for (`securitySchemes`, `icons`) to the
|
|
123
|
+
* named tools in tools/list, by wrapping its tools/list handler; every other
|
|
124
|
+
* field stays the SDK's own output. If the SDK keeps its handlers elsewhere,
|
|
125
|
+
* nothing is added and a log line says so: `securitySchemes` still reach
|
|
126
|
+
* clients in each tool's `_meta`, and the host falls back to the app's logo.
|
|
127
|
+
*/
|
|
128
|
+
function listToolFields(server, fields) {
|
|
129
|
+
const handlers = server.server._requestHandlers;
|
|
130
|
+
const list = handlers instanceof Map ? handlers.get('tools/list') : undefined;
|
|
131
|
+
if (!list) {
|
|
132
|
+
console.error('[postfast-mcp/core] securitySchemes and icons not listed at the top level: no tools/list handler to wrap');
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
handlers.set('tools/list', async (request, extra) => {
|
|
136
|
+
const result = (await list(request, extra));
|
|
137
|
+
for (const tool of result.tools ?? []) {
|
|
138
|
+
Object.assign(tool, fields.get(tool.name));
|
|
139
|
+
}
|
|
140
|
+
return result;
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
/**
|
|
144
|
+
* Register the resolved catalog for a binding on an MCP server. On the remote
|
|
145
|
+
* binding every tool lists its `securitySchemes`. With `app`, also registers
|
|
146
|
+
* the view as a UI resource and lists the app tools' icons, but only when a
|
|
147
|
+
* registered tool opens the view (a port without the app methods registers
|
|
148
|
+
* neither).
|
|
105
149
|
*/
|
|
106
150
|
export function registerCatalogTools(server, options) {
|
|
107
151
|
const { port } = options;
|
|
152
|
+
const scopeChallenge = options.binding === 'remote' ? options.scopeChallenge : undefined;
|
|
153
|
+
if (scopeChallenge)
|
|
154
|
+
assertScopeChallengeOptions(scopeChallenge);
|
|
108
155
|
const tools = buildTools(options);
|
|
109
156
|
for (const tool of tools) {
|
|
110
157
|
server.registerTool(tool.name, {
|
|
@@ -113,19 +160,29 @@ export function registerCatalogTools(server, options) {
|
|
|
113
160
|
inputSchema: tool.inputSchema,
|
|
114
161
|
annotations: tool.annotations,
|
|
115
162
|
...(tool._meta ? { _meta: tool._meta } : {}),
|
|
116
|
-
}, (args) => runTool(() => {
|
|
163
|
+
}, (args, extra) => runTool(() => {
|
|
117
164
|
const { workspaceId, ...rest } = args ?? {};
|
|
118
165
|
return tool.run(port, rest, workspaceId);
|
|
119
|
-
}, tool.toResult
|
|
166
|
+
}, tool.toResult, scopeChallenge
|
|
167
|
+
? (err) => isInsufficientScopeError(err)
|
|
168
|
+
? scopeChallengeFor(tool, scopeChallenge, extra?.authInfo)
|
|
169
|
+
: undefined
|
|
170
|
+
: undefined));
|
|
171
|
+
}
|
|
172
|
+
const listed = new Map();
|
|
173
|
+
for (const tool of tools) {
|
|
174
|
+
if (tool.securitySchemes)
|
|
175
|
+
listed.set(tool.name, { securitySchemes: tool.securitySchemes });
|
|
120
176
|
}
|
|
121
177
|
const opensView = (tool) => tool._meta?.ui?.resourceUri === APP_RESOURCE_URI;
|
|
122
178
|
if (options.app && tools.some(opensView)) {
|
|
123
179
|
registerAppResource(server, options.app);
|
|
124
|
-
const
|
|
125
|
-
for (const tool of tools)
|
|
180
|
+
for (const tool of tools) {
|
|
126
181
|
if (tool.icons)
|
|
127
|
-
|
|
128
|
-
|
|
182
|
+
listed.set(tool.name, { ...listed.get(tool.name), icons: tool.icons });
|
|
183
|
+
}
|
|
129
184
|
}
|
|
185
|
+
if (listed.size)
|
|
186
|
+
listToolFields(server, listed);
|
|
130
187
|
}
|
|
131
188
|
//# sourceMappingURL=build-tools.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-tools.js","sourceRoot":"","sources":["../../src/core/build-tools.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"build-tools.js","sourceRoot":"","sources":["../../src/core/build-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Tokens that tie
|
|
3
|
-
*
|
|
4
|
-
* `v1.<exp>.<jti>.<base64url mac>`, exp in epoch seconds. Stateless
|
|
5
|
-
* the used-jti list below, so a token verifies on any replica of a
|
|
2
|
+
* Tokens that tie a comment reply, private reply or deletion to exactly what
|
|
3
|
+
* its preview tool showed: an HMAC over the workspace, item, action and text.
|
|
4
|
+
* Format `v1.<exp>.<jti>.<base64url mac>`, exp in epoch seconds. Stateless
|
|
5
|
+
* apart from the used-jti list below, so a token verifies on any replica of a
|
|
6
|
+
* host. The action is signed too, so a token previewed for one operation never
|
|
7
|
+
* carries out another.
|
|
6
8
|
*/
|
|
7
9
|
export type ConfirmAction = 'REPLY' | 'PRIVATE_REPLY' | 'DELETE';
|
|
8
10
|
export interface ConfirmFields {
|
|
@@ -18,6 +20,10 @@ export declare function sign(fields: ConfirmFields, secret: string, now?: number
|
|
|
18
20
|
/**
|
|
19
21
|
* Verify a token against the caller's own values and reserve its jti in the
|
|
20
22
|
* same synchronous step, so two concurrent confirms cannot both pass. Returns
|
|
21
|
-
*
|
|
23
|
+
* the jti, which identifies this one approved action, and a release() for
|
|
24
|
+
* when the action itself then fails.
|
|
22
25
|
*/
|
|
23
|
-
export declare function redeem(confirmToken: string, fields: ConfirmFields, secret: string, now?: number):
|
|
26
|
+
export declare function redeem(confirmToken: string, fields: ConfirmFields, secret: string, now?: number): {
|
|
27
|
+
jti: string;
|
|
28
|
+
release: () => void;
|
|
29
|
+
};
|
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
import { createHmac, randomUUID, timingSafeEqual } from 'node:crypto';
|
|
2
2
|
const TTL_SECONDS = 900;
|
|
3
|
-
|
|
4
|
-
const
|
|
3
|
+
/** The tool that previews each action, named in the errors so the model knows how to start over. */
|
|
4
|
+
const PREVIEW_TOOLS = {
|
|
5
|
+
REPLY: 'preview_comment_reply',
|
|
6
|
+
PRIVATE_REPLY: 'preview_private_reply',
|
|
7
|
+
DELETE: 'preview_comment_deletion',
|
|
8
|
+
};
|
|
9
|
+
const missing = (action) => `confirmToken is required. Preview it first with ${PREVIEW_TOOLS[action]}.`;
|
|
10
|
+
const mismatch = (action) => `confirmToken does not match this request. Preview it again with ${PREVIEW_TOOLS[action]} and pass exactly what was previewed.`;
|
|
11
|
+
const expired = (action) => `confirmToken has expired. Preview it again with ${PREVIEW_TOOLS[action]}.`;
|
|
5
12
|
const USED = 'This confirmToken was already used.';
|
|
6
13
|
/**
|
|
7
14
|
* jti -> exp of every redeemed token that has not expired yet. Module-level,
|
|
8
15
|
* so it spans sessions and buildTools() calls, but it is per process: a token
|
|
9
|
-
* replayed on another replica of a host is not caught here.
|
|
16
|
+
* replayed on another replica of a host is not caught here. The reply tools
|
|
17
|
+
* send the jti as the backend's idempotency key, so such a replay sends once.
|
|
10
18
|
*/
|
|
11
19
|
const usedJtis = new Map();
|
|
12
20
|
function prune(nowSeconds) {
|
|
@@ -36,29 +44,36 @@ export function sign(fields, secret, now = Date.now()) {
|
|
|
36
44
|
/**
|
|
37
45
|
* Verify a token against the caller's own values and reserve its jti in the
|
|
38
46
|
* same synchronous step, so two concurrent confirms cannot both pass. Returns
|
|
39
|
-
*
|
|
47
|
+
* the jti, which identifies this one approved action, and a release() for
|
|
48
|
+
* when the action itself then fails.
|
|
40
49
|
*/
|
|
41
50
|
export function redeem(confirmToken, fields, secret, now = Date.now()) {
|
|
42
51
|
const nowSeconds = Math.floor(now / 1000);
|
|
43
52
|
prune(nowSeconds);
|
|
53
|
+
if (typeof confirmToken !== 'string' || !confirmToken) {
|
|
54
|
+
throw new Error(missing(fields.action));
|
|
55
|
+
}
|
|
44
56
|
const parts = confirmToken.split('.');
|
|
45
57
|
const [version, expText, jti, given] = parts;
|
|
46
58
|
if (parts.length !== 4 || version !== 'v1' || !/^\d+$/.test(expText)) {
|
|
47
|
-
throw new Error(
|
|
59
|
+
throw new Error(mismatch(fields.action));
|
|
48
60
|
}
|
|
49
61
|
const exp = Number(expText);
|
|
50
62
|
if (nowSeconds > exp)
|
|
51
|
-
throw new Error(
|
|
63
|
+
throw new Error(expired(fields.action));
|
|
52
64
|
const expected = Buffer.from(mac(secret, exp, jti, fields));
|
|
53
65
|
const actual = Buffer.from(given);
|
|
54
66
|
if (expected.length !== actual.length || !timingSafeEqual(expected, actual)) {
|
|
55
|
-
throw new Error(
|
|
67
|
+
throw new Error(mismatch(fields.action));
|
|
56
68
|
}
|
|
57
69
|
if (usedJtis.has(jti))
|
|
58
70
|
throw new Error(USED);
|
|
59
71
|
usedJtis.set(jti, exp);
|
|
60
|
-
return
|
|
61
|
-
|
|
72
|
+
return {
|
|
73
|
+
jti,
|
|
74
|
+
release: () => {
|
|
75
|
+
usedJtis.delete(jti);
|
|
76
|
+
},
|
|
62
77
|
};
|
|
63
78
|
}
|
|
64
79
|
//# sourceMappingURL=confirm-token.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confirm-token.js","sourceRoot":"","sources":["../../src/core/confirm-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"confirm-token.js","sourceRoot":"","sources":["../../src/core/confirm-token.ts"],"names":[],"mappings":"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"}
|
package/dist/core/index.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ export * from './backend-port.js';
|
|
|
7
7
|
export { APP_RESOURCE_MIME_TYPE, APP_RESOURCE_URI, appViewHtml, assertAppOptions, type AppOptions, } from './app.js';
|
|
8
8
|
export { buildTools, registerCatalogTools, runTool, toolError, toolResult, type BuildToolsOptions, type ConfirmGateOptions, type RegisterToolsOptions, } from './build-tools.js';
|
|
9
9
|
export { SERVER_INSTRUCTIONS, instructionsFor } from './instructions.js';
|
|
10
|
+
export { InsufficientScopeError, insufficientScopeResult, type InsufficientScopeOptions, type ScopeChallengeOptions, type SecurityScheme, } from './scope-challenge.js';
|
|
10
11
|
export { CAPTION_MIME_TYPES, CREATE_APPROVAL_STATUSES, CREATE_STATUSES, DOCUMENT_MIME_TYPES, IMAGE_MIME_TYPES, PLATFORMS, POST_STATUSES, SET_APPROVAL_STATUSES, VIDEO_MIME_TYPES, jsonParse, uploadTypeFor, workspaceIdField, } from './shared.js';
|
|
11
12
|
export type { Binding, ResolvedTool, ResolvedToolAnnotations, ToolAnnotations, ToolDef, ToolIcon, } from './tool-def.js';
|
|
12
13
|
export { ALL_TOOLS } from './tools/index.js';
|
package/dist/core/index.js
CHANGED
|
@@ -7,6 +7,7 @@ export * from './backend-port.js';
|
|
|
7
7
|
export { APP_RESOURCE_MIME_TYPE, APP_RESOURCE_URI, appViewHtml, assertAppOptions, } from './app.js';
|
|
8
8
|
export { buildTools, registerCatalogTools, runTool, toolError, toolResult, } from './build-tools.js';
|
|
9
9
|
export { SERVER_INSTRUCTIONS, instructionsFor } from './instructions.js';
|
|
10
|
+
export { InsufficientScopeError, insufficientScopeResult, } from './scope-challenge.js';
|
|
10
11
|
export { CAPTION_MIME_TYPES, CREATE_APPROVAL_STATUSES, CREATE_STATUSES, DOCUMENT_MIME_TYPES, IMAGE_MIME_TYPES, PLATFORMS, POST_STATUSES, SET_APPROVAL_STATUSES, VIDEO_MIME_TYPES, jsonParse, uploadTypeFor, workspaceIdField, } from './shared.js';
|
|
11
12
|
export { ALL_TOOLS } from './tools/index.js';
|
|
12
13
|
export * from './types.js';
|
package/dist/core/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,cAAc,mBAAmB,CAAC;AAClC,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,WAAW,EACX,gBAAgB,GAEjB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,UAAU,EACV,oBAAoB,EACpB,OAAO,EACP,SAAS,EACT,UAAU,GAIX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,SAAS,EACT,aAAa,EACb,qBAAqB,EACrB,gBAAgB,EAChB,SAAS,EACT,aAAa,EACb,gBAAgB,GACjB,MAAM,aAAa,CAAC;AASrB,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,cAAc,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,cAAc,mBAAmB,CAAC;AAClC,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,WAAW,EACX,gBAAgB,GAEjB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,UAAU,EACV,oBAAoB,EACpB,OAAO,EACP,SAAS,EACT,UAAU,GAIX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EACL,sBAAsB,EACtB,uBAAuB,GAIxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,SAAS,EACT,aAAa,EACb,qBAAqB,EACrB,gBAAgB,EAChB,SAAS,EACT,aAAa,EACb,gBAAgB,GACjB,MAAM,aAAa,CAAC;AASrB,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,cAAc,YAAY,CAAC"}
|
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
* surfaces differ (workspace switching and conversation-media/URL uploads on
|
|
9
9
|
* the remote host, local files on stdio) and in how posts and comment replies
|
|
10
10
|
* go out: on the remote binding every post is held until approve_posts, and
|
|
11
|
-
*
|
|
12
|
-
*
|
|
11
|
+
* each reply, private reply and comment deletion is previewed by one tool and
|
|
12
|
+
* carried out by another, only after the user says yes.
|
|
13
13
|
*/
|
|
14
14
|
const INTRO = `PostFast schedules and publishes social posts across X, Instagram, Facebook, TikTok, LinkedIn, YouTube, Threads, Pinterest, Bluesky, Telegram, and Google Business Profile.`;
|
|
15
15
|
const CONNECTED = `Before scheduling, confirm the target account's connectionStatus is CONNECTED. A DISABLED account will not publish (disconnected accounts are the #1 cause of failed posts) — saving a DRAFT is still allowed.`;
|
|
@@ -64,7 +64,7 @@ const REMOTE_INSTRUCTIONS = [
|
|
|
64
64
|
CONTROLS,
|
|
65
65
|
FAILED,
|
|
66
66
|
REMOTE_DELETE_POST,
|
|
67
|
-
`Social inbox (comments on your posts: TikTok, Instagram, Facebook Pages, Threads; an account's inboxCapable flag from list_accounts says what is live today): read with list_inbox_conversations → list_inbox_items (get_inbox_unread_count for the total).
|
|
67
|
+
`Social inbox (comments on your posts: TikTok, Instagram, Facebook Pages, Threads; an account's inboxCapable flag from list_accounts says what is live today): read with list_inbox_conversations → list_inbox_items (get_inbox_unread_count for the total). A public reply under a comment, an Instagram private reply (one per comment, within 7 days) and a permanent comment deletion each take two tools: preview it with preview_comment_reply, preview_private_reply or preview_comment_deletion, show the user the preview, and carry it out with reply_to_comment, send_private_reply or delete_comment only after they say yes, even if they gave you the text. Whether and how long a reply can be comes ONLY from the conversation's server-computed canReply / maxReplyLength / windowState / disabledReason; never assume platform rules. Hide or restore a comment with set_inbox_item_state (HIDE / UNHIDE), triage with set_inbox_conversation_status and assign_inbox_conversation, and call mark_inbox_conversation_read after presenting a thread. It is a comments inbox; never present it as DMs or messages.`,
|
|
68
68
|
].join('\n\n');
|
|
69
69
|
export const SERVER_INSTRUCTIONS = {
|
|
70
70
|
stdio: STDIO_INSTRUCTIONS,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../src/core/instructions.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AAEH,MAAM,KAAK,GAAG,6KAA6K,CAAC;AAE5L,MAAM,SAAS,GAAG,gNAAgN,CAAC;AAEnO,MAAM,KAAK,GAAG,8uBAA8uB,CAAC;AAE7vB,MAAM,MAAM,GAAG;;;;;;;;;;;wLAWyK,CAAC;AAEzL,MAAM,QAAQ,GAAG;;;;;;;;;;0RAUyQ,CAAC;AAE3R,MAAM,MAAM,GAAG,mHAAmH,CAAC;AAEnI,MAAM,WAAW,GAAG,gPAAgP,CAAC;AAErQ,MAAM,kBAAkB,GAAG,GAAG,WAAW,uKAAuK,CAAC;AAEjN,MAAM,kBAAkB,GAAG;IACzB,KAAK;IACL,qSAAqS;IACrS,+EAA+E;IAC/E,SAAS;IACT,yXAAyX;IACzX,KAAK;IACL,MAAM;IACN,QAAQ;IACR,MAAM;IACN,WAAW;IACX,y4BAAy4B;CAC14B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAEf,MAAM,mBAAmB,GAAG;IAC1B,KAAK;IACL,8cAA8c;IAC9c,sIAAsI;IACtI,SAAS;IACT,4QAA4Q;IAC5Q,KAAK;IACL,MAAM;IACN,QAAQ;IACR,MAAM;IACN,kBAAkB;IAClB,
|
|
1
|
+
{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../src/core/instructions.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AAEH,MAAM,KAAK,GAAG,6KAA6K,CAAC;AAE5L,MAAM,SAAS,GAAG,gNAAgN,CAAC;AAEnO,MAAM,KAAK,GAAG,8uBAA8uB,CAAC;AAE7vB,MAAM,MAAM,GAAG;;;;;;;;;;;wLAWyK,CAAC;AAEzL,MAAM,QAAQ,GAAG;;;;;;;;;;0RAUyQ,CAAC;AAE3R,MAAM,MAAM,GAAG,mHAAmH,CAAC;AAEnI,MAAM,WAAW,GAAG,gPAAgP,CAAC;AAErQ,MAAM,kBAAkB,GAAG,GAAG,WAAW,uKAAuK,CAAC;AAEjN,MAAM,kBAAkB,GAAG;IACzB,KAAK;IACL,qSAAqS;IACrS,+EAA+E;IAC/E,SAAS;IACT,yXAAyX;IACzX,KAAK;IACL,MAAM;IACN,QAAQ;IACR,MAAM;IACN,WAAW;IACX,y4BAAy4B;CAC14B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAEf,MAAM,mBAAmB,GAAG;IAC1B,KAAK;IACL,8cAA8c;IAC9c,sIAAsI;IACtI,SAAS;IACT,4QAA4Q;IAC5Q,KAAK;IACL,MAAM;IACN,QAAQ;IACR,MAAM;IACN,kBAAkB;IAClB,okCAAokC;CACrkC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAEf,MAAM,CAAC,MAAM,mBAAmB,GAA4B;IAC1D,KAAK,EAAE,kBAAkB;IACzB,MAAM,EAAE,mBAAmB;CAC5B,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,OAAgB,EAAE,KAA2B;IAC3E,OAAO,mBAAmB,CAAC,OAAO,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
|
|
2
|
+
/**
|
|
3
|
+
* The access a remote tool needs, listed on the tool as `securitySchemes` and
|
|
4
|
+
* mirrored in its `_meta.securitySchemes` for clients that read only `_meta`.
|
|
5
|
+
* It is a hint for clients: the backend checks the token's scopes on every
|
|
6
|
+
* call, whatever a client does with it.
|
|
7
|
+
*/
|
|
8
|
+
export interface SecurityScheme {
|
|
9
|
+
type: 'oauth2';
|
|
10
|
+
scopes: string[];
|
|
11
|
+
}
|
|
12
|
+
/** What a host passes to answer a backend scope refusal with an OAuth challenge. */
|
|
13
|
+
export interface ScopeChallengeOptions {
|
|
14
|
+
/** The host's RFC 9728 protected resource metadata URL. */
|
|
15
|
+
resourceMetadataUrl: string;
|
|
16
|
+
}
|
|
17
|
+
export interface InsufficientScopeOptions extends ScopeChallengeOptions {
|
|
18
|
+
/** The scopes the refused call needs. */
|
|
19
|
+
scopes: readonly string[];
|
|
20
|
+
/**
|
|
21
|
+
* The scopes the access token already has, when known. The challenge then
|
|
22
|
+
* asks for them together with the missing ones, so a client that requests
|
|
23
|
+
* exactly the challenge's scope never ends up with fewer than before.
|
|
24
|
+
*/
|
|
25
|
+
grantedScopes?: readonly string[];
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Thrown by a host's port when the backend refuses a call because the access
|
|
29
|
+
* token lacks a scope. registerCatalogTools() with `scopeChallenge` answers it
|
|
30
|
+
* with insufficientScopeResult() for the tool's own scopes; without that
|
|
31
|
+
* option it is an ordinary tool error carrying this message.
|
|
32
|
+
*/
|
|
33
|
+
export declare class InsufficientScopeError extends Error {
|
|
34
|
+
constructor(message?: string);
|
|
35
|
+
}
|
|
36
|
+
/** By class or by name, so a second copy of this module in a host's tree still counts. */
|
|
37
|
+
export declare function isInsufficientScopeError(err: unknown): boolean;
|
|
38
|
+
/** Throws unless the URL is https (http only on a loopback host) and safe inside a quoted header value. */
|
|
39
|
+
export declare function assertScopeChallengeOptions(options: ScopeChallengeOptions): void;
|
|
40
|
+
/**
|
|
41
|
+
* The result for a call the token's scopes don't cover: an error whose
|
|
42
|
+
* `_meta["mcp/www_authenticate"]` holds an RFC 6750 insufficient_scope
|
|
43
|
+
* challenge pointing at the protected resource metadata, so a client can ask
|
|
44
|
+
* the user for the missing scopes and retry. The text tells the model the same.
|
|
45
|
+
*/
|
|
46
|
+
export declare function insufficientScopeResult(options: InsufficientScopeOptions): CallToolResult;
|