@qwen-code/qwen-code 0.21.8 → 0.21.9

package/chunks/{scheduler-MD3AL2W5.js → scheduler-YNQNOU2E.js}

@@ -3,10 +3,14 @@
 import {
   msSinceLastInteraction
 } from "./chunk-KW7NOTN6.js";
+import {
+  DEFAULT_OPENAI_LOG_RETENTION_DAYS
+} from "./chunk-7GOYZQPR.js";
+import "./chunk-5EJZE3FP.js";
 import {
   FILE_HISTORY_DIR,
   getSubagentsRootDir
-} from "./chunk-GXSNGY5M.js";
+} from "./chunk-XX7QFP34.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
@@ -16,7 +20,7 @@ import "./chunk-MVUQRLOH.js";
 import "./chunk-XCWO3SMQ.js";
 import "./chunk-7MH4J33A.js";
 import "./chunk-6PVPNMXU.js";
-import "./chunk-VXZ5HAOV.js";
+import "./chunk-K4ADGWHU.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
 import "./chunk-GNPNYXJB.js";
@@ -32,8 +36,10 @@ import "./chunk-SEZ556DZ.js";
 import "./chunk-2FRY5CRX.js";
 import "./chunk-67N6HB5H.js";
 import "./chunk-WAUGQKUU.js";
-import "./chunk-PLFATELK.js";
-import "./chunk-L4N6TIP7.js";
+import {
+  resolveOpenAILogDir
+} from "./chunk-DZUO626D.js";
+import "./chunk-4TRQPFDP.js";
 import "./chunk-SAH4BD2J.js";
 import "./chunk-CPG6P4GG.js";
 import "./chunk-S6LOFUVP.js";
@@ -55,23 +61,23 @@ import "./chunk-AXMWHKXA.js";
 import "./chunk-GLCZKT5V.js";
 import "./chunk-DJ2GSRLV.js";
 import "./chunk-EI3HZX6C.js";
-import "./chunk-3PY4LPJF.js";
+import "./chunk-YGT2AUJ7.js";
 import "./chunk-WOJZWRAZ.js";
 import "./chunk-VGC4I5JJ.js";
 import "./chunk-FVKHVJZQ.js";
 import "./chunk-COBO5EBO.js";
 import "./chunk-6ZRFAKXK.js";
 import "./chunk-PYQADEFD.js";
-import "./chunk-M3STHEMM.js";
+import "./chunk-PVOGHGSF.js";
 import "./chunk-F6WFNA7U.js";
 import "./chunk-46UV252V.js";
 import "./chunk-ZBVS26BY.js";
 import "./chunk-KKBPOU75.js";
 import "./chunk-EUNWC2VS.js";
 import "./chunk-FOGU3LJX.js";
-import "./chunk-6M26GBKX.js";
+import "./chunk-L2AFWWJE.js";
 import "./chunk-W4RQUHY3.js";
-import "./chunk-LKRMNRSN.js";
+import "./chunk-PDPFQ2FO.js";
 import {
   Storage,
   createDebugLogger
@@ -97,15 +103,16 @@ import { join as join2 } from "node:path";
 
 // packages/cli/src/utils/housekeeping/cleanup.ts
 init_esbuild_shims();
-import { readdir, stat, rm, rmdir } from "node:fs/promises";
+import { opendir, readdir, stat, rm, rmdir, unlink } from "node:fs/promises";
 import { join } from "node:path";
 var debugLogger = createDebugLogger("HOUSEKEEPING");
 var MS_PER_DAY = 24 * 60 * 60 * 1e3;
 var MS_PER_HOUR = 60 * 60 * 1e3;
+var MIN_DATE_MS = -864e13;
 var SWEEP_CONCURRENCY = 20;
 function getCutoffDate(cleanupPeriodDays) {
   const periodMs = cleanupPeriodDays > 0 ? cleanupPeriodDays * MS_PER_DAY : MS_PER_HOUR;
-  return new Date(Date.now() - periodMs);
+  return new Date(Math.max(Date.now() - periodMs, MIN_DATE_MS));
 }
 __name(getCutoffDate, "getCutoffDate");
 async function sweepOldSessionDirs(root, opts) {
@@ -158,6 +165,53 @@ async function cleanupOldSubagentTranscripts(opts) {
   });
 }
 __name(cleanupOldSubagentTranscripts, "cleanupOldSubagentTranscripts");
