bopodev-api 0.1.14 → 0.1.16

package/src/services/governance-service.ts

@@ -1,7 +1,7 @@
 import { and, eq } from "drizzle-orm";
 import { mkdir } from "node:fs/promises";
 import { z } from "zod";
-import { AgentCreateRequestSchema } from "bopodev-contracts";
+import { AgentCreateRequestSchema, TemplateManifestDefault, TemplateManifestSchema } from "bopodev-contracts";
 import type { BopoDb } from "bopodev-db";
 import {
   approvalRequests,
@@ -9,11 +9,16 @@ import {
   createGoal,
   createIssue,
   createProject,
+  createProjectWorkspace,
+  getCurrentTemplateVersion,
+  getTemplate,
   goals,
   listAgents,
   listIssues,
+  listProjectWorkspaces,
   listProjects,
   projects,
+  updateProjectWorkspace,
   updatePluginConfig
 } from "bopodev-db";
 import {
@@ -24,8 +29,14 @@ import {
   runtimeConfigToStateBlobPatch
 } from "../lib/agent-config";
 import { resolveOpencodeRuntimeModel } from "../lib/opencode-model";
-import { hasText, resolveDefaultRuntimeCwdForCompany } from "../lib/workspace-policy";
+import {
+  normalizeCompanyWorkspacePath,
+  resolveAgentFallbackWorkspacePath,
+  resolveProjectWorkspacePath
+} from "../lib/instance-paths";
+import { assertRuntimeCwdForCompany, hasText, resolveDefaultRuntimeCwdForCompany } from "../lib/workspace-policy";
 import { appendDurableFact } from "./memory-file-service";
+import { applyTemplateManifest } from "./template-apply-service";
 
 const approvalGatedActions = new Set([
   "hire_agent",
@@ -34,7 +45,8 @@ const approvalGatedActions = new Set([
   "pause_agent",
   "terminate_agent",
   "promote_memory_fact",
-  "grant_plugin_capabilities"
+  "grant_plugin_capabilities",
+  "apply_template"
 ]);
 
 const hireAgentPayloadSchema = AgentCreateRequestSchema.extend({
@@ -75,6 +87,11 @@ const grantPluginCapabilitiesPayloadSchema = z.object({
   grantedCapabilities: z.array(z.string().min(1)).default([]),
   config: z.record(z.string(), z.unknown()).default({})
 });
+const applyTemplatePayloadSchema = z.object({
+  templateId: z.string().min(1),
+  templateVersion: z.string().min(1),
+  variables: z.record(z.string(), z.unknown()).default({})
+});
 const AGENT_STARTUP_PROJECT_NAME = "Agent Onboarding";
 const AGENT_STARTUP_TASK_MARKER = "[bopodev:onboarding:agent-startup:v1]";
 
@@ -121,7 +138,7 @@ export async function resolveApproval(
     let execution:
       | {
           applied: boolean;
-          entityType?: "agent" | "goal" | "memory";
+          entityType?: "agent" | "goal" | "memory" | "template";
           entityId?: string;
           entity?: Record<string, unknown>;
         }
@@ -195,6 +212,13 @@ async function applyApprovalAction(db: BopoDb, companyId: string, action: string
       },
       defaultRuntimeCwd
     });
+    if (runtimeConfig.runtimeCwd) {
+      try {
+        runtimeConfig.runtimeCwd = assertRuntimeCwdForCompany(companyId, runtimeConfig.runtimeCwd, "runtimeCwd");
+      } catch (error) {
+        throw new GovernanceError(String(error));
+      }
+    }
     runtimeConfig.runtimeModel = await resolveOpencodeRuntimeModel(parsed.data.providerType, runtimeConfig);
     runtimeConfig.runtimeModel = resolveRuntimeModelForProvider(parsed.data.providerType, runtimeConfig.runtimeModel);
     if (providerRequiresNamedModel(parsed.data.providerType) && !hasText(runtimeConfig.runtimeModel)) {
@@ -339,7 +363,7 @@ async function applyApprovalAction(db: BopoDb, companyId: string, action: string
     });
     return {
       applied: true,
-      entityType: "memory" as const,
+      entityType: "template" as const,
       entityId: parsed.data.pluginId,
       entity: {
         pluginId: parsed.data.pluginId,
@@ -349,6 +373,45 @@ async function applyApprovalAction(db: BopoDb, companyId: string, action: string
       }
     };
   }
+  if (action === "apply_template") {
+    const parsed = applyTemplatePayloadSchema.safeParse(payload);
+    if (!parsed.success) {
+      throw new GovernanceError("Approval payload for template apply is invalid.");
+    }
+    const template = await getTemplate(db, companyId, parsed.data.templateId);
+    if (!template) {
+      throw new GovernanceError("Template not found for apply request.");
+    }
+    const version =
+      (await getCurrentTemplateVersion(db, companyId, parsed.data.templateId)) ??
+      null;
+    if (!version) {
+      throw new GovernanceError("Template version not found for apply request.");
+    }
+    const manifest = parsePayload(version.manifestJson);
+    const parsedManifest = TemplateManifestSchema.safeParse(manifest);
+    const normalizedManifest = parsedManifest.success
+      ? parsedManifest.data
+      : TemplateManifestSchema.parse(TemplateManifestDefault);
+    const applied = await applyTemplateManifest(db, {
+      companyId,
+      templateId: template.id,
+      templateVersion: version.version,
+      templateVersionId: version.id,
+      manifest: normalizedManifest,
+      variables: parsed.data.variables
+    });
+    return {
+      applied: applied.applied,
+      entityType: "template" as const,
+      entityId: template.id,
+      entity: {
+        id: template.id,
+        installId: applied.installId ?? null,
+        summary: applied.summary
+      }
+    };
+  }
 
   throw new GovernanceError(`Unsupported approval action: ${action}`);
 }
@@ -370,6 +433,7 @@ async function ensureAgentStartupProject(db: BopoDb, companyId: string) {
   const projects = await listProjects(db, companyId);
   const existing = projects.find((project) => project.name === AGENT_STARTUP_PROJECT_NAME);
   if (existing) {
+    await ensureProjectPrimaryWorkspace(db, companyId, existing.id, AGENT_STARTUP_PROJECT_NAME);
     return existing.id;
   }
   const created = await createProject(db, {
@@ -377,9 +441,50 @@ async function ensureAgentStartupProject(db: BopoDb, companyId: string) {
     name: AGENT_STARTUP_PROJECT_NAME,
     description: "Operating baseline tasks for newly approved hires."
   });
+  if (!created) {
+    throw new Error("Failed to create startup project.");
+  }
+  await ensureProjectPrimaryWorkspace(db, companyId, created.id, AGENT_STARTUP_PROJECT_NAME);
   return created.id;
 }
 
+async function ensureProjectPrimaryWorkspace(db: BopoDb, companyId: string, projectId: string, projectName: string) {
+  const existingWorkspaces = await listProjectWorkspaces(db, companyId, projectId);
+  const existingPrimary = existingWorkspaces.find((workspace) => workspace.isPrimary);
+  if (existingPrimary) {
+    if (existingPrimary.cwd) {
+      const normalized = normalizeCompanyWorkspacePath(companyId, existingPrimary.cwd);
+      await mkdir(normalized, { recursive: true });
+    }
+    return existingPrimary;
+  }
+  const defaultWorkspaceCwd = resolveProjectWorkspacePath(companyId, projectId);
+  await mkdir(defaultWorkspaceCwd, { recursive: true });
+  const fallbackWorkspace = existingWorkspaces[0];
+  if (fallbackWorkspace) {
+    const normalizedCwd = fallbackWorkspace.cwd?.trim()
+      ? normalizeCompanyWorkspacePath(companyId, fallbackWorkspace.cwd)
+      : defaultWorkspaceCwd;
+    if (normalizedCwd) {
+      await mkdir(normalizedCwd, { recursive: true });
+    }
+    return updateProjectWorkspace(db, {
+      companyId,
+      projectId,
+      id: fallbackWorkspace.id,
+      cwd: normalizedCwd,
+      isPrimary: true
+    });
+  }
+  return createProjectWorkspace(db, {
+    companyId,
+    projectId,
+    name: projectName,
+    cwd: defaultWorkspaceCwd,
+    isPrimary: true
+  });
+}
+
 async function ensureAgentStartupIssue(
   db: BopoDb,
   companyId: string,
@@ -388,7 +493,7 @@ async function ensureAgentStartupIssue(
   role: string
 ) {
   const title = `Set up ${role} operating files`;
-  const body = buildAgentStartupTaskBody(agentId);
+  const body = buildAgentStartupTaskBody(companyId, agentId);
   const existingIssues = await listIssues(db, companyId);
   const existing = existingIssues.find(
     (issue) =>
@@ -414,24 +519,26 @@ async function ensureAgentStartupIssue(
   return created.id;
 }
 
-function buildAgentStartupTaskBody(agentId: string) {
-  const agentFolder = `agents/${agentId}`;
+function buildAgentStartupTaskBody(companyId: string, agentId: string) {
+  const agentWorkspaceRoot = resolveAgentFallbackWorkspacePath(companyId, agentId);
+  const agentOperatingFolder = `${agentWorkspaceRoot}/operating`;
   return [
     AGENT_STARTUP_TASK_MARKER,
     "",
     `Create your operating baseline before starting feature delivery work.`,
     "",
-    `1. Create the folder \`${agentFolder}/\` in the repository workspace.`,
+    `1. Create your operating folder at \`${agentOperatingFolder}/\` (system path, outside project workspaces).`,
     "2. Author these files with your own responsibilities and working style:",
-    `   - \`${agentFolder}/AGENTS.md\``,
-    `   - \`${agentFolder}/HEARTBEAT.md\``,
-    `   - \`${agentFolder}/SOUL.md\``,
-    `   - \`${agentFolder}/TOOLS.md\``,
-    `3. Update your own agent runtime config via \`PUT /agents/:agentId\` and set \`runtimeConfig.bootstrapPrompt\` to reference \`${agentFolder}/AGENTS.md\` as your primary guide.`,
+    `   - \`${agentOperatingFolder}/AGENTS.md\``,
+    `   - \`${agentOperatingFolder}/HEARTBEAT.md\``,
+    `   - \`${agentOperatingFolder}/SOUL.md\``,
+    `   - \`${agentOperatingFolder}/TOOLS.md\``,
+    `3. Update your own agent runtime config via \`PUT /agents/:agentId\` and set \`runtimeConfig.bootstrapPrompt\` to reference \`${agentOperatingFolder}/AGENTS.md\` as your primary guide.`,
     "4. Post an issue comment summarizing completed setup artifacts.",
     "",
     "Safety checks:",
-    "- Do not overwrite another agent's folder.",
+    "- Do not write operating/system files under any project workspace folder.",
+    "- Do not overwrite another agent's operating folder.",
     "- Keep content original to your role and scope."
   ].join("\n");
 }

package/src/services/heartbeat-service.ts

@@ -25,8 +25,9 @@ import {
 } from "bopodev-db";
 import { appendAuditEvent, appendCost } from "bopodev-db";
 import { parseRuntimeConfigFromAgentRow } from "../lib/agent-config";
-import { resolveProjectWorkspacePath } from "../lib/instance-paths";
-import { getProjectWorkspaceMap, hasText, resolveAgentFallbackWorkspace } from "../lib/workspace-policy";
+import { bootstrapRepositoryWorkspace, ensureIsolatedGitWorktree, GitRuntimeError } from "../lib/git-runtime";
+import { isInsidePath, normalizeCompanyWorkspacePath, resolveProjectWorkspacePath } from "../lib/instance-paths";
+import { assertRuntimeCwdForCompany, getProjectWorkspaceContextMap, hasText, resolveAgentFallbackWorkspace } from "../lib/workspace-policy";
 import type { RealtimeHub } from "../realtime/hub";
 import { createHeartbeatRunsRealtimeEvent } from "../realtime/heartbeat-runs";
 import { publishOfficeOccupantForAgent } from "../realtime/office-space";
@@ -773,6 +774,16 @@ export async function runHeartbeatForAgent(
       externalAbortSignal: activeRunAbort.signal
     });
     executionSummary = execution.summary;
+    const normalizedUsage = execution.usage ?? {
+      inputTokens: Math.max(0, execution.tokenInput),
+      cachedInputTokens: 0,
+      outputTokens: Math.max(0, execution.tokenOutput),
+      ...(execution.usdCost > 0 ? { costUsd: execution.usdCost } : {}),
+      ...(execution.summary ? { summary: execution.summary } : {})
+    };
+    const effectiveTokenInput = normalizedUsage.inputTokens + normalizedUsage.cachedInputTokens;
+    const effectiveTokenOutput = normalizedUsage.outputTokens;
+    const effectiveRuntimeUsdCost = normalizedUsage.costUsd ?? (execution.usdCost > 0 ? execution.usdCost : 0);
     const afterAdapterHook = await runPluginHook(db, {
       hook: "afterAdapterExecute",
       context: {
@@ -806,8 +817,10 @@ export async function runHeartbeatForAgent(
       runtimeModelId: effectivePricingModelId ?? runtimeModelId,
       pricingProviderType: effectivePricingProviderType,
       pricingModelId: effectivePricingModelId,
-      tokenInput: execution.tokenInput,
-      tokenOutput: execution.tokenOutput,
+      tokenInput: effectiveTokenInput,
+      tokenOutput: effectiveTokenOutput,
+      runtimeUsdCost: effectiveRuntimeUsdCost,
+      failureType: readTraceString(execution.trace, "failureType"),
       issueId: primaryIssueId,
       projectId: primaryProjectId,
       agentId,
@@ -865,8 +878,8 @@ export async function runHeartbeatForAgent(
     if (
       execution.nextState ||
       executionUsdCost > 0 ||
-      execution.tokenInput > 0 ||
-      execution.tokenOutput > 0 ||
+      effectiveTokenInput > 0 ||
+      effectiveTokenOutput > 0 ||
       execution.status !== "skipped"
     ) {
       await db
@@ -875,7 +888,7 @@ export async function runHeartbeatForAgent(
           stateBlob: JSON.stringify(execution.nextState ?? state),
           runtimeModel: effectivePricingModelId ?? persistedRuntime.runtimeModel ?? null,
           usedBudgetUsd: sql`${agents.usedBudgetUsd} + ${executionUsdCost}`,
-          tokenUsage: sql`${agents.tokenUsage} + ${execution.tokenInput + execution.tokenOutput}`,
+          tokenUsage: sql`${agents.tokenUsage} + ${effectiveTokenInput + effectiveTokenOutput}`,
           updatedAt: new Date()
         })
         .where(and(eq(agents.companyId, companyId), eq(agents.id, agentId)));
@@ -883,8 +896,8 @@ export async function runHeartbeatForAgent(
 
     const shouldAdvanceIssuesToReview = shouldPromoteIssuesToReview({
       summary: execution.summary,
-      tokenInput: execution.tokenInput,
-      tokenOutput: execution.tokenOutput,
+      tokenInput: effectiveTokenInput,
+      tokenOutput: effectiveTokenOutput,
       usdCost: executionUsdCost,
       trace: executionTrace,
       outcome: executionOutcome
@@ -929,8 +942,8 @@ export async function runHeartbeatForAgent(
           summary: execution.summary,
           outcome: executionOutcome,
           usage: {
-            tokenInput: execution.tokenInput,
-            tokenOutput: execution.tokenOutput,
+            tokenInput: effectiveTokenInput,
+            tokenOutput: effectiveTokenOutput,
             usdCost: executionUsdCost
           }
         }
@@ -1062,9 +1075,9 @@ export async function runHeartbeatForAgent(
         outcome: executionOutcome,
         issueIds,
         usage: {
-          tokenInput: execution.tokenInput,
-          tokenOutput: execution.tokenOutput,
-          usdCost: execution.usdCost,
+          tokenInput: effectiveTokenInput,
+          tokenOutput: effectiveTokenOutput,
+          usdCost: executionUsdCost,
           source: readTraceString(execution.trace, "usageSource") ?? "unknown"
         },
         trace: execution.trace ?? null,
@@ -1401,7 +1414,10 @@ async function buildHeartbeatContext(
           .where(and(eq(projects.companyId, companyId), inArray(projects.id, projectIds)))
       : [];
   const projectNameById = new Map(projectRows.map((row) => [row.id, row.name]));
-  const projectWorkspaceMap = await getProjectWorkspaceMap(db, companyId, projectIds);
+  const projectWorkspaceContextMap = await getProjectWorkspaceContextMap(db, companyId, projectIds);
+  const projectWorkspaceMap = new Map(
+    Array.from(projectWorkspaceContextMap.entries()).map(([projectId, context]) => [projectId, context.cwd])
+  );
   const issueIds = input.workItems.map((item) => item.id);
   const attachmentRows =
     issueIds.length > 0
@@ -1432,6 +1448,9 @@ async function buildHeartbeatContext(
   for (const row of attachmentRows) {
     const projectWorkspace = projectWorkspaceMap.get(row.projectId) ?? resolveProjectWorkspacePath(companyId, row.projectId);
     const absolutePath = resolve(projectWorkspace, row.relativePath);
+    if (!isInsidePath(projectWorkspace, absolutePath)) {
+      continue;
+    }
     const existing = attachmentsByIssue.get(row.issueId) ?? [];
     existing.push({
       id: row.id,
@@ -1761,7 +1780,7 @@ async function resolveRuntimeWorkspaceForWorkItems(
   db: BopoDb,
   companyId: string,
   agentId: string,
-  workItems: Array<{ project_id: string }>,
+  workItems: Array<{ id?: string; project_id: string }>,
   runtime:
     | {
         command?: string;
@@ -1785,22 +1804,76 @@ async function resolveRuntimeWorkspaceForWorkItems(
   const normalizedRuntimeCwd = runtime?.cwd?.trim();
   const warnings: string[] = [];
   const projectIds = Array.from(new Set(workItems.map((item) => item.project_id)));
-  const projectWorkspaceMap = await getProjectWorkspaceMap(db, companyId, projectIds);
-
-  let selectedProjectWorkspace: string | null = null;
+  const projectWorkspaceContextMap = await getProjectWorkspaceContextMap(db, companyId, projectIds);
   for (const projectId of projectIds) {
-    const projectWorkspace = projectWorkspaceMap.get(projectId) ?? null;
-    if (hasText(projectWorkspace)) {
-      selectedProjectWorkspace = projectWorkspace;
-      break;
+    const projectContext = projectWorkspaceContextMap.get(projectId);
+    if (!projectContext) {
+      continue;
+    }
+    const mode = projectContext.policy?.mode ?? "project_primary";
+    const baseWorkspaceCwd = hasText(projectContext.cwd)
+      ? normalizeCompanyWorkspacePath(companyId, projectContext.cwd as string)
+      : projectContext.repoUrl
+        ? resolveProjectWorkspacePath(companyId, projectId)
+        : null;
+    if (mode === "agent_default" && hasText(normalizedRuntimeCwd)) {
+      const boundedRuntimeCwd = assertRuntimeCwdForCompany(companyId, normalizedRuntimeCwd!, "runtime.cwd");
+      return {
+        source: "agent_runtime",
+        warnings,
+        runtime: {
+          ...runtime,
+          cwd: boundedRuntimeCwd
+        }
+      };
+    }
+    if (!baseWorkspaceCwd) {
+      continue;
+    }
+    let selectedWorkspaceCwd = normalizeCompanyWorkspacePath(companyId, baseWorkspaceCwd);
+    await mkdir(baseWorkspaceCwd, { recursive: true });
+    try {
+      if (hasText(projectContext.repoUrl)) {
+        const bootstrap = await bootstrapRepositoryWorkspace({
+          companyId,
+          projectId,
+          cwd: baseWorkspaceCwd,
+          repoUrl: projectContext.repoUrl as string,
+          repoRef: projectContext.repoRef,
+          policy: projectContext.policy,
+          runtimeEnv: runtime?.env
+        });
+        selectedWorkspaceCwd = normalizeCompanyWorkspacePath(companyId, bootstrap.cwd);
+      }
+      if (
+        mode === "isolated" &&
+        projectContext.policy?.strategy?.type === "git_worktree" &&
+        resolveGitWorktreeIsolationEnabled()
+      ) {
+        const projectIssue = workItems.find((item) => item.project_id === projectId);
+        const worktree = await ensureIsolatedGitWorktree({
+          companyId,
+          repoCwd: selectedWorkspaceCwd,
+          projectId,
+          agentId,
+          issueId: projectIssue?.id ?? null,
+          repoRef: projectContext.repoRef,
+          policy: projectContext.policy
+        });
+        selectedWorkspaceCwd = normalizeCompanyWorkspacePath(companyId, worktree.cwd);
+      } else if (mode === "isolated" && projectContext.policy?.strategy?.type === "git_worktree") {
+        warnings.push(
+          "Project execution workspace policy mode 'isolated' is configured with git_worktree, but BOPO_ENABLE_GIT_WORKTREE_ISOLATION is disabled. Falling back to primary project workspace."
+        );
+      }
+    } catch (error) {
+      const message = error instanceof GitRuntimeError ? error.message : String(error);
+      warnings.push(`Workspace bootstrap failed for project '${projectId}': ${message}`);
     }
-  }
 
-  if (selectedProjectWorkspace) {
-    await mkdir(selectedProjectWorkspace, { recursive: true });
-    if (hasText(normalizedRuntimeCwd) && normalizedRuntimeCwd !== selectedProjectWorkspace) {
+    if (hasText(normalizedRuntimeCwd) && normalizedRuntimeCwd !== selectedWorkspaceCwd) {
       warnings.push(
-        `Runtime cwd '${normalizedRuntimeCwd}' was overridden to project workspace '${selectedProjectWorkspace}' for assigned work.`
+        `Runtime cwd '${normalizedRuntimeCwd}' was overridden to project workspace '${selectedWorkspaceCwd}' for assigned work.`
       );
     }
     return {
@@ -1808,27 +1881,28 @@ async function resolveRuntimeWorkspaceForWorkItems(
       warnings,
       runtime: {
         ...runtime,
-        cwd: selectedProjectWorkspace
+        cwd: selectedWorkspaceCwd
       }
     };
   }
 
   if (projectIds.length > 0) {
-    warnings.push("Assigned project has no local workspace path configured. Falling back to agent workspace.");
+    warnings.push("Assigned project has no primary workspace cwd/repo configured. Falling back to agent workspace.");
   }
 
   if (hasText(normalizedRuntimeCwd)) {
+    const boundedRuntimeCwd = assertRuntimeCwdForCompany(companyId, normalizedRuntimeCwd!, "runtime.cwd");
     return {
       source: "agent_runtime",
       warnings,
       runtime: {
         ...runtime,
-        cwd: normalizedRuntimeCwd
+        cwd: boundedRuntimeCwd
       }
     };
   }
 
-  const fallbackWorkspace = resolveAgentFallbackWorkspace(companyId, agentId);
+  const fallbackWorkspace = normalizeCompanyWorkspacePath(companyId, resolveAgentFallbackWorkspace(companyId, agentId));
   await mkdir(fallbackWorkspace, { recursive: true });
   warnings.push(`Runtime cwd was not configured. Falling back to '${fallbackWorkspace}'.`);
   return {
@@ -1841,6 +1915,13 @@ async function resolveRuntimeWorkspaceForWorkItems(
   };
 }
 
+function resolveGitWorktreeIsolationEnabled() {
+  const value = String(process.env.BOPO_ENABLE_GIT_WORKTREE_ISOLATION ?? "")
+    .trim()
+    .toLowerCase();
+  return value === "1" || value === "true";
+}
+
 function resolveStaleRunThresholdMs() {
   const parsed = Number(process.env.BOPO_HEARTBEAT_STALE_RUN_MS ?? 10 * 60 * 1000);
   if (!Number.isFinite(parsed) || parsed < 1_000) {
@@ -2430,6 +2511,8 @@ async function appendFinishedRunCostEntry(input: {
   pricingModelId?: string | null;
   tokenInput: number;
   tokenOutput: number;
+  runtimeUsdCost?: number;
+  failureType?: string | null;
   issueId?: string | null;
   projectId?: string | null;
   agentId?: string | null;
@@ -2446,24 +2529,41 @@ async function appendFinishedRunCostEntry(input: {
   });
 
   const shouldPersist = input.status === "ok" || input.status === "failed";
-  if (shouldPersist) {
+  const runtimeUsdCost = Math.max(0, input.runtimeUsdCost ?? 0);
+  const pricedUsdCost = Math.max(0, pricingDecision.usdCost);
+  const shouldUseRuntimeUsdCost = pricedUsdCost <= 0 && runtimeUsdCost > 0;
+  const baseUsdCost = shouldUseRuntimeUsdCost ? runtimeUsdCost : pricedUsdCost;
+  const effectiveUsdCost =
+    baseUsdCost > 0
+      ? baseUsdCost
+      : input.status === "failed" && input.failureType !== "spawn_error"
+        ? 0.000001
+        : 0;
+  const effectivePricingSource = pricingDecision.pricingSource;
+  const shouldPersistWithUsage =
+    shouldPersist && (input.tokenInput > 0 || input.tokenOutput > 0 || effectiveUsdCost > 0);
+  if (shouldPersistWithUsage) {
     await appendCost(input.db, {
       companyId: input.companyId,
       providerType: input.providerType,
       runtimeModelId: input.runtimeModelId,
       pricingProviderType: pricingDecision.pricingProviderType,
       pricingModelId: pricingDecision.pricingModelId,
-      pricingSource: pricingDecision.pricingSource,
+      pricingSource: effectivePricingSource,
       tokenInput: input.tokenInput,
       tokenOutput: input.tokenOutput,
-      usdCost: pricingDecision.usdCost.toFixed(6),
+      usdCost: effectiveUsdCost.toFixed(6),
       issueId: input.issueId ?? null,
       projectId: input.projectId ?? null,
       agentId: input.agentId ?? null
     });
   }
 
-  return pricingDecision;
+  return {
+    ...pricingDecision,
+    pricingSource: effectivePricingSource,
+    usdCost: effectiveUsdCost
+  };
 }
 
 function isHeartbeatDue(cronExpression: string, lastRunAt: Date | null, now: Date) {

package/src/services/plugin-runtime.ts

@@ -214,8 +214,8 @@ export async function ensureCompanyBuiltinPluginDefaults(db: BopoDb, companyId:
   const existing = await listCompanyPluginConfigs(db, companyId);
   const existingIds = new Set(existing.map((row) => row.pluginId));
   const defaults = [
-    { pluginId: "trace-exporter", enabled: true, priority: 40 },
-    { pluginId: "memory-enricher", enabled: true, priority: 60 },
+    { pluginId: "trace-exporter", enabled: false, priority: 40 },
+    { pluginId: "memory-enricher", enabled: false, priority: 60 },
     { pluginId: "queue-publisher", enabled: false, priority: 80 },
     { pluginId: "heartbeat-tagger", enabled: false, priority: 90 }
   ];