zidane 3.1.2 → 3.2.0

package/dist/{agent-C9q5VMGa.d.ts → agent-CE2jhpNE.d.ts}

@@ -2092,7 +2092,14 @@ interface AgentOptions {
     session?: Session;
     /** Skills configuration */
     skills?: SkillsConfig;
-    /** @internal */
+    /**
+     * Test seam — replaces the default MCP connector with a custom
+     * implementation. Bypasses the `mcpServers` normalization layer entirely
+     * and is **not** part of the supported public API. Subject to change or
+     * removal in any release.
+     *
+     * @internal
+     */
     mcpConnector?: (configs: McpServerConfig[]) => Promise<McpConnection>;
     /**
      * Pre-connect MCP servers in the background as soon as `createAgent` returns,
@@ -2156,7 +2163,13 @@ interface Agent {
     readonly session: Session | null;
     /** Snapshot of currently active skills. */
     readonly activeSkills: readonly ActiveSkill[];
-    meta: Record<string, unknown>;
+    /**
+     * Frozen view of the underlying `provider.meta`. Read-only to prevent
+     * accidental cross-agent contamination — writes are rejected at runtime
+     * (via `Object.freeze`) and at compile time (via `Readonly`). To override
+     * model / capability defaults, construct a new provider.
+     */
+    readonly meta: Readonly<Record<string, unknown>>;
 }
 declare function createAgent({ provider, name: agentName, system: agentSystem, tools: agentTools, toolAliases, behavior: agentBehavior, execution, mcpServers, session, skills: agentSkills, mcpConnector, eager }: AgentOptions): Agent;
 

package/dist/{chunk-2AE3VM5O.js → chunk-6JIVVEQQ.js}

@@ -3,12 +3,12 @@ import {
   createSkillActivationState,
   installAllowedToolsGate,
   interpolateShellCommands,
-  resolveSkills,
+  resolveSkillsWithCleanup,
   validateResourcePath
-} from "./chunk-TPXPVEH6.js";
+} from "./chunk-J4ZOSNSH.js";
 import {
   createProcessContext
-} from "./chunk-IUBBVF53.js";
+} from "./chunk-UD25QF3H.js";
 import {
   connectMcpServers
 } from "./chunk-7H34OFDA.js";
@@ -367,6 +367,18 @@ var glob = {
   }
 };
 
+// src/tools/shell-quote.ts
+var SAFE_TOKEN_RE = /^[\w@%+=:,./-]+$/;
+var SINGLE_QUOTE_RE = /'/g;
+function shellQuote(arg) {
+  if (SAFE_TOKEN_RE.test(arg))
+    return arg;
+  return `'${arg.replace(SINGLE_QUOTE_RE, "'\\''")}'`;
+}
+function alwaysQuote(arg) {
+  return `'${arg.replace(SINGLE_QUOTE_RE, "'\\''")}'`;
+}
+
 // src/tools/grep.ts
 var DEFAULT_HEAD_LIMIT = 250;
 var DEFAULT_OUTPUT_MODE = "files_with_matches";
@@ -442,11 +454,6 @@ async function runViaRipgrep(input, ctx) {
   }
   return formatPaginated(result.stdout, input);
 }
