npm - toolcraft - Versions diffs - 0.0.144 → 0.0.146 - Mend

toolcraft 0.0.144 → 0.0.146

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.

Files changed (9) hide show

package/composition.json +2 -2
package/dist/composition.json +2 -2
package/dist/http-hosted-oauth.js +31 -13
package/dist/index.d.ts +10 -0
package/dist/index.js +11 -0
package/dist/mcp.js +14 -6
package/node_modules/tiny-stdio-mcp-server/dist/composition.json +1 -1
package/node_modules/toolcraft-schema/package.json +1 -1
package/package.json +2 -2

package/composition.json CHANGED Viewed

@@ -113,7 +113,7 @@
     },
     {
       "name": "toolcraft",
-      "version": "0.0.144",
+      "version": "0.0.146",
       "license": "MIT"
     },
     {
@@ -123,7 +123,7 @@
     },
     {
       "name": "toolcraft-schema",
-      "version": "0.0.144",
+      "version": "0.0.146",
       "license": "MIT"
     },
     {

package/dist/composition.json CHANGED Viewed

@@ -113,7 +113,7 @@
     },
     {
       "name": "toolcraft",
-      "version": "0.0.144",
+      "version": "0.0.146",
       "license": "MIT"
     },
     {
@@ -123,7 +123,7 @@
     },
     {
       "name": "toolcraft-schema",
-      "version": "0.0.144",
+      "version": "0.0.146",
       "license": "MIT"
     },
     {

package/dist/http-hosted-oauth.js CHANGED Viewed

@@ -111,18 +111,30 @@ function loginField(field) {
         type: field === "password" || field === "apiKey" ? "password" : field === "email" ? "email" : "text"
     };
 }
