qwenproxy-cli 1.0.0 → 1.0.2

package/src/services/session-keeper.ts

@@ -1,88 +1,88 @@
-import { config } from "../core/config.ts";
-
-import {
-  closeIdlePlaywrightAccounts,
-  evictIdlePlaywrightContextsToLimit,
-  getActivePlaywrightAccountIds,
-  isPlaywrightAlreadyClosedError,
-  keepAlivePlaywrightAccount,
-} from "./playwright.ts";
-import { humanDelay, sleep } from "./human-behavior.ts";
-
-let running = false;
-let intervalId: ReturnType<typeof setInterval> | null = null;
-let cycleInProgress = false;
-
-export function isSessionKeeperRunning(): boolean {
-  return running;
-}
-
-async function runKeepAliveCycle(): Promise<void> {
-  if (cycleInProgress) return;
-  cycleInProgress = true;
-  try {
-    if (config.sessionKeeper.enabled) {
-      const accountIds = getActivePlaywrightAccountIds();
-      for (const accountId of accountIds) {
-        await keepAlivePlaywrightAccount(accountId).catch((error) => {
-          // Shutdown/eviction closes contexts while a cycle is in flight; the
-          // resulting "already closed" rejection is benign. The old substring
-          // filter ("Target closed"/"Page is closed") missed Playwright's real
-          // message ("Target page, context or browser has been closed") and
-          // leaked a warning on every Ctrl+C.
-          if (isPlaywrightAlreadyClosedError(error)) return;
-          const message =
-            error instanceof Error ? error.message : String(error);
-          console.warn(
-            `[SessionKeeper] Keep-alive failed for ${accountId}: ${message}`,
-          );
-        });
-        await sleep(humanDelay(250, 900));
-      }
-    }
-
-    const closed = await closeIdlePlaywrightAccounts(
-      config.playwright.idleContextTtlMs,
-    );
-    const evicted = await evictIdlePlaywrightContextsToLimit();
-    const totalClosed = closed + evicted;
-    if (totalClosed > 0) {
-      console.log(
-        `🧹 [SessionKeeper] Closed ${totalClosed} idle Playwright context(s)`,
-      );
-    }
-  } finally {
-    cycleInProgress = false;
-  }
-}
-
-export function startSessionKeeper(): void {
-  const hasKeepAliveWork = config.sessionKeeper.enabled;
-  const hasIdleCleanupWork = config.playwright.idleContextTtlMs > 0;
-  if (running || (!hasKeepAliveWork && !hasIdleCleanupWork)) return;
-
-  running = true;
-  intervalId = setInterval(() => {
-    if (running) void runKeepAliveCycle();
-  }, config.sessionKeeper.intervalMs);
-  intervalId.unref?.();
-
-  if (config.sessionKeeper.enabled) {
-    console.log(
-      `💓 [SessionKeeper] Keep-alive enabled | interval=${config.sessionKeeper.intervalMs}ms idle=${config.sessionKeeper.idleMs}ms`,
-    );
-  }
-}
-
-export function stopSessionKeeper(): void {
-  running = false;
-  if (intervalId) {
-    clearInterval(intervalId);
-    intervalId = null;
-  }
-  cycleInProgress = false;
-}
-
-export async function runSessionKeeperOnceForTesting(): Promise<void> {
-  await runKeepAliveCycle();
-}
+import { config } from "../core/config.ts";
+
+import {
+  closeIdlePlaywrightAccounts,
+  evictIdlePlaywrightContextsToLimit,
+  getActivePlaywrightAccountIds,
+  isPlaywrightAlreadyClosedError,
+  keepAlivePlaywrightAccount,
+} from "./playwright.ts";
+import { humanDelay, sleep } from "./human-behavior.ts";
+
+let running = false;
+let intervalId: ReturnType<typeof setInterval> | null = null;
+let cycleInProgress = false;
+
+export function isSessionKeeperRunning(): boolean {
+  return running;
+}
+
+async function runKeepAliveCycle(): Promise<void> {
+  if (cycleInProgress) return;
+  cycleInProgress = true;
+  try {
+    if (config.sessionKeeper.enabled) {
+      const accountIds = getActivePlaywrightAccountIds();
+      for (const accountId of accountIds) {
+        await keepAlivePlaywrightAccount(accountId).catch((error) => {
+          // Shutdown/eviction closes contexts while a cycle is in flight; the
+          // resulting "already closed" rejection is benign. The old substring
+          // filter ("Target closed"/"Page is closed") missed Playwright's real
+          // message ("Target page, context or browser has been closed") and
+          // leaked a warning on every Ctrl+C.
+          if (isPlaywrightAlreadyClosedError(error)) return;
+          const message =
+            error instanceof Error ? error.message : String(error);
+          console.warn(
+            `[SessionKeeper] Keep-alive failed for ${accountId}: ${message}`,
+          );
+        });
+        await sleep(humanDelay(250, 900));
+      }
+    }
+
+    const closed = await closeIdlePlaywrightAccounts(
+      config.playwright.idleContextTtlMs,
+    );
+    const evicted = await evictIdlePlaywrightContextsToLimit();
+    const totalClosed = closed + evicted;
+    if (totalClosed > 0) {
+      console.log(
+        `🧹 [SessionKeeper] Closed ${totalClosed} idle Playwright context(s)`,
+      );
+    }
+  } finally {
+    cycleInProgress = false;
+  }
+}
+
+export function startSessionKeeper(): void {
+  const hasKeepAliveWork = config.sessionKeeper.enabled;
+  const hasIdleCleanupWork = config.playwright.idleContextTtlMs > 0;
+  if (running || (!hasKeepAliveWork && !hasIdleCleanupWork)) return;
+
+  running = true;
+  intervalId = setInterval(() => {
+    if (running) void runKeepAliveCycle();
+  }, config.sessionKeeper.intervalMs);
+  intervalId.unref?.();
+
+  if (config.sessionKeeper.enabled) {
+    console.log(
+      `💓 [SessionKeeper] Keep-alive enabled | interval=${config.sessionKeeper.intervalMs}ms idle=${config.sessionKeeper.idleMs}ms`,
+    );
+  }
+}
+
+export function stopSessionKeeper(): void {
+  running = false;
+  if (intervalId) {
+    clearInterval(intervalId);
+    intervalId = null;
+  }
+  cycleInProgress = false;
+}
+
+export async function runSessionKeeperOnceForTesting(): Promise<void> {
+  await runKeepAliveCycle();
+}

