@canonry/canonry 5.10.0 → 5.12.0

package/dist/{chunk-W67ORZUR.js → chunk-KBSAEALE.js}

@@ -17,12 +17,12 @@ import {
   resolveOperatorApiKeyIds,
   runWithUsageTags,
   saveConfigPatch
-} from "./chunk-GQ37ALYP.js";
+} from "./chunk-WJGUBZSW.js";
 import {
   deleteSiteCrawlGraphLayout,
   persistSiteCrawlGraphLayout,
   prepareSiteCrawlGraphLayout
-} from "./chunk-S7D23FEE.js";
+} from "./chunk-LWGYRN3T.js";
 import {
   PACKAGE_VERSION
 } from "./chunk-AOJU5LKX.js";
@@ -151,6 +151,7 @@ import {
   readInstalledVersion,
   redactNotificationUrl,
   refreshAccessToken,
+  registerAgentConversationRoutes,
   registerOAuthAdminRoutes,
   registerOAuthRoutes,
   requireInstanceAdministrator,
@@ -178,7 +179,7 @@ import {
   siteLivenessState,
   toAlertView,
   usageCounters
-} from "./chunk-KBPSOB55.js";
+} from "./chunk-DOC4QQLS.js";
 import {
   AGENT_MEMORY_VALUE_MAX_BYTES,
   AGENT_NONE,
@@ -299,6 +300,7 @@ import {
   isVertexGroundingRedirect,
   mapWithConcurrency,
   maskTelemetryAnonymousId,
+  missingDependency,
   nextScheduleUpdatedAt,
   normalizeAgentSlug,
   normalizeIdTokens,
@@ -335,7 +337,7 @@ import {
   visibilityReportRequestSchema,
   winnabilityClassLabel,
   withRetry
-} from "./chunk-KEMMVSAQ.js";
+} from "./chunk-NYRRWWEE.js";
 
 // src/runtime-context.ts
 function cliRuntimeContext(env = process.env, stdio = process) {
@@ -6481,7 +6483,7 @@ function nonBlank(value) {
   return trimmed ? trimmed : void 0;
 }
 function resolveBuildCommit(env = process.env) {
-  const embedded = true ? "f55491f2af7978e1e202050de7dd986e7c888d8c" : void 0;
+  const embedded = true ? "3cbbec137ff9c498f0b59f30a5e2b84c99af6f40" : void 0;
   return nonBlank(embedded) ?? nonBlank(env.CANONRY_COMMIT);
 }
 function resolveInstanceIdentity(env = process.env) {
@@ -11775,7 +11777,7 @@ function readStoredGroundingSources(rawResponse) {
   return result2;
 }
 async function backfillInsightsCommand(project, opts) {
-  const { IntelligenceService: IntelligenceService2 } = await import("./intelligence-service-7PVUFJTX.js");
+  const { IntelligenceService: IntelligenceService2 } = await import("./intelligence-service-K4U55A2J.js");
   const config = loadConfig();
   const db = createClient(config.database);
   migrate(db);
@@ -13864,13 +13866,15 @@ function resolveAgentId(providerOrPiAi) {
   return void 0;
 }
 function buildAgentProvidersResponse(config) {
+  const pinned = coerceAgentProvider(config.agent?.provider ?? void 0);
+  const pinnedModel = pinned ? config.agent?.model ?? void 0 : void 0;
   const providers = listAgentProviders().map((id) => {
     const entry = AGENT_PROVIDERS[id];
     const source = resolveApiKeySource(id, config);
     return {
       id,
       label: entry.label,
-      defaultModel: entry.defaultModel,
+      defaultModel: id === pinned && pinnedModel ? pinnedModel : entry.defaultModel,
       configured: source !== void 0,
       keySource: source?.source ?? null
     };
@@ -13878,7 +13882,7 @@ function buildAgentProvidersResponse(config) {
   const firstConfigured = agentProvidersByPriority().find((p) => resolveApiKeySource(p, config));
   return {
     providers,
-    defaultProvider: firstConfigured ?? null
+    defaultProvider: pinned ?? firstConfigured ?? null
   };
 }
 
@@ -14174,6 +14178,9 @@ function mcpToAgentTool(tool, ctx) {
 }
 var AERO_EXCLUDED_MCP_TOOLS = /* @__PURE__ */ new Set([
   CanonryMcpToolNames.canonry_agent_clear,
+  CanonryMcpToolNames.canonry_agent_conversations_new,
+  CanonryMcpToolNames.canonry_agent_conversations_resume,
+  CanonryMcpToolNames.canonry_agent_conversations_delete,
   CanonryMcpToolNames.canonry_results_clear
 ]);
 function buildMcpAgentTools(registry, ctx, opts = {}) {
@@ -14841,6 +14848,27 @@ function missingProviderMessage() {
   const envHints = agentProvidersByPriority().map(agentProviderApiKeyEnvVar).join(" / ");
   return `No agent LLM provider configured. Add an API key for one of: ${configHints} in ~/.canonry/config.yaml, or export ${envHints}.`;
 }
+function resolveConfiguredAgentProvider(config) {
+  return coerceAgentProvider(config.agent?.provider);
+}
+function describeAgentPin(config) {
+  const provider = resolveConfiguredAgentProvider(config);
+  if (!provider) return null;
+  const model = config.agent?.model ?? getAgentProvider(provider).defaultModel;
+  let modelError = null;
+  try {
+    resolveAeroModel(provider, model);
+  } catch (err) {
+    modelError = err instanceof Error ? err.message : String(err);
+  }
+  return {
+    provider,
+    model,
+    configured: Boolean(resolveApiKeyFor(provider, config)),
+    envVar: agentProviderApiKeyEnvVar(provider),
+    modelError
+  };
+}
 function detectAgentProvider(config) {
   for (const provider of agentProvidersByPriority()) {
     if (resolveApiKeyFor(provider, config)) return provider;
@@ -14911,9 +14939,11 @@ function createAeroSession(opts) {
   return agent;
 }
 function resolveSessionProviderAndModel(config, opts) {
-  const provider = opts?.provider ?? detectAgentProvider(config);
+  const pinned = resolveConfiguredAgentProvider(config);
+  const provider = opts?.provider ?? pinned ?? detectAgentProvider(config);
   if (!provider) throw new Error(missingProviderMessage());
-  const modelId = opts?.modelId ?? getAgentProvider(provider).defaultModel;
+  const pinnedModelId = provider === pinned ? config.agent?.model : void 0;
+  const modelId = opts?.modelId ?? pinnedModelId ?? getAgentProvider(provider).defaultModel;
   return { provider, modelId };
 }
 
@@ -15006,7 +15036,7 @@ async function loadExternalMcpTools(servers, opts = {}) {
 
 // src/agent/memory-store.ts
 import crypto23 from "crypto";
-import { and as and16, desc as desc7, eq as eq19, like, sql as sql8 } from "drizzle-orm";
+import { and as and16, desc as desc7, eq as eq19, like, sql as sql8, or as or2 } from "drizzle-orm";
 var COMPACTION_KEY_PREFIX = "compaction:";
 var COMPACTION_NOTES_PER_SESSION = 3;
 function rowToDto(row) {
@@ -15060,8 +15090,13 @@ function deleteMemoryEntry(db, projectId, key) {
   const changes = result2.changes ?? 0;
   return changes > 0;
 }
-function loadRecentForHydrate(db, projectId, limit) {
-  return listMemoryEntries(db, projectId, { limit });
+function loadRecentForHydrate(db, projectId, limit, sessionId) {
+  if (sessionId === void 0) return listMemoryEntries(db, projectId, { limit });
+  const sessionPrefix = `compaction:${sessionId ?? ""}:`;
+  return db.select().from(agentMemory).where(and16(
+    eq19(agentMemory.projectId, projectId),
+    or2(sql8`substr(${agentMemory.key}, 1, ${COMPACTION_KEY_PREFIX.length}) <> ${COMPACTION_KEY_PREFIX}`, sessionId ? sql8`substr(${agentMemory.key}, 1, ${sessionPrefix.length}) = ${sessionPrefix}` : void 0)
+  )).orderBy(desc7(agentMemory.updatedAt)).limit(limit).all().map(rowToDto);
 }
 function writeCompactionNote(db, args) {
   if (Buffer.byteLength(args.summary, "utf8") > AGENT_MEMORY_VALUE_MAX_BYTES) {
@@ -15337,9 +15372,8 @@ var SessionRegistry = class {
       if (row.systemPrompt !== systemPrompt) {
         this.persistPromptSnapshot(projectId, systemPrompt);
       }
-      const effectiveProvider = preferences?.provider ?? row.modelProvider;
-      const effectiveModelId = preferences?.modelId ?? row.modelId;
-      if (preferences?.provider || preferences?.modelId) {
+      const { provider: effectiveProvider, modelId: effectiveModelId } = this.resolveTurnModel(preferences, { provider: row.modelProvider, modelId: row.modelId });
+      if (effectiveProvider !== row.modelProvider || effectiveModelId !== row.modelId) {
         this.opts.db.update(agentSessions).set({
           modelProvider: effectiveProvider,
           modelId: effectiveModelId,
@@ -15418,7 +15452,7 @@ var SessionRegistry = class {
    * escape the `<memory>` wrapper are neutralized before interpolation.
    */
   buildHydratedSystemPrompt(projectId, basePrompt) {
-    const entries = loadRecentForHydrate(this.opts.db, projectId, MAX_HYDRATE_NOTES);
+    const entries = loadRecentForHydrate(this.opts.db, projectId, MAX_HYDRATE_NOTES, this.loadRow(projectId)?.id ?? null);
     if (entries.length === 0) return basePrompt;
     let totalBytes = 0;
     const kept = [];
@@ -15472,17 +15506,19 @@ ${lines.join("\n")}
    *   - align `state.tools` to the requested scope/profile (CLI full vs
    *     dashboard read-only share the same cached Agent; each request
    *     re-scopes it).
-   *   - align `state.model` when the caller passes `provider` or `modelId`,
-   *     honoring `--provider` / `--model` on hot sessions (not just on
-   *     fresh/hydrated construction).
+   *   - align `state.model` on every turn (see `resolveTurnModel`): an
+   *     explicit `provider` / `modelId` wins for this turn, then the
+   *     `agent.provider` pin, then the session's stored model.
+   *   - refuse, naming `agent.provider`, a pinned provider that has no key.
    *
-   * Persists the new model choice to the DB row so subsequent invocations
-   * stay on it unless overridden again.
+   * Persists the resolved model to the DB row as provenance. Without a pin an
+   * override therefore sticks, as it always has; with a pin, the next turn
+   * that names no provider returns to it.
    */
   async acquireForTurn(projectName, preferences) {
     preferences?.signal?.throwIfAborted();
     if (this.acquisitions.has(projectName)) throw agentBusy(projectName);
-    const agent = this.getOrCreate(projectName);
+    const agent = this.getOrCreate(projectName, preferences);
     if (agent.state.isStreaming) {
       throw agentBusy(projectName);
     }
@@ -15499,9 +15535,8 @@ ${lines.join("\n")}
         scope: preferences?.toolScope ?? AeroToolScopes.all,
         profile: preferences?.toolProfile ?? AeroToolProfiles.default
       });
-      if (preferences?.provider || preferences?.modelId) {
-        this.alignModel(projectName, agent, preferences);
-      }
+      this.alignModel(projectName, agent, preferences ?? {});
+      this.assertTurnProviderUsable(projectId);
       await this.mergeExternalTools(agent);
       const view = { client: this.opts.client, projectName, basePath: this.opts.config.basePath, context: preferences?.context };
       const evidence = preferences?.context ? await readAeroViewEvidence(view) : void 0;
@@ -15580,15 +15615,56 @@ ${lines.join("\n")}
     this.scopes.set(projectName, want.scope);
     this.profiles.set(projectName, want.profile);
   }
+  /**
+   * Throw a named, actionable error when the `agent.provider` pin chose this
+   * turn's provider and that provider has no key. Auto-detection only ever
+   * picks a keyed provider, so the pin is the one path that can land a turn on
+   * a keyless one without anything saying so. An explicitly requested provider
+   * keeps its existing behaviour: the caller named it, and the provider's own
+   * error reports the missing key when the prompt is sent.
+   */
+  assertTurnProviderUsable(projectId) {
+    const provider = coerceAgentProvider(this.loadRow(projectId)?.modelProvider ?? void 0);
+    if (!provider || provider !== resolveConfiguredAgentProvider(this.opts.config)) return;
+    if (resolveApiKeyFor(provider, this.opts.config)) return;
+    throw missingDependency(
+      `Aero is pinned to ${provider} by agent.provider, but no key is configured for it. Set providers.${provider}.apiKey in config.yaml or export ${agentProviderApiKeyEnvVar(provider)}, or change agent.provider.`,
+      { provider, pinned: true }
+    );
+  }
+  /**
+   * Resolve the provider/model a turn should use: an explicit request outranks
+   * the `agent.provider` pin, which outranks whatever the row last recorded.
+   *
+   * The row is provenance (what answered), not policy (what answers next), so
+   * a configured pin reasserts itself every turn instead of being frozen at
+   * whatever the first session happened to pick -- and survives the
+   * conversation-delete path, which drops the row entirely. With a pin, an
+   * explicit request therefore lasts one turn.
+   *
+   * The model is a function of the request and the config, never of which
+   * provider ran last: naming the pinned provider gets `agent.model` whether or
+   * not the session just came back from another one. The row's model is used
+   * only when nothing is pinned and nothing was requested, which keeps an
+   * unpinned install's override sticky as it always was. A model id is never
+   * forwarded across providers: any other case takes the provider's default.
+   */
+  resolveTurnModel(preferences, current) {
+    const pinned = resolveConfiguredAgentProvider(this.opts.config);
+    const provider = preferences?.provider ?? pinned ?? current.provider ?? AgentProviderIds.claude;
+    const carried = !preferences?.provider && !pinned && provider === current.provider ? current.modelId ?? void 0 : void 0;
+    const pinnedModelId = provider === pinned ? this.opts.config.agent?.model ?? void 0 : void 0;
+    const modelId = preferences?.modelId ?? pinnedModelId ?? carried ?? getAgentProvider(provider).defaultModel;
+    return { provider, modelId };
+  }
   alignModel(projectName, agent, preferences) {
     const projectId = this.tryResolveProjectId(projectName);
     if (!projectId) return;
     const row = this.loadRow(projectId);
-    const currentProvider = row?.modelProvider ?? AgentProviderIds.claude;
-    const currentModelId = row?.modelId;
-    const nextProvider = preferences.provider ?? currentProvider;
-    const nextModelId = preferences.modelId ?? (preferences.provider ? getAgentProvider(nextProvider).defaultModel : currentModelId);
-    if (!nextModelId) return;
+    if (!row) return;
+    const currentProvider = row.modelProvider;
+    const currentModelId = row.modelId;
+    const { provider: nextProvider, modelId: nextModelId } = this.resolveTurnModel(preferences, { provider: row.modelProvider, modelId: row.modelId });
     if (nextProvider === currentProvider && nextModelId === currentModelId) return;
     agent.state.model = resolveAeroModel(nextProvider, nextModelId);
     this.opts.db.update(agentSessions).set({
@@ -15597,6 +15673,13 @@ ${lines.join("\n")}
       updatedAt: (/* @__PURE__ */ new Date()).toISOString()
     }).where(eq20(agentSessions.projectId, projectId)).run();
   }
+  /** Snapshot pending work without consuming it before an atomic conversation switch. */
+  prepareConversationChange(projectName) {
+    if (this.isBusy(projectName)) throw agentBusy(projectName);
+    this.save(projectName);
+    const pending = this.pending.get(projectName);
+    if (pending?.length) this.updateRow(this.resolveProjectId(projectName), { followUpQueue: JSON.stringify(pending) });
+  }
   /** Persist a session's transcript back to the DB. Call after any run settles. */
   save(projectName) {
     const agent = this.live.get(projectName);
@@ -16011,6 +16094,7 @@ function resolveProject(db, name) {
   return row;
 }
 function registerAgentRoutes(app, opts) {
+  registerAgentConversationRoutes(app, { db: opts.db, runtime: opts.sessionRegistry });
   app.get(
     "/projects/:name/agent/transcript",
     async (request) => {
@@ -16018,11 +16102,12 @@ function registerAgentRoutes(app, opts) {
       const project = resolveProject(opts.db, request.params.name);
       const row = opts.db.select().from(agentSessions).where(eq22(agentSessions.projectId, project.id)).get();
       if (!row) {
-        return { messages: [], modelProvider: null, modelId: null, updatedAt: null };
+        return { conversationId: null, messages: [], modelProvider: null, modelId: null, updatedAt: null };
       }
       const messages = parseJsonColumn(row.messages, []);
       return {
         messages,
+        conversationId: row.id,
         isStreaming: opts.sessionRegistry.isBusy(project.name),
         modelProvider: row.modelProvider,
         modelId: row.modelId,
@@ -16043,6 +16128,7 @@ function registerAgentRoutes(app, opts) {
     async (request) => {
       requireInstanceAdministrator(request);
       const project = resolveProject(opts.db, request.params.name);
+      if (opts.sessionRegistry.isBusy(project.name)) throw agentBusy(project.name);
       opts.sessionRegistry.reset(project.name);
       opts.db.update(agentSessions).set({ messages: "[]", followUpQueue: "[]", updatedAt: (/* @__PURE__ */ new Date()).toISOString() }).where(eq22(agentSessions.projectId, project.id)).run();
       return { status: "reset" };
@@ -16054,6 +16140,10 @@ function registerAgentRoutes(app, opts) {
     const parsed = agentPromptRequestSchema.safeParse(request.body);
     if (!parsed.success) throw validationError(parsed.error.issues.map((issue) => issue.message).join("; "));
     const body = parsed.data;
+    if (body.conversationId !== void 0) {
+      const current = opts.db.select({ id: agentSessions.id }).from(agentSessions).where(eq22(agentSessions.projectId, project.id)).get();
+      if ((current?.id ?? null) !== body.conversationId) throw validationError("The active conversation changed. Reload the conversation before sending.");
+    }
     const promptText = body.prompt;
     const requestedScope = body?.scope === AeroToolScopes.all ? AeroToolScopes.all : AeroToolScopes.readOnly;
     const requestedProfile = isAeroToolProfile(body?.profile) ? body.profile : AeroToolProfiles.default;
@@ -18958,6 +19048,7 @@ async function createServer(opts) {
     // Resolved fresh each call so a key added at runtime (settings API) shows
     // up immediately in the `config.agent-providers` doctor check.
     getAgentProviderSummary: () => buildAgentProvidersResponse(opts.config).providers,
+    getAgentPin: () => describeAgentPin(opts.config),
     getGoogleMarketingDoctorInput: (ctx) => {
       if (!ctx.project) return null;
       const googleAds = opts.db.select().from(googleAdsConnections).where(eq25(googleAdsConnections.projectId, ctx.project.id)).get();

package/dist/{chunk-S7D23FEE.js → chunk-LWGYRN3T.js}

@@ -5,12 +5,12 @@ import {
   siteCrawlGraphNodes,
   siteCrawlPages,
   siteCrawlSnapshots
-} from "./chunk-KBPSOB55.js";
+} from "./chunk-DOC4QQLS.js";
 import {
   SITE_CRAWL_GRAPH_MAX_EDGES,
   SITE_CRAWL_GRAPH_MAX_NODES,
   TEMPLATE_LINK_RATIO_THRESHOLD
-} from "./chunk-KEMMVSAQ.js";
+} from "./chunk-NYRRWWEE.js";
 
 // src/site-crawl-graph-layout.ts
 import crypto from "crypto";

package/dist/{chunk-KEMMVSAQ.js → chunk-NYRRWWEE.js}

@@ -13962,8 +13962,11 @@ var agentProvidersResponseDtoSchema = z45.object({
    */
   providers: z45.array(agentProviderOptionDtoSchema).default([]),
   /**
-   * Provider Aero auto-picks when no explicit override is passed. Null if
-   * nothing is configured (install never exchanged a key).
+   * Provider a new session uses when the caller names none: the
+   * `agent.provider` pin when set (reported even without a key, as its
+   * `configured: false` entry), else the first configured provider by
+   * priority. An existing unpinned session keeps its stored provider. Null
+   * when nothing is pinned and nothing is configured.
    */
   defaultProvider: agentProviderIdSchema.nullable()
 });
@@ -13980,6 +13983,7 @@ var agentMemoryDeleteRequestSchema = z45.object({
 });
 var agentPromptRequestSchema = z45.object({
   prompt: z45.string().trim().min(1),
+  conversationId: z45.string().min(1).nullable().optional(),
   provider: agentProviderIdSchema.optional(),
   modelId: z45.string().trim().min(1).optional(),
   scope: z45.enum(["all", "read-only"]).optional(),
@@ -13987,6 +13991,43 @@ var agentPromptRequestSchema = z45.object({
   context: agentViewContextSchema.optional(),
   limits: agentTurnLimitsSchema.optional()
 });
+var agentConversationMessageSchema = z45.looseObject({ role: z45.string(), content: z45.unknown().optional() });
+var agentConversationSummarySchema = z45.object({
+  id: z45.string(),
+  title: z45.string(),
+  active: z45.boolean(),
+  modelProvider: z45.string(),
+  modelId: z45.string(),
+  createdAt: z45.string(),
+  updatedAt: z45.string()
+});
+var agentConversationSchema = agentConversationSummarySchema.extend({
+  messages: z45.array(agentConversationMessageSchema),
+  isStreaming: z45.boolean()
+});
+var agentConversationListSchema = z45.object({
+  conversations: z45.array(agentConversationSummarySchema),
+  currentConversationId: z45.string().nullable(),
+  nextOffset: z45.number().int().nullable()
+});
+var agentConversationCreateSchema = z45.object({
+  id: z45.uuid()
+}).strict();
+var agentConversationDeleteSchema = z45.object({ id: z45.string(), status: z45.literal("deleted") });
+function agentConversationTitle(messages) {
+  for (const message of messages) {
+    if (message.role !== "user") continue;
+    const content = message.content;
+    const text = typeof content === "string" ? content : Array.isArray(content) ? content.flatMap((block) => typeof block === "object" && block !== null && "type" in block && block.type === "text" && "text" in block && typeof block.text === "string" ? [block.text] : []).join(" ") : "";
+    const title = text.replace(/\s+/g, " ").trim();
+    if (title && !title.startsWith("[system]")) return title.length > 80 ? title.slice(0, 79) + "\u2026" : title;
+  }
+  return "New conversation";
+}
+var agentConversationListQuerySchema = z45.object({
+  offset: z45.coerce.number().int().min(0).default(0),
+  limit: z45.coerce.number().int().min(1).max(100).default(50)
+}).strict();
 
 // ../contracts/src/backlinks.ts
 import { z as z46 } from "zod";
@@ -19673,6 +19714,7 @@ export {
   agentViewContextSchema,
   agentTurnLimitsSchema,
   agentVisibilityEvidence,
+  agentProviderIdSchema,
   agentProvidersResponseDtoSchema,
   MemorySources,
   AGENT_MEMORY_VALUE_MAX_BYTES,
@@ -19680,6 +19722,12 @@ export {
   agentMemoryUpsertRequestSchema,
   agentMemoryDeleteRequestSchema,
   agentPromptRequestSchema,
+  agentConversationSchema,
+  agentConversationListSchema,
+  agentConversationCreateSchema,
+  agentConversationDeleteSchema,
+  agentConversationTitle,
+  agentConversationListQuerySchema,
   backlinkSourceSchema,
   BacklinkSources,
   computeBacklinkSummaryMetrics,

package/dist/{chunk-HF6MAKWE.js → chunk-S4BIBUCK.js}

@@ -4,14 +4,14 @@ import {
   installSkills,
   loadConfigRaw,
   saveConfigPatch
-} from "./chunk-GQ37ALYP.js";
+} from "./chunk-WJGUBZSW.js";
 import {
   PACKAGE_VERSION
 } from "./chunk-AOJU5LKX.js";
 import {
   SKILL_MANIFEST_FILENAME,
   SkillsClients
-} from "./chunk-KEMMVSAQ.js";
+} from "./chunk-NYRRWWEE.js";
 
 // src/skills-autosync.ts
 import fs from "fs";