@mycadet/assistant 0.12.9 → 0.12.11

package/src/daemon/conversation-skill-tools.ts

@@ -22,12 +22,10 @@ import {
 import type { Message, ToolDefinition } from "../providers/types.js";
 import type { ActiveSkillEntry } from "../skills/active-skill-tools.js";
 import { deriveActiveSkills } from "../skills/active-skill-tools.js";
-import { getCachedCatalogSync } from "../skills/catalog-cache.js";
 import { isSkillCompatibleWithCloud } from "../skills/cloud-compatibility.js";
-import { readInstallMeta, touchSkillLastUsed } from "../skills/install-meta.js";
+import { touchSkillLastUsed } from "../skills/install-meta.js";
 import { parseToolManifestFile } from "../skills/tool-manifest.js";
 import { computeSkillVersionHash } from "../skills/version-hash.js";
-import { recordSkillLoadedEvent } from "../telemetry/skill-loaded-events-store.js";
 import {
   getTool,
   getToolOwner,
@@ -35,8 +33,6 @@ import {
   unregisterSkillTools,
 } from "../tools/registry.js";
 import { createSkillToolsFromManifest } from "../tools/skills/skill-tool-factory.js";
-import type { UsageAttributionSnapshot } from "../usage/attribution.js";
-import { toAttributionColumns } from "../usage/attribution.js";
 import { getLogger } from "../util/logger.js";
 
 const log = getLogger("conversation-skill-tools");
@@ -125,11 +121,6 @@ export interface ProjectSkillToolsOptions {
    * conversation's resolution; non-plugin skills are unaffected.
    */
   effectiveEnabledPluginSet?: Set<string> | null;
-  /** Telemetry context for skill_loaded events; absent disables recording. */
-  telemetry?: {
-    conversationId: string;
-    attribution: UsageAttributionSnapshot | null;
-  };
 }
 
 // ---------------------------------------------------------------------------
@@ -160,63 +151,11 @@ function loadManifestForSkill(skill: SkillSummary): SkillToolManifest | null {
   }
 }
 
-/**
- * Whether a skill is Cadet-produced for `skill_loaded` telemetry purposes:
- * bundled skills always are; managed skills only when their install metadata
- * records a `cadet` origin (legacy version.json installs are inferred as
- * cadet by `readInstallMeta`). All other sources (workspace, extra, plugin)
- * never emit.
- */
-function isCadetProducedSkill(skill: SkillSummary): boolean {
-  if (skill.source === "bundled") {
-    return true;
-  }
-  if (skill.source === "managed") {
-    return readInstallMeta(skill.directoryPath)?.origin === "cadet";
-  }
-  return false;
-}
-
-/**
- * Record a `skill_loaded` telemetry event for a newly-activated Cadet-produced
- * skill. Metadata only — never skill output or conversation content.
- * `skill_updated_at` comes from the cached merged catalog (sync accessor —
- * this runs on the hot tool-projection path). Failures are swallowed at
- * debug level: recording must never break tool projection.
- */
-function recordSkillLoadedTelemetry(
-  skill: SkillSummary,
-  telemetry: ProjectSkillToolsOptions["telemetry"],
-): void {
-  if (!telemetry) {
-    return;
-  }
-  try {
-    if (!isCadetProducedSkill(skill)) {
-      return;
-    }
-    const catalogEntry = getCachedCatalogSync().find((s) => s.id === skill.id);
-    recordSkillLoadedEvent({
-      conversationId: telemetry.conversationId,
-      skillName: skill.id,
-      skillUpdatedAt: catalogEntry?.updatedAt,
-      ...toAttributionColumns(telemetry.attribution),
-    });
-  } catch (err) {
-    log.debug(
-      { err, skillId: skill.id },
-      "Failed to record skill_loaded telemetry event (non-fatal)",
-    );
-  }
-}
-
 /**
  * Stamp `lastUsedAt` (day-debounced) on a newly-loaded managed skill's
- * install metadata. Independent of telemetry consent and the
- * `isCadetProducedSkill` gate — those suppress `origin: "custom"` skills,
- * which are exactly the assistant-authored skills the usage-based prune must
- * track. Only managed skills carry install metadata; bundled, workspace, and
- * plugin skills are skipped. Best-effort: the underlying write never throws.
+ * install metadata. Only managed skills carry install metadata; bundled,
+ * workspace, and plugin skills are skipped. Best-effort: the underlying
+ * write never throws.
  */
 function stampCloudSkillUsage(skill: SkillSummary): void {
   if (skill.source !== "managed") {
@@ -439,7 +378,6 @@ export function projectSkillTools(
       }
       successfulEntries.set(skillId, NO_TOOLS_VERSION);
       if (prevHash === undefined) {
-        recordSkillLoadedTelemetry(skill, options?.telemetry);
         stampCloudSkillUsage(skill);
       }
       continue;
@@ -481,10 +419,6 @@ export function projectSkillTools(
           // skill_loaded record below) is retried next turn.
           continue;
         }
-        // A first successful registration counts as the load; a manifest-less
-        // activation gaining a TOOLS.json re-registers, which — like a
-        // version-hash change — counts as a new load.
-        recordSkillLoadedTelemetry(skill, options?.telemetry);
         stampCloudSkillUsage(skill);
       } else if (prevHash !== currentHash) {
         // Hash changed — unregister stale tools, then re-register with new definitions
@@ -504,8 +438,6 @@ export function projectSkillTools(
           // Don't add to successfulEntries — will be cleaned up as transiently-failed
           continue;
         }
-        // A version change that re-registers counts as a new skill load.
-        recordSkillLoadedTelemetry(skill, options?.telemetry);
         stampCloudSkillUsage(skill);
       } else {
         // Hash unchanged — filter to only tools that are actually registered

package/src/daemon/conversation-store.ts

@@ -28,7 +28,7 @@ import {
 import { RateLimitProvider } from "../providers/ratelimit.js";
 import { listProviders } from "../providers/registry.js";
 import { getSubagentManager } from "../subagent/index.js";
-import { getSandboxWorkingDir } from "../util/platform.js";
+import { getSandboxWorkingDir } from "../util/layout.js";
 import { Conversation } from "./conversation.js";
 import { conversationEventSink } from "./conversation-event-sink.js";
 import {

package/src/daemon/conversation-surface-state.ts

@@ -12,10 +12,6 @@ import {
   type SurfaceType,
   SurfaceTypeSchema,
 } from "../api/surfaces.js";
-import {
-  type ActivationMomentParam,
-  isActivationMomentParam,
-} from "../telemetry/activation-funnel.js";
 import { isPlainObject } from "../util/object.js";
 
 /** Action snapshot stored with a surface (style stays a loose string). */
@@ -48,14 +44,6 @@ export type SurfaceStateEntry = {
     data: SurfaceDataByType[K];
     title?: string;
     actions?: StoredSurfaceAction[];
-    /**
-     * Activation-rail telemetry tag (daemon-only). When the model tags a
-     * `ui_show` surface as an activation funnel moment, the token is captured
-     * here so the milestone can be recorded deterministically when the user
-     * commits the surface (`handleSurfaceAction`). Never forwarded to the
-     * client.
-     */
-    activationMoment?: ActivationMomentParam;
   };
 }[SurfaceType];
 
@@ -70,12 +58,6 @@ export type CurrentTurnSurface = {
     display?: string;
     persistent?: boolean;
     toolCallId?: string;
-    /**
-     * Commit-timing activation-rail tag (daemon-only). Carried through to the
-     * persisted `ui_surface` history block so it survives a reload — never sent
-     * to the client.
-     */
-    activationMoment?: ActivationMomentParam;
     /**
      * Completion stamped when the user answers the surface before this turn's
      * message lands. The snapshot is the only record of the surface at that
@@ -170,18 +152,6 @@ export function parseStoredActions(
   });
 }
 
-/**
- * The daemon-only commit-timing activation tag from a persisted block,
- * validated and dropped if malformed. This field never reaches the client.
- */
-export function parseActivationMomentTag(
-  value: unknown,
-): ActivationMomentParam | undefined {
-  return typeof value === "string" && isActivationMomentParam(value)
-    ? value
-    : undefined;
-}
-
 /**
  * Map a persisted `ui_surface` history block to a live `surfaceState` entry.
  * The block is untyped JSON from the messages table: both `surfaceType` and
@@ -209,13 +179,10 @@ export function restoreSurfaceStateEntry(
     typeof b.surfaceType === "string" && b.surfaceType.trim().length > 0
       ? b.surfaceType
       : "dynamic_page";
-  const activationMoment = parseActivationMomentTag(b.activationMoment);
-
   return {
     surfaceType,
     data: coerceSurfaceDataRecord(b.data),
     title: typeof b.title === "string" ? b.title : undefined,
     actions: parseStoredActions(b.actions),
-    ...(activationMoment ? { activationMoment } : {}),
   } as SurfaceStateEntry;
 }

package/src/daemon/conversation-surfaces.ts

@@ -30,12 +30,10 @@ import {
 } from "../apps/app-store.js";
 import { executeDesktopComputerUse } from "../desktop/desktop-computer-use.js";
 import { canUseVirtualDesktop } from "../desktop/virtual-desktop-feature.js";
-import { recordActivationEvent } from "../onboarding/onboarding-events-store.js";
 import {
   getMessages,
   updateMessageContent,
 } from "../persistence/conversation-crud.js";
-import { isActivationSession } from "../plugins/defaults/memory/activation-session-store.js";
 import {
   assistantEventHub,
   broadcastMessage,
@@ -50,12 +48,6 @@ import type {
   InteractiveUiRequest,
   InteractiveUiResult,
 } from "../runtime/interactive-ui-types.js";
-import {
-  activationMomentEmitsAtShow,
-  type ActivationMomentParam,
-  activationStepNameForMomentParam,
-  isActivationMomentParam,
-} from "../telemetry/activation-funnel.js";
 import { resolveAppId } from "../tools/apps/resolve-app-id.js";
 import { formatDesktopAppRequired } from "../tools/capability-offer.js";
 import { POINT_AT_PROXY_TOOL } from "../tools/computer-use/skill-proxy-bridge.js";
@@ -1837,53 +1829,6 @@ function getRequestedSurfaceCompletionSummary(
  * when the surface renders) and the commit-time path (the other moments,
  * recorded when the user commits the surface).
  */
-function recordActivationMoment(
-  ctx: Conversation,
-  moment: ActivationMomentParam,
-): void {
-  try {
-    if (!isActivationSession(ctx.conversationId)) {
-      return;
-    }
-    recordActivationEvent({
-      stepName: activationStepNameForMomentParam(moment),
-      sessionId: ctx.conversationId,
-    });
-  } catch (err) {
-    log.warn(
-      { err, conversationId: ctx.conversationId, moment },
-      "Failed to record activation moment",
-    );
-  }
-}
-
-/**
- * Best-effort activation-funnel emission on a user surface commit.
- *
- * When the committed surface carries a commit-timing `activationMoment` tag,
- * record the corresponding funnel milestone. Show-timing moments
- * (`first_wow_executed`) are recorded at render time in `surfaceProxyResolver`
- * and are NOT stored on `surfaceState`, so they never reach this path. The tag
- * is cleared after the first record so re-entrant or repeated commits on the
- * same surface do not double-emit (and the deterministic `daemon_event_id`
- * collapses any cross-surface duplicate downstream anyway).
- *
- * Must be called only from terminal-commit paths (user clicked an action /
- * submitted / selected-and-committed), NOT from intermediate non-terminal
- * events (`selection_changed` / `content_changed` / `state_update`).
- */
-function maybeEmitActivationMoment(ctx: Conversation, surfaceId: string): void {
-  const stored = ctx.surfaceState.get(surfaceId);
-  const moment = stored?.activationMoment;
-  if (!moment) {
-    return;
-  }
-  // Clear the tag first so this can fire at most once per surface even if the
-  // commit path is re-entered.
-  stored.activationMoment = undefined;
-  recordActivationMoment(ctx, moment);
-}
-
 /** The action result for an enqueue the message queue refused. */
 const QUEUE_FULL_RESULT: SurfaceActionResult = {
   accepted: false,
@@ -2081,7 +2026,6 @@ export async function handleSurfaceAction(
     // — record an activation milestone if tagged. Must run before
     // `cleanupStandaloneSurface` clears the surface state.
     if (!isCancellation) {
-      maybeEmitActivationMoment(ctx, surfaceId);
     }
 
     // Cleanup and resolve — order matters: cleanup clears the timer
@@ -2174,7 +2118,6 @@ export async function handleSurfaceAction(
     // Launching a child conversation is a terminal user commit — record an
     // activation milestone if tagged. The helper clears the tag after firing,
     // so the other commit-path call sites below can't double-emit.
-    maybeEmitActivationMoment(ctx, surfaceId);
     return { accepted: true, conversationId };
   }
 
@@ -2347,7 +2290,6 @@ export async function handleSurfaceAction(
     // surface was tagged (best-effort, no-op otherwise). Deferred until after
     // the rejection check so a queue-full click doesn't over-report a moment
     // (and the one-shot tag stays intact for the user's retry).
-    maybeEmitActivationMoment(ctx, surfaceId);
 
     maybeCompleteSurfaceAfterAction(ctx, surfaceId, actionId, mergedData, {
       liveSurfaceType: stored?.surfaceType,
@@ -2603,7 +2545,6 @@ export async function handleSurfaceAction(
   // surface was tagged (best-effort, no-op otherwise). Deferred until after the
   // rejection check so a queue-full click doesn't over-report a moment (and the
   // one-shot tag stays intact for the user's retry).
-  maybeEmitActivationMoment(ctx, surfaceId);
 
   maybeCompleteSurfaceAfterAction(ctx, surfaceId, actionId, mergedData, {
     liveSurfaceType: pending.surfaceType,
@@ -3706,37 +3647,14 @@ export async function surfaceProxyResolver(
       ...(a.data ? { data: a.data } : {}),
     }));
 
-    // Optional activation-rail telemetry tag. Daemon-only metadata: validated
-    // and ignored if invalid; never forwarded to the client.
-    const activationMoment =
-      typeof input.activation_moment === "string" &&
-      isActivationMomentParam(input.activation_moment)
-        ? input.activation_moment
-        : undefined;
-
-    // Show-timing moments (`first_wow_executed`) record the instant the surface
-    // renders — a display-only result/`work_result` card may never be committed,
-    // so a commit-time emit would never fire. We record now and do NOT store the
-    // tag, so the commit path won't double-emit. Commit-timing moments are
-    // stored and recorded when the user commits the surface (see
-    // `handleSurfaceAction` → `maybeEmitActivationMoment`).
-    const storeTagForCommit =
-      activationMoment !== undefined &&
-      !activationMomentEmitsAtShow(activationMoment);
-
     // Track surface state for ui_update merging (includes actions so we can
     // look up per-action data payloads when the client sends an action back).
     ctx.surfaceState.set(surfaceId, {
       title,
       actions: mappedActions,
-      ...(storeTagForCommit ? { activationMoment } : {}),
       ...showPair,
     });
 
-    if (activationMoment !== undefined && !storeTagForCommit) {
-      recordActivationMoment(ctx, activationMoment);
-    }
-
     log.info(
       {
         surfaceId,
@@ -3763,9 +3681,7 @@ export async function surfaceProxyResolver(
       ...showPair,
     });
 
-    // Track surface for persistence with the message. The commit-timing
-    // activation tag rides along (daemon-only) so it survives history restore;
-    // show-timing moments aren't stored here (already recorded at render).
+    // Track surface for persistence with the message.
     ctx.currentTurnSurfaces.push({
       surfaceId,
       title,
@@ -3773,7 +3689,6 @@ export async function surfaceProxyResolver(
       display,
       ...(persistent ? { persistent: true } : {}),
       ...(toolUseId ? { toolCallId: toolUseId } : {}),
-      ...(storeTagForCommit ? { activationMoment } : {}),
       ...showPair,
     });
 

package/src/daemon/conversation-tool-setup.test.ts

@@ -3,7 +3,7 @@ import { join } from "node:path";
 import { afterEach, describe, expect, test } from "bun:test";
 
 import { getAllDefaultPlugins } from "../plugins/defaults/index.js";
-import { getWorkspacePluginsDir } from "../util/platform.js";
+import { getWorkspacePluginsDir } from "../util/layout.js";
 import { getEffectiveEnabledPluginSet } from "./conversation-tool-setup.js";
 
 const DEFAULT_NAMES = getAllDefaultPlugins().map((p) => p.manifest.name);

package/src/daemon/conversation-tool-setup.ts

@@ -30,7 +30,6 @@ import {
 } from "../persistence/conversation-tool-surface.js";
 import { getBindingByConversation } from "../persistence/external-conversation-store.js";
 import { getAllDefaultPluginNames } from "../plugins/defaults/main.js";
-import { isActivationSession } from "../plugins/defaults/memory/activation-session-store.js";
 import { isPluginDisabled } from "../plugins/disabled-state.js";
 import type { Message, ToolDefinition } from "../providers/types.js";
 import { registerConversationSender } from "../tools/browser/browser-screencast.js";
@@ -64,7 +63,6 @@ import {
   type ToolContext,
   type ToolExecutionResult,
 } from "../tools/types.js";
-import { injectActivationMomentParam } from "../tools/ui-surface/channel-variants.js";
 import { loadWorkspaceTools } from "../tools/workspace-tools/loader.js";
 import {
   resolveUsageAttribution,
@@ -1198,14 +1196,6 @@ export function createResolveToolsCallback(
           : definition,
       );
     }
-    // Activation-rail conversations carry the optional `activation_moment`
-    // telemetry param on ui_show. The marker is written before the first
-    // tool resolution (see `applyBootstrapTemplate` in system-prompt.ts), so
-    // the projected schema is stable for the conversation's lifetime.
-    if (isActivationSession(ctx.conversationId)) {
-      allBaseDefs = injectActivationMomentParam(allBaseDefs);
-    }
-
     const effectivePreactivated = [
       ...DEFAULT_PREACTIVATED_SKILL_IDS,
       ...(ctx.preactivatedSkillIds ?? []),
@@ -1220,19 +1210,6 @@ export function createResolveToolsCallback(
       // Scope plugin-contributed skills to the conversation's per-chat plugin
       // selection (null = no restriction).
       effectiveEnabledPluginSet,
-      // skill_loaded telemetry context — resolved per turn so attribution
-      // reflects the call site/profile the current turn actually runs on.
-      telemetry:
-        ctx.conversationId !== undefined
-          ? {
-              conversationId: ctx.conversationId,
-              attribution: resolveConversationAttribution({
-                conversationId: ctx.conversationId,
-                currentCallSite: ctx.currentCallSite,
-                currentTurnOverrideProfile: ctx.currentTurnOverrideProfile,
-              }),
-            }
-          : undefined,
     });
     const turnAllowed = new Set(allBaseDefs.map((d) => d.name));
     for (const name of projection.allowedToolNames) {

package/src/daemon/conversation.ts

@@ -1167,12 +1167,10 @@ export class Conversation {
 
   setOnboardingContext(ctx: OnboardingContext): void {
     this.onboardingContext = ctx;
-    // Reseed BOOTSTRAP.md and mark the activation session at the earliest point
-    // the conversation knows its bootstrap selection — before the first turn's
-    // tool resolution, which `buildSystemPrompt` is too late for. See
-    // `applyBootstrapTemplate`.
+    // Reseed BOOTSTRAP.md from the requested onboarding template at the
+    // earliest point the conversation knows its bootstrap selection.
     if (ctx.bootstrapTemplate) {
-      applyBootstrapTemplate(ctx.bootstrapTemplate, this.conversationId);
+      applyBootstrapTemplate(ctx.bootstrapTemplate);
     }
   }
 

package/src/daemon/daemon-control.ts

@@ -14,7 +14,6 @@ import { getIsContainerized } from "../config/env-registry.js";
 import { loadOrCreateSigningKey } from "../runtime/auth/token-service.js";
 import { ensureBun } from "../util/bun-runtime.js";
 import { DaemonError } from "../util/errors.js";
-import { getLogger } from "../util/logger.js";
 import {
   ensureDataDir,
   getDaemonStartupLockPath,
@@ -22,7 +21,8 @@ import {
   getDataDir,
   getPidPath,
   getWorkspaceConfigPath,
-} from "../util/platform.js";
+} from "../util/layout.js";
+import { getLogger } from "../util/logger.js";
 import { readRawProcessCommand } from "../util/process-table.js";
 import { isDaemonCommand } from "../util/worker-ownership.js";
 
@@ -43,7 +43,7 @@ function isPositiveInteger(v: unknown): v is number {
 
 /**
  * Read daemon timeout values directly from the config JSON file, bypassing
- * loadConfig() and its ensureDataDir() side effects.
+ * getConfig() and its ensureDataDir() side effects.
  * Falls back to hardcoded defaults on any error (missing file, malformed JSON,
  * unexpected shape) so daemon stop/start never fails due to config issues.
  */

package/src/daemon/dictation-profile-store.ts

@@ -8,8 +8,8 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 
+import { getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceDir } from "../util/platform.js";
 import { safeStringSlice } from "../util/unicode.js";
 
 const log = getLogger("dictation-profile-store");
@@ -262,7 +262,7 @@ function loadFromDisk(): DictationProfilesConfig {
 
 // --- Public API ---
 
-export function loadConfig(): DictationProfilesConfig {
+export function getConfig(): DictationProfilesConfig {
   if (cachedConfig == null) {
     cachedConfig = loadFromDisk();
   }
@@ -283,7 +283,7 @@ export function resolveProfile(
   appName: string,
   requestProfileId?: string,
 ): ProfileResolution {
-  const config = loadConfig();
+  const config = getConfig();
 
   const enabledProfiles = config.profiles.filter(isProfileEnabled);
   const profileById = (id: string) => enabledProfiles.find((p) => p.id === id);