@theokit/sdk 3.1.1 → 3.2.2

package/dist/index.cjs

@@ -976,10 +976,10 @@ function buildToolPrompt(prompt) {
 Respond by calling the \`output\` tool with the structured answer that matches the schema.`;
 }
 function setupStructuredOutput(schema, maxRetries) {
-  const z10 = requireZod();
+  const z11 = requireZod();
   const jsonSchema = toJsonSchema(schema, { unrepresentable: "any" });
   return {
-    z: z10,
+    z: z11,
     jsonSchema,
     maxRetries: maxRetries ?? 1,
     initialUsage: { inputTokens: 0, outputTokens: 0 }
@@ -4757,7 +4757,14 @@ var init_env_policy = __esm({
       /[_-]PWD/i,
       /CREDENTIAL/i,
       /PRIVATE/i,
-      /_AUTH/i
+      /_AUTH/i,
+      // #54-a — value-embedded-secret conventions (no generic `*_URL` — see keep-list test).
+      /DSN/i,
+      /WEBHOOK/i,
+      /COOKIE/i,
+      /CONNECTION[_-]?STRING/i,
+      // Known DB / message-broker connection-string vars (carry `user:pass@`).
+      /(?:^|[_-])(?:DATABASE|DB|REDIS|MONGO(?:DB)?|POSTGRES(?:QL)?|MYSQL|MARIADB|AMQP|RABBITMQ|CLICKHOUSE|ELASTIC(?:SEARCH)?|CASSANDRA|COUCHDB|MEMCACHED|NATS|KAFKA)[_-]?(?:URL|URI|DSN|CONNECTION)/i
     ];
     CORE_VARS = [
       "PATH",
@@ -6055,7 +6062,7 @@ async function buildSystemPromptContext(inputs, userText, memoryFacts, manager =
     memory: memoryFacts.map((fact) => ({ text: fact.text }))
   };
 }
-async function buildAssemblyContext(inputs, userText, baseSystemPrompt, memoryFacts, activeMemorySummary) {
+async function buildAssemblyContext(inputs, userText, baseSystemPrompt, memoryFacts, activeMemorySummary, contextPaths) {
   const resolved = await resolveSendSkills(inputs, userText, memoryFacts);
   const baseCtx = await buildSystemPromptContext(inputs, userText, memoryFacts, resolved.manager);
   const assemblyCtx = {
@@ -6068,19 +6075,21 @@ async function buildAssemblyContext(inputs, userText, baseSystemPrompt, memoryFa
     assemblyCtx.activeMemorySummary = activeMemorySummary;
   }
   if (inputs.context !== void 0) {
+    await inputs.context.applyScope(contextPaths);
     const internal = inputs.context.internalAssemblySnapshot();
     assemblyCtx.contextSnapshot = { sources: internal.sources };
     if (internal.maxTokens !== void 0) assemblyCtx.contextMaxTokens = internal.maxTokens;
   }
   return assemblyCtx;
 }
-async function assembleSystemPromptForSend(inputs, userText, baseSystemPrompt, memoryFacts, activeMemorySummary) {
+async function assembleSystemPromptForSend(inputs, userText, baseSystemPrompt, memoryFacts, activeMemorySummary, contextPaths) {
   const ctx = await buildAssemblyContext(
     inputs,
     userText,
     baseSystemPrompt,
     memoryFacts,
-    activeMemorySummary
+    activeMemorySummary,
+    contextPaths
   );
   return inputs.systemPromptPipeline.assemble(ctx);
 }
@@ -6787,6 +6796,14 @@ var init_context_discovery = __esm({
         followImports: false,
         priority: 40
       },
+      {
+        id: "theokit-rules",
+        pattern: ".theokit/rules/*.md",
+        scope: "globbed",
+        parser: "rules-frontmatter",
+        followImports: false,
+        priority: 45
+      },
       {
         id: "theokit-context",
         pattern: ".theokit/context/*.md",
@@ -6870,32 +6887,27 @@ var init_context_import_resolver = __esm({
     MAX_HOPS = 5;
   }
 });
-function parseMdc(content) {
-  const m = FRONTMATTER_RE.exec(content);
-  if (m === null) {
-    return { frontmatter: { alwaysApply: true }, body: content };
-  }
-  const yamlBody = m[1] ?? "";
-  const body = m[2] ?? "";
-  try {
-    const parsed = parseSimpleYaml2(yamlBody);
-    const validated = McdFrontmatterSchema.safeParse(parsed);
-    if (!validated.success) return void 0;
-    return { frontmatter: validated.data, body };
-  } catch {
-    return void 0;
-  }
+
+// src/internal/runtime/context/context-glob.ts
+function globToRegex(glob) {
+  const compiled = glob.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*\*\//g, "::GLOBSTAR_SLASH::").replace(/\*\*/g, "::GLOBSTAR::").replace(/\*/g, "[^/]*").replace(/\?/g, "[^/]").replace(/::GLOBSTAR_SLASH::/g, "(?:.*/)?").replace(/::GLOBSTAR::/g, ".*");
+  return new RegExp(`^${compiled}$`);
 }
-function shouldActivate(fm, touchedFiles) {
-  if (fm.alwaysApply === true) return true;
-  if (fm.globs === void 0 || fm.globs.length === 0) return false;
-  if (touchedFiles.length === 0) return false;
-  const globRes = fm.globs.map(globToRegex);
-  return touchedFiles.some((file) => globRes.some((re) => re.test(file)));
+function anyGlobMatches(patterns, paths) {
+  if (patterns.length === 0 || paths.length === 0) return false;
+  const res = patterns.map(globToRegex);
+  return paths.some((p) => res.some((re) => re.test(p)));
 }
-function globToRegex(glob) {
-  const escaped = glob.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*\*/g, "::DOUBLESTAR::").replace(/\*/g, "[^/]*").replace(/::DOUBLESTAR::/g, ".*").replace(/\?/g, ".");
-  return new RegExp(`^${escaped}$`);
+var init_context_glob = __esm({
+  "src/internal/runtime/context/context-glob.ts"() {
+  }
+});
+
+// src/internal/runtime/context/context-yaml-lite.ts
+function splitFrontmatter3(content) {
+  const m = FRONTMATTER_RE.exec(content);
+  if (m === null) return { yaml: void 0, body: content };
+  return { yaml: m[1] ?? "", body: m[2] ?? "" };
 }
 function parseSimpleYaml2(yaml) {
   const out = {};
@@ -6942,15 +6954,76 @@ function parseScalar(s) {
   if (/^-?\d+$/.test(s)) return parseInt(s, 10);
   return s.replace(/^["']|["']$/g, "");
 }
-var McdFrontmatterSchema, FRONTMATTER_RE;
+var FRONTMATTER_RE;
+var init_context_yaml_lite = __esm({
+  "src/internal/runtime/context/context-yaml-lite.ts"() {
+    FRONTMATTER_RE = /^---\s*\n([\s\S]*?)\n---\s*\n([\s\S]*)$/;
+  }
+});
+function parseMdc(content) {
+  const { yaml, body } = splitFrontmatter3(content);
+  if (yaml === void 0) {
+    return { frontmatter: { alwaysApply: true }, body: content };
+  }
+  try {
+    const parsed = parseSimpleYaml2(yaml);
+    const validated = McdFrontmatterSchema.safeParse(parsed);
+    if (!validated.success) return void 0;
+    return { frontmatter: validated.data, body };
+  } catch {
+    return void 0;
+  }
+}
+function shouldActivate(fm, touchedFiles) {
+  if (fm.alwaysApply === true) return true;
+  if (fm.globs === void 0 || fm.globs.length === 0) return false;
+  return anyGlobMatches(fm.globs, touchedFiles);
+}
+var McdFrontmatterSchema;
 var init_context_mdc_parser = __esm({
   "src/internal/runtime/context/context-mdc-parser.ts"() {
+    init_context_glob();
+    init_context_yaml_lite();
     McdFrontmatterSchema = zod.z.object({
       description: zod.z.string().optional(),
       globs: zod.z.array(zod.z.string()).optional(),
       alwaysApply: zod.z.boolean().optional()
     });
-    FRONTMATTER_RE = /^---\s*\n([\s\S]*?)\n---\s*\n([\s\S]*)$/;
+  }
+});
+function parseRules(content) {
+  const { yaml, body } = splitFrontmatter3(content);
+  if (yaml === void 0) {
+    return { frontmatter: { alwaysApply: true }, body: content };
+  }
+  try {
+    const parsed = parseSimpleYaml2(yaml);
+    const validated = RulesFrontmatterSchema.safeParse(parsed);
+    if (!validated.success) return void 0;
+    return { frontmatter: validated.data, body };
+  } catch {
+    return void 0;
+  }
+}
+function shouldActivateRule(fm, inScopePaths) {
+  if (fm.enabled === false) return false;
+  if (fm.alwaysApply === true) return true;
+  const patterns = [...fm.paths ?? [], ...fm.globs ?? []];
+  if (patterns.length === 0) return false;
+  return anyGlobMatches(patterns, inScopePaths);
+}
+var RulesFrontmatterSchema;
+var init_context_rules_frontmatter = __esm({
+  "src/internal/runtime/context/context-rules-frontmatter.ts"() {
+    init_context_glob();
+    init_context_yaml_lite();
+    RulesFrontmatterSchema = zod.z.object({
+      description: zod.z.string().optional(),
+      paths: zod.z.array(zod.z.string()).optional(),
+      globs: zod.z.array(zod.z.string()).optional(),
+      alwaysApply: zod.z.boolean().optional(),
+      enabled: zod.z.boolean().optional()
+    });
   }
 });
 async function runDiscovery(opts) {
@@ -6986,6 +7059,9 @@ async function loadOneSource(spec, path$1, opts, gitRoot) {
   if (spec.parser === "mdc") {
     return loadMdcSource(spec, path$1, id, opts);
   }
+  if (spec.parser === "rules-frontmatter") {
+    return loadRulesSource(spec, path$1, id, opts);
+  }
   if (spec.parser === "frontmatter-zod") {
     return void 0;
   }
@@ -7009,6 +7085,24 @@ async function loadMdcSource(spec, path, id, opts) {
     truncated: false
   };
 }
+async function loadRulesSource(spec, path, id, opts) {
+  let raw;
+  try {
+    raw = await promises.readFile(path, "utf8");
+  } catch {
+    return void 0;
+  }
+  const parsed = parseRules(raw);
+  if (parsed === void 0) return void 0;
+  if (!shouldActivateRule(parsed.frontmatter, opts.touchedFiles ?? [])) return void 0;
+  return {
+    id,
+    source: path,
+    content: parsed.body,
+    priority: spec.priority,
+    truncated: false
+  };
+}
 async function loadPlainMarkdownSource(spec, path, id, opts) {
   const loaded = await loadPlainMarkdown(path, { maxBytesPerFile: opts.maxBytesPerFile });
   if (loaded === void 0) return void 0;
@@ -7034,6 +7128,7 @@ var init_context_discovery_runner = __esm({
     init_context_import_resolver();
     init_context_loaders();
     init_context_mdc_parser();
+    init_context_rules_frontmatter();
   }
 });
 var ContextSourceFrontmatterSchema;
@@ -7169,6 +7264,10 @@ function matchesGlob(pattern, path) {
 function tokenizeContent(content) {
   return content.split(/\s+/).filter((token) => token.length > 0);
 }
+function sameScope(a, b) {
+  if (a.length !== b.length) return false;
+  return a.every((v, i) => v === b[i]);
+}
 var FileContextManager;
 var init_context_manager = __esm({
   "src/internal/runtime/context/context-manager.ts"() {
@@ -7189,6 +7288,13 @@ var init_context_manager = __esm({
       settings;
       settingSourcesIncludeProject;
       state;
+      /**
+       * The in-scope file set used by the most recent `refresh`. Tracked so
+       * `applyScope` only touches state when the scope actually changes — a
+       * caller that never scopes (the common case) keeps the create-time
+       * snapshot untouched, at zero per-send cost.
+       */
+      lastScope = [];
       async initialize() {
         if (!this.settingSourcesIncludeProject && this.settings.manager !== "file") {
           this.state = { config: { sources: [] }, loadedSources: [] };
@@ -7196,14 +7302,31 @@ var init_context_manager = __esm({
         }
         await this.refresh();
       }
-      async refresh() {
+      /**
+       * Re-run discovery for a specific per-send in-scope file set (T3). Path-scoped
+       * rules (`.theokit/rules/*.md`, `.cursor/rules/*.mdc` globs) activate iff a
+       * pattern matches one of `contextPaths`. Idempotent: unchanged scope is a
+       * no-op, and `undefined` scope while never previously scoped never touches
+       * state (preserves the create-time snapshot for non-users).
+       */
+      async applyScope(contextPaths) {
+        const scope = contextPaths ?? [];
+        if (scope.length === 0 && this.lastScope.length === 0) return;
+        if (sameScope(scope, this.lastScope)) return;
+        await this.refresh({ touchedFiles: scope });
+      }
+      async refresh(opts) {
+        const touchedFiles = opts?.touchedFiles ?? [];
+        this.lastScope = [...touchedFiles];
         const config = await loadContextConfig(this.cwd);
         const legacy = await loadSources(config, this.cwd);
         const maxBytesPerFile = this.settings.maxBytesPerFile ?? DEFAULT_MAX_BYTES_PER_FILE;
         const maxBytesTotal = this.settings.maxBytesTotal ?? DEFAULT_MAX_BYTES_TOTAL;
         const discovered = await runDiscovery({
           cwd: this.cwd,
-          maxBytesPerFile});
+          maxBytesPerFile,
+          touchedFiles
+        });
         const legacyAsAggregator = legacy.map((src) => ({
           id: src.name,
           source: src.path,
@@ -7638,15 +7761,19 @@ async function collectChildToolResults(run) {
 ${lines.join("\n")}
 </subagent-tool-results>`;
 }
-async function runChildAgent(spec, input, signal, maxSteps, inherited) {
-  const { Agent: Agent2 } = await Promise.resolve().then(() => (init_agent(), agent_exports));
+function buildChildCreateOptions(spec, inherited) {
   const model = spec.model ? { id: spec.model } : inherited?.model;
-  const agent = await Agent2.create({
+  return {
     ...inherited?.apiKey !== void 0 ? { apiKey: inherited.apiKey } : {},
     ...model !== void 0 ? { model } : {},
+    ...inherited?.plugins !== void 0 ? { plugins: inherited.plugins } : {},
     systemPrompt: spec.instructions,
     tools: spec.tools ?? []
-  });
+  };
+}
+async function runChildAgent(spec, input, signal, maxSteps, inherited) {
+  const { Agent: Agent2 } = await Promise.resolve().then(() => (init_agent(), agent_exports));
+  const agent = await Agent2.create(buildChildCreateOptions(spec, inherited));
   try {
     const sendOptions = {
       ...signal !== void 0 ? { signal } : {},
@@ -9549,7 +9676,10 @@ async function runAgentLoop(inputs) {
       }
       budget.consume();
       inputs.budgetTracker?.nextIteration?.();
-      if (inputs.signal?.aborted === true) break;
+      if (inputs.signal?.aborted === true) {
+        ctx.finalStatus = "cancelled";
+        break;
+      }
     }
     if (lastTurnDecision === "continue" && budget.shouldContinue() === false) {
       ctx.stoppedAtIterationLimit = true;
@@ -9734,15 +9864,15 @@ async function guardAndTransformToolResults(inputs, raw, ctx) {
 }
 async function continueOrTerminate(inputs, ctx, llmOutput) {
   if (llmOutput.errored) return "error";
-  if (llmOutput.text.length > 0) {
-    await emitAssistantTextStep(inputs, ctx, llmOutput.text);
+  const tCtx = { agentId: inputs.agentId, runId: inputs.runId };
+  const text = llmOutput.text.length > 0 ? await transformLlmOutputText(inputs, llmOutput.text, tCtx) : llmOutput.text;
+  if (text.length > 0) {
+    await emitAssistantTextStep(inputs, ctx, text);
   }
   if (llmOutput.stopReason !== "tool_use" || llmOutput.toolCalls.length === 0) {
     return finishOrReflect(inputs, ctx, llmOutput);
   }
-  const tCtx = { agentId: inputs.agentId, runId: inputs.runId };
-  const outText = await transformLlmOutputText(inputs, llmOutput.text, tCtx);
-  ctx.messages.push(buildAssistantTurn(outText, llmOutput.toolCalls));
+  ctx.messages.push(buildAssistantTurn(text, llmOutput.toolCalls));
   const rawResults = await dispatchTools(
     // SE12 — forward a read-only text projection of the transcript-so-far to tool
     // handlers via `ctx.messages` (consumed by defineSubAgent's messageFilter).
@@ -13080,7 +13210,12 @@ var init_client = __esm({
             code: "mcp_http_error"
           });
         }
-        return await response.json();
+        try {
+          return await response.json();
+        } catch (cause) {
+          if (isAbortLike(cause)) throw mcpTimeoutError(this.name, timeoutMs);
+          throw cause;
+        }
       }
     };
   }
@@ -13320,9 +13455,11 @@ function declarativeSubagentTools(agentOptions, parentTools) {
   return subAgentToolsFromDefinitions(agents2, parentTools);
 }
 function bindParentCredentials(tools, agentOptions) {
+  const parentPlugins = Array.isArray(agentOptions.plugins) ? agentOptions.plugins : void 0;
   const credentials = {
     ...agentOptions.apiKey !== void 0 ? { apiKey: agentOptions.apiKey } : {},
-    ...typeof agentOptions.model === "object" ? { model: agentOptions.model } : {}
+    ...typeof agentOptions.model === "object" ? { model: agentOptions.model } : {},
+    ...parentPlugins !== void 0 ? { plugins: parentPlugins } : {}
   };
   for (const tool of tools) inheritSubAgentCredentials(tool, credentials);
 }
@@ -15856,10 +15993,11 @@ var init_local_agent_memory = __esm({
       }
       buildTelemetryRecallArgs(telemetry) {
         const userId = typeof this.options.memoryContext?.userId === "string" ? this.options.memoryContext.userId : void 0;
+        const tenantId = typeof this.options.memoryContext?.tenantId === "string" ? this.options.memoryContext.tenantId : void 0;
         return {
           ...telemetry !== void 0 ? { telemetry } : {},
           ...userId !== void 0 ? { userId } : {},
-          namespace: "default",
+          namespace: tenantId ?? "default",
           scope: "session"
         };
       }
@@ -17156,7 +17294,8 @@ async function executeSendLocked(inputs, message, options) {
     userText,
     baseSystemPrompt,
     memoryFacts,
-    activeMemorySummary
+    activeMemorySummary,
+    options.contextPaths
   );
   const projectedSystemPrompt = await projectCurrentObjective(
     inputs.storageHandle,
@@ -18229,7 +18368,7 @@ var init_local_agent = __esm({
             runPreHook: (ut) => this.runPreHook(ut),
             // biome-ignore format: G8 budget — callbacks wire to private methods.
             resolveSystemPromptForSend: (ut, o, mf) => this.resolveSystemPrompt(ut, o, mf),
-            assembleSystemPromptForSend: (ut, bp, mf, ams) => assembleSystemPromptForSend(this.assemblyInputs(), ut, bp, mf, ams),
+            assembleSystemPromptForSend: (ut, bp, mf, ams, cp) => assembleSystemPromptForSend(this.assemblyInputs(), ut, bp, mf, ams, cp),
             dispatchRun: (msg, o, sp, mf, pm, mt, mp) => this.dispatchRun(msg, o, sp, mf, pm, mt, mp)
           },
           message,
@@ -22128,8 +22267,10 @@ var JobQueue = class {
     const job = this.jobs.get(id);
     if (!job) return false;
     if (job.status === "pending" || job.status === "running") {
+      const wasRunning = job.status === "running";
       job.status = "cancelled";
       this.controllers.get(id)?.abort();
+      if (wasRunning) this.#release(id);
       return true;
     }
     return false;
@@ -22147,8 +22288,14 @@ var JobQueue = class {
       });
     });
   }
-  /** Release a slot + clean up the controller; start the next waiting job. */
+  /**
+   * Release a slot + clean up the controller; start the next waiting job.
+   * Idempotent — keyed on the controller's presence, so a running job that was
+   * cancelled (released early) does not double-decrement when its `.finally`
+   * eventually fires.
+   */
   #release(id) {
+    if (!this.controllers.has(id)) return;
     this.controllers.delete(id);
     this.running -= 1;
     const next = this.waiting.shift();