toolnexus 0.22.0 → 0.24.0

package/src/toolkit.ts

@@ -11,6 +11,7 @@ import { startA2AServer, type A2AConfig, type OnTask, type ServeHandle } from ".
 import { type MCPServeConfig, type OnCall } from "./mcpserve.js"
 import { toAnthropic, toGemini, toOpenAI } from "./adapters.js"
 import type { Client } from "./client.js"
+import type { Media } from "./media.js"
 
 export interface ToolkitOptions {
   mcpConfig?: string | object
@@ -31,6 +32,8 @@ export interface ToolkitOptions {
   /** Sibling-file sample cap: 0 ⇒ default 10, n>0 ⇒ cap, -1 ⇒ omit <skill_files> (§3, S5). */
   skillSampleLimit?: number
   extraTools?: Tool[]
+  /** Media generation (§7G): registers `media.tools()` (source "media"). */
+  media?: Media
   /** Built-in tools (§4A). On by default. false | { disabled:true } | { enabled:false } ⇒ off. */
   builtins?: BuiltinsConfig
   /** Remote A2A agents — each advertised skill becomes a tool (source:"a2a"). */
@@ -79,7 +82,7 @@ export class Toolkit {
     }
   }
 
-  static async create(opts: ToolkitOptions): Promise<Toolkit> {
+  static async create(opts: ToolkitOptions = {}): Promise<Toolkit> {
     const mcp = opts.mcpConfig !== undefined ? await loadMcp(opts.mcpConfig, { waitFor: opts.waitFor, signal: opts.signal }) : undefined
     // Skills come from directories, in-memory data, and/or a lazy provider (§3,
     // S1). The provider is resolved here (create() is async) and merged with the
@@ -137,7 +140,7 @@ export class Toolkit {
         }),
       ),
     )
-    const agentToolsFlat = agentToolLists.flat()
+    const agentToolsFlat = [...agentToolLists.flat(), ...(opts.media ? opts.media.tools() : [])]
 
     // A2A inbound profile: a top-level `a2a` block on a parsed config object
     // (mirrors builtins/agents). serve() prefers its inline `a2a` over this.
@@ -250,6 +253,6 @@ export class Toolkit {
   }
 }
 
-export function createToolkit(opts: ToolkitOptions): Promise<Toolkit> {
+export function createToolkit(opts: ToolkitOptions = {}): Promise<Toolkit> {
   return Toolkit.create(opts)
 }

package/src/types.ts

@@ -12,7 +12,7 @@ export type JSONSchema = {
 
 import type { ContentPart } from "./content.js"
 
-export type ToolSource = "mcp" | "skill" | "builtin" | "native" | "http" | "a2a" | "custom"
+export type ToolSource = "mcp" | "skill" | "builtin" | "native" | "http" | "a2a" | "media" | "custom"
 
 export interface ToolResult {
   output: string
@@ -130,6 +130,9 @@ export interface Tool {
   /** What the tool may do (§4C). Builtins always carry hints; MCP tools carry them when the
    * server sends annotations. Advisory: a server can mislabel its tools. */
   hints?: ToolHints
+  /** Decides per call whether this tool may run alongside other safe calls of the same model
+   * response (SPEC §8 "Tool scheduling"). Absent ⇒ safe only when `hints.readOnly`. */
+  concurrencySafe?: (args: Record<string, unknown>) => boolean
 }
 
 export type McpStatus = "connected" | "disabled" | "failed"