package/src/services/token-estimation-metrics.ts

@@ -1,118 +1,118 @@
-import { logger } from "../core/logger.ts";
-import { estimateTokenCount } from "../utils/context-truncation.ts";
-import type { Usage } from "../utils/types.ts";
-import type { ContextMeterSnapshot } from "./context-meter.ts";
-
-export interface PersonalizationEstimationInfo {
-  accountId: string;
-  model: string | null;
-  toolCount: number;
-  chars: number;
-  bytes: number;
-  hash: string;
-  estimatedTokens: number;
-  source: "memory" | "db" | "verified" | "synced";
-  updatedAt: number;
-}
-
-export interface TokenEstimationContext {
-  requestDeclaredToolCount?: number;
-  activePersonalization?: PersonalizationEstimationInfo | null;
-  qwenPayloadBytes?: number;
-  qwenPayloadPromptChars?: number;
-  qwenPayloadMessageCount?: number;
-  contextMeter?: ContextMeterSnapshot | null;
-}
-
-function isEnabled(): boolean {
-  return process.env.TOKEN_ESTIMATION_LOG === "true";
-}
-
-function ratio(estimated: number, actual: number): number | null {
-  if (!Number.isFinite(actual) || actual <= 0) return null;
-  return Number((estimated / actual).toFixed(4));
-}
-
-export function logTokenEstimationSample(input: {
-  model: string;
-  finalPrompt: string;
-  userPrompt?: string;
-  assistantContent?: string;
-  reasoningContent?: string;
-  usage?: Usage | null;
-  mode: "stream" | "non-stream";
-  context?: TokenEstimationContext;
-}): void {
-  if (!isEnabled()) return;
-
-  const actualPromptTokens = input.usage?.prompt_tokens;
-  if (
-    typeof actualPromptTokens !== "number" ||
-    !Number.isFinite(actualPromptTokens) ||
-    actualPromptTokens <= 0
-  ) {
-    return;
-  }
-
-  const assistantContent = input.assistantContent ?? "";
-  const reasoningContent = input.reasoningContent ?? "";
-  const estimatedPromptTokens = estimateTokenCount(input.finalPrompt);
-  const estimatedUserPromptTokens = input.userPrompt
-    ? estimateTokenCount(input.userPrompt)
-    : null;
-  const estimatedCompletionTokens =
-    reasoningContent || assistantContent
-      ? estimateTokenCount(reasoningContent, assistantContent)
-      : 0;
-  const personalization = input.context?.activePersonalization ?? null;
-  const estimatedPersonalizationTokens = personalization?.estimatedTokens ?? 0;
-  const estimatedEffectivePromptTokens =
-    estimatedPromptTokens + estimatedPersonalizationTokens;
-
-  logger.info("token_estimation_sample", {
-    model: input.model,
-    mode: input.mode,
-    localFinalPromptChars: input.finalPrompt.length,
-    userPromptChars: input.userPrompt?.length ?? 0,
-    completionChars: assistantContent.length,
-    reasoningChars: reasoningContent.length,
-    requestDeclaredToolCount: input.context?.requestDeclaredToolCount ?? 0,
-    activePersonalizationToolCount: personalization?.toolCount ?? 0,
-    personalizationChars: personalization?.chars ?? 0,
-    personalizationBytes: personalization?.bytes ?? 0,
-    personalizationHash: personalization?.hash ?? null,
-    personalizationSource: personalization?.source ?? "none",
-    personalizationModel: personalization?.model ?? null,
-    qwenPayloadBytes: input.context?.qwenPayloadBytes ?? null,
-    qwenPayloadPromptChars: input.context?.qwenPayloadPromptChars ?? null,
-    qwenPayloadMessageCount: input.context?.qwenPayloadMessageCount ?? null,
-    contextMeterMode: input.context?.contextMeter?.mode ?? null,
-    contextMeterEstimatedTokens:
-      input.context?.contextMeter?.estimatedContextTokens ?? null,
-    contextMeterWindowTokens:
-      input.context?.contextMeter?.contextWindowTokens ?? null,
-    contextMeterPercent:
-      input.context?.contextMeter?.estimatedContextPercent ?? null,
-    contextMeterFullPromptBytes:
-      input.context?.contextMeter?.fullPromptBytes ?? null,
-    contextMeterRequestPromptBytes:
-      input.context?.contextMeter?.requestPromptBytes ?? null,
-    estimatedLocalPromptTokens: estimatedPromptTokens,
-    estimatedUserPromptTokens,
-    estimatedPersonalizationTokens,
-    estimatedEffectivePromptTokens,
-    estimatedCompletionTokens,
-    actualPromptTokens,
-    actualCompletionTokens: input.usage?.completion_tokens ?? null,
-    actualTotalTokens: input.usage?.total_tokens ?? null,
-    localPromptEstimateRatio: ratio(estimatedPromptTokens, actualPromptTokens),
-    effectivePromptEstimateRatio: ratio(
-      estimatedEffectivePromptTokens,
-      actualPromptTokens,
-    ),
-    completionEstimateRatio: ratio(
-      estimatedCompletionTokens,
-      input.usage?.completion_tokens ?? 0,
-    ),
-  });
-}
+import { logger } from "../core/logger.ts";
+import { estimateTokenCount } from "../utils/context-truncation.ts";
+import type { Usage } from "../utils/types.ts";
+import type { ContextMeterSnapshot } from "./context-meter.ts";
+
+export interface PersonalizationEstimationInfo {
+  accountId: string;
+  model: string | null;
+  toolCount: number;
+  chars: number;
+  bytes: number;
+  hash: string;
+  estimatedTokens: number;
+  source: "memory" | "db" | "verified" | "synced";
+  updatedAt: number;
+}
+
+export interface TokenEstimationContext {
+  requestDeclaredToolCount?: number;
+  activePersonalization?: PersonalizationEstimationInfo | null;
+  qwenPayloadBytes?: number;
+  qwenPayloadPromptChars?: number;
+  qwenPayloadMessageCount?: number;
+  contextMeter?: ContextMeterSnapshot | null;
+}
+
+function isEnabled(): boolean {
+  return process.env.TOKEN_ESTIMATION_LOG === "true";
+}
+
+function ratio(estimated: number, actual: number): number | null {
+  if (!Number.isFinite(actual) || actual <= 0) return null;
+  return Number((estimated / actual).toFixed(4));
+}
+
+export function logTokenEstimationSample(input: {
+  model: string;
+  finalPrompt: string;
+  userPrompt?: string;
+  assistantContent?: string;
+  reasoningContent?: string;
+  usage?: Usage | null;
+  mode: "stream" | "non-stream";
+  context?: TokenEstimationContext;
+}): void {
+  if (!isEnabled()) return;
+
+  const actualPromptTokens = input.usage?.prompt_tokens;
+  if (
+    typeof actualPromptTokens !== "number" ||
+    !Number.isFinite(actualPromptTokens) ||
+    actualPromptTokens <= 0
+  ) {
+    return;
+  }
+
+  const assistantContent = input.assistantContent ?? "";
+  const reasoningContent = input.reasoningContent ?? "";
+  const estimatedPromptTokens = estimateTokenCount(input.finalPrompt);
+  const estimatedUserPromptTokens = input.userPrompt
+    ? estimateTokenCount(input.userPrompt)
+    : null;
+  const estimatedCompletionTokens =
+    reasoningContent || assistantContent
+      ? estimateTokenCount(reasoningContent, assistantContent)
+      : 0;
+  const personalization = input.context?.activePersonalization ?? null;
+  const estimatedPersonalizationTokens = personalization?.estimatedTokens ?? 0;
+  const estimatedEffectivePromptTokens =
+    estimatedPromptTokens + estimatedPersonalizationTokens;
+
+  logger.info("token_estimation_sample", {
+    model: input.model,
+    mode: input.mode,
+    localFinalPromptChars: input.finalPrompt.length,
+    userPromptChars: input.userPrompt?.length ?? 0,
+    completionChars: assistantContent.length,
+    reasoningChars: reasoningContent.length,
+    requestDeclaredToolCount: input.context?.requestDeclaredToolCount ?? 0,
+    activePersonalizationToolCount: personalization?.toolCount ?? 0,
+    personalizationChars: personalization?.chars ?? 0,
+    personalizationBytes: personalization?.bytes ?? 0,
+    personalizationHash: personalization?.hash ?? null,
+    personalizationSource: personalization?.source ?? "none",
+    personalizationModel: personalization?.model ?? null,
+    qwenPayloadBytes: input.context?.qwenPayloadBytes ?? null,
+    qwenPayloadPromptChars: input.context?.qwenPayloadPromptChars ?? null,
+    qwenPayloadMessageCount: input.context?.qwenPayloadMessageCount ?? null,
+    contextMeterMode: input.context?.contextMeter?.mode ?? null,
+    contextMeterEstimatedTokens:
+      input.context?.contextMeter?.estimatedContextTokens ?? null,
+    contextMeterWindowTokens:
+      input.context?.contextMeter?.contextWindowTokens ?? null,
+    contextMeterPercent:
+      input.context?.contextMeter?.estimatedContextPercent ?? null,
+    contextMeterFullPromptBytes:
+      input.context?.contextMeter?.fullPromptBytes ?? null,
+    contextMeterRequestPromptBytes:
+      input.context?.contextMeter?.requestPromptBytes ?? null,
+    estimatedLocalPromptTokens: estimatedPromptTokens,
+    estimatedUserPromptTokens,
+    estimatedPersonalizationTokens,
+    estimatedEffectivePromptTokens,
+    estimatedCompletionTokens,
+    actualPromptTokens,
+    actualCompletionTokens: input.usage?.completion_tokens ?? null,
+    actualTotalTokens: input.usage?.total_tokens ?? null,
+    localPromptEstimateRatio: ratio(estimatedPromptTokens, actualPromptTokens),
+    effectivePromptEstimateRatio: ratio(
+      estimatedEffectivePromptTokens,
+      actualPromptTokens,
+    ),
+    completionEstimateRatio: ratio(
+      estimatedCompletionTokens,
+      input.usage?.completion_tokens ?? 0,
+    ),
+  });
+}

