@orangeworks/orangetree 0.4.4 → 0.4.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @orangeworks/orangetree
 
+## 0.4.6
+
+### Patch Changes
+
+- 3314be8: After pairing, the app no longer restarts itself automatically. It keeps running in your terminal and shows a clear message to restart it (stop with Ctrl+C, then run it again) to finish connecting to the cloud — so it is easy to stop and never leaves a hidden background process or popup window. The tunnel connector also no longer opens a console window on Windows.
+
+## 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

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 \uC801\uC6A9\uC744 \uC704\uD574 \uC571\uC744 \uC7AC\uC2DC\uC791\uD558\uC138\uC694. \uD130\uBBF8\uB110\uC5D0\uC11C Ctrl+C\uB85C \uC885\uB8CC\uD55C \uB4A4 orangetree\uB97C \uB2E4\uC2DC \uC2E4\uD589\uD558\uBA74 \uD074\uB77C\uC6B0\uB4DC\uC5D0\uC11C \uC811\uC18D\uB429\uB2C8\uB2E4. (\uC7AC\uC2DC\uC791 \uC804\uC5D0\uB294 \uB300\uC2DC\uBCF4\uB4DC \u201C\uC5F4\uAE30\u201D\uAC00 \uB3D9\uC791\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.)",
   "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": 'Restart the app to activate the cloud connection: stop it (Ctrl+C) and run orangetree again. "Open" from the dashboard works only after you restart.',
   "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\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u30A2\u30D7\u30EA\u3092\u518D\u8D77\u52D5\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u30BF\u30FC\u30DF\u30CA\u30EB\u3067 Ctrl+C \u3067\u7D42\u4E86\u3057\u3001orangetree \u3092\u518D\u5B9F\u884C\u3057\u307E\u3059\u3002\u518D\u8D77\u52D5\u3059\u308B\u307E\u3067\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u306E\u300C\u958B\u304F\u300D\u306F\u52D5\u4F5C\u3057\u307E\u305B\u3093\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/public/pairing.js

@@ -72,7 +72,7 @@ function openPairingPanel() {
     } else if (s.phase === "paired") {
       bodyHtml = `<p class="ui-msg"><b>${esc(t("pair.paired.title"))}</b></p>
         ${s.accessUrl ? `<div class="ui-hint">${esc(t("pair.paired.url"))}</div><div class="pair-url"><a href="${esc(s.accessUrl)}" target="_blank" rel="noopener">${esc(s.accessUrl)}</a></div>` : ""}
-        ${s.needsRestart ? `<div class="ui-hint">${esc(t("pair.paired.restart"))}</div>` : ""}`;
+        ${s.needsRestart ? `<p class="ui-msg"><b>\u26A0 ${esc(t("pair.paired.restart"))}</b></p>` : ""}`;
     } else {
       bodyHtml = `<p class="ui-msg">${esc(failureMessage(s.error))}</p>`;
     }

package/dist/server.js

@@ -8,8 +8,7 @@ var __export = (target, all) => {
 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, openSync } from "node:fs";
+import { existsSync as existsSync9, readFileSync as readFileSync4 } 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";
@@ -16488,7 +16487,7 @@ var NewtManager = class {
     const args = this.opts.buildArgs(this.opts.credentials, this.opts.upstreamPort);
     let child;
     try {
-      child = spawn(this.opts.binPath, args, { stdio: ["ignore", "pipe", "pipe"] });
+      child = spawn(this.opts.binPath, args, { stdio: ["ignore", "pipe", "pipe"], windowsHide: true });
     } catch (err) {
       this.onExit(`spawn threw: ${err.message}`);
       return;
@@ -17863,37 +17862,6 @@ async function startNewt(upstreamPort) {
     newtStarting = false;
   }
 }
-var relaunching = false;
-function relaunch() {
-  if (relaunching) return;
-  relaunching = true;
-  console.log("[pair] config changed \u2014 relaunching to apply cloud remote mode.");
-  let spawned = false;
-  const spawnChild = () => {
-    if (spawned) return;
-    spawned = true;
-    const env = { ...process.env };
-    for (const k of ["OTREE_ROOT", "OTREE_REMOTE_AUTH", "OTREE_CLOUD_API", "OTREE_BIND", "OTREE_OPEN"]) {
-      delete env[k];
-    }
-    env.OTREE_PORT = String(resolvedPort || PORT);
-    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);
-  };
-  void (newtManager?.stop() ?? Promise.resolve()).finally(() => {
-    newtManager = null;
-    server.close(spawnChild);
-    server.closeAllConnections();
-    setTimeout(spawnChild, 2e3).unref();
-  });
-}
 function cloudApiBase() {
   const v = process.env.OTREE_CLOUD_API?.trim();
   return v && /^https?:\/\//i.test(v) ? v : null;
@@ -17925,7 +17893,6 @@ async function onPaired(r) {
   });
   const needsRestart = !remoteSession || pairingCloudBase() !== remoteCfg.cloudApiBase;
   if (needsRestart) {
-    setTimeout(() => relaunch(), 2500);
     return true;
   }
   if (remoteCfg.mode === "remote") {

package/package.json

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