dropsh 0.7.3 → 0.8.2

package/README.md

@@ -599,6 +599,8 @@ shipped inside the `dropsh` npm tarball — each is a separately published packa
 | [`@dropsh/plugin-schemata`](plugins/schemata/README.md) | `schemataPlugin` | authoritative JSON Schema from Drupal `schemata` (legacy) |
 | [`@dropsh/plugin-canvas`](plugins/canvas/README.md) | `canvasPlugin` | Canvas component schemas from `jsonapi_sdc` |
 | [`@dropsh/plugin-display-builder`](plugins/display-builder/README.md) | `displayBuilderPlugin` | Display Builder operation schemas and metadata |
+| [`@dropsh/plugin-mcp`](plugins/mcp/README.md) | `mcpPlugin` | Model Context Protocol server (stdio and loopback HTTP) |
+| [`@dropsh/plugin-tool`](plugins/tool/README.md) | `toolPlugin` | list and call Drupal Tool API tools over the site's `mcp_server` endpoint |
 
 Basic auth is not a separate package — its `basicAuthPlugin` factory ships in the
 core CLI's `dropsh/plugin` entry.

package/dist/src/core/auth/types.d.ts

@@ -52,6 +52,11 @@ export interface AdapterRuntime {
     now(): number;
     /** Persist a refreshed session back to the active session slot. */
     save(session: AuthSession): Promise<void>;
+    /**
+     * Re-read the persisted session slot. Other processes sharing the slot may have
+     * renewed (and rotated the refresh token) since this adapter was created.
+     */
+    load?(): Promise<AuthSession | undefined>;
 }
 export interface AuthProvider {
     readonly id: string;

package/dist/src/core/command-context.d.ts

@@ -0,0 +1,17 @@
+import type { AuthAdapter } from "./auth/types.js";
+import type { HttpClient } from "./http.js";
+import type { JsonApiClient } from "./jsonapi/client.js";
+import type { DropSHPlugin } from "./plugin.js";
+export interface CommandContext {
+    client: JsonApiClient;
+    http: HttpClient;
+    auth: AuthAdapter;
+    baseUrl: string;
+    jsonapiPrefix: string;
+    cwd: string;
+    plugins: DropSHPlugin[];
+}
+export interface PluginCommandServices {
+    getContext(auth?: AuthAdapter): Promise<CommandContext>;
+    stderr(message: string): void;
+}

package/dist/src/core/command-context.js

@@ -0,0 +1 @@
+export {};

package/dist/src/core/plugin.d.ts

@@ -1,6 +1,7 @@
 import type { Command } from "commander";
 import type { AuthAdapter, AuthProvider } from "./auth/types.js";
 import type { AnyRenderer } from "./cli/render.js";
+import type { PluginCommandServices } from "./command-context.js";
 import type { HttpClient, HttpRequest } from "./http.js";
 import type { DropSHOperation } from "./jsonapi/client.js";
 import type { Operation } from "./schema/to-jsonschema.js";
@@ -57,7 +58,7 @@ export interface DropSHPlugin {
     extendSchema?(entityType: string, bundle: string, baseSchema: unknown, ctx: PluginContext): Promise<unknown>;
     extendOperationSchema?(entityType: string, bundle: string, operation: SchemaOperation, operationSchema: unknown, ctx: PluginContext): Promise<unknown>;
     alterRequest?(req: HttpRequest, ctx: RequestContext): Promise<HttpRequest>;
-    registerCommands?(program: Command): void;
+    registerCommands?(program: Command, services: PluginCommandServices): void;
     renderers?: AnyRenderer[];
 }
 /**

package/dist/src/index.d.ts

@@ -1,20 +1,12 @@
 #!/usr/bin/env node
 import { Command } from "commander";
 import type { AuthAdapter, AuthStatusInfo } from "./core/auth/types.js";
+import type { CommandContext } from "./core/command-context.js";
 import type { HttpClient } from "./core/http.js";
-import { type JsonApiClient } from "./core/jsonapi/client.js";
 import type { DropSHPlugin } from "./core/plugin.js";
-export interface CommandContext {
-    client: JsonApiClient;
-    http: HttpClient;
-    auth: AuthAdapter;
-    baseUrl: string;
-    jsonapiPrefix: string;
-    cwd: string;
-    plugins: DropSHPlugin[];
-}
+export type { CommandContext, PluginCommandServices } from "./core/command-context.js";
 export interface ProgramOptions {
-    contextFactory?: () => Promise<CommandContext>;
+    contextFactory?: (auth?: AuthAdapter) => Promise<CommandContext>;
     stdout?: (s: string) => void;
     stderr?: (s: string) => void;
     setExitCode?: (code: number) => void;

package/dist/src/index.js

@@ -9,7 +9,7 @@ import { runDelete } from "./commands/delete.js";
 import { runRead } from "./commands/read.js";
 import { applyOperationSchemaPlugins, operationHookPluginIds, runSchema, SCHEMA_PIPELINE_VERSION, schemaCacheMetadataMatches, siteCacheRoot, } from "./commands/schema.js";
 import { runSearch } from "./commands/search.js";
-import { assertUpdateTarget, runUpdate, } from "./commands/update.js";
+import { assertUpdateTarget, runUpdate } from "./commands/update.js";
 import { runUploadFile } from "./commands/upload-file.js";
 import { collectProviders, defaultProvider, providerById, sessionlessProvider, } from "./core/auth/registry.js";
 import { readProfiles, writeProfile } from "./core/auth/session-store.js";
@@ -68,6 +68,7 @@ export async function resolveAuth(deps) {
                 http: deps.http,
                 now: deps.now,
                 save: (session) => writeProfile(deps.baseUrl, name, provider.id, session, deps.stateDir),
+                load: async () => (await readProfiles(deps.baseUrl, deps.stateDir))?.profiles[name]?.session,
             });
         }
         // No stored session for the chosen profile: a login-less provider carries its
@@ -113,16 +114,20 @@ export async function authStatus(deps) {
     }
     return provider.status(rec.session);
 }
-async function defaultContext(configPath, profile) {
+async function defaultContext(configPath, profile, authOverride) {
     const cfg = await loadConfig(configPath);
-    const http = createHttpClient({ timeoutMs: cfg.defaults.timeout_ms });
-    const auth = await resolveAuth({
-        baseUrl: cfg.site.base_url,
-        plugins: cfg.plugins,
-        http,
-        now: Date.now,
-        ...(profile !== undefined ? { profile } : {}),
+    const http = createHttpClient({
+        timeoutMs: cfg.defaults.timeout_ms,
+        ...(authOverride !== undefined ? { maxRetries: 0 } : {}),
     });
+    const auth = authOverride ??
+        (await resolveAuth({
+            baseUrl: cfg.site.base_url,
+            plugins: cfg.plugins,
+            http,
+            now: Date.now,
+            ...(profile !== undefined ? { profile } : {}),
+        }));
     const pluginContext = {
         http,
         auth,
@@ -183,10 +188,16 @@ export function buildProgram(opts = {}) {
         });
     }
     const contextFactory = opts.contextFactory ??
-        (() => {
+        ((auth) => {
             const profile = program.opts().authProfile ?? process.env.DROPSH_AUTH_PROFILE;
-            return defaultContext(currentConfigSource().path, profile);
+            return auth !== undefined
+                ? defaultContext(currentConfigSource().path, profile, auth)
+                : defaultContext(currentConfigSource().path, profile);
         });
+    const commandServices = {
+        getContext: (auth) => auth !== undefined ? contextFactory(auth) : contextFactory(),
+        stderr,
+    };
     const renderers = (opts.plugins ?? []).flatMap((p) => p.renderers ?? []);
     const output = createOutput({
         stdout,
@@ -591,7 +602,7 @@ Example:
         .action((o) => run2(async () => runAuthStatus(o, await authDeps())));
     if (opts.plugins) {
         for (const plugin of opts.plugins) {
-            plugin.registerCommands?.(program);
+            plugin.registerCommands?.(program, commandServices);
         }
     }
     program.exitOverride();

package/dist/src/plugin-api.d.ts

@@ -1,8 +1,19 @@
+export { readDataArg } from "./commands/_data.js";
+export type { CreateArgs, CreateDeps } from "./commands/create.js";
+export { runCreate } from "./commands/create.js";
+export type { ReadArgs, ReadDeps } from "./commands/read.js";
+export { runRead } from "./commands/read.js";
+export { applyOperationSchemaPlugins } from "./commands/schema.js";
+export type { SearchArgs, SearchDeps } from "./commands/search.js";
+export { runSearch } from "./commands/search.js";
+export type { UpdateArgs, UpdateDeps } from "./commands/update.js";
+export { runUpdate } from "./commands/update.js";
 export type { BasicAuthConfig } from "./core/auth/basic.js";
 export { basicAuthPlugin, basicAuthProvider } from "./core/auth/basic.js";
 export type { AdapterRuntime, AuthAdapter, AuthContext, AuthProvider, AuthSession, AuthStatusInfo, } from "./core/auth/types.js";
 export type { AnyRenderer, InteractiveRenderer, RenderContext, Renderer, RenderServices, } from "./core/cli/render.js";
 export { indexIncluded, isInteractive } from "./core/cli/render.js";
+export type { CommandContext, PluginCommandServices } from "./core/command-context.js";
 export type { Config, SiteConfig } from "./core/config.js";
 export { loadConfig } from "./core/config.js";
 export type { ConfigSource, ConfigSourceKind, ConnectionEntry, ResolveConfigSourceInput, ResolveConnectionsDirInput, } from "./core/connections.js";
@@ -21,5 +32,9 @@ export type { FieldDescriptor, SchemaFieldIndex } from "./core/params/schema-fie
 export { indexSchemaFields, propertiesOf } from "./core/params/schema-fields.js";
 export type { DropSHPlugin, PluginContext, PluginDescriptor, RequestContext, SchemaOperation, } from "./core/plugin.js";
 export { composePlugins } from "./core/plugin.js";
-export { AuthError, ConfigError, HttpError, PluginError } from "./errors.js";
-export type { CommandContext } from "./index.js";
+export { fetchCatalog } from "./core/schema/catalog.js";
+export { fetchJsonSchema } from "./core/schema/jsonschema-source.js";
+export type { Operation } from "./core/schema/to-jsonschema.js";
+export { toOperationVariant } from "./core/schema/to-jsonschema.js";
+export { validatePayload } from "./core/schema/validate.js";
+export { AuthError, CliError, ConfigError, exitCodeFor, HttpError, PluginError, ValidationError, } from "./errors.js";

package/dist/src/plugin-api.js

@@ -1,3 +1,9 @@
+export { readDataArg } from "./commands/_data.js";
+export { runCreate } from "./commands/create.js";
+export { runRead } from "./commands/read.js";
+export { applyOperationSchemaPlugins } from "./commands/schema.js";
+export { runSearch } from "./commands/search.js";
+export { runUpdate } from "./commands/update.js";
 export { basicAuthPlugin, basicAuthProvider } from "./core/auth/basic.js";
 export { indexIncluded, isInteractive } from "./core/cli/render.js";
 export { loadConfig } from "./core/config.js";
@@ -7,4 +13,8 @@ export { createJsonApiClient } from "./core/jsonapi/client.js";
 export { buildPayloadFromParameters } from "./core/params/from-parameters.js";
 export { indexSchemaFields, propertiesOf } from "./core/params/schema-fields.js";
 export { composePlugins } from "./core/plugin.js";
-export { AuthError, ConfigError, HttpError, PluginError } from "./errors.js";
+export { fetchCatalog } from "./core/schema/catalog.js";
+export { fetchJsonSchema } from "./core/schema/jsonschema-source.js";
+export { toOperationVariant } from "./core/schema/to-jsonschema.js";
+export { validatePayload } from "./core/schema/validate.js";
+export { AuthError, CliError, ConfigError, exitCodeFor, HttpError, PluginError, ValidationError, } from "./errors.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dropsh",
-  "version": "0.7.3",
+  "version": "0.8.2",
   "description": "Entity-agnostic helper CLI for Drupal 11 JSON:API, used by the dropsh Claude skill for editorial publishing workflows.",
   "type": "module",
   "bin": {
@@ -48,6 +48,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.14",
+    "@modelcontextprotocol/sdk": "1.32.1",
     "@types/node": "^20.14.0",
     "tsx": "^4.19.0",
     "typescript": "^5.6.0",