-function renderLogin(providerName, fields, transaction, csrfToken, error) {
+function renderLogin(providerName, fields, transaction, csrfToken, error, submittedValues = {}) {
+    const scriptNonce = randomBytes(18).toString("base64");
     const controls = fields
         .map((field) => {
         const name = escapeHtml(field.name);
-        return `<label>${escapeHtml(field.label ?? field.name)}<input name="${name}" type="${field.type ?? "text"}" required autocomplete="${field.type === "password" ? "current-password" : "off"}"></label>`;
+        const type = field.type ?? "text";
+        const autocomplete = type === "email" ? "username" : field.name === "password" ? "current-password" : "off";
+        const value = type === "email" ? submittedValues[field.name] ?? "" : "";
+        return `<label>${escapeHtml(field.label ?? field.name)}<input name="${name}" type="${type}" required autocomplete="${autocomplete}"${value.length === 0 ? "" : ` value="${escapeHtml(value)}"`}></label>`;
     })
         .join("");
-    return `<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Connect ${escapeHtml(providerName)}</title><style>body{font:16px system-ui;max-width:28rem;margin:10vh auto;padding:1rem;color:#171717}form{display:grid;gap:1rem}label{display:grid;gap:.35rem}input,button{font:inherit;padding:.7rem}button{cursor:pointer}${error === undefined ? "" : ".error{color:#b42318}"}</style></head><body><h1>Connect ${escapeHtml(providerName)}</h1>${error === undefined ? "" : `<p class="error">${escapeHtml(error)}</p>`}<form method="post" action="/oauth/connect"><input type="hidden" name="transaction" value="${escapeHtml(transaction.id)}"><input type="hidden" name="csrf" value="${escapeHtml(csrfToken)}">${controls}<button type="submit">Connect</button></form></body></html>`;
+    const idleLabel = `Connect ${providerName}`;
+    const html = `<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Connect ${escapeHtml(providerName)}</title><style>body{font:16px system-ui;max-width:28rem;margin:10vh auto;padding:1rem;color:#171717}form{display:grid;gap:1rem}label{display:grid;gap:.35rem}input,button{font:inherit;padding:.7rem}button{cursor:pointer}button:disabled{cursor:wait;opacity:.7}.status{margin:0;color:#525252}.error{color:#b42318}</style></head><body><h1>Connect ${escapeHtml(providerName)}</h1>${error === undefined ? "" : `<p class="error" role="alert">${escapeHtml(error)}</p>`}<form id="oauth-connect-form" method="post" action="/oauth/connect"><input type="hidden" name="transaction" value="${escapeHtml(transaction.id)}"><input type="hidden" name="csrf" value="${escapeHtml(csrfToken)}">${controls}<button id="oauth-connect-button" type="submit" data-idle-label="${escapeHtml(idleLabel)}">${escapeHtml(idleLabel)}</button><p id="oauth-connect-status" class="status" role="status" aria-live="polite" hidden>Signing in… This may take a moment.</p></form><script nonce="${scriptNonce}">(()=>{const form=document.getElementById("oauth-connect-form");const button=document.getElementById("oauth-connect-button");const status=document.getElementById("oauth-connect-status");if(!(form instanceof HTMLFormElement)||!(button instanceof HTMLButtonElement)||!(status instanceof HTMLElement))return;const reset=()=>{form.removeAttribute("aria-busy");button.disabled=false;button.textContent=button.dataset.idleLabel||"Connect";status.hidden=true};form.addEventListener("submit",()=>{form.setAttribute("aria-busy","true");button.disabled=true;button.textContent="Connecting…";status.hidden=false});addEventListener("pageshow",reset)})();</script></body></html>`;
+    return {
+        contentSecurityPolicy: loginContentSecurityPolicy(transaction, scriptNonce),
+        html
+    };
 }
-function loginContentSecurityPolicy(transaction) {
+function loginContentSecurityPolicy(transaction, scriptNonce) {
     const callbackOrigin = new URL(transaction.redirectUri).origin;
-    return `default-src 'none'; style-src 'unsafe-inline'; form-action 'self' ${callbackOrigin}; base-uri 'none'; frame-ancestors 'none'`;
+    return `default-src 'none'; style-src 'unsafe-inline'; script-src 'nonce-${scriptNonce}'; form-action 'self' ${callbackOrigin}; base-uri 'none'; frame-ancestors 'none'`;
+}
+function renderExpiredConnection() {
+    return `<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Connection expired</title><style>body{font:16px system-ui;max-width:28rem;margin:10vh auto;padding:1rem;color:#171717}p{line-height:1.5}</style></head><body><h1>Connection expired</h1><p>This sign-in link has expired or was already used.</p><p>Close this tab, return to the app that started the connection, and click Connect again.</p></body></html>`;
 }
 function interactionCookieName(transactionId) {
     const suffix = createHash("sha256").update(transactionId).digest("base64url").slice(0, 22);
@@ -186,11 +198,12 @@ export async function prepareHostedOAuthRuntime(config) {
             const security = createAuthorizationInteractionSecurity({
                 cookieName: interactionCookieName(transaction.id)
             });
-            return new Response(renderLogin(displayName, fields, transaction, security.csrfToken), {
+            const login = renderLogin(displayName, fields, transaction, security.csrfToken);
+            return new Response(login.html, {
                 status: 200,
                 headers: {
                     "content-type": "text/html; charset=utf-8",
-                    "content-security-policy": loginContentSecurityPolicy(transaction),
+                    "content-security-policy": login.contentSecurityPolicy,
                     "cache-control": "no-store",
                     "referrer-policy": "no-referrer",
                     "x-content-type-options": "nosniff",
@@ -273,10 +286,13 @@ export async function prepareHostedOAuthRuntime(config) {
                 }) ||
                 transaction.expiresAt <= Date.now()) {
                 response.writeHead(400, {
-                    "content-type": "text/plain; charset=utf-8",
-                    "cache-control": "no-store"
+                    "content-type": "text/html; charset=utf-8",
+                    "content-security-policy": "default-src 'none'; style-src 'unsafe-inline'; base-uri 'none'; frame-ancestors 'none'",
+                    "cache-control": "no-store",
+                    "referrer-policy": "no-referrer",
+                    "x-content-type-options": "nosniff"
                 });
-                response.end("This connection has expired or was already used. Restart the connection.");
+                response.end(renderExpiredConnection());
                 return true;
             }
             const controller = new AbortController();
@@ -312,13 +328,15 @@ export async function prepareHostedOAuthRuntime(config) {
                 const safeError = error instanceof HostedOAuthLoginError
                     ? error.message
                     : "Sign-in failed. Please try again.";
+                const login = renderLogin(displayName, fields, transaction, csrf, safeError, values);
                 response.writeHead(400, {
                     "content-type": "text/html; charset=utf-8",
-                    "content-security-policy": loginContentSecurityPolicy(transaction),
+                    "content-security-policy": login.contentSecurityPolicy,
                     "cache-control": "no-store",
-                    "referrer-policy": "no-referrer"
+                    "referrer-policy": "no-referrer",
+                    "x-content-type-options": "nosniff"
                 });
-                response.end(renderLogin(displayName, fields, transaction, csrf, safeError));
+                response.end(login.html);
             }
             return true;
         }

package/dist/index.d.ts CHANGED Viewed

@@ -95,6 +95,12 @@ export interface Renderers<TResult> {
     markdown?: (result: TResult, primitives: RenderPrimitives) => string;
     json?: (result: TResult, primitives: RenderPrimitives) => unknown;
 }
+export interface ToolAnnotations {
+    readOnlyHint?: boolean;
+    destructiveHint?: boolean;
+    idempotentHint?: boolean;
+    openWorldHint?: boolean;
+}
 export type HandlerContext<TParamsSchema extends ObjectSchema<any> = AnyObjectSchema, TSecrets extends SecretDeclarations | undefined = undefined, TServices extends object = EmptyServices> = TServices & {
     params: Static<TParamsSchema>;
     secrets: InferSecrets<TSecrets>;
@@ -106,7 +112,9 @@ export type HandlerContext<TParamsSchema extends ObjectSchema<any> = AnyObjectSc
 };
 export interface CommandConfig<TServices extends object, TParamsSchema extends ObjectSchema<any>, TSecrets extends SecretDeclarations | undefined, TResult> {
     name: string;
+    title?: string;
     description?: string;
+    annotations?: ToolAnnotations;
     hidden?: boolean;
     examples?: CommandExample[];
     aliases?: string[];
@@ -138,7 +146,9 @@ export interface StreamCommandConfig<TServices extends object, TParamsSchema ext
 export interface Command<TServices extends object = EmptyServices, TParamsSchema extends ObjectSchema<any> = AnyObjectSchema, TSecrets extends SecretDeclarations | undefined = undefined, TResult = unknown> {
     kind: "command";
     name: string;
+    title?: string;
     description?: string;
+    annotations?: ToolAnnotations;
     hidden: boolean;
     examples: CommandExample[];
     aliases: string[];

package/dist/index.js CHANGED Viewed

@@ -33,6 +33,9 @@ function cloneRequires(requires) {
         check: requires.check
     };
 }
+function cloneToolAnnotations(annotations) {
+    return annotations === undefined ? undefined : { ...annotations };
+}
 function cloneStringArray(values) {
     return values === undefined ? undefined : [...values];
 }
@@ -291,7 +294,9 @@ function createBaseCommand(config) {
     const command = {
         kind: "command",
         name: config.name,
+        title: config.title,
         description: config.description,
+        annotations: cloneToolAnnotations(config.annotations),
         hidden: config.hidden ?? false,
         examples: cloneCommandExamples(config.examples),
         aliases: [...(config.aliases ?? [])],
@@ -309,6 +314,8 @@ function createBaseCommand(config) {
     };
     Object.defineProperty(command, commandConfigSymbol, {
         value: {
+            title: config.title,
+            annotations: cloneToolAnnotations(config.annotations),
             scope: cloneScope(config.scope),
             hidden: config.hidden ?? false,
             examples: cloneCommandExamples(config.examples),
@@ -360,7 +367,9 @@ function materializeCommand(command, inherited) {
     const materialized = {
         kind: "command",
         name: command.name,
+        title: internal.title,
         description: command.description,
+        annotations: cloneToolAnnotations(internal.annotations),
         hidden: internal.hidden,
         examples: cloneCommandExamples(internal.examples),
         aliases: [...command.aliases],
@@ -378,6 +387,8 @@ function materializeCommand(command, inherited) {
     };
     Object.defineProperty(materialized, commandConfigSymbol, {
         value: {
+            title: internal.title,
+            annotations: cloneToolAnnotations(internal.annotations),
             scope: cloneScope(internal.scope),
             hidden: internal.hidden,
             examples: cloneCommandExamples(internal.examples),

package/dist/mcp.js CHANGED Viewed

@@ -222,6 +222,8 @@ function enumerateTools(root, casing, allowlist, omitRootToolNamePrefix) {
                 command: node,
                 commandPath: resolvedCommandPath,
                 name,
+                ...(node.title === undefined ? {} : { title: node.title }),
+                ...(node.annotations === undefined ? {} : { annotations: { ...node.annotations } }),
                 description: buildToolDescription(node.description, params, node.examples, node.name, casing),
                 inputSchema: applySchemaCasing(toJsonSchema(params), casing),
                 ...(node.result === undefined
@@ -915,12 +917,18 @@ function createResolvedMCPServer(root, options, runtime = {}) {
                 throw toToolError(error, report?.displayPath);
             }
         };
-        if (tool.outputSchema === undefined) {
-            server.tool(tool.name, tool.description, tool.inputSchema, handler);
-        }
-        else {
-            server.tool(tool.name, tool.description, tool.inputSchema, handler, tool.outputSchema);
-        }
+        server.registerTool({
+            name: tool.name,
+            ...(tool.title === undefined ? {} : { title: tool.title }),
+            description: tool.description,
+            inputSchema: tool.inputSchema,
+            ...(tool.outputSchema === undefined
+                ? {}
+                : {
+                    outputSchema: tool.outputSchema
+                }),
+            ...(tool.annotations === undefined ? {} : { annotations: tool.annotations })
+        }, handler);
     }
     return {
         ...server,

package/node_modules/tiny-stdio-mcp-server/dist/composition.json CHANGED Viewed

@@ -8,7 +8,7 @@
     },
     {
       "name": "toolcraft-schema",
-      "version": "0.0.144",
+      "version": "0.0.146",
       "license": "MIT"
     }
   ]

package/node_modules/toolcraft-schema/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft-schema",
-  "version": "0.0.144",
+  "version": "0.0.146",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft",
-  "version": "0.0.144",
+  "version": "0.0.146",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",
@@ -158,7 +158,7 @@
     "yaml"
   ],
   "optionalDependencies": {
-    "toolcraft-schema": "0.0.144",
+    "toolcraft-schema": "0.0.146",
     "toolcraft-design": "*",
     "@poe-code/frontmatter": "*",
     "@poe-code/agent-mcp-config": "*",