+var OPENAI_LOG_FILE_PATTERN = /^openai-(\d{4}-\d{2}-\d{2})T\d{2}-\d{2}-\d{2}\.\d{3}Z-[a-f0-9]{8}(?:-[a-zA-Z0-9._](?:[a-zA-Z0-9._-]*[a-zA-Z0-9._])?)?\.json$/;
+async function cleanupOldOpenAILogs(opts) {
+  const result = { removed: 0, errors: 0 };
+  let dir;
+  try {
+    dir = await opendir(opts.logDir);
+  } catch (e) {
+    if (isENOENT(e)) return result;
+    debugLogger.error("opendir failed", e);
+    throw e;
+  }
+  const cutoffDay = opts.cutoffDate.toISOString().slice(0, 10);
+  let batch = [];
+  for await (const entry of dir) {
+    const filenameDate = entry.isFile() ? OPENAI_LOG_FILE_PATTERN.exec(entry.name)?.[1] : void 0;
+    if (!filenameDate) continue;
+    const filePath = join(opts.logDir, entry.name);
+    batch.push(
+      (async () => {
+        try {
+          let shouldRemove;
+          if (filenameDate !== cutoffDay) {
+            shouldRemove = filenameDate < cutoffDay;
+          } else {
+            const s = await stat(filePath);
+            shouldRemove = s.mtime < opts.cutoffDate;
+          }
+          if (shouldRemove) {
+            await unlink(filePath);
+            result.removed++;
+          }
+        } catch (err) {
+          if (isENOENT(err)) return;
+          result.errors++;
+          debugLogger.error(`failed to sweep ${filePath}`, err);
+        }
+      })()
+    );
+    if (batch.length === SWEEP_CONCURRENCY) {
+      await Promise.all(batch);
+      batch = [];
+    }
+  }
+  await Promise.all(batch);
+  return result;
+}
+__name(cleanupOldOpenAILogs, "cleanupOldOpenAILogs");
 function isENOENT(e) {
   return e?.code === "ENOENT";
 }
@@ -165,7 +219,7 @@ __name(isENOENT, "isENOENT");
 
 // packages/cli/src/utils/housekeeping/throttledOnce.ts
 init_esbuild_shims();
-import { mkdir, open, stat as stat2, unlink, writeFile } from "node:fs/promises";
+import { mkdir, open, stat as stat2, unlink as unlink2, writeFile } from "node:fs/promises";
 import { dirname } from "node:path";
 var debugLogger2 = createDebugLogger("HOUSEKEEPING");
 var ONE_DAY_MS = 24 * 60 * 60 * 1e3;
