@orangeworks/orangetree 0.4.3 → 0.4.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @orangeworks/orangetree
 
+## 0.4.5
+
+### Patch Changes
+
+- 922648b: Connecting to the cloud while a conversation is running no longer interrupts it. The app now waits for the running conversation to finish — or for you to stop it — before restarting to apply the cloud connection.
+
+## 0.4.4
+
+### Patch Changes
+
+- fc66b51: Fix the automatic restart after pairing crashing on Windows. In 0.4.3 the app relaunched itself to finish connecting, but the restarted process exited instead of coming back — leaving the app down and the cloud "Open" failing. The relaunched app now survives and connects reliably (its output goes to a log file under the data folder).
+
 ## 0.4.3
 
 ### Patch Changes

package/dist/public/i18n.js

@@ -34,7 +34,7 @@ const ko = {
   "pair.provisioning": "PC\uB97C \uC900\uBE44\uD558\uB294 \uC911",
   "pair.paired.title": "\uC5F0\uACB0 \uC644\uB8CC!",
   "pair.paired.url": "\uC811\uC18D \uC8FC\uC18C",
-  "pair.paired.restart": "\uD074\uB77C\uC6B0\uB4DC \uC5F0\uACB0\uC744 \uC801\uC6A9\uD558\uB824\uACE0 \uC571\uC744 \uB2E4\uC2DC \uC2DC\uC791\uD558\uB294 \uC911\uC785\uB2C8\uB2E4. \uC7A0\uC2DC \uD6C4 \uB300\uC2DC\uBCF4\uB4DC\uC758 \u201C\uC5F0\uACB0 PC\u201D\uC5D0\uC11C \uC5F4\uC5B4 \uC8FC\uC138\uC694.",
+  "pair.paired.restart": "\uD074\uB77C\uC6B0\uB4DC \uC5F0\uACB0\uC744 \uB9C8\uBB34\uB9AC\uD558\uB294 \uC911\uC785\uB2C8\uB2E4. \uC9C4\uD589 \uC911\uC778 \uB300\uD654\uAC00 \uC788\uC73C\uBA74 \uB05D\uB098\uAC70\uB098 \uC815\uC9C0\uD55C \uB4A4 \uC571\uC774 \uC790\uB3D9\uC73C\uB85C \uB2E4\uC2DC \uC2DC\uC791\uB429\uB2C8\uB2E4. \uC7A0\uC2DC \uD6C4 \uB300\uC2DC\uBCF4\uB4DC\uC758 \u201C\uC5F0\uACB0 PC\u201D\uC5D0\uC11C \uC5F4\uC5B4 \uC8FC\uC138\uC694.",
   "pair.retry": "\uB2E4\uC2DC \uC2DC\uB3C4",
   "pair.start.fail": "\uC5F0\uACB0\uC744 \uC2DC\uC791\uD558\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4.",
   "pair.failed.denied": "\uC2B9\uC778\uC774 \uAC70\uBD80\uB418\uC5C8\uC2B5\uB2C8\uB2E4.",
@@ -338,7 +338,7 @@ const en = {
   "pair.provisioning": "Preparing your PC",
   "pair.paired.title": "Connected!",
   "pair.paired.url": "Access URL",
-  "pair.paired.restart": "Restarting the app to apply the cloud connection \u2014 open this PC from the dashboard in a moment.",
+  "pair.paired.restart": "Finishing the cloud connection. If a conversation is running, the app will auto-restart after it finishes or you stop it, then open this PC from the dashboard.",
   "pair.retry": "Try again",
   "pair.start.fail": "Could not start the connection.",
   "pair.failed.denied": "The request was denied.",
@@ -638,7 +638,7 @@ const ja = {
   "pair.provisioning": "PC\u3092\u6E96\u5099\u4E2D",
   "pair.paired.title": "\u63A5\u7D9A\u5B8C\u4E86\uFF01",
   "pair.paired.url": "\u30A2\u30AF\u30BB\u30B9URL",
-  "pair.paired.restart": "\u30AF\u30E9\u30A6\u30C9\u63A5\u7D9A\u3092\u9069\u7528\u3059\u308B\u305F\u3081\u306B\u30A2\u30D7\u30EA\u3092\u518D\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059\u3002\u5C11\u3057\u5F85\u3063\u3066\u304B\u3089\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u3067\u3053\u306EPC\u3092\u958B\u3044\u3066\u304F\u3060\u3055\u3044\u3002",
+  "pair.paired.restart": "\u30AF\u30E9\u30A6\u30C9\u63A5\u7D9A\u3092\u4ED5\u4E0A\u3052\u3066\u3044\u307E\u3059\u3002\u4F1A\u8A71\u304C\u5B9F\u884C\u4E2D\u306E\u5834\u5408\u306F\u3001\u7D42\u4E86\u3059\u308B\u304B\u505C\u6B62\u3057\u305F\u5F8C\u306B\u30A2\u30D7\u30EA\u304C\u81EA\u52D5\u7684\u306B\u518D\u8D77\u52D5\u3057\u307E\u3059\u3002\u305D\u306E\u5F8C\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u3067\u3053\u306EPC\u3092\u958B\u3044\u3066\u304F\u3060\u3055\u3044\u3002",
   "pair.retry": "\u518D\u8A66\u884C",
   "pair.start.fail": "\u63A5\u7D9A\u3092\u958B\u59CB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002",
   "pair.failed.denied": "\u627F\u8A8D\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F\u3002",

package/dist/server.js

@@ -9,7 +9,7 @@ import { createServer as createServer2 } from "node:http";
 import { readFile, readdir, writeFile, mkdir as mkdir2 } from "node:fs/promises";
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { spawn as spawn2 } from "node:child_process";
-import { existsSync as existsSync9, readFileSync as readFileSync4 } from "node:fs";
+import { existsSync as existsSync9, readFileSync as readFileSync4, openSync } from "node:fs";
 import { homedir as homedir3 } from "node:os";
 import { join as join9, extname, normalize as normalize5, basename as basename3, dirname as dirname6, relative as relative3, isAbsolute as isAbsolute3, sep as sep2 } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -17877,7 +17877,13 @@ function relaunch() {
       delete env[k];
     }
     env.OTREE_PORT = String(resolvedPort || PORT);
-    const child = spawn2(process.execPath, process.argv.slice(1), { detached: true, stdio: "inherit", env });
+    let stdio = "ignore";
+    try {
+      const logFd = openSync(join9(appData.root, "relaunch.log"), "a");
+      stdio = ["ignore", logFd, logFd];
+    } catch {
+    }
+    const child = spawn2(process.execPath, process.argv.slice(1), { detached: true, stdio, windowsHide: true, env });
     child.unref();
     setTimeout(() => process.exit(0), 100);
   };
@@ -17888,6 +17894,16 @@ function relaunch() {
     setTimeout(spawnChild, 2e3).unref();
   });
 }
+var relaunchArmed = false;
+function relaunchWhenIdle() {
+  if (relaunchArmed) return;
+  relaunchArmed = true;
+  const tick = () => {
+    if (sessions.busy.size === 0) setTimeout(() => relaunch(), 2500);
+    else setTimeout(tick, 1e3);
+  };
+  tick();
+}
 function cloudApiBase() {
   const v = process.env.OTREE_CLOUD_API?.trim();
   return v && /^https?:\/\//i.test(v) ? v : null;
@@ -17919,7 +17935,7 @@ async function onPaired(r) {
   });
   const needsRestart = !remoteSession || pairingCloudBase() !== remoteCfg.cloudApiBase;
   if (needsRestart) {
-    setTimeout(() => relaunch(), 2500);
+    relaunchWhenIdle();
     return true;
   }
   if (remoteCfg.mode === "remote") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orangeworks/orangetree",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Branching session-tree work-tracking tool (local-first, TypeScript)",
   "author": "OrangeWorks <support@orangeworks.kr>",
   "repository": {