sync-preview: merge main into preview (conflicts)

.github/workflows/sync-from-public.yml

@@ -37,8 +37,7 @@ jobs:
 
       - name: Sync main with public/main
         run: |
-          git checkout main
-          git reset --hard origin/main
+          git checkout -B main origin/main
 
           # Check if public/main is already merged
           if git merge-base --is-ancestor public/main HEAD; then
@@ -137,8 +136,7 @@ jobs:
 
       - name: Sync preview with public/preview
         run: |
-          git checkout preview
-          git reset --hard origin/preview
+          git checkout -B preview origin/preview
 
           # Check if public/preview is already merged
           if git merge-base --is-ancestor public/preview HEAD; then

integ-tests/create-edge-cases.test.ts

@@ -1,5 +1,6 @@
 /* eslint-disable security/detect-non-literal-fs-filename */
 import { exists, prereqs, runCLI } from '../src/test-utils/index.js';
+import { createTelemetryHelper } from '../src/test-utils/telemetry-helper.js';
 import { randomUUID } from 'node:crypto';
 import { mkdir, rm } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
@@ -9,18 +10,21 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 describe.skipIf(!prereqs.npm || !prereqs.git)('integration: create edge cases', () => {
   let testDir: string;
 
+  const telemetry = createTelemetryHelper();
+
   beforeAll(async () => {
     testDir = join(tmpdir(), `agentcore-integ-edge-${randomUUID()}`);
     await mkdir(testDir, { recursive: true });
   });
 
   afterAll(async () => {
+    telemetry.destroy();
     await rm(testDir, { recursive: true, force: true });
   });
 
   describe('reserved names', () => {
     it('rejects reserved name "Test"', async () => {
-      const result = await runCLI(['create', '--name', 'Test', '--json'], testDir);
+      const result = await runCLI(['create', '--name', 'Test', '--json'], testDir, { env: telemetry.env });
 
       expect(result.exitCode).toBe(1);
       const json = JSON.parse(result.stdout);
@@ -30,6 +34,13 @@ describe.skipIf(!prereqs.npm || !prereqs.git)('integration: create edge cases',
         json.error.toLowerCase().includes('reserved') || json.error.toLowerCase().includes('conflict'),
         `Error should mention reserved/conflict: ${json.error}`
       ).toBeTruthy();
+
+      telemetry.assertMetricEmitted({
+        command: 'create',
+        exit_reason: 'failure',
+        language: 'python',
+        has_agent: 'true',
+      });
     });
 
     it('rejects reserved name "bedrock"', async () => {
@@ -121,12 +132,21 @@ describe.skipIf(!prereqs.npm || !prereqs.git)('integration: create edge cases',
   describe('flag interactions', () => {
     it('--defaults creates project with default settings', async () => {
       const name = `Def${Date.now().toString().slice(-6)}`;
-      const result = await runCLI(['create', '--name', name, '--defaults', '--json'], testDir);
+      const result = await runCLI(['create', '--name', name, '--defaults', '--json'], testDir, { env: telemetry.env });
 
       expect(result.exitCode, `stderr: ${result.stderr}`).toBe(0);
       const json = JSON.parse(result.stdout);
       expect(json.success).toBe(true);
       expect(json.projectPath).toBeTruthy();
+
+      telemetry.assertMetricEmitted({
+        command: 'create',
+        exit_reason: 'success',
+        language: 'python',
+        framework: 'strands',
+        model_provider: 'bedrock',
+        has_agent: 'true',
+      });
     });
 
     it('--dry-run shows what would be created without writing files', async () => {

integ-tests/create-frameworks.test.ts

@@ -1,4 +1,5 @@
 import { exists, prereqs, readProjectConfig, runCLI } from '../src/test-utils/index.js';
+import { createTelemetryHelper } from '../src/test-utils/telemetry-helper.js';
 import { randomUUID } from 'node:crypto';
 import { mkdir, readFile, rm } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
@@ -8,12 +9,15 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 describe.skipIf(!prereqs.npm || !prereqs.git)('integration: create with different frameworks', () => {
   let testDir: string;
 
+  const telemetry = createTelemetryHelper();
+
   beforeAll(async () => {
     testDir = join(tmpdir(), `agentcore-integ-frameworks-${randomUUID()}`);
     await mkdir(testDir, { recursive: true });
   });
 
   afterAll(async () => {
+    telemetry.destroy();
     await rm(testDir, { recursive: true, force: true });
   });
 
@@ -34,7 +38,8 @@ describe.skipIf(!prereqs.npm || !prereqs.git)('integration: create with differen
         'none',
         '--json',
       ],
-      testDir
+      testDir,
+      { env: telemetry.env }
     );
 
     expect(result.exitCode, `stderr: ${result.stderr}`).toBe(0);
@@ -60,6 +65,15 @@ describe.skipIf(!prereqs.npm || !prereqs.git)('integration: create with differen
     expect(agents).toBeDefined();
     expect(agents.length).toBe(1);
     expect(agents[0]!.name).toBe(agentName);
+
+    telemetry.assertMetricEmitted({
+      command: 'create',
+      exit_reason: 'success',
+      language: 'python',
+      framework: 'langchain_langgraph',
+      model_provider: 'bedrock',
+      has_agent: 'true',
+    });
   });
 
   it('creates GoogleADK project with Gemini provider', async () => {