@sentry/junior 0.63.0 → 0.64.0

package/README.md

@@ -25,7 +25,11 @@ export default app;
 
 Run `junior init my-bot` to scaffold a complete project including `vercel.json` for Vercel deployment.
 
-Use `juniorNitro({ plugins: { packages: [...] } })` in `nitro.config.ts` to declare which plugin packages to bundle and load at runtime. Packages with trusted runtime hooks, such as `@sentry/junior-github`, also need to be registered in app code with `createApp({ plugins: [...] })`.
+Use `defineJuniorPlugins([...])` in a runtime-safe plugin module, then point
+`juniorNitro({ plugins: "./plugins" })` at that module. `createApp()` reads the
+same enabled set from Nitro's virtual module. Manifest-only packages use
+package-name strings; trusted factories such as `githubPlugin()` register their
+manifest and in-process hooks together.
 
 ## Full docs
 

package/dist/api-reference.d.ts

@@ -3,5 +3,7 @@ export type { JuniorAppOptions } from "./app";
 export { initSentry } from "./instrumentation";
 export { juniorNitro } from "./nitro";
 export type { JuniorNitroOptions } from "./nitro";
+export { defineJuniorPlugins } from "./plugins";
+export type { JuniorPluginInput, JuniorPluginSet, JuniorPluginSetOptions, } from "./plugins";
 export { juniorVercelConfig } from "./vercel";
 export type { JuniorVercelConfigOptions } from "./vercel";

package/dist/app.d.ts

@@ -1,18 +1,13 @@
 import { Hono } from "hono";
-import type { PluginConfig } from "@/chat/plugins/types";
-import type { JuniorPlugin } from "@sentry/junior-plugin-api";
+import { type JuniorPluginSet } from "@/plugins";
 import type { WaitUntilFn } from "@/handlers/types";
+export { defineJuniorPlugins } from "@/plugins";
+export type { JuniorPluginInput, JuniorPluginSet, JuniorPluginSetOptions, } from "@/plugins";
 export interface JuniorAppOptions {
     /** Install-wide provider defaults (`provider.key` format). Channel overrides take precedence. */
     configDefaults?: Record<string, unknown>;
-    /**
-     * Plugin packages/overrides, or trusted plugin instances loaded by this app.
-     *
-     * Use `PluginConfig` for declarative package lists and manifest overrides.
-     * Use `JuniorPlugin[]` for trusted plugin factories such as `githubPlugin()`;
-     * their package config is merged with the catalog bundled by `juniorNitro()`.
-     */
-    plugins?: PluginConfig | JuniorPlugin[];
+    /** Direct plugin set override. Usually omitted when `juniorNitro()` uses a plugin module. */
+    plugins?: JuniorPluginSet;
     waitUntil?: WaitUntilFn;
 }
 /** Create a Hono app with all Junior routes. */

package/dist/app.js

@@ -22,13 +22,13 @@ import {
   splitSlackReplyText,
   truncateStatusText,
   upsertAgentTurnSessionRecord
-} from "./chunk-ITZ2F7UE.js";
+} from "./chunk-4CRYMG7M.js";
 import {
   discoverSkills,
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-ITOW4DED.js";
+} from "./chunk-D23WCM66.js";
 import {
   buildNonInteractiveShellScript,
   createSandboxInstance,
@@ -37,7 +37,7 @@ import {
   isSnapshotMissingError,
   resolveRuntimeDependencySnapshot,
   runNonInteractiveCommand
-} from "./chunk-LRVKJAR2.js";
+} from "./chunk-WZFQQ6SP.js";
 import {
   ACTIVE_LOCK_TTL_MS,
   GEN_AI_PROVIDER_NAME,
@@ -70,7 +70,7 @@ import {
   toGenAiPayloadMetadata,
   toGenAiPayloadTraceAttributes,
   toGenAiTextMetadata
-} from "./chunk-PEF6UXTY.js";
+} from "./chunk-IGVHCX2U.js";
 import {
   CredentialUnavailableError,
   buildOAuthTokenRequest,
@@ -101,7 +101,8 @@ import {
   resolveAuthTokenPlaceholder,
   resolvePluginCommandEnv,
   serializeGenAiAttribute,
-  setPluginConfig,
+  setPluginCatalogConfig,
+  setSentryUser,
   setSpanAttributes,
   setSpanStatus,
   setTags,
@@ -109,14 +110,19 @@ import {
   toOptionalString,
   withContext,
   withSpan
-} from "./chunk-H652GMDH.js";
+} from "./chunk-WDPWFMCE.js";
 import {
   sentry_exports
 } from "./chunk-Z3YD6NHK.js";
+import {
+  defineJuniorPlugins,
+  pluginCatalogConfigFromPluginSet,
+  trustedPluginRegistrationsFromPluginSet
+} from "./chunk-5VDO6LSG.js";
 import {
   homeDir,
   listReferenceFiles
-} from "./chunk-5LUISFEY.js";
+} from "./chunk-KVZL5NZS.js";
 import "./chunk-2KG3PWR4.js";
 
 // src/app.ts
