oasis_test 0.1.91 → 0.1.92

package/dist/index.js

@@ -141010,6 +141010,41 @@ var init_base = __esm({
   }
 });
 
+// ../connectors/src/logger.ts
+function ts() {
+  return (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
+}
+function log(tag, msg, extra) {
+  const suffix = extra ? "  " + JSON.stringify(extra) : "";
+  console.log(`[${ts()}] ${tag} ${msg}${suffix}`);
+}
+var init_logger = __esm({
+  "../connectors/src/logger.ts"() {
+    "use strict";
+  }
+});
+
+// ../connectors/src/_base/host-isolation.ts
+function hostIsolationEnabled(env = process.env) {
+  const v2 = env[HOST_ISOLATION_ENV];
+  return v2 === "1" || v2 === "true";
+}
+function logHostIdentityFallback(keys, where) {
+  if (keys.length === 0) return;
+  log(
+    where,
+    `\u26A0 \u5BBF\u4E3B\u673A\u8EAB\u4EFD\u9694\u79BB\u5DF2\u5173\u95ED\uFF08${HOST_ISOLATION_ENV} \u672A\u5F00\uFF09\uFF1A\u672A\u63A5\u901A\u7684\u8FDE\u63A5\u5668\u4E0D\u518D\u5C4F\u853D\u5BBF\u4E3B\u673A\u767B\u5F55\u6001\uFF0C\u672C\u8F6E ${keys.join(", ")} \u4FDD\u6301\u5BBF\u4E3B\u673A\u9ED8\u8BA4\u503C \u2014\u2014 agent \u8C03 gh/git \u65F6\u7528\u7684\u662F**\u8FD9\u53F0\u673A\u5668\u4E0A\u90A3\u4E2A\u8D26\u53F7**\uFF08\u6743\u9650\u901A\u5E38\u6BD4\u8FDE\u63A5\u5668\u8EAB\u4EFD\u66F4\u5927\uFF09\uFF0Ccommit \u7F72\u540D\u8D70 git config --global\u3002`
+  );
+}
+var HOST_ISOLATION_ENV;
+var init_host_isolation = __esm({
+  "../connectors/src/_base/host-isolation.ts"() {
+    "use strict";
+    init_logger();
+    HOST_ISOLATION_ENV = "OASIS_CONNECTOR_HOST_ISOLATION";
+  }
+});
+
 // ../connectors/src/feishu/index.ts
 function parseFeishuTokenResponse(data, nowMs) {
   const accessToken = String(data["access_token"] ?? "");
@@ -142025,20 +142060,6 @@ var init_registry2 = __esm({
   }
 });
 
-// ../connectors/src/logger.ts
-function ts() {
-  return (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
-}
-function log(tag, msg, extra) {
-  const suffix = extra ? "  " + JSON.stringify(extra) : "";
-  console.log(`[${ts()}] ${tag} ${msg}${suffix}`);
-}
-var init_logger = __esm({
-  "../connectors/src/logger.ts"() {
-    "use strict";
-  }
-});
-
 // ../connectors/src/provision.ts
 function collectCredentials(connector, ctx) {
   const creds = {};
@@ -142090,19 +142111,24 @@ async function buildConnectorProvision(ctx) {
       log("[provision]", `${connector.config.slug}: \u88C5\u914D\u5931\u8D25\uFF08\u8BE5\u8FDE\u63A5\u5668\u672C\u8F6E\u4E0D\u53EF\u7528\uFF09: ${String(err)}`);
     }
   }
-  const isolationRoot = await (0, import_promises5.mkdtemp)((0, import_node_path8.join)((0, import_node_os4.tmpdir)(), "oasis-isolate-"));
-  let isolationUsed = false;
-  for (const key of isolationKeys) {
-    if (envOverrides[key]) continue;
-    const dir = (0, import_node_path8.join)(isolationRoot, key.toLowerCase());
-    await (0, import_promises5.mkdir)(dir, { recursive: true, mode: 448 });
-    envOverrides[key] = dir;
-    isolationUsed = true;
+  const pendingIsolation = [...isolationKeys].filter((k2) => !envOverrides[k2]);
+  if (!hostIsolationEnabled()) {
+    logHostIdentityFallback(pendingIsolation, "[provision]");
+  } else {
+    const isolationRoot = await (0, import_promises5.mkdtemp)((0, import_node_path8.join)((0, import_node_os4.tmpdir)(), "oasis-isolate-"));
+    let isolationUsed = false;
+    for (const key of isolationKeys) {
+      if (envOverrides[key]) continue;
+      const dir = (0, import_node_path8.join)(isolationRoot, key.toLowerCase());
+      await (0, import_promises5.mkdir)(dir, { recursive: true, mode: 448 });
+      envOverrides[key] = dir;
+      isolationUsed = true;
+    }
+    if (!isolationUsed) await (0, import_promises5.rm)(isolationRoot, { recursive: true, force: true });
+    else cleanups.push(async () => {
+      await (0, import_promises5.rm)(isolationRoot, { recursive: true, force: true });
+    });
   }
-  if (!isolationUsed) await (0, import_promises5.rm)(isolationRoot, { recursive: true, force: true });
-  else cleanups.push(async () => {
-    await (0, import_promises5.rm)(isolationRoot, { recursive: true, force: true });
-  });
   const cleanup = async () => {
     for (const fn of cleanups) await fn().catch(() => {
     });
@@ -142122,6 +142148,7 @@ var init_provision = __esm({
     "use strict";
     init_base();
     init_registry2();
+    init_host_isolation();
     init_logger();
     import_promises5 = require("node:fs/promises");
     import_node_os4 = require("node:os");
@@ -142180,11 +142207,12 @@ async function prepareConnectorsForJob(job, deps) {
   if (droppedWrappers > 0) log("[node-connectors]", `\u4E22\u5F03 ${droppedWrappers} \u6761\u672C\u673A\u4E0D\u53EF\u7528\u7684 wrapper \u8DEF\u5F84`);
   const staleKeys = /* @__PURE__ */ new Set();
   const isolationKeys = /* @__PURE__ */ new Set();
+  const isolate = hostIsolationEnabled();
   for (const connector of createAllConnectors()) {
     if (injected.has(connector.config.slug)) continue;
     const isolation = new Set(connector.hostCredentialIsolationEnvKeys ?? []);
     for (const key of connector.injectedEnvKeys) {
-      if (isolation.has(key)) isolationKeys.add(key);
+      if (isolate && isolation.has(key)) isolationKeys.add(key);
       else staleKeys.add(key);
     }
   }
@@ -142198,7 +142226,12 @@ async function prepareConnectorsForJob(job, deps) {
     delete jobEnv[key];
     dropped++;
   }
-  if (isolationKeys.size > 0) {
+  if (!isolate) {
+    logHostIdentityFallback(
+      createAllConnectors().filter((c) => !injected.has(c.config.slug)).flatMap((c) => [...c.hostCredentialIsolationEnvKeys ?? []]),
+      "[node-connectors]"
+    );
+  } else if (isolationKeys.size > 0) {
     const isolationRoot = await (0, import_promises6.mkdtemp)((0, import_node_path9.join)((0, import_node_os5.tmpdir)(), "oasis-node-isolate-"));
     for (const key of isolationKeys) {
       const dir = (0, import_node_path9.join)(isolationRoot, key.toLowerCase());
@@ -142285,6 +142318,7 @@ var init_prepare_job = __esm({
     import_node_path9 = require("node:path");
     init_base();
     init_registry2();
+    init_host_isolation();
     init_logger();
     SESSION_CREDENTIAL_RENEW_INTERVAL_MS = 30 * 6e4;
   }
@@ -146890,6 +146924,7 @@ var init_src5 = __esm({
     init_base();
     init_base();
     init_base();
+    init_host_isolation();
     init_feishu();
     init_scopes();
     init_oauth();
@@ -187089,7 +187124,7 @@ function syncRuntimeAssets(candidateRoots, binDir) {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.91" : "dev";
+var PKG_VERSION = true ? "0.1.92" : "dev";
 var OASIS_DIR = path29.join(os9.homedir(), ".oasis");
 var CONFIG_FILE = path29.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path29.join(OASIS_DIR, "node.pid");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.91",
+  "version": "0.1.92",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"