Merge remote-tracking branch 'origin/main' into okcode/multi-language-support

# Conflicts:
#	apps/web/src/hooks/useTheme.ts

Author: BunsDev

.github/workflows/release.yml

@@ -208,7 +208,7 @@ jobs:
             printf '%s' "$APPLE_API_KEY" > "$key_path"
             export APPLE_API_KEY="$key_path"
             echo "macOS signing + notarization enabled."
-            args+=(--signed)
+            args+=(--signed --require-signed)
           elif [[ "${{ matrix.platform }}" == "win" ]]; then
             if has_all \
               "$AZURE_TENANT_ID" \

TODO.md

@@ -6,7 +6,7 @@
 - [x] Projects should be sorted by latest thread update
 - [x] Submitting new messages should scroll to bottom — [#13](https://github.com/OpenKnots/okcode/issues/13)
 - [ ] Thread archiving — [#10](https://github.com/OpenKnots/okcode/issues/10)
-- [ ] New projects should go on top — [#11](https://github.com/OpenKnots/okcode/issues/11)
+- [x] New projects should go on top — [#11](https://github.com/OpenKnots/okcode/issues/11)
 
 ## Bigger things
 

apps/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okcode/desktop",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "private": true,
   "main": "dist-electron/main.js",
   "scripts": {
@@ -11,7 +11,8 @@
     "start": "bun run scripts/start-electron.mjs",
     "typecheck": "tsc --noEmit",
     "test": "vitest run --passWithNoTests",
-    "smoke-test": "node scripts/smoke-test.mjs"
+    "smoke-test": "node scripts/smoke-test.mjs",
+    "release-smoke": "node ../../scripts/release-smoke.ts"
   },
   "dependencies": {
     "effect": "catalog:",

apps/desktop/scripts/smoke-test.mjs

@@ -1,11 +1,13 @@
 import { spawn } from "node:child_process";
+import { createRequire } from "node:module";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const desktopDir = resolve(__dirname, "..");
-const electronBin = resolve(desktopDir, "node_modules/.bin/electron");
 const mainJs = resolve(desktopDir, "dist-electron/main.js");
+const require = createRequire(import.meta.url);
+const electronBin = require("electron");
 
 console.log("\nLaunching Electron smoke test...");
 
@@ -26,6 +28,13 @@ child.stderr.on("data", (chunk) => {
   output += chunk.toString();
 });
 
+child.on("error", (error) => {
+  clearTimeout(timeout);
+  console.error("\nDesktop smoke test failed to launch Electron:");
+  console.error(error);
+  process.exit(1);
+});
+
 const timeout = setTimeout(() => {
   child.kill();
 }, 8_000);

apps/desktop/turbo.jsonc

@@ -20,5 +20,9 @@
       "cache": false,
       "outputs": [],
     },
+    "release-smoke": {
+      "cache": false,
+      "outputs": [],
+    },
   },
 }

apps/marketing/turbo.jsonc

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://turbo.build/schema.json",
+  "extends": ["//"],
+  "tasks": {
+    "preview": {
+      "dependsOn": ["build"],
+      "cache": false,
+      "persistent": true,
+    },
+  },
+}

apps/server/integration/OrchestrationEngineHarness.integration.ts

@@ -74,6 +74,12 @@ function runGit(cwd: string, args: ReadonlyArray<string>) {
     cwd,
     stdio: ["ignore", "pipe", "pipe"],
     encoding: "utf8",
+    env: {
+      ...process.env,
+      GIT_CONFIG_COUNT: "1",
+      GIT_CONFIG_KEY_0: "commit.gpgsign",
+      GIT_CONFIG_VALUE_0: "false",
+    },
   });
 }
 

apps/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "okcodes",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "license": "MIT",
   "repository": {
     "type": "git",

apps/server/src/checkpointing/Layers/CheckpointDiffQuery.ts

@@ -133,6 +133,8 @@ const make = Effect.gen(function* () {
         fromCheckpointRef,
         toCheckpointRef,
         fallbackFromToHead: false,
+        ...(input.relativePath ? { relativePath: input.relativePath } : {}),
+        ...(input.contextMode ? { contextMode: input.contextMode } : {}),
       });
 
       const turnDiff: OrchestrationGetTurnDiffResultType = {
@@ -158,6 +160,8 @@ const make = Effect.gen(function* () {
       threadId: input.threadId,
       fromTurnCount: 0,
       toTurnCount: input.toTurnCount,
+      relativePath: input.relativePath,
+      contextMode: input.contextMode,
     }).pipe(Effect.map((result): OrchestrationGetFullThreadDiffResult => result));
 
   return {

apps/server/src/checkpointing/Layers/CheckpointStore.ts

@@ -240,10 +240,21 @@ const makeCheckpointStore = Effect.gen(function* () {
         });
       }
 
+      const args = [
+        "diff",
+        "--patch",
+        "--minimal",
+        "--no-color",
+        ...(input.contextMode === "full" ? ["--unified=999999"] : []),
+        fromCommitOid,
+        toCommitOid,
+        ...(input.relativePath ? ["--", input.relativePath] : []),
+      ];
+
       const result = yield* git.execute({
         operation,
         cwd: input.cwd,
-        args: ["diff", "--patch", "--minimal", "--no-color", fromCommitOid, toCommitOid],
+        args,
       });
 
       return result.stdout;