@@ -298,7 +304,7 @@ var AGENT_PLUGIN_ROUTE_METHODS = /* @__PURE__ */ new Set([
   "ALL"
 ]);
 function validateLegacyStatePrefixes(plugin) {
-  const prefixes = plugin.pluginConfig?.legacyStatePrefixes;
+  const prefixes = plugin.legacyStatePrefixes;
   if (prefixes === void 0) {
     return;
   }
@@ -367,7 +373,7 @@ function getAgentPluginTools(context) {
       threadTs: context.threadTs,
       userText: context.userText,
       state: createPluginState(plugin.name, {
-        legacyStatePrefixes: plugin.pluginConfig?.legacyStatePrefixes
+        legacyStatePrefixes: plugin.legacyStatePrefixes
       })
     });
     for (const [name, tool2] of Object.entries(pluginTools)) {
@@ -10703,6 +10709,8 @@ Note: No file was attached in this turn. I need to attach the file before claimi
 // src/chat/services/turn-result.ts
 var POST_CANVAS_REPLY_MAX_CHARS = 700;
 var POST_CANVAS_REPLY_MAX_LINES = 8;
+var THINKING_XML_BLOCK_PATTERN = /[ \t]*<thinking\b[^>]*>[\s\S]*?<\/thinking>[ \t]*(?:\r?\n)?/gi;
+var FENCED_CODE_BLOCK_PATTERN = /```[\s\S]*?```/g;
 function isVerbosePostCanvasReply(text) {
   const lines = text.split(/\r?\n/).filter((line) => line.trim().length > 0);
   return text.length > POST_CANVAS_REPLY_MAX_CHARS || lines.length > POST_CANVAS_REPLY_MAX_LINES;
@@ -10717,6 +10725,21 @@ function buildBriefPostCanvasReply(artifactStatePatch) {
   const canvasUrl = getCreatedCanvasUrl(artifactStatePatch);
   return canvasUrl ? `I created a canvas with the full reference: ${canvasUrl}` : "I created a canvas with the full reference.";
 }
+function stripThinkingXmlBlocks(text) {
+  let result = "";
+  let cursor = 0;
+  for (const match of text.matchAll(FENCED_CODE_BLOCK_PATTERN)) {
+    const start = match.index;
+    if (start === void 0) {
+      continue;
+    }
+    result += text.slice(cursor, start).replace(THINKING_XML_BLOCK_PATTERN, "");
+    result += match[0];
+    cursor = start + match[0].length;
+  }
+  result += text.slice(cursor).replace(THINKING_XML_BLOCK_PATTERN, "");
+  return result;
+}
 function buildTurnResult(input) {
   const {
     newMessages,
@@ -10737,7 +10760,9 @@ function buildTurnResult(input) {
   const toolResults = newMessages.filter(isToolResultMessage);
   const assistantMessages = newMessages.filter(isAssistantMessage);
   const terminalAssistantMessages = getTerminalAssistantMessages(newMessages);
-  const primaryText = terminalAssistantMessages.map((message) => extractAssistantText(message)).join("\n\n").trim();
+  const primaryText = stripThinkingXmlBlocks(
+    terminalAssistantMessages.map((message) => extractAssistantText(message)).join("\n\n")
+  ).trim();
   const toolErrorCount = toolResults.filter((result) => result.isError).length;
   const explicitChannelPostIntent = isExplicitChannelPostIntent(userInput);
   const successfulToolNames = new Set(
@@ -14449,7 +14474,7 @@ async function runTrustedPluginHeartbeats(args) {
         Promise.resolve(
           heartbeat(
             createHeartbeatContext({
-              legacyStatePrefixes: plugin.pluginConfig?.legacyStatePrefixes,
+              legacyStatePrefixes: plugin.legacyStatePrefixes,
               plugin: plugin.name,
               nowMs: args.nowMs
             })
@@ -19559,6 +19584,13 @@ function createReplyToThread(deps) {
           conversation: preparedState.conversation
         });
         const resolvedUserName = message.author.userName ?? fallbackIdentity?.userName;
+        if (message.author.userId) {
+          setSentryUser({
+            id: message.author.userId,
+            ...resolvedUserName ? { username: resolvedUserName } : {},
+            ...fallbackIdentity?.email ? { email: fallbackIdentity.email } : {}
+          });
+        }
         if (resolvedUserName) {
           setTags({ slackUserName: resolvedUserName });
         }
@@ -21135,10 +21167,14 @@ async function defaultWaitUntil() {
     };
   }
 }
-async function resolveVirtualPluginConfig() {
+async function resolveVirtualConfig() {
   try {
     const mod = await import("#junior/config");
-    return mod.plugins;
+    return {
+      pluginSet: mod.pluginSet,
+      plugins: mod.plugins,
+      trustedPluginRegistrations: mod.trustedPluginRegistrations ?? []
+    };
   } catch (error) {
     if (!isMissingVirtualConfig(error)) {
       throw error;
@@ -21146,11 +21182,7 @@ async function resolveVirtualPluginConfig() {
     return void 0;
   }
 }
-async function resolveBuildPluginConfig() {
-  const virtualConfig = await resolveVirtualPluginConfig();
-  if (virtualConfig) {
-    return virtualConfig;
-  }
+function resolveEnvPluginCatalogConfig() {
   const packages = readEnvPluginPackages();
   if (packages) {
     return { packages };
@@ -21189,38 +21221,55 @@ function hasConfiguredPluginCatalog(config) {
     return false;
   }
   return Boolean(
-    config.packages?.length || Object.keys(config.manifests ?? {}).length
+    config.inlineManifests?.length || config.packages?.length || Object.keys(config.manifests ?? {}).length
   );
 }
-function isJuniorPluginArray(plugins) {
-  return Array.isArray(plugins);
+function pluginPackageNames(config) {
+  return config?.packages ?? [];
 }
-function mergePluginConfig(base, next) {
-  if (!base) return next;
-  if (!next) return base;
-  return {
-    packages: [
-      .../* @__PURE__ */ new Set([...base.packages ?? [], ...next.packages ?? []])
-    ],
-    manifests: base.manifests || next.manifests ? {
-      ...base.manifests ?? {},
-      ...next.manifests ?? {}
-    } : void 0
-  };
+function validateBuildIncludesPluginPackages(pluginConfig, virtualConfig) {
+  if (!virtualConfig?.plugins) {
+    return;
+  }
+  const bundled = new Set(pluginPackageNames(virtualConfig.plugins));
+  const missing = pluginPackageNames(pluginConfig).filter(
+    (packageName) => !bundled.has(packageName)
+  );
+  if (missing.length === 0) {
+    return;
+  }
+  throw new Error(
+    `createApp() registered plugin package(s) not bundled by juniorNitro(): ${missing.join(", ")}. Point juniorNitro({ plugins: "./plugins" }) at the runtime plugin module or pass the same defineJuniorPlugins(...) set to juniorNitro({ plugins }) and createApp({ plugins }).`
+  );
 }
-function pluginConfigFromAgentPlugins(plugins) {
-  const packages = [
-    ...new Set(
-      plugins.flatMap((plugin) => plugin.pluginConfig?.packages ?? [])
-    )
-  ];
-  return packages.length ? { packages } : void 0;
+function validateBuildIncludesTrustedRegistrations(trustedRegistrations, virtualConfig) {
+  const bundledTrustedRegistrations = virtualConfig?.trustedPluginRegistrations ?? [];
+  if (bundledTrustedRegistrations.length === 0) {
+    return;
+  }
+  const registered = new Set(trustedRegistrations.map((plugin) => plugin.name));
+  const missing = bundledTrustedRegistrations.filter(
+    (pluginName) => !registered.has(pluginName)
+  );
+  if (missing.length === 0) {
+    return;
+  }
+  throw new Error(
+    `createApp() is missing trusted plugin registration(s) bundled by juniorNitro(): ${missing.join(", ")}. Pass a runtime-safe plugin module to juniorNitro({ plugins: "./plugins" }) or pass the same defineJuniorPlugins(...) set to createApp({ plugins }).`
+  );
 }
-async function resolveAgentPluginBaseConfig(plugins) {
-  if (plugins.length === 0) {
-    return resolveVirtualPluginConfig();
+function validatePluginRegistrations(registrations) {
+  const loadedPlugins = getPluginProviders();
+  const loadedNames = new Set(
+    loadedPlugins.map((plugin) => plugin.manifest.name)
+  );
+  for (const registration of registrations) {
+    if (!loadedNames.has(registration.name)) {
+      throw new Error(
+        `Plugin registration "${registration.name}" does not have a matching plugin manifest. Add an inline manifest, packageName, or app-local plugin.yaml with the same name.`
+      );
+    }
   }
-  return resolveBuildPluginConfig();
 }
 function mountAgentPluginRoutes(app, routes) {
   for (const route of routes) {
@@ -21237,15 +21286,17 @@ function mountAgentPluginRoutes(app, routes) {
   }
 }
 async function createApp(options) {
-  const configuredPlugins = options?.plugins;
-  const agentPlugins2 = isJuniorPluginArray(configuredPlugins) ? configuredPlugins : [];
-  const pluginConfig = isJuniorPluginArray(configuredPlugins) ? mergePluginConfig(
-    await resolveAgentPluginBaseConfig(configuredPlugins),
-    pluginConfigFromAgentPlugins(configuredPlugins)
-  ) : configuredPlugins ?? await resolveBuildPluginConfig();
+  const virtualConfig = await resolveVirtualConfig();
+  const configuredPlugins = options?.plugins ?? virtualConfig?.pluginSet;
+  const agentPlugins2 = trustedPluginRegistrationsFromPluginSet(configuredPlugins);
+  const pluginConfig = configuredPlugins ? pluginCatalogConfigFromPluginSet(configuredPlugins) : virtualConfig?.plugins ?? resolveEnvPluginCatalogConfig();
+  if (configuredPlugins) {
+    validateBuildIncludesPluginPackages(pluginConfig, virtualConfig);
+  }
+  validateBuildIncludesTrustedRegistrations(agentPlugins2, virtualConfig);
   validateAgentPlugins(agentPlugins2);
-  const shouldValidatePluginCatalog = hasConfiguredPluginCatalog(pluginConfig) || Boolean(Object.keys(options?.configDefaults ?? {}).length);
-  const previousPluginConfig = setPluginConfig(pluginConfig);
+  const shouldValidatePluginCatalog = hasConfiguredPluginCatalog(pluginConfig) || Boolean(configuredPlugins?.registrations.length) || Boolean(Object.keys(options?.configDefaults ?? {}).length);
+  const previousPluginCatalogConfig = setPluginCatalogConfig(pluginConfig);
   const previousAgentPlugins = setAgentPlugins(agentPlugins2);
   const previousConfigDefaults = getConfigDefaults();
   let agentPluginRoutes = [];
@@ -21253,10 +21304,11 @@ async function createApp(options) {
     setConfigDefaults(options?.configDefaults);
     if (shouldValidatePluginCatalog) {
       getPluginCatalogSignature();
+      validatePluginRegistrations(configuredPlugins?.registrations ?? []);
     }
     agentPluginRoutes = getAgentPluginRoutes();
   } catch (error) {
-    setPluginConfig(previousPluginConfig);
+    setPluginCatalogConfig(previousPluginCatalogConfig);
     setAgentPlugins(previousAgentPlugins);
     setConfigDefaults(previousConfigDefaults);
     throw error;
@@ -21297,5 +21349,6 @@ async function createApp(options) {
   return app;
 }
 export {
-  createApp
+  createApp,
+  defineJuniorPlugins
 };

package/dist/build/virtual-config.d.ts

@@ -1,4 +1,20 @@
 import type { Nitro } from "nitro/types";
-import type { PluginConfig } from "@/chat/plugins/types";
+import type { PluginCatalogConfig } from "@/chat/plugins/types";
+import { type JuniorPluginSet } from "@/plugins";
+export interface RuntimePluginModule {
+    exportName: string;
+    specifier: string;
+}
+/** Render the virtual config module consumed by createApp(). */
+export declare function renderVirtualConfig(options: {
+    plugins?: PluginCatalogConfig;
+    pluginModule?: RuntimePluginModule;
+    trustedPluginRegistrations?: string[];
+}): string;
 /** Inject a virtual module so createApp() can read the plugin list at runtime. */
-export declare function injectVirtualConfig(nitro: Nitro, plugins?: PluginConfig): void;
+export declare function injectVirtualConfig(nitro: Nitro, options?: {
+    loadPluginSet?: () => Promise<JuniorPluginSet | undefined>;
+    pluginModule?: RuntimePluginModule;
+    plugins?: PluginCatalogConfig;
+    trustedPluginRegistrations?: string[];
+}): void;

package/dist/chat/logging.d.ts

@@ -18,6 +18,7 @@ export interface LogContext {
     slackThreadId?: string;
     slackUserId?: string;
     slackUserName?: string;
+    slackUserEmail?: string;
     slackChannelId?: string;
     runId?: string;
     actorType?: string;
@@ -30,6 +31,11 @@ export interface LogContext {
     urlFull?: string;
     userAgent?: string;
 }
+interface SentryUserIdentity {
+    id: string | number;
+    email?: string;
+    username?: string;
+}
 /** Normalize runtime finish reasons to the telemetry spelling we emit. */
 export declare function normalizeGenAiFinishReason(reason: string): string;
 export declare const log: {
@@ -37,7 +43,7 @@ export declare const log: {
     info(eventName: string, attrs?: Record<string, unknown>, body?: string): void;
     warn(eventName: string, attrs?: Record<string, unknown>, body?: string): void;
     error(eventName: string, attrs?: Record<string, unknown>, body?: string): void;
-    exception(eventName: string, error: unknown, attrs?: Record<string, unknown>, body?: string): string | undefined;
+    exception(eventName: string, error: unknown, attrs?: Record<string, unknown>, body?: string, context?: LogContext): string | undefined;
 };
 /** Create a Chat SDK logger that routes records through Junior's logging backend. */
 export declare function createChatSdkLogger(): ChatSdkLogger;
@@ -47,7 +53,11 @@ export declare function getLogContextAttributes(): LogAttributes;
 export declare function registerLogRecordSink(sink: (record: EmittedLogRecord) => void): () => void;
 export declare function createLogContextFromRequest(request: Request, context?: Partial<LogContext>): LogContext;
 export declare function toSpanAttributes(context: LogContext): Record<string, string>;
+/** Attach filterable non-user context tags to Sentry. */
 export declare function setSentryTagsFromContext(context: LogContext): void;
+/** Bind requester identity to Sentry's native user fields. */
+export declare function setSentryUser(identity: SentryUserIdentity | undefined): void;
+/** Attach scoped Sentry context for isolated exception capture. */
 export declare function setSentryScopeContext(scope: Sentry.Scope, context: LogContext): void;
 /** Capture an error to Sentry and emit an error log record. */
 export declare function captureException(error: unknown, context?: LogContext): void;
@@ -59,7 +69,7 @@ export declare function logWarn(eventName: string, context?: LogContext, attribu
 export declare function logError(eventName: string, context?: LogContext, attributes?: Record<string, unknown>, body?: string): void;
 /** Log an error with exception capture; returns the Sentry event ID if available. */
 export declare function logException(error: unknown, eventName: string, context?: LogContext, attributes?: Record<string, unknown>, body?: string): string | undefined;
-/** Set log context and Sentry tags for the current scope. */
+/** Set log context and Sentry scope metadata for the current request. */
 export declare function setTags(context?: LogContext): void;
 /** Create a LogContext from an incoming HTTP request. */
 export declare function createRequestContext(request: Request, context?: Partial<LogContext>): LogContext;

package/dist/chat/plugins/agent-hooks.d.ts

@@ -1,4 +1,4 @@
-import type { AgentPluginRequester, AgentPluginRoute, SlackConversationLink, JuniorPlugin } from "@sentry/junior-plugin-api";
+import type { AgentPluginRequester, AgentPluginRoute, SlackConversationLink, JuniorPluginRegistration } from "@sentry/junior-plugin-api";
 import type { ToolDefinition } from "@/chat/tools/definition";
 import type { ToolRuntimeContext } from "@/chat/tools/types";
 import type { SandboxInstance } from "@/chat/sandbox/workspace";
@@ -22,11 +22,11 @@ export interface AgentPluginHookRunner {
     prepareSandbox(sandbox: SandboxInstance): Promise<void>;
 }
 /** Validate trusted plugin identity before it can affect process-wide hooks. */
-export declare function validateAgentPlugins(plugins: JuniorPlugin[]): void;
+export declare function validateAgentPlugins(plugins: JuniorPluginRegistration[]): void;
 /** Replace trusted agent plugins and return the previous list for rollback. */
-export declare function setAgentPlugins(plugins: JuniorPlugin[]): JuniorPlugin[];
+export declare function setAgentPlugins(plugins: JuniorPluginRegistration[]): JuniorPluginRegistration[];
 /** Return the current trusted agent plugins without exposing mutable state. */
-export declare function getAgentPlugins(): JuniorPlugin[];
+export declare function getAgentPlugins(): JuniorPluginRegistration[];
 /** Collect turn-scoped tools exposed by trusted plugins. */
 export declare function getAgentPluginTools(context: ToolRuntimeContext): Record<string, ToolDefinition<any>>;
 /** Collect route handlers exposed by trusted plugins for app-level mounting. */

package/dist/chat/plugins/inline-manifest-source.d.ts

@@ -0,0 +1,5 @@
+import type { PluginManifest } from "./types";
+type ManifestSource = Record<string, unknown>;
+/** Convert inline JavaScript plugin manifests to the canonical source shape. */
+export declare function inlineManifestSource(manifest: PluginManifest): ManifestSource;
+export {};

package/dist/chat/plugins/manifest.d.ts

@@ -1,3 +1,5 @@
-import type { PluginConfig, PluginManifest } from "./types";
-/** Parse one plugin manifest after applying install-level plugin config. */
-export declare function parsePluginManifest(raw: string, dir: string, config?: PluginConfig): PluginManifest;
+import type { PluginCatalogConfig, PluginManifest } from "./types";
+/** Parse one plugin.yaml manifest after applying install-level plugin config. */
+export declare function parsePluginManifest(raw: string, dir: string, config?: PluginCatalogConfig): PluginManifest;
+/** Parse one inline JavaScript manifest through the same effective manifest pipeline as plugin.yaml. */
+export declare function parseInlinePluginManifest(manifest: PluginManifest, dir: string, config?: PluginCatalogConfig): PluginManifest;

package/dist/chat/plugins/package-discovery.d.ts

@@ -1,5 +1,10 @@
 export interface InstalledPluginPackageContent {
     packageNames: string[];
+    packages: {
+        dir: string;
+        hasSkillsDir: boolean;
+        name: string;
+    }[];
     manifestRoots: string[];
     skillRoots: string[];
     tracingIncludes: string[];

package/dist/chat/plugins/registry.d.ts

@@ -1,9 +1,9 @@
 import type { CapabilityProviderDefinition } from "@/chat/capabilities/catalog";
 import type { CredentialBroker } from "@/chat/credentials/broker";
 import { type InstalledPluginPackageContent } from "./package-discovery";
-import type { PluginBrokerDeps, PluginConfig, PluginDefinition, OAuthProviderConfig, PluginRuntimeDependency, PluginRuntimePostinstallCommand } from "./types";
+import type { PluginBrokerDeps, PluginCatalogConfig, PluginDefinition, OAuthProviderConfig, PluginRuntimeDependency, PluginRuntimePostinstallCommand } from "./types";
 /** Set install-wide plugin configuration and return the previous value for rollback. */
-export declare function setPluginConfig(config: PluginConfig | undefined): PluginConfig | undefined;
+export declare function setPluginCatalogConfig(config: PluginCatalogConfig | undefined): PluginCatalogConfig | undefined;
 /** Return installed plugin package content from the active plugin configuration. */
 export declare function getPluginPackageContent(): InstalledPluginPackageContent;
 /** Return the current plugin catalog signature used for cache invalidation. */

package/dist/chat/plugins/types.d.ts

@@ -130,8 +130,9 @@ export interface PluginManifestConfig {
         commandFlags?: string[] | null;
     } | null;
 }
-/** Install-level plugin package list and manifest configuration. */
-export interface PluginConfig {
+/** Install-level plugin package list and manifest override catalog. */
+export interface PluginCatalogConfig {
+    inlineManifests?: InlinePluginManifestDefinition[];
     packages?: string[];
     manifests?: Record<string, PluginManifestConfig>;
 }
@@ -141,6 +142,10 @@ export interface PluginBrokerDeps {
 export interface PluginDefinition {
     manifest: PluginManifest;
     dir: string;
-    skillsDir: string;
+    skillsDir?: string;
+}
+export interface InlinePluginManifestDefinition {
+    manifest: PluginManifest;
+    packageName?: string;
 }
 export {};

package/dist/chat/state/turn-session.d.ts

@@ -13,7 +13,7 @@ export interface AgentTurnSessionRecord {
     conversationTitle?: string;
     version: number;
     conversationId: string;
-    cumulativeDurationMs?: number;
+    cumulativeDurationMs: number;
     cumulativeUsage?: AgentTurnUsage;
     errorMessage?: string;
     lastProgressAtMs: number;

package/dist/{chunk-ITZ2F7UE.js → chunk-4CRYMG7M.js}

@@ -6,12 +6,12 @@ import {
   getConnectedStateContext,
   getStateAdapter,
   sandboxSkillDir
-} from "./chunk-PEF6UXTY.js";
+} from "./chunk-IGVHCX2U.js";
 import {
   isRecord,
   logInfo,
   logWarn
-} from "./chunk-H652GMDH.js";
+} from "./chunk-WDPWFMCE.js";
 import {
   sentry_exports
 } from "./chunk-Z3YD6NHK.js";
@@ -19,7 +19,7 @@ import {
   listReferenceFiles,
   soulPathCandidates,
   worldPathCandidates
-} from "./chunk-5LUISFEY.js";
+} from "./chunk-KVZL5NZS.js";
 
 // src/handlers/health.ts
 function GET() {
@@ -1251,9 +1251,7 @@ function parseAgentTurnSessionFields(parsed) {
   const sliceId = toFiniteNonNegativeNumber(parsed.sliceId);
   const version = toFiniteNonNegativeNumber(parsed.version);
   const updatedAtMs = toFiniteNonNegativeNumber(parsed.updatedAtMs);
-  const cumulativeDurationMs = toFiniteNonNegativeNumber(
-    parsed.cumulativeDurationMs
-  );
+  const cumulativeDurationMs = toFiniteNonNegativeNumber(parsed.cumulativeDurationMs) ?? 0;
   const cumulativeUsage = parseAgentTurnUsage(parsed.cumulativeUsage);
   const lastProgressAtMs = toFiniteNonNegativeNumber(parsed.lastProgressAtMs);
   const logSessionId = typeof parsed.logSessionId === "string" ? parsed.logSessionId : void 0;
@@ -1273,8 +1271,8 @@ function parseAgentTurnSessionFields(parsed) {
     startedAtMs: startedAtMs ?? updatedAtMs,
     lastProgressAtMs: lastProgressAtMs ?? updatedAtMs,
     updatedAtMs,
+    cumulativeDurationMs,
     ...logSessionId ? { logSessionId } : {},
-    ...cumulativeDurationMs !== void 0 ? { cumulativeDurationMs } : {},
     ...cumulativeUsage ? { cumulativeUsage } : {},
     ...requester ? { requester } : {},
     ...Array.isArray(parsed.loadedSkillNames) ? {
@@ -1363,7 +1361,7 @@ function materializeAgentTurnSessionRecord(stored, piMessages) {
     lastProgressAtMs: stored.lastProgressAtMs,
     updatedAtMs: stored.updatedAtMs,
     piMessages,
-    ...stored.cumulativeDurationMs !== void 0 ? { cumulativeDurationMs: stored.cumulativeDurationMs } : {},
+    cumulativeDurationMs: stored.cumulativeDurationMs,
     ...stored.cumulativeUsage ? { cumulativeUsage: stored.cumulativeUsage } : {},
     ...stored.resumeReason ? { resumeReason: stored.resumeReason } : {},
     ...stored.errorMessage ? { errorMessage: stored.errorMessage } : {},
@@ -1424,12 +1422,7 @@ function buildStoredRecord(args) {
     updatedAtMs: nowMs,
     committedMessageCount: args.committedMessageCount,
     ...args.logSessionId ? { logSessionId: args.logSessionId } : {},
-    ...typeof args.cumulativeDurationMs === "number" && Number.isFinite(args.cumulativeDurationMs) ? {
-      cumulativeDurationMs: Math.max(
-        0,
-        Math.floor(args.cumulativeDurationMs)
-      )
-    } : {},
+    cumulativeDurationMs: args.cumulativeDurationMs,
     ...args.cumulativeUsage ? { cumulativeUsage: args.cumulativeUsage } : {},
     ...args.requester ? { requester: args.requester } : {},
     ...Array.isArray(args.loadedSkillNames) ? {
@@ -1483,7 +1476,7 @@ async function updateAgentTurnSessionState(args) {
       lastProgressAtMs: parsed.lastProgressAtMs,
       previousVersion: parsed.version,
       ...parsed.logSessionId ? { logSessionId: parsed.logSessionId } : {},
-      ...args.existing.cumulativeDurationMs !== void 0 ? { cumulativeDurationMs: args.existing.cumulativeDurationMs } : {},
+      cumulativeDurationMs: args.existing.cumulativeDurationMs,
       ...args.existing.cumulativeUsage ? { cumulativeUsage: args.existing.cumulativeUsage } : {},
       ...args.existing.loadedSkillNames ? { loadedSkillNames: args.existing.loadedSkillNames } : {},
       ...args.existing.requester ? { requester: args.existing.requester } : {},
@@ -1522,7 +1515,7 @@ async function upsertAgentTurnSessionRecord(args) {
       committedMessageCount: args.piMessages.length,
       logSessionId: commit.sessionId,
       previousVersion: existingRecord?.version,
-      ...args.cumulativeDurationMs !== void 0 ? { cumulativeDurationMs: args.cumulativeDurationMs } : {},
+      cumulativeDurationMs: toFiniteNonNegativeNumber(args.cumulativeDurationMs) ?? existingRecord?.cumulativeDurationMs ?? 0,
       ...args.cumulativeUsage ? { cumulativeUsage: args.cumulativeUsage } : {},
       ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
       ...args.requester ?? existingRecord?.requester ? { requester: args.requester ?? existingRecord?.requester } : {},
@@ -1554,12 +1547,7 @@ async function recordAgentTurnSessionSummary(args) {
       lastProgressAtMs: args.lastProgressAtMs ?? nowMs,
       state: args.state,
       updatedAtMs: nowMs,
-      ...typeof args.cumulativeDurationMs === "number" && Number.isFinite(args.cumulativeDurationMs) ? {
-        cumulativeDurationMs: Math.max(
-          0,
-          Math.floor(args.cumulativeDurationMs)
-        )
-      } : existing?.cumulativeDurationMs !== void 0 ? { cumulativeDurationMs: existing.cumulativeDurationMs } : {},
+      cumulativeDurationMs: toFiniteNonNegativeNumber(args.cumulativeDurationMs) ?? existing?.cumulativeDurationMs ?? 0,
       ...args.cumulativeUsage ?? existing?.cumulativeUsage ? { cumulativeUsage: args.cumulativeUsage ?? existing?.cumulativeUsage } : {},
       ...args.requester ?? existing?.requester ? { requester: args.requester ?? existing?.requester } : {},
       ...Array.isArray(args.loadedSkillNames) ? {