@yoooclaw/phone-notifications 1.7.0 → 1.7.1

package/dist/index.js

@@ -3648,7 +3648,7 @@ var require_websocket_server = __commonJS({
 
 // src/index.ts
 import { readFileSync as readFileSync14 } from "fs";
-import { basename as basename2, dirname as dirname5 } from "path";
+import { basename as basename2, dirname as dirname6 } from "path";
 
 // src/light/protocol.ts
 var MAX_LIGHT_SEGMENTS = 12;
@@ -3794,11 +3794,11 @@ import { randomUUID } from "crypto";
 
 // src/env.ts
 import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
-import { dirname } from "path";
+import { dirname as dirname2 } from "path";
 
 // src/host.ts
 import { existsSync, readFileSync } from "fs";
-import { join } from "path";
+import { dirname, join } from "path";
 function trimToUndefined(value) {
   if (typeof value !== "string") {
     return void 0;
@@ -3809,6 +3809,18 @@ function trimToUndefined(value) {
 function homeDir() {
   return process.env.HOME || process.env.USERPROFILE || "/tmp";
 }
+function expandUserPath(value) {
+  if (!value) {
+    return void 0;
+  }
+  if (value === "~") {
+    return homeDir();
+  }
+  if (value.startsWith("~/")) {
+    return join(homeDir(), value.slice(2));
+  }
+  return value;
+}
 function candidateMetaPaths() {
   const home = homeDir();
   return [
@@ -3824,8 +3836,8 @@ function loadQClawMeta() {
     try {
       const parsed = JSON.parse(readFileSync(metaPath, "utf-8"));
       return {
-        stateDir: trimToUndefined(parsed?.stateDir),
-        configPath: trimToUndefined(parsed?.configPath)
+        stateDir: expandUserPath(trimToUndefined(parsed?.stateDir)),
+        configPath: expandUserPath(trimToUndefined(parsed?.configPath))
       };
     } catch {
     }
@@ -3833,21 +3845,42 @@ function loadQClawMeta() {
   return void 0;
 }
 function resolveStateDirFromEnv() {
-  return trimToUndefined(process.env.OPENCLAW_STATE_DIR) ?? trimToUndefined(process.env.QCLAW_STATE_DIR) ?? trimToUndefined(process.env.OPENCLAW_ROOT) ?? trimToUndefined(process.env.OPENCLAW_HOME) ?? trimToUndefined(process.env.QCLAW_HOME);
+  return expandUserPath(
+    trimToUndefined(process.env.OPENCLAW_STATE_DIR) ?? trimToUndefined(process.env.QCLAW_STATE_DIR) ?? trimToUndefined(process.env.OPENCLAW_ROOT) ?? trimToUndefined(process.env.OPENCLAW_HOME) ?? trimToUndefined(process.env.QCLAW_HOME)
+  );
+}
+function resolveConfigPathFromEnv() {
+  return expandUserPath(
+    trimToUndefined(process.env.OPENCLAW_CONFIG_PATH) ?? trimToUndefined(process.env.QCLAW_CONFIG_PATH)
+  );
+}
+function hasOpenClawMarkers() {
+  const baseDir = join(homeDir(), ".openclaw");
+  return [
+    join(baseDir, "openclaw.json"),
+    join(baseDir, "credentials.json"),
+    join(baseDir, "extensions")
+  ].some((candidate) => existsSync(candidate));
 }
 function resolveStateDir() {
   const envDir = resolveStateDirFromEnv();
   if (envDir) {
     return envDir;
   }
+  if (hasOpenClawMarkers()) {
+    return join(homeDir(), ".openclaw");
+  }
   const meta = loadQClawMeta();
   if (meta?.stateDir) {
     return meta.stateDir;
   }
+  if (meta?.configPath) {
+    return dirname(meta.configPath);
+  }
   return join(homeDir(), ".openclaw");
 }
 function resolveConfigPath(stateDir = resolveStateDir()) {
-  const envConfigPath = trimToUndefined(process.env.OPENCLAW_CONFIG_PATH) ?? trimToUndefined(process.env.QCLAW_CONFIG_PATH);
+  const envConfigPath = resolveConfigPathFromEnv();
   if (envConfigPath) {
     return envConfigPath;
   }
@@ -3893,7 +3926,7 @@ function saveEnvName(env) {
     throw new Error(`\u65E0\u6548\u7684\u73AF\u5883\u540D\u79F0: ${env}\uFF0C\u53EF\u9009\u503C: ${[...VALID_ENVS].join(", ")}`);
   }
   const filePath = envFilePath();
-  mkdirSync(dirname(filePath), { recursive: true, mode: 448 });
+  mkdirSync(dirname2(filePath), { recursive: true, mode: 448 });
   writeFileSync(filePath, JSON.stringify({ env }, null, 2), {
     encoding: "utf-8",
     mode: 384
@@ -3964,7 +3997,7 @@ import {
   writeFileSync as writeFileSync2,
   watch
 } from "fs";
-import { dirname as dirname2, basename } from "path";
+import { dirname as dirname3, basename } from "path";
 function credentialsPath() {
   return resolveStateFile("credentials.json");
 }
@@ -3979,7 +4012,7 @@ function readCredentials() {
 }
 function writeCredentials(creds) {
   const path2 = credentialsPath();
-  mkdirSync2(dirname2(path2), { recursive: true, mode: 448 });
+  mkdirSync2(dirname3(path2), { recursive: true, mode: 448 });
   writeFileSync2(path2, JSON.stringify(creds, null, 2), {
     encoding: "utf-8",
     mode: 384
@@ -4000,7 +4033,7 @@ function requireApiKey() {
 }
 function watchCredentials(onChange) {
   const path2 = credentialsPath();
-  const dir = dirname2(path2);
+  const dir = dirname3(path2);
   const filename = basename(path2);
   let debounceTimer = null;
   const delayMs = 200;
@@ -5447,11 +5480,11 @@ import {
   unlinkSync,
   writeFileSync as writeFileSync9
 } from "fs";
-import { dirname as dirname4, join as join10 } from "path";
+import { dirname as dirname5, join as join10 } from "path";
 
 // src/tunnel/relay-client.ts
 import { writeFileSync as writeFileSync8, mkdirSync as mkdirSync6 } from "fs";
-import { dirname as dirname3 } from "path";
+import { dirname as dirname4 } from "path";
 
 // node_modules/.pnpm/ws@8.19.0/node_modules/ws/wrapper.mjs
 var import_stream = __toESM(require_stream(), 1);
@@ -5483,7 +5516,7 @@ var RelayClient = class {
       lastDisconnectReason
     };
     try {
-      mkdirSync6(dirname3(this.opts.statusFilePath), { recursive: true });
+      mkdirSync6(dirname4(this.opts.statusFilePath), { recursive: true });
       writeFileSync8(this.opts.statusFilePath, JSON.stringify(info, null, 2));
     } catch {
     }
@@ -6360,7 +6393,7 @@ function createTunnelService(opts) {
     }
   }
   function acquireLock(filePath) {
-    mkdirSync7(dirname4(filePath), { recursive: true });
+    mkdirSync7(dirname5(filePath), { recursive: true });
     for (let attempt = 0; attempt < 2; attempt++) {
       try {
         const fd = openSync(filePath, "wx", 384);
@@ -6826,7 +6859,7 @@ var index_default = {
       if (openclawDir) return openclawDir;
       if (!workspaceDir) return void 0;
       if (basename2(workspaceDir) !== "workspace") return void 0;
-      return dirname5(workspaceDir);
+      return dirname6(workspaceDir);
     };
     api.registerCli(
       (ctx) => {