@@ -185,7 +239,7 @@ async function runThrottledOnce(opts, task) {
     try {
       const s = await stat2(opts.lockPath);
       if (Date.now() - s.mtimeMs > staleLockMs) {
-        await unlink(opts.lockPath).catch(() => {
+        await unlink2(opts.lockPath).catch(() => {
         });
         acquired = await tryAcquire(opts.lockPath);
       }
@@ -219,7 +273,7 @@ async function runThrottledOnce(opts, task) {
     }
     return taskCompleted;
   } finally {
-    await unlink(opts.lockPath).catch(() => {
+    await unlink2(opts.lockPath).catch(() => {
       debugLogger2.debug(`${opts.name}: lock unlink failed (harmless)`);
     });
   }
@@ -261,6 +315,7 @@ var CATCHUP_THRESHOLD_MS = 7 * 24 * 60 * 60 * 1e3;
 var STARTUP_DELAY_CATCHUP_MS = 60 * 1e3;
 var FILE_HISTORY_MARKER = ".file-history-cleanup";
 var SUBAGENT_MARKER = ".subagent-cleanup";
+var OPENAI_LOGS_MARKER = ".openai-logs-cleanup";
 var started = false;
 function startBackgroundHousekeeping(config, settings) {
   if (started) return;
@@ -275,12 +330,22 @@ function startBackgroundHousekeeping(config, settings) {
 }
 __name(startBackgroundHousekeeping, "startBackgroundHousekeeping");
 async function scheduleFirstPass(config, settings) {
-  const markerPath = join2(Storage.getGlobalQwenDir(), FILE_HISTORY_MARKER);
-  const delay = await needsCatchUp(markerPath) ? STARTUP_DELAY_CATCHUP_MS : STARTUP_DELAY_MS;
+  const delay = await getFirstPassDelay(config, settings);
   debugLogger3.debug(`first pass in ${delay / 1e3}s`);
   setTimeout(() => scheduleNextPass(config, settings), delay).unref();
 }
 __name(scheduleFirstPass, "scheduleFirstPass");
+async function getFirstPassDelay(config, settings) {
+  const qwenDir = Storage.getGlobalQwenDir();
+  const markerPaths = [join2(qwenDir, FILE_HISTORY_MARKER)];
+  const openaiTarget = getOpenAILogCleanupTarget(config, settings);
+  if (openaiTarget) {
+    markerPaths.push(getOpenAILogsMarkerPath(qwenDir, openaiTarget.logDir));
+  }
+  const catchUpStates = await Promise.all(markerPaths.map(needsCatchUp));
+  return catchUpStates.some(Boolean) ? STARTUP_DELAY_CATCHUP_MS : STARTUP_DELAY_MS;
+}
+__name(getFirstPassDelay, "getFirstPassDelay");
 async function needsCatchUp(markerPath) {
   try {
     const s = await stat3(markerPath);
@@ -295,6 +360,36 @@ function getSubagentMarkerPath(qwenDir, projectDir) {
   return join2(qwenDir, `${SUBAGENT_MARKER}-${projectKey}`);
 }
 __name(getSubagentMarkerPath, "getSubagentMarkerPath");
+function getOpenAILogsMarkerPath(qwenDir, logDir) {
+  const logDirKey = createHash("sha256").update(logDir).digest("hex").slice(0, 16);
+  return join2(qwenDir, `${OPENAI_LOGS_MARKER}-${logDirKey}`);
+}
+__name(getOpenAILogsMarkerPath, "getOpenAILogsMarkerPath");
+function getOpenAILogCleanupTarget(config, settings) {
+  try {
+    const customLogDir = config.getContentGeneratorConfig?.()?.openAILoggingDir ?? settings.merged.model?.openAILoggingDir;
+    const systemRetention = settings.system?.settings.model?.openAILogRetentionDays;
+    const workspaceRetention = settings.isTrusted ? settings.workspace?.settings.model?.openAILogRetentionDays : void 0;
+    if (customLogDir && workspaceRetention !== void 0 && systemRetention === void 0) {
+      debugLogger3.error(
+        "workspace-scoped openAILogRetentionDays is unsafe with a custom openAILoggingDir; skipping cleanup"
+      );
+      return void 0;
+    }
+    const retentionDays = customLogDir ? systemRetention ?? settings.user?.settings.model?.openAILogRetentionDays ?? settings.systemDefaults?.settings.model?.openAILogRetentionDays ?? DEFAULT_OPENAI_LOG_RETENTION_DAYS : settings.merged.model?.openAILogRetentionDays ?? DEFAULT_OPENAI_LOG_RETENTION_DAYS;
+    return {
+      logDir: resolveOpenAILogDir(customLogDir, config.getWorkingDir()),
+      retentionDays
+    };
+  } catch (err) {
+    debugLogger3.error(
+      "failed to resolve OpenAI log cleanup target; skipping",
+      err
+    );
+    return void 0;
+  }
+}
+__name(getOpenAILogCleanupTarget, "getOpenAILogCleanupTarget");
 async function runPass(config, settings) {
   if (msSinceLastInteraction() < RECENT_INTERACTION_MS) {
     debugLogger3.debug("user active, deferring 10 min");
@@ -361,6 +456,27 @@ async function runHousekeeping(config, settings) {
       }
     );
   }
+  const openaiTarget = getOpenAILogCleanupTarget(config, settings);
+  if (openaiTarget) {
+    const { logDir, retentionDays } = openaiTarget;
+    const markerPath = getOpenAILogsMarkerPath(qwenDir, logDir);
+    await runThrottledOnce(
+      {
+        name: "openai-logs-cleanup",
+        markerPath,
+        lockPath: markerPath + ".lock"
+      },
+      async () => {
+        const r = await cleanupOldOpenAILogs({
+          logDir,
+          cutoffDate: getCutoffDate(retentionDays)
+        });
+        debugLogger3.debug(
+          `openai-logs: removed=${r.removed} errors=${r.errors}`
+        );
+      }
+    );
+  }
 }
 __name(runHousekeeping, "runHousekeeping");
 function _resetForTesting() {
@@ -368,12 +484,16 @@ function _resetForTesting() {
 }
 __name(_resetForTesting, "_resetForTesting");
 var _needsCatchUpForTesting = needsCatchUp;
+var _getFirstPassDelayForTesting = getFirstPassDelay;
 var _runHousekeepingForTesting = runHousekeeping;
 var _runPassForTesting = runPass;
 var _FILE_HISTORY_MARKER_FOR_TESTING = FILE_HISTORY_MARKER;
 var _getSubagentMarkerPathForTesting = getSubagentMarkerPath;
+var _getOpenAILogsMarkerPathForTesting = getOpenAILogsMarkerPath;
 export {
   _FILE_HISTORY_MARKER_FOR_TESTING,
+  _getFirstPassDelayForTesting,
+  _getOpenAILogsMarkerPathForTesting,
   _getSubagentMarkerPathForTesting,
   _needsCatchUpForTesting,
   _resetForTesting,

package/chunks/{sdk-exporters-http-KHAB5JSD.js → sdk-exporters-http-XVTZQRCE.js}

@@ -18,12 +18,12 @@ import {
   isInNativeSubagentSpan,
   randomHexString,
   randomSpanId
-} from "./chunk-6M26GBKX.js";
+} from "./chunk-L2AFWWJE.js";
 import {
   EVENT_SUBAGENT_EXECUTION,
   EVENT_TOOL_CALL,
   SERVICE_NAME
-} from "./chunk-LKRMNRSN.js";
+} from "./chunk-PDPFQ2FO.js";
 import {
   getCurrentSessionId
 } from "./chunk-OIVKILPI.js";

package/chunks/{sdk-impl-KD7FSTC3.js → sdk-impl-7W7AKCS4.js}

@@ -14,7 +14,7 @@ import {
 } from "./chunk-W4RQUHY3.js";
 import {
   SERVICE_NAME
-} from "./chunk-LKRMNRSN.js";
+} from "./chunk-PDPFQ2FO.js";
 import {
   createDebugLogger,
   getCurrentSessionId
@@ -9031,7 +9031,7 @@ async function startTelemetrySdk(config) {
         `OTLP HTTP endpoints: traces=${tracesUrl ?? "none"}, logs=${logsUrl ?? "none"}, metrics=${metricsUrl ?? "none"}`
       );
       if (tracesUrl || logsUrl || metricsUrl) {
-        const { createHttpExporters } = await import("./sdk-exporters-http-KHAB5JSD.js");
+        const { createHttpExporters } = await import("./sdk-exporters-http-XVTZQRCE.js");
         const httpExporters = createHttpExporters({
           tracesUrl,
           logsUrl,
@@ -9138,7 +9138,11 @@ async function startTelemetrySdk(config) {
     // `configureMetricProviderFromEnv()` unconditionally, so env-based readers
     // are only suppressed when an explicit reader is provided. This is
     // intentionally asymmetric with `spanProcessors`/`logRecordProcessors`,
-    // where an empty array disables env fallback for those signals.
+    // where an empty array disables env fallback for those signals. Those two
+    // must stay unconditional arrays: omitting them re-enables sdk-node's
+    // env-based fallback, and the logs fallback runs in the NodeSDK
+    // constructor — outside the env-var scrub window around `start()` in
+    // sdk.ts (`startSdkWithExplicitExporters`).
     ...metricReader && { metricReader },
     instrumentations: [
       new import_instrumentation_http.HttpInstrumentation({

package/chunks/{serve-E3VUDRZN.js → serve-LJHAXDCH.js}

@@ -1,26 +1,29 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
+  localControlUrls,
   maybeOpenWebShellBrowser,
   serveCommand
-} from "./chunk-HWX5HPUG.js";
+} from "./chunk-LZZLUCRS.js";
 import "./chunk-6H67XLET.js";
 import "./chunk-HGCQ5SE7.js";
 import "./chunk-MZSJ43WV.js";
 import "./chunk-XCGIMOLN.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-BKHCW2BI.js";
-import "./chunk-OHKJVAKG.js";
+import "./chunk-JUWS2Z5K.js";
+import "./chunk-7GOYZQPR.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
-import "./chunk-PG62DFWD.js";
-import "./chunk-B52AWKBB.js";
-import "./chunk-UA5H3DS2.js";
-import "./chunk-HA3SAB64.js";
+import "./chunk-WP5VOXF7.js";
+import "./chunk-5EJZE3FP.js";
+import "./chunk-T6HEQR2Q.js";
+import "./chunk-VFMASYQA.js";
+import "./chunk-ZOSTTOUJ.js";
 import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
-import "./chunk-GXSNGY5M.js";
+import "./chunk-XX7QFP34.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
@@ -30,7 +33,7 @@ import "./chunk-MVUQRLOH.js";
 import "./chunk-XCWO3SMQ.js";
 import "./chunk-7MH4J33A.js";
 import "./chunk-6PVPNMXU.js";
-import "./chunk-VXZ5HAOV.js";
+import "./chunk-K4ADGWHU.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
 import "./chunk-GNPNYXJB.js";
@@ -46,8 +49,8 @@ import "./chunk-SEZ556DZ.js";
 import "./chunk-2FRY5CRX.js";
 import "./chunk-67N6HB5H.js";
 import "./chunk-WAUGQKUU.js";
-import "./chunk-PLFATELK.js";
-import "./chunk-L4N6TIP7.js";
+import "./chunk-DZUO626D.js";
+import "./chunk-4TRQPFDP.js";
 import "./chunk-SAH4BD2J.js";
 import "./chunk-CPG6P4GG.js";
 import "./chunk-S6LOFUVP.js";
@@ -69,23 +72,23 @@ import "./chunk-AXMWHKXA.js";
 import "./chunk-GLCZKT5V.js";
 import "./chunk-DJ2GSRLV.js";
 import "./chunk-EI3HZX6C.js";
-import "./chunk-3PY4LPJF.js";
+import "./chunk-YGT2AUJ7.js";
 import "./chunk-WOJZWRAZ.js";
 import "./chunk-VGC4I5JJ.js";
 import "./chunk-FVKHVJZQ.js";
 import "./chunk-COBO5EBO.js";
 import "./chunk-6ZRFAKXK.js";
 import "./chunk-PYQADEFD.js";
-import "./chunk-M3STHEMM.js";
+import "./chunk-PVOGHGSF.js";
 import "./chunk-F6WFNA7U.js";
 import "./chunk-46UV252V.js";
 import "./chunk-ZBVS26BY.js";
 import "./chunk-KKBPOU75.js";
 import "./chunk-EUNWC2VS.js";
 import "./chunk-FOGU3LJX.js";
-import "./chunk-6M26GBKX.js";
+import "./chunk-L2AFWWJE.js";
 import "./chunk-W4RQUHY3.js";
-import "./chunk-LKRMNRSN.js";
+import "./chunk-PDPFQ2FO.js";
 import "./chunk-OIVKILPI.js";
 import "./chunk-VOQXFAY5.js";
 import "./chunk-KGJGEEVR.js";
@@ -97,6 +100,7 @@ import "./chunk-QUGAUQGJ.js";
 import "./chunk-5O2XNYP6.js";
 import "./chunk-J2S4EL5Y.js";
 export {
+  localControlUrls,
   maybeOpenWebShellBrowser,
   serveCommand
 };