Clean up for PR

Fixes #6256

.github/workflows/build-apps.yml

@@ -10,7 +10,8 @@ on:
       - 'nightly-v[0-9]+.[0-9]+.[0-9]+'
 
 env:
-  IS_RELEASE: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
+  # IS_RELEASE: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
+  IS_RELEASE: true
   IS_NIGHTLY: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'nightly-v') }}
 
 concurrency:
@@ -99,11 +100,11 @@ jobs:
           yarn files:set-version
           yarn files:flip-to-nightly
 
-      - name: Set release version
+      # - name: Set release version
-        if: ${{ env.IS_RELEASE == 'true' }}
+      #   if: ${{ env.IS_RELEASE == 'true' }}
-        run: |
+      #   run: |
-          export VERSION=${GITHUB_REF_NAME#v}
+      #     export VERSION=${GITHUB_REF_NAME#v}
-          yarn files:set-version
+      #     yarn files:set-version
 
       - uses: actions/upload-artifact@v4
         with:
@@ -183,30 +184,32 @@ jobs:
           max_attempts: 3
           command: yarn install
 
+      # Next steps are from Digicert docs at
+      # https://docs.digicert.com/en/digicert-keylocker/ci-cd-integrations/scripts/github/scripts-for-signing-using-ksp-library-on-github.html#ksp-signing-using-github-action-488726
       - name: Prepare certificate and variables (Windows only)
         if: ${{ (env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true') && matrix.os == 'windows-2022' }}
         run: |
-          echo "${{secrets.SM_CLIENT_CERT_FILE_B64 }}" | base64 --decode > /d/Certificate_pkcs12.p12
+          CERTIFICATE_PATH=$RUNNER_TEMP/certificate.p12
-          cat /d/Certificate_pkcs12.p12
+          echo "$SM_CLIENT_CERT_FILE_B64" | base64 --decode > $CERTIFICATE_PATH
-          echo "::set-output name=version::${GITHUB_REF#refs/tags/v}"
+          echo "SM_CLIENT_CERT_FILE=$CERTIFICATE_PATH" >> "$GITHUB_ENV"
           echo "SM_HOST=${{ secrets.SM_HOST }}" >> "$GITHUB_ENV"
           echo "SM_API_KEY=${{ secrets.SM_API_KEY }}" >> "$GITHUB_ENV"
-          echo "SM_CLIENT_CERT_FILE=D:\\Certificate_pkcs12.p12" >> "$GITHUB_ENV"
           echo "SM_CLIENT_CERT_PASSWORD=${{ secrets.SM_CLIENT_CERT_PASSWORD }}" >> "$GITHUB_ENV"
           echo "C:\Program Files (x86)\Windows Kits\10\App Certification Kit" >> $GITHUB_PATH
           echo "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools" >> $GITHUB_PATH
-          echo "C:\Program Files\DigiCert\DigiCert One Signing Manager Tools" >> $GITHUB_PATH
+          echo "C:\Program Files\DigiCert\DigiCert Keylocker Tools" >> $GITHUB_PATH
         shell: bash
 
       - name: Setup certicate with SSM KSP (Windows only)
         if: ${{ (env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true') && matrix.os == 'windows-2022' }}
         run: |
-          curl -X GET  https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download -H "x-api-key:%SM_API_KEY%" -o smtools-windows-x64.msi
+          curl -X GET  https://one.digicert.com/signingmanager/api-ui/v1/releases/Keylockertools-windows-x64.msi/download -H "x-api-key:%SM_API_KEY%" -o Keylockertools-windows-x64.msi
-          msiexec /i smtools-windows-x64.msi /quiet /qn
+          msiexec /i Keylockertools-windows-x64.msi /quiet /qn
           smksp_registrar.exe list
           smctl.exe keypair ls
           C:\Windows\System32\certutil.exe -csp "DigiCert Signing Manager KSP" -key -user
           smksp_cert_sync.exe
+          smctl windows certsync
         shell: cmd
 
       - name: Build the app (debug)
@@ -225,8 +228,8 @@ jobs:
           CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
           CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
           CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
+          # DEBUG: "electron-notarize*"
-          DEBUG: "electron-notarize*"
+          DEBUG: electron-builder
         # TODO: Fix electron-notarize flakes. The logs above should help gather more data on failures
         uses: nick-fields/retry@v3.0.2
         with:

e2e/playwright/fixtures/homePageFixture.ts

@@ -99,6 +99,7 @@ export class HomePageFixture {
   createAndGoToProject = async (projectTitle = 'untitled') => {
     await this.projectsLoaded()
     await this.projectButtonNew.click()
+    await this.projectTextName.click()
     await this.projectTextName.fill(projectTitle)
     await this.projectButtonContinue.click()
   }

e2e/playwright/fixtures/sceneFixture.ts

@@ -230,12 +230,16 @@ export class SceneFixture {
     await expect(this.networkToggleConnected).toBeVisible({ timeout })
   }
 
-  settled = async (cmdBar?: CmdBarFixture) => {
+  settled = async (cmdBar: CmdBarFixture) => {
     const u = await getUtils(this.page)
 
-    await expect(this.startEditSketchBtn).not.toBeDisabled({ timeout: 15_000 })
+    await expect(this.startEditSketchBtn).not.toBeDisabled()
     await expect(this.startEditSketchBtn).toBeVisible()
 
+    await cmdBar.openCmdBar()
+    await cmdBar.chooseCommand('Settings · app · show debug panel')
+    await cmdBar.selectOption({ name: 'on' }).click()
+
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()

e2e/playwright/prompt-to-edit-snapshot-tests.spec.ts

@@ -68,10 +68,12 @@ test.describe('edit with AI example snapshots', () => {
         body1CapCoords.x,
         body1CapCoords.y
       )
+      const yellow: [number, number, number] = [179, 179, 131]
       const submittingToast = page.getByText('Submitting to Text-to-CAD API...')
 
       await test.step('wait for scene to load select body and check selection came through', async () => {
         await clickBody1Cap()
+        await scene.expectPixelColor(yellow, body1CapCoords, 20)
         await editor.expectState({
           highlightedCode: '',
           activeLines: ['|>startProfileAt([-73.64,-42.89],%)'],

e2e/playwright/snapshot-tests.spec.ts

@@ -588,7 +588,6 @@ test(
   'Draft circle should look right',
   { tag: '@snapshot' },
   async ({ page, context, cmdBar, scene }) => {
-    test.fixme(orRunWhenFullSuiteEnabled())
     const u = await getUtils(page)
     await page.setViewportSize({ width: 1200, height: 500 })
     const PUR = 400 / 37.5 //pixeltoUnitRatio

e2e/playwright/stress-test.spec.ts

@@ -1,15 +0,0 @@
-import { createProject } from '@e2e/playwright/test-utils'
-import { test } from '@e2e/playwright/zoo-test'
-
-test.describe('Stress test', () => {
-  test('Create project and load stress test', async ({
-    cmdBar,
-    scene,
-    page,
-  }, testInfo) => {
-    const projectName = 'stress-test-project'
-    // Create and load project
-    await createProject({ name: projectName, page })
-    await scene.settled(cmdBar)
-  })
-})

electron-builder.yml

@@ -33,10 +33,12 @@ win:
         - x64
         - arm64
   signtoolOptions:
-    sign: "./scripts/sign-win.js"
+    certificateSha1: F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D
     signingHashAlgorithms:
       - sha256
-    publisherName: "KittyCAD Inc" # needs to be exactly like on Digicert
+    publisherName: "KittyCAD Inc"
+    certificateSubjectName: "KittyCAD Inc"
+    rfc3161TimeStampServer: http://timestamp.digicert.com
   icon: "assets/icon.ico"
   fileAssociations:
     - ext: kcl

scripts/sign-win.js

@@ -1,37 +0,0 @@
-// From https://github.com/OpenBuilds/OpenBuilds-CONTROL/blob/4800540ffaa517925fc2cff26670809efa341ffe/signWin.js
-const { execSync } = require('node:child_process')
-
-exports.default = async (configuration) => {
-  if (!process.env.SM_API_KEY) {
-    console.error(
-      'Signing using signWin.js script: failed: SM_API_KEY ENV VAR NOT FOUND'
-    )
-    return
-  }
-
-  if (!process.env.WINDOWS_CERTIFICATE_THUMBPRINT) {
-    console.error(
-      'Signing using signWin.js script: failed: FINGERPRINT ENV VAR NOT FOUND'
-    )
-    return
-  }
-
-  if (!configuration.path) {
-    throw new Error(
-      `Signing using signWin.js script: failed: TARGET PATH NOT FOUND`
-    )
-  }
-
-  try {
-    execSync(
-      `smctl sign --fingerprint="${process.env.WINDOWS_CERTIFICATE_THUMBPRINT
-      }" --input "${String(configuration.path)}"`,
-      {
-        stdio: 'inherit',
-      }
-    )
-    console.log('Signing using signWin.js script: successful')
-  } catch (error) {
-    throw new Error('Signing using signWin.js script: failed:', error)
-  }
-}

src/components/CommandBar/CommandBar.tsx

@@ -14,7 +14,6 @@ import {
   commandBarActor,
   useCommandBarState,
 } from '@src/machines/commandBarMachine'
-import toast from 'react-hot-toast'
 
 export const COMMAND_PALETTE_HOTKEY = 'mod+k'
 
@@ -36,23 +35,13 @@ export const CommandBar = () => {
     commandBarActor.send({ type: 'Close' })
   }, [pathname])
 
-  /**
-   * if the engine connection is about to end, we don't want users
-   * to be able to perform commands that might require that connection,
-   * so we just close the command palette.
-   * TODO: instead, let each command control whether it is disabled, and
-   * don't just bail out
-   */
   useEffect(() => {
     if (
-      !commandBarActor.getSnapshot().matches('Closed') &&
+      immediateState.type !== EngineConnectionStateType.ConnectionEstablished
-      (immediateState.type === EngineConnectionStateType.Disconnecting ||
-        immediateState.type === EngineConnectionStateType.Disconnected)
     ) {
       commandBarActor.send({ type: 'Close' })
-      toast.error('Exiting command flow because engine disconnected')
     }
-  }, [immediateState, commandBarActor])
+  }, [immediateState])
 
   // Hook up keyboard shortcuts
   useHotkeyWrapper([COMMAND_PALETTE_HOTKEY], () => {

src/components/ModelingSidebar/ModelingPanes/index.tsx

@@ -3,7 +3,6 @@ import { faBugSlash } from '@fortawesome/free-solid-svg-icons'
 import type { MouseEventHandler, ReactNode } from 'react'
 import type { ContextFrom } from 'xstate'
 
-import { IS_PLAYWRIGHT_KEY } from '@e2e/playwright/storageStates'
 import type { CustomIconName } from '@src/components/CustomIcon'
 import {
   FileTreeInner,
@@ -242,8 +241,6 @@ export const sidebarPanes: SidebarPane[] = [
       )
     },
     keybinding: 'Shift + D',
-    hide: ({ settings }) =>
+    hide: ({ settings }) => !settings.app.showDebugPanel.current,
-      !(window?.localStorage.getItem(IS_PLAYWRIGHT_KEY) === 'true') &&
-      !settings.app.showDebugPanel.current,
   },
 ]