Merge branch 'main' into fix-ssh-auth-timestamps

Author: ardenworks

.github/workflows/ci.yml

@@ -46,6 +46,14 @@ jobs:
       - name: Install dependencies
         run: bun install --frozen-lockfile
 
+      - name: Ensure Electron runtime is installed
+        run: |
+          if ! node -e "require('./apps/desktop/node_modules/electron')" >/dev/null 2>&1; then
+            rm -rf apps/desktop/node_modules/electron/dist apps/desktop/node_modules/electron/path.txt
+            bun apps/desktop/node_modules/electron/install.js
+          fi
+          node -e "require('./apps/desktop/node_modules/electron')"
+
       - name: Format
         run: bun run fmt:check
 

apps/desktop/package.json

@@ -10,7 +10,7 @@
     "dev:electron": "node scripts/dev-electron.mjs",
     "build": "tsdown",
     "start": "node scripts/start-electron.mjs",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsgo --noEmit",
     "test": "vitest run --passWithNoTests",
     "smoke-test": "node scripts/smoke-test.mjs"
   },
@@ -25,11 +25,9 @@
     "electron-updater": "^6.6.2"
   },
   "devDependencies": {
-    "@effect/language-service": "catalog:",
     "@effect/vitest": "catalog:",
     "@types/node": "catalog:",
     "tsdown": "catalog:",
-    "typescript": "catalog:",
     "vitest": "catalog:"
   },
   "productName": "T3 Code (Alpha)"

apps/desktop/src/app/DesktopApp.ts

@@ -1,8 +1,8 @@
 import * as Cause from "effect/Cause";
+import * as Crypto from "effect/Crypto";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
-import * as Random from "effect/Random";
 import * as Ref from "effect/Ref";
 
 import * as NetService from "@t3tools/shared/Net";
@@ -26,7 +26,8 @@ const DEFAULT_DESKTOP_BACKEND_PORT = 3773;
 const MAX_TCP_PORT = 65_535;
 const DESKTOP_BACKEND_PORT_PROBE_HOSTS = ["127.0.0.1", "0.0.0.0", "::"] as const;
 
-const makeDesktopRunId = Random.nextUUIDv4.pipe(
+const makeDesktopRunId = Crypto.Crypto.pipe(
+  Effect.flatMap((crypto) => crypto.randomUUIDv4),
   Effect.map((value) => value.replaceAll("-", "").slice(0, 12)),
 );
 

apps/desktop/src/app/DesktopAppIdentity.ts

@@ -26,7 +26,7 @@ export interface DesktopAppIdentityShape {
 export class DesktopAppIdentity extends Context.Service<
   DesktopAppIdentity,
   DesktopAppIdentityShape
->()("t3/desktop/AppIdentity") {}
+>()("@t3tools/desktop/app/DesktopAppIdentity") {}
 
 const normalizeCommitHash = (value: string): Option.Option<string> => {
   const trimmed = value.trim();

apps/desktop/src/app/DesktopAssets.ts

@@ -18,7 +18,7 @@ export interface DesktopAssetsShape {
 }
 
 export class DesktopAssets extends Context.Service<DesktopAssets, DesktopAssetsShape>()(
-  "t3/desktop/Assets",
+  "@t3tools/desktop/app/DesktopAssets",
 ) {}
 
 const resolveResourcePath = Effect.fn("desktop.assets.resolveResourcePath")(function* (

apps/desktop/src/app/DesktopEnvironment.test.ts

@@ -32,9 +32,7 @@ const makeEnvironment = (
   overrides: Partial<DesktopEnvironment.MakeDesktopEnvironmentInput> = {},
   env: Record<string, string | undefined> = {},
 ) =>
-  Effect.gen(function* () {
-    return yield* DesktopEnvironment.DesktopEnvironment;
-  }).pipe(Effect.provide(makeEnvironmentLayer(overrides, env)));
+  DesktopEnvironment.DesktopEnvironment.pipe(Effect.provide(makeEnvironmentLayer(overrides, env)));
 
 describe("DesktopEnvironment", () => {
   it.effect("derives state paths and development identity inside Effect", () =>

apps/desktop/src/app/DesktopEnvironment.ts

@@ -78,7 +78,7 @@ export interface DesktopEnvironmentShape {
 export class DesktopEnvironment extends Context.Service<
   DesktopEnvironment,
   DesktopEnvironmentShape
->()("t3/desktop/Environment") {}
+>()("@t3tools/desktop/app/DesktopEnvironment") {}
 
 const APP_BASE_NAME = "T3 Code";
 

apps/desktop/src/app/DesktopLifecycle.ts

@@ -24,7 +24,7 @@ export interface DesktopShutdownShape {
 }
 
 export class DesktopShutdown extends Context.Service<DesktopShutdown, DesktopShutdownShape>()(
-  "t3/desktop/Shutdown",
+  "@t3tools/desktop/app/DesktopLifecycle/DesktopShutdown",
 ) {}
 
 const makeShutdown = Effect.gen(function* () {
@@ -61,8 +61,11 @@ export interface DesktopLifecycleShape {
   readonly register: Effect.Effect<void, never, Scope.Scope | DesktopLifecycleRuntimeServices>;
 }
 
+/**
+ * @effect-expect-leaking DesktopEnvironment | DesktopShutdown | DesktopState | DesktopWindow | ElectronApp | ElectronTheme
+ */
 export class DesktopLifecycle extends Context.Service<DesktopLifecycle, DesktopLifecycleShape>()(
-  "t3/desktop/Lifecycle",
+  "@t3tools/desktop/app/DesktopLifecycle",
 ) {}
 
 const { logInfo: logLifecycleInfo, logError: logLifecycleError } =

apps/desktop/src/app/DesktopObservability.ts

@@ -43,7 +43,7 @@ export interface DesktopBackendOutputLogShape {
 export class DesktopBackendOutputLog extends Context.Service<
   DesktopBackendOutputLog,
   DesktopBackendOutputLogShape
->()("t3/desktop/BackendOutputLog") {}
+>()("@t3tools/desktop/app/DesktopObservability/DesktopBackendOutputLog") {}
 
 const textEncoder = new TextEncoder();
 const textDecoder = new TextDecoder();

apps/desktop/src/app/DesktopState.ts

@@ -9,7 +9,7 @@ export interface DesktopStateShape {
 }
 
 export class DesktopState extends Context.Service<DesktopState, DesktopStateShape>()(
-  "t3/desktop/State",
+  "@t3tools/desktop/app/DesktopState",
 ) {}
 
 export const layer = Layer.effect(