frely-cli 0.3.7 → 0.4.0

package/dist/skill/router.d.ts

@@ -0,0 +1,52 @@
+import { type AuthCredential } from "../auth.js";
+export type SkillCapabilityLevel = "base" | "advanced";
+export type SkillEntrypoint = "model" | "mcp" | "a2a";
+export interface SkillCapability {
+    readonly id: string;
+    readonly level: SkillCapabilityLevel;
+    readonly entrypoints: readonly SkillEntrypoint[];
+}
+export interface SkillInvocationResult {
+    readonly text: string;
+    readonly usage?: Readonly<Record<string, unknown>>;
+}
+export declare class SkillInvocationError extends Error {
+    readonly code: "payment_required" | "entitlement_required" | "remote_authorization_failed" | "capability_unavailable";
+    readonly details: Readonly<{
+        readonly capabilityId?: string;
+        readonly registrationUrl?: string;
+    }>;
+    constructor(code: "payment_required" | "entitlement_required" | "remote_authorization_failed" | "capability_unavailable", details?: Readonly<{
+        readonly capabilityId?: string;
+        readonly registrationUrl?: string;
+    }>);
+}
+export interface RemoteAgentMcpInvoker {
+    invoke(input: {
+        readonly relayUrl: string;
+        readonly modelId: string;
+        readonly token: string;
+        readonly credential?: AuthCredential;
+        readonly task: string;
+        readonly capabilityId?: string;
+        readonly signal?: AbortSignal;
+    }): Promise<SkillInvocationResult>;
+}
+export interface SkillRouterOptions {
+    readonly relayUrl?: string;
+    readonly modelId: string;
+    readonly task: string;
+    readonly entrypoint?: SkillEntrypoint;
+    readonly capability?: SkillCapability;
+    readonly registrationUrl?: string;
+    readonly baseSkill: () => Promise<SkillInvocationResult>;
+    readonly remoteAgentMcp: RemoteAgentMcpInvoker;
+    readonly signal?: AbortSignal;
+}
+/**
+ * Route one Skill step according to the REQ-NEXT-SKILL-003 state machine.
+ * Local token presence is checked once and is intentionally not validated.
+ */
+export declare function invokeSkill(options: SkillRouterOptions): Promise<SkillInvocationResult>;
+/** Minimal stateless MCP client used by the router's remote path. */
+export declare const remoteAgentMcpInvoker: RemoteAgentMcpInvoker;

package/dist/skill/router.js

@@ -0,0 +1,125 @@
+import { hasConfiguredLocalToken, normalizeRelayUrl, readConfiguredLocalCredential, } from "../auth.js";
+export class SkillInvocationError extends Error {
+    code;
+    details;
+    constructor(code, details = {}) {
+        super(code);
+        this.code = code;
+        this.details = details;
+        this.name = "SkillInvocationError";
+    }
+}
+/**
+ * Route one Skill step according to the REQ-NEXT-SKILL-003 state machine.
+ * Local token presence is checked once and is intentionally not validated.
+ */
+export async function invokeSkill(options) {
+    const entrypoint = options.entrypoint ?? "model";
+    const capability = options.capability;
+    if (capability !== undefined && !capability.entrypoints.includes(entrypoint)) {
+        throw new SkillInvocationError("capability_unavailable", { capabilityId: capability.id });
+    }
+    const relayUrl = normalizeRelayUrl(options.relayUrl);
+    const tokenConfigured = await hasConfiguredLocalToken(relayUrl);
+    if (!tokenConfigured) {
+        if (capability?.level === "advanced") {
+            if (options.registrationUrl === undefined || !isSafeRegistrationUrl(options.registrationUrl)) {
+                throw new Error("registration_url_required");
+            }
+            throw new SkillInvocationError("payment_required", {
+                capabilityId: capability.id,
+                registrationUrl: options.registrationUrl,
+            });
+        }
+        return options.baseSkill();
+    }
+    // Do not fall back to baseSkill when the remote invocation rejects: a
+    // configured-but-expired/revoked token must remain on the remote route.
+    const credential = await readConfiguredLocalCredential(relayUrl);
+    if (credential === null || credential.value.length === 0) {
+        throw new SkillInvocationError("remote_authorization_failed", {
+            ...(capability === undefined ? {} : { capabilityId: capability.id }),
+        });
+    }
+    try {
+        return await options.remoteAgentMcp.invoke({
+            relayUrl,
+            modelId: options.modelId,
+            token: credential.value,
+            credential,
+            task: options.task,
+            ...(capability === undefined ? {} : { capabilityId: capability.id }),
+            ...(options.signal === undefined ? {} : { signal: options.signal }),
+        });
+    }
+    catch (error) {
+        if (error instanceof SkillInvocationError)
+            throw error;
+        throw new SkillInvocationError("remote_authorization_failed", {
+            ...(capability === undefined ? {} : { capabilityId: capability.id }),
+        });
+    }
+}
+/** Minimal stateless MCP client used by the router's remote path. */
+export const remoteAgentMcpInvoker = {
+    async invoke(input) {
+        const endpoint = new URL(`/mcp/${encodeURIComponent(input.modelId)}`, input.relayUrl);
+        const response = await fetch(endpoint, {
+            method: "POST",
+            headers: {
+                accept: "application/json",
+                "content-type": "application/json",
+                ...(input.credential?.scheme === "cookie"
+                    ? { cookie: input.credential.value }
+                    : { authorization: `Bearer ${input.token}` }),
+            },
+            body: JSON.stringify({
+                jsonrpc: "2.0",
+                id: "skill-invoke",
+                method: "tools/call",
+                params: {
+                    name: "invoke",
+                    arguments: {
+                        input: input.task,
+                        ...(input.capabilityId === undefined ? {} : { capabilityId: input.capabilityId }),
+                    },
+                },
+            }),
+            ...(input.signal === undefined ? {} : { signal: input.signal }),
+        });
+        const payload = await response.json().catch(() => null);
+        if (!response.ok || !isRecord(payload)) {
+            throw new SkillInvocationError("remote_authorization_failed");
+        }
+        if (isRecord(payload.error)) {
+            const data = isRecord(payload.error.data) ? payload.error.data : {};
+            const code = data.code === "entitlement_required"
+                ? "entitlement_required"
+                : data.code === "capability_unavailable" ? "capability_unavailable" : "remote_authorization_failed";
+            throw new SkillInvocationError(code);
+        }
+        const result = isRecord(payload.result) ? payload.result : undefined;
+        const content = result && Array.isArray(result.content) ? result.content : [];
+        const text = content
+            .filter((item) => isRecord(item) && item.type === "text" && typeof item.text === "string")
+            .map((item) => item.text)
+            .join("");
+        if (result === undefined || result.isError === true || text.length === 0) {
+            throw new SkillInvocationError("remote_authorization_failed");
+        }
+        return Object.freeze({ text });
+    },
+};
+function isRecord(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function isSafeRegistrationUrl(value) {
+    try {
+        const url = new URL(value);
+        return url.protocol === "https:" && !url.username && !url.password && !url.hash;
+    }
+    catch {
+        return false;
+    }
+}
+//# sourceMappingURL=router.js.map

package/dist/skill/router.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frely-cli",
-  "version": "0.3.7",
+  "version": "0.4.0",
   "description": "Frely account CLI and local MCP runtime",
   "license": "Apache-2.0",
   "repository": {