-function shellQuote(arg) {
-  if (/^[\w@%+=:,./-]+$/.test(arg))
-    return arg;
-  return `'${arg.replace(/'/g, "'\\''")}'`;
-}
 async function runInProcess(input, ctx) {
   const mode = input.output_mode ?? DEFAULT_OUTPUT_MODE;
   const flags = `${input["-i"] ? "i" : ""}${input.multiline ? "s" : ""}${mode !== "content" ? "" : "g"}`;
@@ -695,6 +702,33 @@ var multiEdit = {
 // src/tools/read-file.ts
 import { Buffer as Buffer2 } from "buffer";
 
+// src/tools/binary-detect.ts
+var SNIFF_BYTES = 8192;
+var REPLACEMENT_RATIO_THRESHOLD = 0.01;
+var REPLACEMENT_MIN_COUNT = 5;
+function containsNullByte(text, sniffBytes = SNIFF_BYTES) {
+  const sample = text.length > sniffBytes ? text.slice(0, sniffBytes) : text;
+  for (let i = 0; i < sample.length; i++) {
+    if (sample.charCodeAt(i) === 0)
+      return true;
+  }
+  return false;
+}
+function looksBinary(text, sniffBytes = SNIFF_BYTES) {
+  const sample = text.length > sniffBytes ? text.slice(0, sniffBytes) : text;
+  if (sample.length === 0)
+    return false;
+  let replacementCount = 0;
+  for (let i = 0; i < sample.length; i++) {
+    const code = sample.charCodeAt(i);
+    if (code === 0)
+      return true;
+    if (code === 65533)
+      replacementCount++;
+  }
+  return replacementCount >= REPLACEMENT_MIN_COUNT && replacementCount / sample.length > REPLACEMENT_RATIO_THRESHOLD;
+}
+
 // src/tools/binary-read.ts
 import { Buffer } from "buffer";
 function imageMediaTypeFor(path) {
@@ -722,21 +756,27 @@ async function readFileAsBase64(execution, handle, path) {
     const b642 = Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength).toString("base64");
     return { base64: b642, byteLength: bytes.byteLength };
   }
-  const cmd = `base64 < ${shellQuote2(path)}`;
+  const cmd = `base64 < ${alwaysQuote(path)}`;
   const result = await execution.exec(handle, cmd);
   if (result.exitCode !== 0)
     throw new Error(`base64 read failed: ${result.stderr || `exit ${result.exitCode}`}`);
   const b64 = result.stdout.replace(/\s+/g, "");
-  return { base64: b64, byteLength: Math.floor(b64.length * 3 / 4) };
+  return { base64: b64, byteLength: decodedBase64ByteLength(b64) };
 }
-function shellQuote2(s) {
-  return `'${s.replace(/'/g, "'\\''")}'`;
+function decodedBase64ByteLength(b64) {
+  if (b64.length === 0)
+    return 0;
+  let pad = 0;
+  if (b64.endsWith("=="))
+    pad = 2;
+  else if (b64.endsWith("="))
+    pad = 1;
+  return Math.max(0, b64.length * 3 / 4 - pad);
 }
 
 // src/tools/read-file.ts
 var DEFAULT_LINE_LIMIT = 2e3;
 var DEFAULT_BYTE_CAP = 65536;
-var BINARY_PROBE_BYTES = 8e3;
 var DEFAULT_IMAGE_BYTE_CAP = 5 * 1024 * 1024;
 var readFile = {
   spec: {
@@ -879,21 +919,6 @@ function normalizeInteger(value, fallback) {
     return fallback;
   return Math.floor(value);
 }
-var REPLACEMENT_RATIO_THRESHOLD = 0.01;
-var REPLACEMENT_MIN_COUNT = 5;
-function looksBinary(text) {
-  const sample = text.length > BINARY_PROBE_BYTES ? text.slice(0, BINARY_PROBE_BYTES) : text;
-  if (sample.includes("\0"))
-    return true;
-  if (sample.length === 0)
-    return false;
-  let replacementCount = 0;
-  for (let i = 0; i < sample.length; i++) {
-    if (sample.charCodeAt(i) === 65533)
-      replacementCount++;
-  }
-  return replacementCount >= REPLACEMENT_MIN_COUNT && replacementCount / sample.length > REPLACEMENT_RATIO_THRESHOLD;
-}
 
 // src/tools/shell.ts
 import { Buffer as Buffer3 } from "buffer";
@@ -996,15 +1021,6 @@ ${tail}`;
 }
 
 // src/tools/skills-read.ts
-var SNIFF_BYTES = 8192;
-function looksBinary2(text) {
-  const len = Math.min(text.length, SNIFF_BYTES);
-  for (let i = 0; i < len; i++) {
-    if (text.charCodeAt(i) === 0)
-      return true;
-  }
-  return false;
-}
 function createSkillsReadTool(options) {
   const byName = new Map(options.catalog.map((s) => [s.name, s]));
   return {
@@ -1049,7 +1065,7 @@ function createSkillsReadTool(options) {
         const message = err instanceof Error ? err.message : String(err);
         return `Error reading "${relPath}" in skill "${skillName}": ${message}`;
       }
-      if (looksBinary2(content)) {
+      if (containsNullByte(content)) {
         return JSON.stringify({
           kind: "binary-unsupported",
           path: validated.absolutePath,
@@ -1062,12 +1078,8 @@ function createSkillsReadTool(options) {
 }
 
 // src/tools/skills-run-script.ts
-var SINGLE_QUOTE_RE = /'/g;
 var ABS_WINDOWS_RE = /^[a-z]:[\\/]/i;
 var COLLAPSE_SLASHES_RE = /\/+/g;
-function quoteShellArg(arg) {
-  return `'${arg.replace(SINGLE_QUOTE_RE, `'\\''`)}'`;
-}
 function createSkillsRunScriptTool(options) {
   const byName = new Map(options.catalog.map((s) => [s.name, s]));
   const timeoutMs = options.scriptTimeoutMs ?? 6e4;
@@ -1114,7 +1126,7 @@ function createSkillsRunScriptTool(options) {
       const validated = validateResourcePath(joinedPath, skill.baseDir);
       if (!validated.valid)
         return `Error: ${validated.error}`;
-      const cmd = [validated.absolutePath, ...args].map(quoteShellArg).join(" ");
+      const cmd = [validated.absolutePath, ...args].map(alwaysQuote).join(" ");
       try {
         const result = await ctx.execution.exec(ctx.handle, cmd, {
           timeout: Math.max(1, Math.round(timeoutMs / 1e3))
@@ -1718,11 +1730,12 @@ async function executeTurn(ctx, turn) {
     );
   } catch (err) {
     const errorUsage = { input: 0, output: 0 };
+    const errorContent = currentText ? [{ type: "text", text: currentText }] : [{ type: "text", text: "[provider error before any output]" }];
     const errorTurn = {
       id: turnId,
       runId: ctx.runId,
       role: "assistant",
-      content: currentText ? [{ type: "text", text: currentText }] : [],
+      content: errorContent,
       usage: errorUsage,
       createdAt: Date.now()
     };
@@ -2055,28 +2068,10 @@ async function executeToolsSequential(ctx, toolCalls, turnId) {
     if (ctx.signal.aborted)
       break;
     if (ctx.steeringQueue.length > 0) {
-      const steerMsg = ctx.steeringQueue.shift();
-      await ctx.hooks.callHook("steer:inject", { message: steerMsg });
-      for (const skipped of toolCalls.slice(toolCalls.indexOf(call))) {
-        results.push({ id: skipped.id, content: "Skipped: steering message received" });
-      }
-      const toolResultMsg = ctx.provider.toolResultsMessage(results);
-      ctx.turns.push({
-        id: await ctx.generateTurnId(),
-        runId: ctx.runId,
-        role: toolResultMsg.role,
-        content: toolResultMsg.content,
-        createdAt: Date.now()
-      });
-      const steerUserMsg = ctx.provider.userMessage(steerMsg);
-      ctx.turns.push({
-        id: await ctx.generateTurnId(),
-        runId: ctx.runId,
-        role: steerUserMsg.role,
-        content: steerUserMsg.content,
-        createdAt: Date.now()
-      });
-      return [];
+      const fromIdx = toolCalls.indexOf(call);
+      for (let i = fromIdx; i < toolCalls.length; i++)
+        results.push({ id: toolCalls[i].id, content: "Skipped: steering message received" });
+      return results;
     }
     const { result } = await executeSingleTool(ctx, call, turnId);
     results.push(result);
@@ -2120,6 +2115,15 @@ function canonicalizePrompt(prompt, legacyImages) {
   }
   if (prompt.length === 0)
     return void 0;
+  for (const part of prompt) {
+    if (!part || typeof part !== "object" || typeof part.type !== "string") {
+      throw new Error("Invalid PromptPart: each part must be an object with a `type` field.");
+    }
+    const type = part.type;
+    if (type !== "text" && type !== "image" && type !== "document") {
+      throw new Error(`Invalid PromptPart type "${type}". Expected "text" | "image" | "document".`);
+    }
+  }
   const hasMeaningfulPart = prompt.some((part) => part.type === "text" && part.text.length > 0 || part.type === "image" || part.type === "document");
   if (!hasMeaningfulPart)
     return void 0;
@@ -2331,6 +2335,8 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
   const skillsDisabled = skillsEnabledValue === false || Array.isArray(skillsEnabledValue) && skillsEnabledValue.length === 0;
   let resolvedSkills = null;
   let skillsCatalog = null;
+  let skillsCleanup = () => {
+  };
   const skillActivationState = createSkillActivationState({
     maxActive: skillsConfig?.maxActive
   });
@@ -2398,7 +2404,9 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
       await warmup();
     }
     if (!skillsDisabled && skillsConfig && !resolvedSkills) {
-      resolvedSkills = await resolveSkills(skillsConfig);
+      const bundle = await resolveSkillsWithCleanup(skillsConfig);
+      resolvedSkills = bundle.skills;
+      skillsCleanup = bundle.cleanup;
       await hooks.callHook("skills:resolve", { skills: resolvedSkills });
       const skillsToolRegistered = skillsConfig?.tool !== false && resolvedSkills.length > 0;
       const catalogCtx = {
@@ -2655,6 +2663,11 @@ ${skillsCatalog}`;
     return idlePromise ?? Promise.resolve();
   }
   async function reset() {
+    if (running) {
+      throw new Error(
+        "Cannot reset() while the agent is running. Call `agent.abort()` and `await agent.waitForIdle()` first."
+      );
+    }
     conversationTurns = [];
     steeringQueue.length = 0;
     followUpQueue.length = 0;
@@ -2743,6 +2756,9 @@ ${skillsCatalog}`;
       await executionContext.destroy(executionHandle);
       executionHandle = null;
     }
+    skillsCleanup();
+    skillsCleanup = () => {
+    };
   }
   if (eager && allMcpServers.length > 0) {
     void warmup().catch(() => {

package/dist/{chunk-BRMURQA2.js → chunk-AUBXCLUC.js}

@@ -5,7 +5,7 @@ import {
   toAnthropic,
   toolResultsMessage,
   userMessage
-} from "./chunk-YQ7LY6CL.js";
+} from "./chunk-QX7TDFD4.js";
 import {
   matchesContextExceeded
 } from "./chunk-LNN5UTS2.js";

package/dist/{chunk-BXO7CZHJ.js → chunk-HPTCF3EX.js}

@@ -6,7 +6,7 @@ import {
   shell,
   spawn,
   writeFile
-} from "./chunk-2AE3VM5O.js";
+} from "./chunk-6JIVVEQQ.js";
 
 // src/presets/basic.ts
 var basicTools = { shell, readFile, writeFile, listFiles, edit, multiEdit };

package/dist/{chunk-TPXPVEH6.js → chunk-J4ZOSNSH.js}

@@ -740,11 +740,16 @@ function writeSkillsToDisk(skills, targetDir) {
 }
 
 // src/skills/resolve.ts
-import { mkdtempSync } from "fs";
+import { mkdtempSync, rmSync } from "fs";
 import { tmpdir } from "os";
 import { join as join3 } from "path";
 async function resolveSkills(config) {
+  const { skills } = await resolveSkillsWithCleanup(config);
+  return skills;
+}
+async function resolveSkillsWithCleanup(config) {
   const sourcedPaths = [];
+  let writeDir;
   if (!config.skipDefaultPaths) {
     sourcedPaths.push(...getDefaultScanPaths());
   }
@@ -752,7 +757,7 @@ async function resolveSkills(config) {
     sourcedPaths.push({ path: p, source: inferSource(p) });
   }
   if (config.write?.length) {
-    const writeDir = mkdtempSync(join3(tmpdir(), "zidane-skills-"));
+    writeDir = mkdtempSync(join3(tmpdir(), "zidane-skills-"));
     writeSkillsToDisk(config.write, writeDir);
     sourcedPaths.push({ path: writeDir, source: "inline" });
   }
@@ -766,7 +771,14 @@ async function resolveSkills(config) {
     const allowlist = new Set(config.enabled);
     filtered = filtered.filter((s) => allowlist.has(s.name));
   }
-  return filtered;
+  const cleanup = writeDir ? () => {
+    try {
+      rmSync(writeDir, { recursive: true, force: true });
+    } catch {
+    }
+  } : () => {
+  };
+  return { skills: filtered, cleanup };
 }
 
 // src/skills/interpolate.ts
@@ -816,5 +828,6 @@ export {
   writeSkillToDisk,
   writeSkillsToDisk,
   resolveSkills,
+  resolveSkillsWithCleanup,
   interpolateShellCommands
 };

package/dist/{chunk-YQ7LY6CL.js → chunk-QX7TDFD4.js}

@@ -532,22 +532,31 @@ function fromOpenAI(msg) {
     content.push({ type: "text", text: c });
     return { role, content };
   }
-  if (typeof c === "object" && c._tag === ASSISTANT_TOOL_CALLS_TAG) {
-    if (c.text) {
-      content.push({ type: "text", text: c.text });
+  if (typeof c === "object" && !Array.isArray(c) && c._tag === ASSISTANT_TOOL_CALLS_TAG) {
+    const tagged = c;
+    if (typeof tagged.text === "string" && tagged.text) {
+      content.push({ type: "text", text: tagged.text });
     }
-    if (Array.isArray(c.tool_calls)) {
-      for (const tc of c.tool_calls) {
-        const input = tc.function?.arguments ? typeof tc.function.arguments === "string" ? JSON.parse(tc.function.arguments) : tc.function.arguments : {};
-        content.push({ type: "tool_call", id: tc.id, name: tc.function?.name ?? "", input });
+    if (Array.isArray(tagged.tool_calls)) {
+      for (const raw of tagged.tool_calls) {
+        if (!raw || typeof raw !== "object")
+          continue;
+        const tc = raw;
+        const rawArgs = tc.function?.arguments;
+        const input = rawArgs ? typeof rawArgs === "string" ? JSON.parse(rawArgs) : rawArgs : {};
+        content.push({ type: "tool_call", id: tc.id ?? "", name: tc.function?.name ?? "", input });
       }
     }
     return { role, content };
   }
-  if (typeof c === "object" && c._tag === TOOL_RESULTS_TAG) {
-    if (Array.isArray(c.results)) {
-      for (const r of c.results) {
-        content.push({ type: "tool_result", callId: r.tool_call_id, output: r.content });
+  if (typeof c === "object" && !Array.isArray(c) && c._tag === TOOL_RESULTS_TAG) {
+    const tagged = c;
+    if (Array.isArray(tagged.results)) {
+      for (const raw of tagged.results) {
+        if (!raw || typeof raw !== "object")
+          continue;
+        const r = raw;
+        content.push({ type: "tool_result", callId: r.tool_call_id ?? "", output: r.content ?? "" });
       }
     }
     return { role, content };
@@ -649,8 +658,10 @@ function toOpenAI(msg) {
 }
 function autoDetectAndConvert(msg) {
   const c = msg.content;
-  if (c && typeof c === "object" && typeof c._tag === "string" && c._tag.startsWith("__zidane_")) {
-    return fromOpenAI(msg);
+  if (c && typeof c === "object" && !Array.isArray(c)) {
+    const tag = c._tag;
+    if (typeof tag === "string" && tag.startsWith("__zidane_"))
+      return fromOpenAI(msg);
   }
   if (Array.isArray(c)) {
     for (const block of c) {

package/dist/{chunk-IUBBVF53.js → chunk-UD25QF3H.js}

@@ -78,19 +78,77 @@ function createDockerContext(config) {
       const stream = await exec.start({ Detach: false });
       return new Promise((resolve2) => {
         let stdout = "";
-        const stderr = "";
+        let stderr = "";
+        let resolved = false;
+        const stdoutSink = {
+          write(chunk) {
+            stdout += typeof chunk === "string" ? chunk : chunk.toString("utf-8");
+            return true;
+          },
+          end() {
+          },
+          on() {
+          },
+          once() {
+          },
+          emit() {
+            return true;
+          }
+        };
+        const stderrSink = {
+          write(chunk) {
+            stderr += typeof chunk === "string" ? chunk : chunk.toString("utf-8");
+            return true;
+          },
+          end() {
+          },
+          on() {
+          },
+          once() {
+          },
+          emit() {
+            return true;
+          }
+        };
+        try {
+          ref.docker.modem.demuxStream(stream, stdoutSink, stderrSink);
+        } catch {
+          stream.on("data", (chunk) => {
+            stdout += chunk.toString("utf-8");
+          });
+        }
         const timeout = options?.timeout ?? defaultLimits?.timeout ?? 30;
         const timer = setTimeout(() => {
-          resolve2({ stdout, stderr: `${stderr}
-[timeout]`, exitCode: 124 });
+          if (resolved)
+            return;
+          resolved = true;
+          try {
+            stream.destroy?.();
+          } catch {
+          }
+          resolve2({ stdout, stderr: stderr ? `${stderr}
+[timeout]` : "[timeout]", exitCode: 124 });
         }, timeout * 1e3);
-        stream.on("data", (chunk) => {
-          stdout += chunk.toString("utf-8");
-        });
         stream.on("end", async () => {
+          if (resolved)
+            return;
+          resolved = true;
+          clearTimeout(timer);
+          let exitCode = 0;
+          try {
+            const inspect = await exec.inspect();
+            exitCode = inspect.ExitCode ?? 0;
+          } catch {
+          }
+          resolve2({ stdout, stderr, exitCode });
+        });
+        stream.on("error", (err) => {
+          if (resolved)
+            return;
+          resolved = true;
           clearTimeout(timer);
-          const inspect = await exec.inspect();
-          resolve2({ stdout, stderr, exitCode: inspect.ExitCode ?? 0 });
+          resolve2({ stdout, stderr: stderr ? `${stderr}
+${err.message}` : err.message, exitCode: 1 });
         });
       });
     },

package/dist/{chunk-BW3WTFIR.js → chunk-YPU6KVL6.js}

@@ -1,6 +1,6 @@
 import {
   validateSkillForWrite
-} from "./chunk-TPXPVEH6.js";
+} from "./chunk-J4ZOSNSH.js";
 
 // src/skills/index.ts
 function defineSkill(config) {

package/dist/contexts.js

@@ -2,7 +2,7 @@ import {
   createDockerContext,
   createProcessContext,
   createSandboxContext
-} from "./chunk-IUBBVF53.js";
+} from "./chunk-UD25QF3H.js";
 export {
   createDockerContext,
   createProcessContext,

package/dist/index.d.ts

@@ -1,12 +1,12 @@
-import { d as AgentHooks } from './agent-C9q5VMGa.js';
-export { ac as ActivationVia, ad as ActiveSkill, A as Agent, a as AgentAbortedError, b as AgentBehavior, c as AgentContextExceededError, e as AgentOptions, f as AgentProviderError, g as AgentRunOptions, h as AgentStats, i as AgentToolNotAllowedError, j as AnthropicParams, C as CONTEXT_EXCEEDED_MESSAGE_PATTERNS, k as CerebrasParams, m as ClassifiedError, n as ClassifiedErrorKind, o as CreateSessionOptions, ae as DeactivationReason, af as FileMapAdapter, ag as FileMapStoreOptions, I as ImageContent, M as McpConnection, p as McpServerConfig, q as McpToolHookContext, O as OAuthRefreshHookContext, ah as OpenAICompatAuthHeader, ai as OpenAICompatHttpError, aj as OpenAICompatParams, r as OpenAIParams, s as OpenRouterParams, P as PromptDocumentPart, t as PromptImagePart, u as PromptPart, v as PromptTextPart, w as Provider, x as ProviderCapabilities, R as RemoteStoreOptions, y as RunHookMap, S as Session, z as SessionContentBlock, B as SessionData, D as SessionEndStatus, E as SessionHookContext, F as SessionMessage, G as SessionRun, H as SessionStore, J as SessionTurn, ak as SkillActivationState, al as SkillActivationStateOptions, K as SkillConfig, am as SkillDiagnostic, L as SkillResource, an as SkillSource, N as SkillsConfig, Q as SpawnHookContext, T as StreamCallbacks, U as StreamHookContext, V as StreamOptions, W as ThinkingLevel, X as ToolCall, Y as ToolContext, Z as ToolDef, _ as ToolExecutionMode, $ as ToolHookContext, a0 as ToolMap, a1 as ToolResult, a2 as ToolResultContent, a3 as ToolResultImageContent, a4 as ToolResultTextContent, a5 as ToolSpec, a6 as TurnFinishReason, a7 as TurnResult, a8 as TurnUsage, ao as anthropic, ap as autoDetectAndConvert, aq as cerebras, ar as classifyOpenAICompatError, as as connectMcpServers, at as createAgent, au as createFileMapStore, av as createMemoryStore, aw as createRemoteStore, ax as createSession, ay as createSkillActivationState, az as fromAnthropic, aA as fromOpenAI, aB as loadSession, aC as mapOAIFinishReason, a9 as matchesContextExceeded, aD as normalizeMcpBlocks, aE as normalizeMcpServers, aF as openai, aG as openaiCompat, aH as openrouter, aI as resultToString, aJ as toAnthropic, aK as toOpenAI, aL as toTypedError, aa as toolOutputByteLength, ab as toolResultToText } from './agent-C9q5VMGa.js';
+import { d as AgentHooks } from './agent-CE2jhpNE.js';
+export { ac as ActivationVia, ad as ActiveSkill, A as Agent, a as AgentAbortedError, b as AgentBehavior, c as AgentContextExceededError, e as AgentOptions, f as AgentProviderError, g as AgentRunOptions, h as AgentStats, i as AgentToolNotAllowedError, j as AnthropicParams, C as CONTEXT_EXCEEDED_MESSAGE_PATTERNS, k as CerebrasParams, m as ClassifiedError, n as ClassifiedErrorKind, o as CreateSessionOptions, ae as DeactivationReason, af as FileMapAdapter, ag as FileMapStoreOptions, I as ImageContent, M as McpConnection, p as McpServerConfig, q as McpToolHookContext, O as OAuthRefreshHookContext, ah as OpenAICompatAuthHeader, ai as OpenAICompatHttpError, aj as OpenAICompatParams, r as OpenAIParams, s as OpenRouterParams, P as PromptDocumentPart, t as PromptImagePart, u as PromptPart, v as PromptTextPart, w as Provider, x as ProviderCapabilities, R as RemoteStoreOptions, y as RunHookMap, S as Session, z as SessionContentBlock, B as SessionData, D as SessionEndStatus, E as SessionHookContext, F as SessionMessage, G as SessionRun, H as SessionStore, J as SessionTurn, ak as SkillActivationState, al as SkillActivationStateOptions, K as SkillConfig, am as SkillDiagnostic, L as SkillResource, an as SkillSource, N as SkillsConfig, Q as SpawnHookContext, T as StreamCallbacks, U as StreamHookContext, V as StreamOptions, W as ThinkingLevel, X as ToolCall, Y as ToolContext, Z as ToolDef, _ as ToolExecutionMode, $ as ToolHookContext, a0 as ToolMap, a1 as ToolResult, a2 as ToolResultContent, a3 as ToolResultImageContent, a4 as ToolResultTextContent, a5 as ToolSpec, a6 as TurnFinishReason, a7 as TurnResult, a8 as TurnUsage, ao as anthropic, ap as autoDetectAndConvert, aq as cerebras, ar as classifyOpenAICompatError, as as connectMcpServers, at as createAgent, au as createFileMapStore, av as createMemoryStore, aw as createRemoteStore, ax as createSession, ay as createSkillActivationState, az as fromAnthropic, aA as fromOpenAI, aB as loadSession, aC as mapOAIFinishReason, a9 as matchesContextExceeded, aD as normalizeMcpBlocks, aE as normalizeMcpServers, aF as openai, aG as openaiCompat, aH as openrouter, aI as resultToString, aJ as toAnthropic, aK as toOpenAI, aL as toTypedError, aa as toolOutputByteLength, ab as toolResultToText } from './agent-CE2jhpNE.js';
 export { createDockerContext, createProcessContext } from './contexts.js';
 export { S as SandboxProvider, c as createSandboxContext } from './sandbox-CLghrTLi.js';
 export { C as ContextCapabilities, a as ContextType, E as ExecResult, b as ExecutionContext, c as ExecutionHandle, S as SpawnConfig } from './types-vA1a_ZX7.js';
 export { Preset, basic, basicTools, definePreset } from './presets.js';
 export { IMPLICITLY_ALLOWED_SKILL_TOOLS, SkillValidationIssue, SkillValidationResult, SourcedScanPath, buildCatalog, defineSkill, discoverSkills, installAllowedToolsGate, interpolateShellCommands, isToolAllowedByUnion, matchesAllowedTool, parseAllowedToolPattern, parseSkillFile, resolveSkills, validateResourcePath, validateSkillForWrite, validateSkillName, writeSkillToDisk, writeSkillsToDisk } from './skills.js';
-export { S as SkillsReadToolOptions, a as SkillsRunScriptToolOptions, b as SkillsUseToolOptions, c as createSkillsReadTool, d as createSkillsRunScriptTool, e as createSkillsUseTool, f as edit, g as glob, h as grep, m as multiEdit } from './skills-use-DU0unNP4.js';
-export { C as ChildAgent, I as InteractionToolOptions, S as SpawnToolOptions, a as SpawnToolState, V as ValidationResult, c as createInteractionTool, b as createSpawnTool, s as spawn, v as validateToolArgs } from './validation-BKA33eqb.js';
+export { S as SkillsReadToolOptions, a as SkillsRunScriptToolOptions, b as SkillsUseToolOptions, c as createSkillsReadTool, d as createSkillsRunScriptTool, e as createSkillsUseTool, f as edit, g as glob, h as grep, m as multiEdit } from './skills-use-CqOKEN56.js';
+export { C as ChildAgent, I as InteractionToolOptions, S as SpawnToolOptions, a as SpawnToolState, V as ValidationResult, c as createInteractionTool, b as createSpawnTool, s as spawn, v as validateToolArgs } from './validation-DlIURVGV.js';
 import { Hookable } from 'hookable';
 import '@modelcontextprotocol/sdk/client/index.js';
 

package/dist/index.js

@@ -1,17 +1,17 @@
 import {
   defineSkill
-} from "./chunk-BW3WTFIR.js";
+} from "./chunk-YPU6KVL6.js";
 import {
   anthropic,
   cerebras,
   openai,
   openrouter
-} from "./chunk-BRMURQA2.js";
+} from "./chunk-AUBXCLUC.js";
 import {
   basicTools,
   basic_default,
   definePreset
-} from "./chunk-BXO7CZHJ.js";
+} from "./chunk-HPTCF3EX.js";
 import {
   createAgent,
   createInteractionTool,
@@ -25,7 +25,7 @@ import {
   multiEdit,
   spawn,
   validateToolArgs
-} from "./chunk-2AE3VM5O.js";
+} from "./chunk-6JIVVEQQ.js";
 import {
   IMPLICITLY_ALLOWED_SKILL_TOOLS,
   buildCatalog,
@@ -43,12 +43,12 @@ import {
   validateSkillName,
   writeSkillToDisk,
   writeSkillsToDisk
-} from "./chunk-TPXPVEH6.js";
+} from "./chunk-J4ZOSNSH.js";
 import {
   createDockerContext,
   createProcessContext,
   createSandboxContext
-} from "./chunk-IUBBVF53.js";
+} from "./chunk-UD25QF3H.js";
 import {
   connectMcpServers,
   normalizeMcpBlocks,
@@ -76,7 +76,7 @@ import {
   openaiCompat,
   toAnthropic,
   toOpenAI
-} from "./chunk-YQ7LY6CL.js";
+} from "./chunk-QX7TDFD4.js";
 import {
   AgentAbortedError,
   AgentContextExceededError,

package/dist/mcp.d.ts

@@ -1,4 +1,4 @@
 import 'hookable';
-export { M as McpConnection, p as McpServerConfig, as as connectMcpServers, aD as normalizeMcpBlocks, aE as normalizeMcpServers, aI as resultToString } from './agent-C9q5VMGa.js';
+export { M as McpConnection, p as McpServerConfig, as as connectMcpServers, aD as normalizeMcpBlocks, aE as normalizeMcpServers, aI as resultToString } from './agent-CE2jhpNE.js';
 import '@modelcontextprotocol/sdk/client/index.js';
 import './types-vA1a_ZX7.js';

package/dist/presets.d.ts

@@ -1,4 +1,4 @@
-import { Z as ToolDef, e as AgentOptions } from './agent-C9q5VMGa.js';
+import { Z as ToolDef, e as AgentOptions } from './agent-CE2jhpNE.js';
 import 'hookable';
 import './types-vA1a_ZX7.js';
 import '@modelcontextprotocol/sdk/client/index.js';

package/dist/presets.js

@@ -2,10 +2,10 @@ import {
   basicTools,
   basic_default,
   definePreset
-} from "./chunk-BXO7CZHJ.js";
-import "./chunk-2AE3VM5O.js";
-import "./chunk-TPXPVEH6.js";
-import "./chunk-IUBBVF53.js";
+} from "./chunk-HPTCF3EX.js";
+import "./chunk-6JIVVEQQ.js";
+import "./chunk-J4ZOSNSH.js";
+import "./chunk-UD25QF3H.js";
 import "./chunk-7H34OFDA.js";
 import "./chunk-JH6IAAFA.js";
 import "./chunk-LNN5UTS2.js";

package/dist/providers.d.ts

@@ -1,4 +1,4 @@
-export { j as AnthropicParams, k as CerebrasParams, ah as OpenAICompatAuthHeader, ai as OpenAICompatHttpError, aj as OpenAICompatParams, r as OpenAIParams, s as OpenRouterParams, w as Provider, x as ProviderCapabilities, T as StreamCallbacks, V as StreamOptions, X as ToolCall, a1 as ToolResult, a5 as ToolSpec, a7 as TurnResult, ao as anthropic, aq as cerebras, ar as classifyOpenAICompatError, aC as mapOAIFinishReason, aF as openai, aG as openaiCompat, aH as openrouter } from './agent-C9q5VMGa.js';
+export { j as AnthropicParams, k as CerebrasParams, ah as OpenAICompatAuthHeader, ai as OpenAICompatHttpError, aj as OpenAICompatParams, r as OpenAIParams, s as OpenRouterParams, w as Provider, x as ProviderCapabilities, T as StreamCallbacks, V as StreamOptions, X as ToolCall, a1 as ToolResult, a5 as ToolSpec, a7 as TurnResult, ao as anthropic, aq as cerebras, ar as classifyOpenAICompatError, aC as mapOAIFinishReason, aF as openai, aG as openaiCompat, aH as openrouter } from './agent-CE2jhpNE.js';
 import 'hookable';
 import './types-vA1a_ZX7.js';
 import '@modelcontextprotocol/sdk/client/index.js';

package/dist/providers.js

@@ -3,13 +3,13 @@ import {
   cerebras,
   openai,
   openrouter
-} from "./chunk-BRMURQA2.js";
+} from "./chunk-AUBXCLUC.js";
 import {
   OpenAICompatHttpError,
   classifyOpenAICompatError,
   mapOAIFinishReason,
   openaiCompat
-} from "./chunk-YQ7LY6CL.js";
+} from "./chunk-QX7TDFD4.js";
 import "./chunk-LNN5UTS2.js";
 export {
   OpenAICompatHttpError,

package/dist/session/sqlite.d.ts

@@ -1,4 +1,4 @@
-import { H as SessionStore } from '../agent-C9q5VMGa.js';
+import { H as SessionStore } from '../agent-CE2jhpNE.js';
 import 'hookable';
 import '../types-vA1a_ZX7.js';
 import '@modelcontextprotocol/sdk/client/index.js';

package/dist/session/sqlite.js

@@ -24,7 +24,9 @@ function createSqliteStore(options) {
   `);
   const stmtDelete = db.prepare("DELETE FROM sessions WHERE id = ?");
   const stmtList = db.prepare("SELECT id FROM sessions ORDER BY updated_at DESC");
+  const stmtListLimited = db.prepare("SELECT id FROM sessions ORDER BY updated_at DESC LIMIT ?");
   const stmtListByAgent = db.prepare("SELECT id FROM sessions WHERE agent_id = ? ORDER BY updated_at DESC");
+  const stmtListByAgentLimited = db.prepare("SELECT id FROM sessions WHERE agent_id = ? ORDER BY updated_at DESC LIMIT ?");
   const store = {
     async load(sessionId) {
       const row = stmtLoad.get(sessionId);
@@ -45,17 +47,14 @@ function createSqliteStore(options) {
       stmtDelete.run(sessionId);
     },
     async list(filter) {
+      const limit = typeof filter?.limit === "number" && filter.limit > 0 ? filter.limit : void 0;
       let rows;
       if (filter?.agentId) {
-        rows = stmtListByAgent.all(filter.agentId);
+        rows = limit ? stmtListByAgentLimited.all(filter.agentId, limit) : stmtListByAgent.all(filter.agentId);
       } else {
-        rows = stmtList.all();
+        rows = limit ? stmtListLimited.all(limit) : stmtList.all();
       }
-      const ids = rows.map((r) => r.id);
-      if (filter?.limit) {
-        return ids.slice(0, filter.limit);
-      }
-      return ids;
+      return rows.map((r) => r.id);
     },
     async appendTurns(sessionId, turns) {
       const data = await store.load(sessionId);

package/dist/session.d.ts

@@ -1,4 +1,4 @@
-export { o as CreateSessionOptions, af as FileMapAdapter, ag as FileMapStoreOptions, R as RemoteStoreOptions, S as Session, z as SessionContentBlock, B as SessionData, F as SessionMessage, G as SessionRun, H as SessionStore, J as SessionTurn, ap as autoDetectAndConvert, au as createFileMapStore, av as createMemoryStore, aw as createRemoteStore, ax as createSession, az as fromAnthropic, aA as fromOpenAI, aB as loadSession, aJ as toAnthropic, aK as toOpenAI } from './agent-C9q5VMGa.js';
+export { o as CreateSessionOptions, af as FileMapAdapter, ag as FileMapStoreOptions, R as RemoteStoreOptions, S as Session, z as SessionContentBlock, B as SessionData, F as SessionMessage, G as SessionRun, H as SessionStore, J as SessionTurn, ap as autoDetectAndConvert, au as createFileMapStore, av as createMemoryStore, aw as createRemoteStore, ax as createSession, az as fromAnthropic, aA as fromOpenAI, aB as loadSession, aJ as toAnthropic, aK as toOpenAI } from './agent-CE2jhpNE.js';
 import 'hookable';
 import './types-vA1a_ZX7.js';
 import '@modelcontextprotocol/sdk/client/index.js';

package/dist/session.js

@@ -11,7 +11,7 @@ import {
   fromOpenAI,
   toAnthropic,
   toOpenAI
-} from "./chunk-YQ7LY6CL.js";
+} from "./chunk-QX7TDFD4.js";
 import "./chunk-LNN5UTS2.js";
 export {
   autoDetectAndConvert,

package/dist/{skills-use-DU0unNP4.d.ts → skills-use-CqOKEN56.d.ts}

@@ -1,4 +1,4 @@
-import { Z as ToolDef, K as SkillConfig, ak as SkillActivationState, d as AgentHooks } from './agent-C9q5VMGa.js';
+import { Z as ToolDef, K as SkillConfig, ak as SkillActivationState, d as AgentHooks } from './agent-CE2jhpNE.js';
 import { Hookable } from 'hookable';
 
 /**

package/dist/skills.d.ts

@@ -1,5 +1,5 @@
-import { d as AgentHooks, ak as SkillActivationState, K as SkillConfig, an as SkillSource, am as SkillDiagnostic, N as SkillsConfig } from './agent-C9q5VMGa.js';
-export { ac as ActivationVia, ad as ActiveSkill, ae as DeactivationReason, al as SkillActivationStateOptions, L as SkillResource, ay as createSkillActivationState } from './agent-C9q5VMGa.js';
+import { d as AgentHooks, ak as SkillActivationState, K as SkillConfig, an as SkillSource, am as SkillDiagnostic, N as SkillsConfig } from './agent-CE2jhpNE.js';
+export { ac as ActivationVia, ad as ActiveSkill, ae as DeactivationReason, al as SkillActivationStateOptions, L as SkillResource, ay as createSkillActivationState } from './agent-CE2jhpNE.js';
 import { Hookable } from 'hookable';
 import { b as ExecutionContext, c as ExecutionHandle } from './types-vA1a_ZX7.js';
 import '@modelcontextprotocol/sdk/client/index.js';
@@ -65,6 +65,12 @@ interface BuildCatalogOptions {
 }
 /**
  * Build the skill catalog XML and behavioral instructions for the system prompt.
+ *
+ * The second argument accepts either {@link BuildCatalogOptions} (preferred)
+ * or — for legacy callers — a bare string interpreted as `readToolName` with
+ * `skillsToolRegistered: false`. The string form is kept for backward
+ * compatibility and will be removed in a future major; pass an options
+ * object instead.
  */
 declare function buildCatalog(skills: SkillConfig[], optionsOrReadToolName?: BuildCatalogOptions | string): string;
 
@@ -265,6 +271,10 @@ declare function interpolateShellCommands(instructions: string, execution: Execu
  * 2. Combine with default + user-provided scan paths (project-first, user-next)
  * 3. Run lenient discovery
  * 4. Apply filters: `exclude`, `enabled` allowlist, optional project-skill trust gate
+ *
+ * Backwards-compatible signature: returns `Promise<SkillConfig[]>`. Use
+ * {@link resolveSkillsWithCleanup} when you need to clean up the temp
+ * directory created for inline `write` skills (e.g. on `agent.destroy()`).
  */
 declare function resolveSkills(config: SkillsConfig): Promise<SkillConfig[]>;
 

package/dist/skills.js

@@ -1,6 +1,6 @@
 import {
   defineSkill
-} from "./chunk-BW3WTFIR.js";
+} from "./chunk-YPU6KVL6.js";
 import {
   IMPLICITLY_ALLOWED_SKILL_TOOLS,
   buildCatalog,
@@ -21,7 +21,7 @@ import {
   validateSkillName,
   writeSkillToDisk,
   writeSkillsToDisk
-} from "./chunk-TPXPVEH6.js";
+} from "./chunk-J4ZOSNSH.js";
 import "./chunk-LNN5UTS2.js";
 export {
   IMPLICITLY_ALLOWED_SKILL_TOOLS,

package/dist/tools.d.ts

@@ -1,7 +1,7 @@
-export { S as SkillsReadToolOptions, a as SkillsRunScriptToolOptions, b as SkillsUseToolOptions, c as createSkillsReadTool, d as createSkillsRunScriptTool, e as createSkillsUseTool, f as edit, g as glob, h as grep, m as multiEdit } from './skills-use-DU0unNP4.js';
-export { C as ChildAgent, I as InteractionToolOptions, S as SpawnToolOptions, a as SpawnToolState, V as ValidationResult, c as createInteractionTool, b as createSpawnTool, s as spawn, v as validateToolArgs } from './validation-BKA33eqb.js';
-import { Z as ToolDef } from './agent-C9q5VMGa.js';
-export { Y as ToolContext, a0 as ToolMap } from './agent-C9q5VMGa.js';
+export { S as SkillsReadToolOptions, a as SkillsRunScriptToolOptions, b as SkillsUseToolOptions, c as createSkillsReadTool, d as createSkillsRunScriptTool, e as createSkillsUseTool, f as edit, g as glob, h as grep, m as multiEdit } from './skills-use-CqOKEN56.js';
+export { C as ChildAgent, I as InteractionToolOptions, S as SpawnToolOptions, a as SpawnToolState, V as ValidationResult, c as createInteractionTool, b as createSpawnTool, s as spawn, v as validateToolArgs } from './validation-DlIURVGV.js';
+import { Z as ToolDef } from './agent-CE2jhpNE.js';
+export { Y as ToolContext, a0 as ToolMap } from './agent-CE2jhpNE.js';
 import 'hookable';
 import './presets.js';
 import './types-vA1a_ZX7.js';

package/dist/tools.js

@@ -14,9 +14,9 @@ import {
   spawn,
   validateToolArgs,
   writeFile
-} from "./chunk-2AE3VM5O.js";
-import "./chunk-TPXPVEH6.js";
-import "./chunk-IUBBVF53.js";
+} from "./chunk-6JIVVEQQ.js";
+import "./chunk-J4ZOSNSH.js";
+import "./chunk-UD25QF3H.js";
 import "./chunk-7H34OFDA.js";
 import "./chunk-JH6IAAFA.js";
 import "./chunk-LNN5UTS2.js";

package/dist/types.d.ts

@@ -1,7 +1,7 @@
-export { A as Agent, a as AgentAbortedError, b as AgentBehavior, c as AgentContextExceededError, d as AgentHooks, e as AgentOptions, f as AgentProviderError, g as AgentRunOptions, h as AgentStats, i as AgentToolNotAllowedError, j as AnthropicParams, C as CONTEXT_EXCEEDED_MESSAGE_PATTERNS, k as CerebrasParams, l as ChildRunStats, m as ClassifiedError, n as ClassifiedErrorKind, o as CreateSessionOptions, I as ImageContent, M as McpConnection, p as McpServerConfig, q as McpToolHookContext, O as OAuthRefreshHookContext, r as OpenAIParams, s as OpenRouterParams, P as PromptDocumentPart, t as PromptImagePart, u as PromptPart, v as PromptTextPart, w as Provider, x as ProviderCapabilities, R as RemoteStoreOptions, y as RunHookMap, S as Session, z as SessionContentBlock, B as SessionData, D as SessionEndStatus, E as SessionHookContext, F as SessionMessage, G as SessionRun, H as SessionStore, J as SessionTurn, K as SkillConfig, L as SkillResource, N as SkillsConfig, Q as SpawnHookContext, T as StreamCallbacks, U as StreamHookContext, V as StreamOptions, W as ThinkingLevel, X as ToolCall, Y as ToolContext, Z as ToolDef, _ as ToolExecutionMode, $ as ToolHookContext, a0 as ToolMap, a1 as ToolResult, a2 as ToolResultContent, a3 as ToolResultImageContent, a4 as ToolResultTextContent, a5 as ToolSpec, a6 as TurnFinishReason, a7 as TurnResult, a8 as TurnUsage, a9 as matchesContextExceeded, aa as toolOutputByteLength, ab as toolResultToText } from './agent-C9q5VMGa.js';
+export { A as Agent, a as AgentAbortedError, b as AgentBehavior, c as AgentContextExceededError, d as AgentHooks, e as AgentOptions, f as AgentProviderError, g as AgentRunOptions, h as AgentStats, i as AgentToolNotAllowedError, j as AnthropicParams, C as CONTEXT_EXCEEDED_MESSAGE_PATTERNS, k as CerebrasParams, l as ChildRunStats, m as ClassifiedError, n as ClassifiedErrorKind, o as CreateSessionOptions, I as ImageContent, M as McpConnection, p as McpServerConfig, q as McpToolHookContext, O as OAuthRefreshHookContext, r as OpenAIParams, s as OpenRouterParams, P as PromptDocumentPart, t as PromptImagePart, u as PromptPart, v as PromptTextPart, w as Provider, x as ProviderCapabilities, R as RemoteStoreOptions, y as RunHookMap, S as Session, z as SessionContentBlock, B as SessionData, D as SessionEndStatus, E as SessionHookContext, F as SessionMessage, G as SessionRun, H as SessionStore, J as SessionTurn, K as SkillConfig, L as SkillResource, N as SkillsConfig, Q as SpawnHookContext, T as StreamCallbacks, U as StreamHookContext, V as StreamOptions, W as ThinkingLevel, X as ToolCall, Y as ToolContext, Z as ToolDef, _ as ToolExecutionMode, $ as ToolHookContext, a0 as ToolMap, a1 as ToolResult, a2 as ToolResultContent, a3 as ToolResultImageContent, a4 as ToolResultTextContent, a5 as ToolSpec, a6 as TurnFinishReason, a7 as TurnResult, a8 as TurnUsage, a9 as matchesContextExceeded, aa as toolOutputByteLength, ab as toolResultToText } from './agent-CE2jhpNE.js';
 export { C as ContextCapabilities, a as ContextType, E as ExecResult, b as ExecutionContext, c as ExecutionHandle, S as SpawnConfig } from './types-vA1a_ZX7.js';
 export { S as SandboxProvider } from './sandbox-CLghrTLi.js';
 export { Preset } from './presets.js';
-export { C as ChildAgent, I as InteractionToolOptions, S as SpawnToolOptions, a as SpawnToolState, V as ValidationResult } from './validation-BKA33eqb.js';
+export { C as ChildAgent, I as InteractionToolOptions, S as SpawnToolOptions, a as SpawnToolState, V as ValidationResult } from './validation-DlIURVGV.js';
 import 'hookable';
 import '@modelcontextprotocol/sdk/client/index.js';

package/dist/{validation-BKA33eqb.d.ts → validation-DlIURVGV.d.ts}

@@ -1,4 +1,4 @@
-import { Y as ToolContext, Z as ToolDef, h as AgentStats, l as ChildRunStats } from './agent-C9q5VMGa.js';
+import { Y as ToolContext, Z as ToolDef, h as AgentStats, l as ChildRunStats } from './agent-CE2jhpNE.js';
 import { Preset } from './presets.js';
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zidane",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "description": "an agent that goes straight to the goal",
   "type": "module",
   "private": false,