@clawrent/cli 0.4.4 → 0.5.0

package/dist/index.js

@@ -1,341 +1,14 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { readFileSync as readFileSync3 } from "fs";
-import { dirname, join as join3 } from "path";
+import { readFileSync as readFileSync2 } from "fs";
+import { dirname, join as join2 } from "path";
 import { fileURLToPath } from "url";
 import { Command } from "commander";
 
 // src/commands/auth.ts
 import { createInterface } from "readline";
-
-// src/config.ts
-import { readFileSync, writeFileSync, mkdirSync, unlinkSync, existsSync } from "fs";
-import { join } from "path";
-import { homedir } from "os";
-var DEFAULT_CONFIG = {
-  apiUrl: "https://clawrent.cloud",
-  wsUrl: "wss://clawrent.cloud"
-};
-function getConfigDir() {
-  return join(homedir(), ".clawrent");
-}
-function getConfigFilePath() {
-  return join(getConfigDir(), "config.json");
-}
-function getConfigPath() {
-  return getConfigFilePath();
-}
-function loadConfig() {
-  let fileConfig = {};
-  const configPath = getConfigFilePath();
-  if (existsSync(configPath)) {
-    try {
-      const raw = readFileSync(configPath, "utf-8");
-      fileConfig = JSON.parse(raw);
-    } catch {
-    }
-  }
-  if (fileConfig.apiUrl?.includes("localhost") || fileConfig.wsUrl?.includes("localhost")) {
-    delete fileConfig.apiUrl;
-    delete fileConfig.wsUrl;
-    try {
-      const cleaned = { ...fileConfig };
-      writeFileSync(configPath, JSON.stringify(cleaned, null, 2), "utf-8");
-    } catch {
-    }
-  }
-  const config = {
-    ...DEFAULT_CONFIG,
-    ...fileConfig
-  };
-  const envApiUrl = process.env["CLAWRENT_API_URL"];
-  const envWsUrl = process.env["CLAWRENT_WS_URL"];
-  const envToken = process.env["CLAWRENT_TOKEN"];
-  const envApiKey = process.env["CLAWRENT_API_KEY"];
-  const envUserId = process.env["CLAWRENT_USER_ID"];
-  if (envApiUrl) config.apiUrl = envApiUrl;
-  if (envWsUrl) config.wsUrl = envWsUrl;
-  if (envToken) config.token = envToken;
-  if (envApiKey) config.apiKey = envApiKey;
-  if (envUserId) config.userId = envUserId;
-  return config;
-}
-function saveConfig(partial) {
-  const configDir = getConfigDir();
-  if (!existsSync(configDir)) {
-    mkdirSync(configDir, { recursive: true });
-  }
-  let existing = {};
-  const configPath = getConfigFilePath();
-  if (existsSync(configPath)) {
-    try {
-      existing = JSON.parse(readFileSync(configPath, "utf-8"));
-    } catch {
-    }
-  }
-  const merged = { ...existing, ...partial };
-  writeFileSync(configPath, JSON.stringify(merged, null, 2), "utf-8");
-}
-function clearConfig() {
-  const configPath = getConfigFilePath();
-  if (existsSync(configPath)) {
-    unlinkSync(configPath);
-  }
-}
-
-// src/api-client.ts
-var ApiClient = class {
-  config;
-  /** When set (e.g. by ProviderAgent.start), overrides config.token for REST auth. */
-  agentTokenOverride = null;
-  constructor(config) {
-    this.config = config;
-  }
-  /**
-   * Set a token that overrides config.token for subsequent REST requests.
-   * Used by the in-process provider agent: once serving with an agentToken,
-   * provider REST calls (approve/list/end + internal autoApprove) authenticate
-   * as the agent owner via this token, so they work without a separate user
-   * JWT login. The backend's resolveAuth accepts the agt_clawrent_* prefix.
-   * Pass null to clear (e.g. on stop_serving).
-   */
-  setAgentToken(token) {
-    this.agentTokenOverride = token;
-  }
-  get apiUrl() {
-    return this.config.apiUrl;
-  }
-  get wsUrl() {
-    return this.config.wsUrl;
-  }
-  get userId() {
-    return this.config.userId;
-  }
-  // --- Auth (no auth needed) ---
-  async sendVerification(email) {
-    return this.request("POST", "/api/auth/send-verification", { email }, false);
-  }
-  async registerUser(input) {
-    return this.request("POST", "/api/auth/register", input, false);
-  }
-  async login(email, password) {
-    return this.request("POST", "/api/auth/login", { email, password }, false);
-  }
-  async getMe() {
-    return this.request("GET", "/api/auth/me");
-  }
-  // --- Marketplace ---
-  async browse(query) {
-    const params = new URLSearchParams();
-    if (query?.search) params.set("search", query.search);
-    if (query?.category) params.set("category", query.category);
-    if (query?.page) params.set("page", String(query.page));
-    if (query?.limit) params.set("limit", String(query.limit));
-    const qs = params.toString();
-    return this.request("GET", `/api/marketplace/browse${qs ? `?${qs}` : ""}`);
-  }
-  async getAgent(slug) {
-    return this.request("GET", `/api/marketplace/agents/${encodeURIComponent(slug)}`);
-  }
-  // --- Sessions ---
-  async rent(options) {
-    return this.request("POST", "/api/sessions", {
-      agentId: options.agentId,
-      taskDescription: options.taskDescription,
-      grantedPermissions: options.grantedPermissions ?? {}
-    });
-  }
-  async getSessions(query) {
-    const params = new URLSearchParams();
-    if (query?.role) params.set("role", query.role);
-    if (query?.status) params.set("status", query.status);
-    if (query?.page) params.set("page", String(query.page));
-    if (query?.limit) params.set("limit", String(query.limit));
-    const qs = params.toString();
-    return this.request("GET", `/api/sessions${qs ? `?${qs}` : ""}`);
-  }
-  async getSession(sessionId) {
-    return this.request("GET", `/api/sessions/${encodeURIComponent(sessionId)}`);
-  }
-  async getSessionMessages(sessionId, options) {
-    const params = new URLSearchParams();
-    if (options?.since) params.set("since", options.since);
-    if (options?.limit) params.set("limit", String(options.limit));
-    const qs = params.toString();
-    return this.request(
-      "GET",
-      `/api/sessions/${encodeURIComponent(sessionId)}/messages${qs ? `?${qs}` : ""}`
-    );
-  }
-  /** POST a message via REST (WS fallback, e.g. session not attached after restart). */
-  async sendSessionMessage(sessionId, body) {
-    return this.request(
-      "POST",
-      `/api/sessions/${encodeURIComponent(sessionId)}/messages`,
-      body
-    );
-  }
-  async endSession(sessionId) {
-    return this.request("POST", `/api/sessions/${encodeURIComponent(sessionId)}/end`);
-  }
-  async approveSession(sessionId) {
-    return this.request("POST", `/api/sessions/${encodeURIComponent(sessionId)}/approve`);
-  }
-  // --- Billing ---
-  async getBalance() {
-    return this.request("GET", "/api/billing/wallet");
-  }
-  async topUp(amount) {
-    return this.request("POST", "/api/billing/wallet/topup", { amount });
-  }
-  // --- Provider: Agents ---
-  async registerAgent(data) {
-    return this.request("POST", "/api/agents", data);
-  }
-  async getMyAgents(query) {
-    const params = new URLSearchParams();
-    if (query?.page) params.set("page", String(query.page));
-    if (query?.limit) params.set("limit", String(query.limit));
-    if (query?.roles) params.set("roles", query.roles);
-    const qs = params.toString();
-    return this.request("GET", `/api/agents/my${qs ? `?${qs}` : ""}`);
-  }
-  /** Resolve the current agent from agentToken. Requires agt_clawrent_ token auth. */
-  async getMyAgent() {
-    return this.request("GET", "/api/agents/me/agent");
-  }
-  async applyProvider(agentId, data) {
-    return this.request("POST", `/api/agents/${encodeURIComponent(agentId)}/apply-provider`, data);
-  }
-  /** Publish agent — simplified apply-provider with defaults, submits for admin review */
-  async publishAgent(agentId, data) {
-    return this.request("POST", `/api/agents/${encodeURIComponent(agentId)}/publish`, data ?? {});
-  }
-  /** Activate agent — verify admin-approved + WebSocket connected, then go online */
-  async activateAgent(agentId) {
-    return this.request("POST", `/api/agents/${encodeURIComponent(agentId)}/activate`);
-  }
-  async setOnlineStatus(agentId, onlineStatus) {
-    return this.request("PATCH", `/api/agents/${encodeURIComponent(agentId)}/status`, { onlineStatus });
-  }
-  async generateAgentToken(agentId) {
-    return this.request("POST", `/api/agents/${encodeURIComponent(agentId)}/token`);
-  }
-  async revokeAgentToken(agentId) {
-    return this.request("DELETE", `/api/agents/${encodeURIComponent(agentId)}/token`);
-  }
-  // --- Orders ---
-  async createOrder(data) {
-    return this.request("POST", "/api/orders", data);
-  }
-  async getOrders(query) {
-    const params = new URLSearchParams();
-    if (query?.status) params.set("status", query.status);
-    if (query?.page) params.set("page", String(query.page));
-    if (query?.limit) params.set("limit", String(query.limit));
-    const qs = params.toString();
-    return this.request("GET", `/api/orders${qs ? `?${qs}` : ""}`);
-  }
-  async getOrder(orderId) {
-    return this.request("GET", `/api/orders/${encodeURIComponent(orderId)}`);
-  }
-  async cancelOrder(orderId) {
-    return this.request("POST", `/api/orders/${encodeURIComponent(orderId)}/cancel`);
-  }
-  // --- Cart ---
-  async getCart() {
-    return this.request("GET", "/api/cart");
-  }
-  async addToCart(data) {
-    return this.request("POST", "/api/cart", data);
-  }
-  async updateCartItem(itemId, data) {
-    return this.request("PATCH", `/api/cart/${encodeURIComponent(itemId)}`, data);
-  }
-  async removeFromCart(itemId) {
-    return this.request("DELETE", `/api/cart/${encodeURIComponent(itemId)}`);
-  }
-  async clearCart() {
-    return this.request("DELETE", "/api/cart");
-  }
-  // --- Favorites ---
-  async listFavorites(query) {
-    const params = new URLSearchParams();
-    if (query?.page) params.set("page", String(query.page));
-    if (query?.limit) params.set("limit", String(query.limit));
-    const qs = params.toString();
-    return this.request("GET", `/api/favorites${qs ? `?${qs}` : ""}`);
-  }
-  async addFavorite(agentId) {
-    return this.request("POST", `/api/favorites/${encodeURIComponent(agentId)}`);
-  }
-  async removeFavorite(agentId) {
-    return this.request("DELETE", `/api/favorites/${encodeURIComponent(agentId)}`);
-  }
-  // --- Health ---
-  async health() {
-    return this.request("GET", "/api/health", void 0, false);
-  }
-  // --- Docs (MCP interface) ---
-  async getDocsTree() {
-    return this.request("GET", "/api/mcp/docs/tree", void 0, false);
-  }
-  async getDocByPath(path) {
-    return this.request("GET", `/api/mcp/docs/by-path/${encodeURI(path)}`, void 0, false);
-  }
-  async searchDocs(query) {
-    const params = new URLSearchParams({ q: query });
-    return this.request("GET", `/api/mcp/docs/search?${params.toString()}`, void 0, false);
-  }
-  async getDoc(id) {
-    return this.request("GET", `/api/mcp/docs/${encodeURIComponent(id)}`, void 0, false);
-  }
-  async createDoc(data) {
-    return this.request("POST", "/api/mcp/docs", data);
-  }
-  async updateDoc(id, data) {
-    return this.request("PATCH", `/api/mcp/docs/${encodeURIComponent(id)}`, data);
-  }
-  async deleteDoc(id) {
-    return this.request("DELETE", `/api/mcp/docs/${encodeURIComponent(id)}`);
-  }
-  async publishDoc(id) {
-    return this.request("POST", `/api/mcp/docs/${encodeURIComponent(id)}/publish`);
-  }
-  async unpublishDoc(id) {
-    return this.request("POST", `/api/mcp/docs/${encodeURIComponent(id)}/unpublish`);
-  }
-  // --- Private ---
-  async request(method, path, body, requireAuth = true) {
-    const url = `${this.config.apiUrl}${path}`;
-    const headers = {};
-    if (body !== void 0) {
-      headers["Content-Type"] = "application/json";
-    }
-    if (requireAuth) {
-      if (this.agentTokenOverride) {
-        headers["Authorization"] = `Bearer ${this.agentTokenOverride}`;
-      } else if (this.config.token) {
-        headers["Authorization"] = `Bearer ${this.config.token}`;
-      } else if (this.config.apiKey) {
-        headers["x-api-key"] = this.config.apiKey;
-      } else {
-        throw new Error("Not authenticated. Run `clawrent auth login` first.");
-      }
-    }
-    const response = await fetch(url, {
-      method,
-      headers,
-      body: body ? JSON.stringify(body) : void 0
-    });
-    if (!response.ok) {
-      const errBody = await response.json().catch(() => ({ message: response.statusText }));
-      throw new Error(`API error ${response.status}: ${errBody["message"] ?? JSON.stringify(errBody)}`);
-    }
-    return response.json();
-  }
-};
+import { ApiClient, loadConfig, saveConfig, clearConfig, getConfigPath } from "@clawrent/provider";
 
 // src/output.ts
 function printJson(data) {
@@ -502,10 +175,11 @@ function registerAuthCommand(program2) {
 }
 
 // src/commands/browse.ts
+import { ApiClient as ApiClient2, loadConfig as loadConfig2 } from "@clawrent/provider";
 function registerBrowseCommand(program2) {
   program2.command("browse").description("Browse available agents on the marketplace").option("-s, --search <query>", "Search by name").option("-c, --category <category>", "Filter by category").option("-p, --page <number>", "Page number", "1").option("-l, --limit <number>", "Results per page", "20").action(async (opts) => {
     try {
-      const client = new ApiClient(loadConfig());
+      const client = new ApiClient2(loadConfig2());
       const result = await client.browse({
         search: opts.search,
         category: opts.category,
@@ -521,10 +195,11 @@ function registerBrowseCommand(program2) {
 }
 
 // src/commands/agent.ts
+import { ApiClient as ApiClient3, loadConfig as loadConfig3 } from "@clawrent/provider";
 function registerAgentCommand(program2) {
   program2.command("agent <slug>").description("Get agent details by slug").action(async (slug) => {
     try {
-      const client = new ApiClient(loadConfig());
+      const client = new ApiClient3(loadConfig3());
       const result = await client.getAgent(slug);
       printJson(result);
     } catch (err) {
@@ -535,10 +210,11 @@ function registerAgentCommand(program2) {
 }
 
 // src/commands/sessions.ts
+import { ApiClient as ApiClient4, loadConfig as loadConfig4 } from "@clawrent/provider";
 function registerSessionsCommand(program2) {
   program2.command("sessions").description("List your sessions").option("-r, --role <role>", "Filter by role (consumer/provider)").option("-s, --status <status>", "Filter by status").option("-p, --page <number>", "Page number", "1").option("-l, --limit <number>", "Results per page", "20").action(async (opts) => {
     try {
-      const client = new ApiClient(loadConfig());
+      const client = new ApiClient4(loadConfig4());
       const result = await client.getSessions({
         role: opts.role,
         status: opts.status,
@@ -554,10 +230,11 @@ function registerSessionsCommand(program2) {
 }
 
 // src/commands/balance.ts
+import { ApiClient as ApiClient5, loadConfig as loadConfig5 } from "@clawrent/provider";
 function registerBalanceCommand(program2) {
   program2.command("balance").description("Check wallet balance").action(async () => {
     try {
-      const client = new ApiClient(loadConfig());
+      const client = new ApiClient5(loadConfig5());
       const result = await client.getBalance();
       printJson(result);
     } catch (err) {
@@ -568,10 +245,11 @@ function registerBalanceCommand(program2) {
 }
 
 // src/commands/topup.ts
+import { ApiClient as ApiClient6, loadConfig as loadConfig6 } from "@clawrent/provider";
 function registerTopupCommand(program2) {
   program2.command("topup <amount>").description("Top up wallet balance").action(async (amount) => {
     try {
-      const client = new ApiClient(loadConfig());
+      const client = new ApiClient6(loadConfig6());
       const result = await client.topUp(amount);
       printJson(result);
     } catch (err) {
@@ -582,10 +260,11 @@ function registerTopupCommand(program2) {
 }
 
 // src/commands/health.ts
+import { ApiClient as ApiClient7, loadConfig as loadConfig7 } from "@clawrent/provider";
 function registerHealthCommand(program2) {
   program2.command("health").description("Check platform health").action(async () => {
     try {
-      const client = new ApiClient(loadConfig());
+      const client = new ApiClient7(loadConfig7());
       const result = await client.health();
       printJson(result);
     } catch (err) {
@@ -596,6 +275,7 @@ function registerHealthCommand(program2) {
 }
 
 // src/commands/rent.ts
+import { ApiClient as ApiClient8, loadConfig as loadConfig8 } from "@clawrent/provider";
 function registerRentCommand(program2) {
   program2.command("rent").description("Rent an agent (create a session)").requiredOption("--agent-id <id>", "Agent ID to rent").requiredOption("--task <description>", "Task description").option("--permissions <json>", "Granted permissions as JSON string", "{}").action(async (opts) => {
     try {
@@ -606,7 +286,7 @@ function registerRentCommand(program2) {
         printError("Invalid JSON for --permissions");
         process.exit(1);
       }
-      const client = new ApiClient(loadConfig());
+      const client = new ApiClient8(loadConfig8());
       const result = await client.rent({
         agentId: opts.agentId,
         taskDescription: opts.task,
@@ -621,10 +301,11 @@ function registerRentCommand(program2) {
 }
 
 // src/commands/end.ts
+import { ApiClient as ApiClient9, loadConfig as loadConfig9 } from "@clawrent/provider";
 function registerEndCommand(program2) {
   program2.command("end <sessionId>").description("End a session").action(async (sessionId) => {
     try {
-      const client = new ApiClient(loadConfig());
+      const client = new ApiClient9(loadConfig9());
       const result = await client.endSession(sessionId);
       printJson(result);
     } catch (err) {
@@ -636,11 +317,12 @@ function registerEndCommand(program2) {
 
 // src/commands/send.ts
 import WebSocket from "ws";
+import { ApiClient as ApiClient10, loadConfig as loadConfig10 } from "@clawrent/provider";
 function registerSendCommand(program2) {
   program2.command("send <sessionId>").description("Send a message to a session via WebSocket").requiredOption("--content <text>", "Message content").option("--type <messageType>", "Message type", "dialogue.message").option("--token <sessionToken>", "Session token (auto-fetched if not provided)").option("--slot <index>", "Slot index for consumer role (default: 0)", "0").option("--wait <ms>", "Wait for response (milliseconds)").action(async (sessionId, opts) => {
     try {
-      const config = loadConfig();
-      const client = new ApiClient(config);
+      const config = loadConfig10();
+      const client = new ApiClient10(config);
       let sessionToken = opts.token;
       let role = "consumer";
       if (!sessionToken) {
@@ -715,6 +397,7 @@ function registerSendCommand(program2) {
 }
 
 // src/commands/provider/index.ts
+import { ApiClient as ApiClient11, loadConfig as loadConfig11 } from "@clawrent/provider";
 function registerProviderCommands(program2) {
   const provider = program2.command("provider").description("Provider operations");
   const agent = provider.command("agent").description("Manage your agents");
@@ -742,7 +425,7 @@ function registerProviderCommands(program2) {
           process.exit(1);
         }
       }
-      const client = new ApiClient(loadConfig());
+      const client = new ApiClient11(loadConfig11());
       const result = await client.registerAgent(data);
       printJson(result);
     } catch (err) {
@@ -752,7 +435,7 @@ function registerProviderCommands(program2) {
   });
   agent.command("list").description("List your agents").option("-r, --roles <roles>", "Filter by roles (consumer, both)").option("-p, --page <number>", "Page number", "1").option("-l, --limit <number>", "Results per page", "20").action(async (opts) => {
     try {
-      const client = new ApiClient(loadConfig());
+      const client = new ApiClient11(loadConfig11());
       const result = await client.getMyAgents({
         roles: opts.roles,
         page: parseInt(opts.page, 10),
@@ -766,7 +449,7 @@ function registerProviderCommands(program2) {
   });
   agent.command("apply-provider <agentId>").description("Apply for provider role on an agent").option("--pricing-model <model>", "Pricing model (per_token/per_session/per_minute)", "per_session").option("--price <amount>", "Price amount", "1.00").option("--currency <cur>", "Currency (CNY/USD)", "CNY").option("--hosting-type <type>", "Hosting type (self_hosted/platform_hosted)", "self_hosted").option("--approval-mode <mode>", "Session approval mode (manual/auto)", "manual").option("--max-concurrent <n>", "Max concurrent sessions", "5").option("--max-slots <n>", "Max consumer slots per session", "1").action(async (agentId, opts) => {
     try {
-      const client = new ApiClient(loadConfig());
+      const client = new ApiClient11(loadConfig11());
       const result = await client.applyProvider(agentId, {
         pricingModel: opts.pricingModel,
         priceAmount: opts.price,
@@ -785,7 +468,7 @@ function registerProviderCommands(program2) {
   });
   agent.command("status <agentId>").description("Set agent online status").requiredOption("--status <status>", "Online status (online/offline/busy)").action(async (agentId, opts) => {
     try {
-      const client = new ApiClient(loadConfig());
+      const client = new ApiClient11(loadConfig11());
       const result = await client.setOnlineStatus(agentId, opts.status);
       printSuccess(`Agent status set to ${opts.status}.`);
       printJson(result);
@@ -796,7 +479,7 @@ function registerProviderCommands(program2) {
   });
   provider.command("sessions").description("List provider sessions").option("-s, --status <status>", "Filter by status").option("-p, --page <number>", "Page number", "1").option("-l, --limit <number>", "Results per page", "20").action(async (opts) => {
     try {
-      const client = new ApiClient(loadConfig());
+      const client = new ApiClient11(loadConfig11());
       const result = await client.getSessions({
         role: "provider",
         status: opts.status,
@@ -811,7 +494,7 @@ function registerProviderCommands(program2) {
   });
   provider.command("approve <sessionId>").description("Approve a pending session").action(async (sessionId) => {
     try {
-      const client = new ApiClient(loadConfig());
+      const client = new ApiClient11(loadConfig11());
       const result = await client.approveSession(sessionId);
       printSuccess("Session approved.");
       printJson(result);
@@ -823,21 +506,23 @@ function registerProviderCommands(program2) {
 }
 
 // src/serve/index.ts
-import WebSocket3 from "ws";
+import WebSocket2 from "ws";
+import { ApiClient as ApiClient12, loadConfig as loadConfig12, SessionManager, resumeActiveSessions } from "@clawrent/provider";
 
 // src/daemon.ts
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, unlinkSync as unlinkSync2, openSync, closeSync, mkdirSync as mkdirSync2, existsSync as existsSync2, readdirSync } from "fs";
-import { join as join2, basename } from "path";
+import { readFileSync, writeFileSync, unlinkSync, openSync, closeSync, mkdirSync, existsSync, readdirSync } from "fs";
+import { join, basename } from "path";
 import { spawn } from "child_process";
+import { getConfigDir } from "@clawrent/provider";
 function getPidFilePath(agentId) {
-  return join2(getConfigDir(), `serve-${agentId}.pid`);
+  return join(getConfigDir(), `serve-${agentId}.pid`);
 }
 function getLogFilePath(agentId) {
-  return join2(getConfigDir(), `serve-${agentId}.log`);
+  return join(getConfigDir(), `serve-${agentId}.log`);
 }
 function readPid(agentId) {
   try {
-    const content = readFileSync2(getPidFilePath(agentId), "utf-8").trim();
+    const content = readFileSync(getPidFilePath(agentId), "utf-8").trim();
     const pid = parseInt(content, 10);
     return Number.isFinite(pid) && pid > 0 ? pid : null;
   } catch {
@@ -846,14 +531,14 @@ function readPid(agentId) {
 }
 function writePid(agentId, pid) {
   const dir = getConfigDir();
-  if (!existsSync2(dir)) {
-    mkdirSync2(dir, { recursive: true });
+  if (!existsSync(dir)) {
+    mkdirSync(dir, { recursive: true });
   }
-  writeFileSync2(getPidFilePath(agentId), String(pid), "utf-8");
+  writeFileSync(getPidFilePath(agentId), String(pid), "utf-8");
 }
 function removePidFile(agentId) {
   try {
-    unlinkSync2(getPidFilePath(agentId));
+    unlinkSync(getPidFilePath(agentId));
   } catch {
   }
 }
@@ -876,7 +561,7 @@ function isDaemonRunning(agentId) {
 }
 function listRunningDaemons() {
   const dir = getConfigDir();
-  if (!existsSync2(dir)) return [];
+  if (!existsSync(dir)) return [];
   const results = [];
   for (const file of readdirSync(dir)) {
     const match = /^serve-(.+)\.pid$/.exec(basename(file));
@@ -892,8 +577,8 @@ function listRunningDaemons() {
 function spawnDaemon(agentId, args) {
   const logFile = getLogFilePath(agentId);
   const dir = getConfigDir();
-  if (!existsSync2(dir)) {
-    mkdirSync2(dir, { recursive: true });
+  if (!existsSync(dir)) {
+    mkdirSync(dir, { recursive: true });
   }
   const logFd = openSync(logFile, "a");
   const child = spawn(process.argv[0], [process.argv[1], ...args], {
@@ -965,138 +650,6 @@ var StdioBridge = class {
   }
 };
 
-// src/serve/session-manager.ts
-import { EventEmitter } from "events";
-import WebSocket2 from "ws";
-var TERMINAL_CLOSE_CODES = /* @__PURE__ */ new Set([4e3, 4001, 4002, 4003, 4004]);
-var SessionManager = class extends EventEmitter {
-  sessions = /* @__PURE__ */ new Map();
-  wsUrl;
-  heartbeatInterval;
-  maxReconnectDelay;
-  maxReconnectAttempts;
-  agentId;
-  constructor(wsUrl, heartbeatInterval = 25e3, maxReconnectDelay = 3e4, maxReconnectAttempts = 5) {
-    super();
-    this.wsUrl = wsUrl;
-    this.heartbeatInterval = heartbeatInterval;
-    this.maxReconnectDelay = maxReconnectDelay;
-    this.maxReconnectAttempts = maxReconnectAttempts;
-  }
-  /** Connect to a session via WebSocket as provider */
-  connect(sessionId, sessionToken) {
-    if (this.sessions.has(sessionId)) {
-      return;
-    }
-    const url = `${this.wsUrl}/ws/session?sessionId=${sessionId}&token=${sessionToken}&role=provider`;
-    const ws = new WebSocket2(url);
-    const conn = {
-      sessionId,
-      sessionToken,
-      ws,
-      heartbeatTimer: null,
-      reconnectAttempts: 0
-    };
-    this.sessions.set(sessionId, conn);
-    ws.on("open", () => {
-      conn.reconnectAttempts = 0;
-      conn.heartbeatTimer = setInterval(() => {
-        if (ws.readyState === WebSocket2.OPEN) {
-          ws.send(JSON.stringify({ type: "system.heartbeat", payload: {} }));
-        }
-      }, this.heartbeatInterval);
-      this.emit("session:connected", sessionId);
-    });
-    ws.on("message", (raw) => {
-      try {
-        const message = JSON.parse(raw.toString());
-        if (message["type"] === "system.heartbeat_ack") return;
-        this.emit("session:message", sessionId, message);
-      } catch {
-      }
-    });
-    ws.on("close", (code, reason) => {
-      this.clearHeartbeat(conn);
-      if (TERMINAL_CLOSE_CODES.has(code)) {
-        this.sessions.delete(sessionId);
-        this.emit("session:dead", sessionId, `session rejected (code ${code}: ${reason.toString()})`);
-        return;
-      }
-      if (code !== 1e3) {
-        if (conn.reconnectAttempts >= this.maxReconnectAttempts) {
-          this.sessions.delete(sessionId);
-          this.emit("session:dead", sessionId, `max reconnect attempts (${this.maxReconnectAttempts}) reached`);
-          return;
-        }
-        const delay = Math.min(
-          1e3 * Math.pow(2, conn.reconnectAttempts),
-          this.maxReconnectDelay
-        );
-        conn.reconnectAttempts++;
-        this.emit("session:reconnecting", sessionId, delay);
-        setTimeout(() => {
-          this.sessions.delete(sessionId);
-          this.connect(sessionId, sessionToken);
-        }, delay);
-      } else {
-        this.sessions.delete(sessionId);
-        this.emit("session:disconnected", sessionId, reason.toString());
-      }
-    });
-    ws.on("error", (err) => {
-      this.emit("session:error", sessionId, err);
-    });
-  }
-  /** Send a message to a specific session, auto-wrapping with protocol envelope */
-  send(sessionId, message) {
-    const conn = this.sessions.get(sessionId);
-    if (!conn || conn.ws.readyState !== WebSocket2.OPEN) {
-      return false;
-    }
-    const envelope = {
-      id: message["id"] ?? `msg_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`,
-      sessionId: message["sessionId"] ?? sessionId,
-      timestamp: message["timestamp"] ?? Date.now(),
-      sender: message["sender"] ?? { role: "provider", agentId: this.agentId ?? "unknown" },
-      type: message["type"] ?? "result.success",
-      payload: message["payload"] ?? {}
-    };
-    conn.ws.send(JSON.stringify(envelope));
-    return true;
-  }
-  /** Disconnect a specific session */
-  disconnect(sessionId) {
-    const conn = this.sessions.get(sessionId);
-    if (!conn) return;
-    this.clearHeartbeat(conn);
-    if (conn.ws.readyState === WebSocket2.OPEN || conn.ws.readyState === WebSocket2.CONNECTING) {
-      conn.ws.close(1e3, "Provider disconnecting");
-    }
-    this.sessions.delete(sessionId);
-  }
-  /** Disconnect all sessions */
-  disconnectAll() {
-    for (const sessionId of this.sessions.keys()) {
-      this.disconnect(sessionId);
-    }
-  }
-  /** Get active session count */
-  get activeCount() {
-    return this.sessions.size;
-  }
-  /** Check if a session is connected */
-  isConnected(sessionId) {
-    const conn = this.sessions.get(sessionId);
-    return conn?.ws.readyState === WebSocket2.OPEN;
-  }
-  clearHeartbeat(conn) {
-    if (conn.heartbeatTimer) {
-      clearInterval(conn.heartbeatTimer);
-      conn.heartbeatTimer = null;
-    }
-  }
-};
-
 // src/serve/protocol.ts
 var correlationCounter = 0;
 function createCorrelationId() {
@@ -1117,9 +670,9 @@ function registerServeCommand(program2) {
   program2.command("serve").description("Start serve daemon - bridge WebSocket sessions to stdin/stdout").requiredOption("--agent-token <token>", "Agent token (agt_clawrent_*) for authentication").option("--auto-approve", "Automatically approve incoming sessions", false).option("--poll-interval <ms>", "Polling interval for pending sessions (ms)", "5000").option("-d, --daemon", "Run in background as a daemon process", false).action(async (opts) => {
     try {
       if (opts.daemon) {
-        const config = loadConfig();
+        const config = loadConfig12();
         config.token = opts.agentToken;
-        const client = new ApiClient(config);
+        const client = new ApiClient12(config);
         let agentId;
         try {
           const agent = await client.getMyAgent();
@@ -1150,9 +703,9 @@ Logs: ${getLogFilePath(agentId)}`);
   });
 }
 async function runDaemon(opts) {
-  const config = loadConfig();
+  const config = loadConfig12();
   config.token = opts.agentToken;
-  const client = new ApiClient(config);
+  const client = new ApiClient12(config);
   const bridge = new StdioBridge();
   const sessionManager = new SessionManager(config.wsUrl);
   const pollInterval = parseInt(opts.pollInterval, 10);
@@ -1261,11 +814,11 @@ async function runDaemon(opts) {
   function connectAgentWs(token) {
     const wsBase = config.wsUrl ?? config.apiUrl.replace(/^http/, "ws");
     const url = `${wsBase}/ws/agent?token=${token}`;
-    agentWs = new WebSocket3(url);
+    agentWs = new WebSocket2(url);
     agentWs.on("open", () => {
       bridge.writeNotification("agent.connected", { agentId });
       agentHeartbeatTimer = setInterval(() => {
-        if (agentWs && agentWs.readyState === WebSocket3.OPEN) {
+        if (agentWs && agentWs.readyState === WebSocket2.OPEN) {
           agentWs.send(JSON.stringify({ type: "system.heartbeat", payload: {} }));
         }
       }, 25e3);
@@ -1354,8 +907,28 @@ async function runDaemon(opts) {
     }, pollInterval);
   }
   connectAgentWs(opts.agentToken);
-  void reattachActiveSessions(client, sessionManager, bridge).catch(() => {
-  });
+  void (async () => {
+    try {
+      const resumed = await resumeActiveSessions(client, sessionManager);
+      for (const s of resumed) {
+        if (activeSessions.has(s.sessionId) || knownPendingSessions.has(s.sessionId)) continue;
+        activeSessions.add(s.sessionId);
+        knownPendingSessions.add(s.sessionId);
+        bridge.writeNotification("session.new", {
+          sessionId: s.sessionId,
+          sessionToken: s.sessionToken,
+          taskDescription: s.taskDescription ?? "",
+          consumerUserId: s.consumerUserId ?? "",
+          slotIndex: s.slotIndex ?? 0,
+          reattached: true
+        });
+      }
+    } catch (err) {
+      bridge.writeNotification("session.reattach_failed", {
+        error: err instanceof Error ? err.message : String(err)
+      });
+    }
+  })();
   const shutdown = async () => {
     if (pollTimer) clearInterval(pollTimer);
     if (agentHeartbeatTimer) clearInterval(agentHeartbeatTimer);
@@ -1398,31 +971,6 @@ async function approveAndConnect(client, sessionManager, bridge, sessionId) {
     });
   }
 }
-async function reattachActiveSessions(client, sessionManager, bridge) {
-  try {
-    const res = await client.getSessions({ role: "provider", status: "active" });
-    const active = res?.data ?? [];
-    for (const s of active) {
-      if (activeSessions.has(s.id) || knownPendingSessions.has(s.id)) continue;
-      if (!s.sessionToken) continue;
-      activeSessions.add(s.id);
-      knownPendingSessions.add(s.id);
-      bridge.writeNotification("session.new", {
-        sessionId: s.id,
-        sessionToken: s.sessionToken,
-        taskDescription: s.taskDescription ?? "",
-        consumerUserId: s.consumerUserId ?? "",
-        slotIndex: 0,
-        reattached: true
-      });
-      sessionManager.connect(s.id, s.sessionToken);
-    }
-  } catch (err) {
-    bridge.writeNotification("session.reattach_failed", {
-      error: err instanceof Error ? err.message : String(err)
-    });
-  }
-}
 
 // src/commands/stop.ts
 async function stopOne(agentId) {
@@ -1513,7 +1061,7 @@ function registerStatusCommand(program2) {
 
 // src/index.ts
 var __dirname = dirname(fileURLToPath(import.meta.url));
-var pkg = JSON.parse(readFileSync3(join3(__dirname, "..", "package.json"), "utf-8"));
+var pkg = JSON.parse(readFileSync2(join2(__dirname, "..", "package.json"), "utf-8"));
 var program = new Command();
 program.name("clawrent").description("ClawRent CLI - Agent capability rental platform").version(pkg.version);
 registerAuthCommand(program);