forge-memory 0.2.114 → 0.2.115

package/README.md

@@ -38,11 +38,12 @@ tools). It also exposes `forge_memory_mcp_diagnostics` so adapter startup issues
 show up as a tool result instead of a closed MCP transport.
 
 `pair-ios` prefers the Iroh QR. Forge starts a Rust Iroh host, prints a QR payload
-with the desktop node id, pairing token, optional relay hint, and ALPN
-`forge-companion/1`, and the iPhone app connects through its native Rust bridge. The
-CLI renders a short-schema QR to keep the terminal code scannable and saves the
-full manual payload under `~/.forge/pairing/` so you can paste it into the iPhone
-app if the camera cannot scan.
+with the desktop node id, pairing token, optional relay hint, ALPN
+`forge-companion/1`, and the request URL as a direct fallback when it is
+phone-reachable. The iPhone app connects through its native Rust bridge first and can
+retry through URLSession when that bridge times out. The CLI renders a short-schema QR
+to keep the terminal code scannable and saves the full manual payload under
+`~/.forge/pairing/` so you can paste it into the iPhone app if the camera cannot scan.
 Use `--manual-http` only when you intentionally want a LAN, Tailscale, or direct
 HTTP/TCP route. For a real iPhone, pass a phone-reachable URL:
 

package/bin/forge-memory.mjs

@@ -606,6 +606,59 @@ function findForgeRepo(start = process.cwd()) {
   }
 }
 
+function resolveRuntimeStorageRoot(healthResult) {
+  const storageRoot = healthResult?.payload?.runtime?.storageRoot;
+  return typeof storageRoot === "string" && storageRoot.trim()
+    ? path.resolve(storageRoot)
+    : null;
+}
+
+function pathsMatch(left, right) {
+  return path.resolve(left) === path.resolve(right);
+}
+
+async function resolveInstallRuntimeTarget({
+  origin,
+  requestedPort,
+  requestedWebPort,
+  dataRoot,
+  dataRootWasExplicit
+}) {
+  if (requestedPort !== 0) {
+    const desiredConfig = { origin, port: requestedPort };
+    const desiredHealth = await health(desiredConfig);
+    if (isHealthyForgeRuntime(desiredHealth)) {
+      const liveDataRoot = resolveRuntimeStorageRoot(desiredHealth);
+      if (liveDataRoot && !pathsMatch(liveDataRoot, dataRoot)) {
+        if (dataRootWasExplicit) {
+          throw new Error(
+            [
+              `A healthy Forge runtime is already running at ${baseUrl(desiredConfig)}, but it uses a different data folder.`,
+              `Live data folder: ${liveDataRoot}.`,
+              `Requested data folder: ${path.resolve(dataRoot)}.`,
+              "Stop or restart that runtime before switching data folders. Your data folder is unchanged."
+            ].join(" ")
+          );
+        }
+        dataRoot = liveDataRoot;
+      }
+      return {
+        port: requestedPort,
+        webPort: requestedWebPort,
+        dataRoot: path.resolve(dataRoot),
+        adoptedExistingRuntime: true
+      };
+    }
+  }
+
+  return {
+    port: await findFreePort(requestedPort),
+    webPort: await findFreePort(requestedWebPort),
+    dataRoot: path.resolve(dataRoot),
+    adoptedExistingRuntime: false
+  };
+}
+
 async function buildInstallConfig(parsed, currentConfig, discovery, command) {
   const repo = parsed.values.repo
     ? path.resolve(parsed.values.repo)
@@ -634,22 +687,25 @@ async function buildInstallConfig(parsed, currentConfig, discovery, command) {
   const dataRoot = parsed.flags.yes
     ? dataRootDefault
     : await promptLine("Forge data folder", dataRootDefault);
-  const portInput = parsed.values.port ?? currentConfig.port;
-  const port = await findFreePort(normalizePort(portInput, DEFAULT_PORT));
-  const webPort = await findFreePort(
-    normalizePort(
+  const origin = parsed.values.origin ?? currentConfig.origin ?? DEFAULT_ORIGIN;
+  const runtimeTarget = await resolveInstallRuntimeTarget({
+    origin,
+    requestedPort: normalizePort(parsed.values.port ?? currentConfig.port, DEFAULT_PORT),
+    requestedWebPort: normalizePort(
       parsed.values.webPort ?? currentConfig.webPort,
       DEFAULT_WEB_PORT
-    )
-  );
+    ),
+    dataRoot,
+    dataRootWasExplicit: typeof parsed.values.dataRoot === "string"
+  });
 
   return {
     version: VERSION,
     mode: parsed.flags.dev ? "dev" : mode,
-    origin: parsed.values.origin ?? currentConfig.origin ?? DEFAULT_ORIGIN,
-    port,
-    webPort,
-    dataRoot: path.resolve(dataRoot),
+    origin,
+    port: runtimeTarget.port,
+    webPort: runtimeTarget.webPort,
+    dataRoot: runtimeTarget.dataRoot,
     adapters,
     repo,
     command

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-memory",
-  "version": "0.2.114",
+  "version": "0.2.115",
   "description": "Guided Forge installer and local runtime manager for the Forge UI, OpenClaw, Hermes, Codex, and iOS pairing.",
   "type": "module",
   "license": "Apache-2.0",