diff --git a/packages/cli/src/demo-assets.ts b/packages/cli/src/demo-assets.ts
index f9e7fb32..5c84b356 100644
--- a/packages/cli/src/demo-assets.ts
+++ b/packages/cli/src/demo-assets.ts
@@ -4,7 +4,7 @@ import { tmpdir } from 'node:os';
 import { join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { randomBytes } from 'node:crypto';
-import type { KtxCliIo } from './cli-runtime.js';
+import { getKtxCliPackageInfo, type KtxCliIo } from './cli-runtime.js';
 
 interface DemoProjectResult {
   projectDir: string;
@@ -152,7 +152,7 @@ export async function ensureDemoProject(options: EnsureDemoProjectOptions): Prom
       name: 'connection_added',
       projectDir,
       io: options.io,
-      packageInfo: { name: '@kaelio/ktx', version: options.cliVersion ?? '0.0.0' },
+      packageInfo: { ...getKtxCliPackageInfo(), version: options.cliVersion ?? getKtxCliPackageInfo().version },
       fields: {
         driver: 'sqlite',
         isDemoConnection: true,
diff --git a/packages/cli/src/setup.ts b/packages/cli/src/setup.ts
index 2977a9f4..825170c0 100644
--- a/packages/cli/src/setup.ts
+++ b/packages/cli/src/setup.ts
@@ -227,7 +227,7 @@ async function recordSetupStep(input: {
     name: 'setup_step',
     projectDir: input.projectDir,
     io: input.io,
-    packageInfo: { name: '@kaelio/ktx', version: input.cliVersion ?? getKtxCliPackageInfo().version },
+    packageInfo: { ...getKtxCliPackageInfo(), version: input.cliVersion ?? getKtxCliPackageInfo().version },
     fields: {
       step: input.step,
       outcome: setupTelemetryOutcome(input.status),
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index 54790f19..10637a3d 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -1,4 +1,4 @@
-import type { KtxCliIo, KtxCliPackageInfo } from '../cli-runtime.js';
+import { getKtxCliPackageInfo, type KtxCliIo, type KtxCliPackageInfo } from '../cli-runtime.js';
 import { loadKtxProject } from '../context/project/project.js';
 import {
   beginCommandSpan,
@@ -81,10 +81,7 @@ export async function emitTelemetryEvent<Name extends TelemetryEventName>(input:
     return;
   }
 
-  const packageInfo = input.packageInfo ?? {
-    name: '@kaelio/ktx',
-    version: process.env.npm_package_version ?? '0.0.0',
-  };
+  const packageInfo = input.packageInfo ?? getKtxCliPackageInfo();
 
   const projectId = input.projectDir ? computeTelemetryProjectId(identity.installId, input.projectDir) : undefined;
   await trackTelemetryEvent({