package/src/sync/claude-code.ts

@@ -1,75 +1,75 @@
-import fs from "node:fs";
-import path from "node:path";
-import type { ClientSyncResult, SyncOptions } from "./types.ts";
-import { createTimestampBackup, restoreFromBackup } from "./utils.ts";
-
-export function syncClaudeCode(options: SyncOptions): ClientSyncResult {
-  const { filePath, apiKey, baseUrl, model = "qwen3.8-max" } = options;
-  try {
-    fs.mkdirSync(path.dirname(filePath), { recursive: true });
-
-    let backupPath: string | undefined;
-    let existingSettings: Record<string, any> = {};
-
-    if (fs.existsSync(filePath)) {
-      backupPath = createTimestampBackup(filePath);
-      try {
-        const content = fs.readFileSync(filePath, "utf-8");
-        existingSettings = JSON.parse(content);
-      } catch {
-        existingSettings = {};
-      }
-    }
-
-    const env = {
-      ...(existingSettings.env || {}),
-      ANTHROPIC_BASE_URL: baseUrl,
-      ANTHROPIC_AUTH_TOKEN: apiKey,
-      ANTHROPIC_MODEL: model,
-      ANTHROPIC_CUSTOM_MODEL_OPTION: model,
-      ANTHROPIC_CUSTOM_MODEL_OPTION_NAME: "Qwen 3.8 Max (1M Context)",
-      ANTHROPIC_CUSTOM_MODEL_OPTION_DESCRIPTION: "QwenProxy model qwen3.8-max - 1M context window",
-      ANTHROPIC_DEFAULT_SONNET_MODEL: model,
-      ANTHROPIC_DEFAULT_HAIKU_MODEL: "qwen3.7-plus",
-      ANTHROPIC_DEFAULT_OPUS_MODEL: model,
-      CLAUDE_CODE_MAX_CONTEXT_TOKENS: "1000000",
-    };
-
-    const updatedSettings = {
-      ...existingSettings,
-      env,
-      model,
-    };
-
-    fs.writeFileSync(filePath, JSON.stringify(updatedSettings, null, 2) + "\n", "utf-8");
-
-    return {
-      client: "claude-code",
-      filePath,
-      backupPath,
-      success: true,
-      action: backupPath ? "updated" : "created",
-      message: `Configured Claude Code with model ${model} and baseUrl ${baseUrl}`,
-    };
-  } catch (err: any) {
-    return {
-      client: "claude-code",
-      filePath,
-      success: false,
-      action: "failed",
-      error: err?.message || String(err),
-    };
-  }
-}
-
-export function restoreClaudeCode(filePath: string, backupPath?: string): ClientSyncResult {
-  const restored = restoreFromBackup(filePath, backupPath);
-  return {
-    client: "claude-code",
-    filePath,
-    backupPath,
-    success: restored,
-    action: restored ? "restored" : "failed",
-    message: restored ? "Restored Claude Code settings from backup" : "Backup file not found",
-  };
-}
+import fs from "node:fs";
+import path from "node:path";
+import type { ClientSyncResult, SyncOptions } from "./types.ts";
+import { createTimestampBackup, restoreFromBackup } from "./utils.ts";
+
+export function syncClaudeCode(options: SyncOptions): ClientSyncResult {
+  const { filePath, apiKey, baseUrl, model = "qwen3.8-max" } = options;
+  try {
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+
+    let backupPath: string | undefined;
+    let existingSettings: Record<string, any> = {};
+
+    if (fs.existsSync(filePath)) {
+      backupPath = createTimestampBackup(filePath);
+      try {
+        const content = fs.readFileSync(filePath, "utf-8");
+        existingSettings = JSON.parse(content);
+      } catch {
+        existingSettings = {};
+      }
+    }
+
+    const env = {
+      ...(existingSettings.env || {}),
+      ANTHROPIC_BASE_URL: baseUrl,
+      ANTHROPIC_AUTH_TOKEN: apiKey,
+      ANTHROPIC_MODEL: model,
+      ANTHROPIC_CUSTOM_MODEL_OPTION: model,
+      ANTHROPIC_CUSTOM_MODEL_OPTION_NAME: "Qwen 3.8 Max (1M Context)",
+      ANTHROPIC_CUSTOM_MODEL_OPTION_DESCRIPTION: "QwenProxy model qwen3.8-max - 1M context window",
+      ANTHROPIC_DEFAULT_SONNET_MODEL: model,
+      ANTHROPIC_DEFAULT_HAIKU_MODEL: "qwen3.7-plus",
+      ANTHROPIC_DEFAULT_OPUS_MODEL: model,
+      CLAUDE_CODE_MAX_CONTEXT_TOKENS: "1000000",
+    };
+
+    const updatedSettings = {
+      ...existingSettings,
+      env,
+      model,
+    };
+
+    fs.writeFileSync(filePath, JSON.stringify(updatedSettings, null, 2) + "\n", "utf-8");
+
+    return {
+      client: "claude-code",
+      filePath,
+      backupPath,
+      success: true,
+      action: backupPath ? "updated" : "created",
+      message: `Configured Claude Code with model ${model} and baseUrl ${baseUrl}`,
+    };
+  } catch (err: any) {
+    return {
+      client: "claude-code",
+      filePath,
+      success: false,
+      action: "failed",
+      error: err?.message || String(err),
+    };
+  }
+}
+
+export function restoreClaudeCode(filePath: string, backupPath?: string): ClientSyncResult {
+  const restored = restoreFromBackup(filePath, backupPath);
+  return {
+    client: "claude-code",
+    filePath,
+    backupPath,
+    success: restored,
+    action: restored ? "restored" : "failed",
+    message: restored ? "Restored Claude Code settings from backup" : "Backup file not found",
+  };
+}