@questionbase/deskfree 0.3.0-alpha.37 → 0.3.0-alpha.39

package/dist/index.js

@@ -3651,6 +3651,132 @@ var require_websocket_server = __commonJS({
   }
 });
 
+// src/channel.validation.ts
+function validateField(opts) {
+  const { value, name, minLength, maxLength, pattern, patternMessage } = opts;
+  if (!value) return `${name} is required`;
+  if (typeof value !== "string") return `${name} must be a string`;
+  const trimmed = value.trim();
+  if (trimmed !== value)
+    return `${name} must not have leading or trailing whitespace`;
+  if (minLength !== void 0 && trimmed.length < minLength)
+    return `${name} appears to be incomplete (minimum ${minLength} characters expected)`;
+  if (maxLength !== void 0 && trimmed.length > maxLength)
+    return `${name} appears to be invalid (maximum ${maxLength} characters expected)`;
+  if (pattern !== void 0 && !pattern.test(trimmed))
+    return patternMessage ?? `${name} contains invalid characters`;
+  return null;
+}
+function isLocalDevelopmentHost(hostname) {
+  return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1" || hostname.endsWith(".local") || hostname.endsWith(".localhost") || /^192\.168\./.test(hostname) || /^10\./.test(hostname) || /^172\.(1[6-9]|2\d|3[01])\./.test(hostname);
+}
+function validateBotToken(value) {
+  const fieldError = validateField({ value, name: "Bot token" });
+  if (fieldError) return fieldError;
+  const trimmed = value.trim();
+  if (!trimmed.startsWith("bot_")) {
+    return 'Bot token must start with "bot_" (check your DeskFree bot configuration)';
+  }
+  const patternError = validateField({
+    value,
+    name: "Bot token",
+    minLength: 10,
+    maxLength: 200,
+    pattern: /^bot_[a-zA-Z0-9_-]+$/,
+    patternMessage: 'Bot token contains invalid characters. Only alphanumeric, underscore, and dash are allowed after "bot_"'
+  });
+  if (patternError) return patternError;
+  if (trimmed.includes(" ") || trimmed.includes("\n") || trimmed.includes("	")) {
+    return "Bot token contains whitespace characters. Please copy the token exactly as shown in DeskFree.";
+  }
+  if (trimmed === "bot_your_token_here" || trimmed === "bot_example") {
+    return "Please replace the placeholder with your actual bot token from DeskFree";
+  }
+  return null;
+}
+function validateApiUrl(value) {
+  const fieldError = validateField({ value, name: "API URL" });
+  if (fieldError) return fieldError;
+  const trimmed = value.trim();
+  let url;
+  try {
+    url = new URL(trimmed);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : "Invalid URL format";
+    return `API URL must be a valid URL: ${message}`;
+  }
+  if (url.protocol !== "https:") {
+    return "API URL must use HTTPS protocol for security. Make sure your DeskFree deployment supports HTTPS.";
+  }
+  if (!url.hostname) {
+    return "API URL must have a valid hostname";
+  }
+  if (isLocalDevelopmentHost(url.hostname)) {
+    if (process.env.NODE_ENV === "production") {
+      return "API URL cannot use localhost or private IP addresses in production. Please use a publicly accessible URL.";
+    }
+  }
+  if (url.hostname.includes("..") || url.hostname.startsWith(".")) {
+    return "API URL hostname appears to be malformed. Please check for typos.";
+  }
+  return null;
+}
+function validateWebSocketUrl(value) {
+  const fieldError = validateField({ value, name: "WebSocket URL" });
+  if (fieldError) return fieldError;
+  const trimmed = value.trim();
+  let url;
+  try {
+    url = new URL(trimmed);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : "Invalid URL format";
+    return `WebSocket URL must be a valid URL: ${message}`;
+  }
+  if (!["ws:", "wss:"].includes(url.protocol)) {
+    return "WebSocket URL must use ws:// or wss:// protocol";
+  }
+  if (!url.hostname) {
+    return "WebSocket URL must have a valid hostname";
+  }
+  if (isLocalDevelopmentHost(url.hostname)) {
+    if (process.env.NODE_ENV === "production") {
+      return "WebSocket URL cannot use localhost or private IP addresses in production. Please use a publicly accessible URL.";
+    }
+  }
+  if (url.hostname.includes("..") || url.hostname.startsWith(".")) {
+    return "WebSocket URL hostname appears to be malformed. Please check for typos.";
+  }
+  return null;
+}
+function validateUserId(value) {
+  const fieldError = validateField({ value, name: "User ID" });
+  if (fieldError) return fieldError;
+  const trimmed = value.trim();
+  const normalizedUserId = trimmed.toUpperCase();
+  if (normalizedUserId !== trimmed) {
+    return "User ID should be uppercase (will be automatically converted)";
+  }
+  if (!/^[UBPT][A-Z0-9]{10}$/.test(normalizedUserId)) {
+    if (normalizedUserId.length !== 11) {
+      return `User ID must be exactly 11 characters long (got: ${normalizedUserId.length}). Example: U9QF3C6X1A`;
+    }
+    const prefix = normalizedUserId.charAt(0);
+    if (!"UBPT".includes(prefix)) {
+      return `User ID must start with U (user), B (bot), P (project), or T (team). Got: "${prefix}". Check your DeskFree account settings.`;
+    }
+    if (!/^[A-Z0-9]+$/.test(normalizedUserId.slice(1))) {
+      return "User ID contains invalid characters. Only letters A-Z and numbers 0-9 are allowed after the prefix.";
+    }
+    return "User ID must be a valid DeskFree ID format: one letter (U/B/P/T) + 10 alphanumeric characters (e.g. U9QF3C6X1A)";
+  }
+  if (["U0000000000", "B0000000000", "P0000000000", "T0000000000"].includes(
+    normalizedUserId
+  )) {
+    return "Please replace the placeholder with your actual User ID from DeskFree account settings";
+  }
+  return null;
+}
+
 // src/client.ts
 var DEFAULT_REQUEST_TIMEOUT_MS = 3e4;
 var DeskFreeError = class _DeskFreeError extends Error {
@@ -4117,6 +4243,92 @@ function resolvePluginStorePath(subpath) {
   return join(stateDir, "plugin-data", "deskfree", subpath);
 }
 
+// src/gateway.cursor.ts
+import { mkdirSync, readFileSync, writeFileSync } from "fs";
+import { dirname } from "path";
+function loadCursor(ctx) {
+  try {
+    const cursorPath = resolvePluginStorePath(
+      `cursors/${ctx.accountId}/cursor`
+    );
+    return readFileSync(cursorPath, "utf-8").trim() || null;
+  } catch {
+    return null;
+  }
+}
+function saveCursor(ctx, cursor, log) {
+  try {
+    const filePath = resolvePluginStorePath(`cursors/${ctx.accountId}/cursor`);
+    const dir = dirname(filePath);
+    mkdirSync(dir, { recursive: true });
+    writeFileSync(filePath, cursor, "utf-8");
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    log?.warn(`Failed to persist cursor: ${message}`);
+  }
+}
+
+// src/gateway.health.ts
+var accountHealth = /* @__PURE__ */ new Map();
+function initializeHealth(accountId) {
+  if (!accountHealth.has(accountId)) {
+    accountHealth.set(accountId, {
+      connectionStartTime: Date.now(),
+      totalReconnects: 0,
+      lastReconnectAt: null,
+      avgReconnectInterval: 0,
+      totalMessagesDelivered: 0,
+      lastMessageAt: null,
+      currentMode: "websocket"
+    });
+  }
+}
+function updateHealthMode(accountId, mode) {
+  const health = accountHealth.get(accountId);
+  if (health) {
+    health.currentMode = mode;
+  }
+}
+function recordReconnect(accountId) {
+  const health = accountHealth.get(accountId);
+  if (health) {
+    const now = Date.now();
+    if (health.lastReconnectAt) {
+      const interval = now - health.lastReconnectAt;
+      health.avgReconnectInterval = (health.avgReconnectInterval * health.totalReconnects + interval) / (health.totalReconnects + 1);
+    }
+    health.totalReconnects++;
+    health.lastReconnectAt = now;
+  }
+}
+function recordMessageDelivery(accountId, count) {
+  const health = accountHealth.get(accountId);
+  if (health) {
+    health.totalMessagesDelivered += count;
+    health.lastMessageAt = Date.now();
+  }
+}
+function formatDuration(ms) {
+  const seconds = Math.floor(ms / 1e3);
+  const minutes = Math.floor(seconds / 60);
+  const hours = Math.floor(minutes / 60);
+  if (hours > 0) {
+    return `${hours}h${minutes % 60}m`;
+  } else if (minutes > 0) {
+    return `${minutes}m${seconds % 60}s`;
+  } else {
+    return `${seconds}s`;
+  }
+}
+function logHealthSummary(accountId, log) {
+  const health = accountHealth.get(accountId);
+  if (!health) return;
+  const uptime = Date.now() - health.connectionStartTime;
+  log.info(
+    `DeskFree health: uptime=${formatDuration(uptime)}, reconnects=${health.totalReconnects}, messages=${health.totalMessagesDelivered}, mode=${health.currentMode}`
+  );
+}
+
 // src/streaming.ts
 var THROTTLE_MS = 300;
 var CHAR_BUFFER_SIZE = 256;
@@ -4258,7 +4470,7 @@ var DeskFreeStreamingSession = class {
 import { randomUUID } from "crypto";
 import { createWriteStream } from "fs";
 import { mkdir, unlink } from "fs/promises";
-import { dirname, extname } from "path";
+import { dirname as dirname2, extname } from "path";
 import { Readable } from "stream";
 import { pipeline } from "stream/promises";
 var MAX_ATTACHMENT_SIZE = 10 * 1024 * 1024;
@@ -4381,7 +4593,7 @@ async function fetchAndSaveMedia(attachment) {
     throw new Error("Generated filename too long (max 255 characters)");
   }
   const filePath = resolvePluginStorePath(`media/inbound/${fileName}`);
-  await mkdir(dirname(filePath), { recursive: true });
+  await mkdir(dirname2(filePath), { recursive: true });
   const controller = new AbortController();
   const timeoutId = setTimeout(() => controller.abort(), DOWNLOAD_TIMEOUT_MS);
   let fileStream = null;
@@ -4699,17 +4911,6 @@ async function deliverMessageToAgent(ctx, message, client) {
   }
 }
 
-// src/version.ts
-import { readFileSync } from "fs";
-import { resolve } from "path";
-var PLUGIN_VERSION = JSON.parse(
-  readFileSync(resolve(__dirname, "..", "package.json"), "utf-8")
-).version;
-
-// src/gateway.ts
-import { mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
-import { dirname as dirname2 } from "path";
-
 // ../node_modules/ws/wrapper.mjs
 var import_stream = __toESM(require_stream(), 1);
 var import_receiver = __toESM(require_receiver(), 1);
@@ -4718,8 +4919,11 @@ var import_websocket = __toESM(require_websocket(), 1);
 var import_websocket_server = __toESM(require_websocket_server(), 1);
 var wrapper_default = import_websocket.default;
 
-// src/gateway.ts
+// src/gateway.state.ts
 var activeWs = null;
+function setActiveWs(ws) {
+  activeWs = ws;
+}
 function sendWsAck(messageId) {
   if (activeWs?.readyState === wrapper_default.OPEN) {
     try {
@@ -4756,17 +4960,6 @@ function clearCompletedTaskId() {
 function setInboundThreadId(taskId) {
   inboundThreadId = taskId;
 }
-var PING_INTERVAL_MS = 5 * 60 * 1e3;
-var POLL_FALLBACK_INTERVAL_MS = 30 * 1e3;
-var WS_CONNECTION_TIMEOUT_MS = 30 * 1e3;
-var WS_PONG_TIMEOUT_MS = 10 * 1e3;
-var NOTIFY_DEBOUNCE_MS = 200;
-var BACKOFF_INITIAL_MS = 2e3;
-var BACKOFF_MAX_MS = 3e4;
-var BACKOFF_FACTOR = 1.8;
-var HEALTH_LOG_INTERVAL_MS = 30 * 60 * 1e3;
-var MAX_CONSECUTIVE_POLL_FAILURES = 5;
-var deliveredMessageIds = /* @__PURE__ */ new Set();
 function sendWsStreamChunk(messageId, delta, fullContent) {
   if (!activeWs || activeWs.readyState !== wrapper_default.OPEN) return false;
   try {
@@ -4778,67 +4971,11 @@ function sendWsStreamChunk(messageId, delta, fullContent) {
     return false;
   }
 }
-var healthState = /* @__PURE__ */ new Map();
-function initializeHealth(accountId) {
-  if (!healthState.has(accountId)) {
-    healthState.set(accountId, {
-      connectionStartTime: Date.now(),
-      totalReconnects: 0,
-      lastReconnectAt: null,
-      avgReconnectInterval: 0,
-      totalMessagesDelivered: 0,
-      lastMessageAt: null,
-      currentMode: "websocket"
-    });
-  }
-}
-function updateHealthMode(accountId, mode) {
-  const health = healthState.get(accountId);
-  if (health) {
-    health.currentMode = mode;
-  }
-}
-function recordReconnect(accountId) {
-  const health = healthState.get(accountId);
-  if (health) {
-    const now = Date.now();
-    if (health.lastReconnectAt) {
-      const interval = now - health.lastReconnectAt;
-      health.avgReconnectInterval = (health.avgReconnectInterval * health.totalReconnects + interval) / (health.totalReconnects + 1);
-    }
-    health.totalReconnects++;
-    health.lastReconnectAt = now;
-  }
-}
-function recordMessageDelivery(accountId, count) {
-  const health = healthState.get(accountId);
-  if (health) {
-    health.totalMessagesDelivered += count;
-    health.lastMessageAt = Date.now();
-  }
-}
-function formatDuration(ms) {
-  const seconds = Math.floor(ms / 1e3);
-  const minutes = Math.floor(seconds / 60);
-  const hours = Math.floor(minutes / 60);
-  if (hours > 0) {
-    return `${hours}h${minutes % 60}m`;
-  } else if (minutes > 0) {
-    return `${minutes}m${seconds % 60}s`;
-  } else {
-    return `${seconds}s`;
-  }
-}
-function logHealthSummary(accountId, log) {
-  const health = healthState.get(accountId);
-  if (!health) return;
-  const uptime = Date.now() - health.connectionStartTime;
-  log.info(
-    `DeskFree health: uptime=${formatDuration(uptime)}, reconnects=${health.totalReconnects}, messages=${health.totalMessagesDelivered}, mode=${health.currentMode}`
-  );
-}
+
+// src/gateway.polling.ts
+var deliveredMessageIds = /* @__PURE__ */ new Set();
 var pollChains = /* @__PURE__ */ new Map();
-function enqueuePoll(client, ctx, getCursor, setCursor, log, account) {
+function enqueuePoll(client, ctx, getCursor, setCursor, log, account, getWelcomeSent, setWelcomeSent) {
   const accountId = ctx.accountId;
   const prev = pollChains.get(accountId) ?? Promise.resolve();
   const next = prev.then(async () => {
@@ -4847,15 +4984,138 @@ function enqueuePoll(client, ctx, getCursor, setCursor, log, account) {
       ctx,
       getCursor(),
       log,
-      account
+      account,
+      getWelcomeSent?.() ?? false
     );
     if (result.cursor) setCursor(result.cursor);
+    if (result.welcomeSent) setWelcomeSent?.(true);
   }).catch((err) => {
     const message = err instanceof Error ? err.message : String(err);
     log.error(`Poll error: ${message}`);
   });
   pollChains.set(accountId, next);
 }
+async function pollAndDeliver(client, ctx, cursor, log, account, alreadyWelcomed) {
+  try {
+    const isFirstRun = !cursor;
+    const response = await client.listMessages({
+      ...cursor ? { cursor } : {}
+    });
+    if (isFirstRun) {
+      const seedCursor = response.cursor ?? (/* @__PURE__ */ new Date()).toISOString();
+      if (response.cursor) {
+        log.info(
+          `First run: skipping ${response.items.length} existing message(s), seeding cursor.`
+        );
+      } else {
+        log.info(
+          "First run: no messages yet (empty inbox), seeding cursor with current time."
+        );
+      }
+      saveCursor(ctx, seedCursor, log);
+      log.info("Connected to DeskFree. Ready to receive messages and tasks.");
+      if (alreadyWelcomed) {
+        log.info("Welcome already sent, skipping duplicate.");
+        return {
+          cursor: seedCursor,
+          ok: true,
+          welcomeSent: false
+        };
+      }
+      try {
+        const botName = account?.botName;
+        const humanName = account?.humanName;
+        const welcomeContent = botName && humanName ? `Hey ${botName}! I'm ${humanName}. We're connected through DeskFree \u2014 I'll send you tasks and you'll help me get things done. What should we work on first? (Just reply to this \u2014 don't introduce yourself again on heartbeat, wait for my response.)` : "DeskFree is connected! Send me tasks and I'll help you get things done. What should we work on first? (Just reply to this \u2014 don't introduce yourself again on heartbeat, wait for my response.)";
+        const welcomeMessage = {
+          messageId: `welcome-${Date.now()}`,
+          botId: "",
+          humanId: account?.userId ?? ctx.account.userId,
+          authorType: "user",
+          content: welcomeContent,
+          createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+          userName: humanName ?? "System"
+        };
+        await deliverMessageToAgent(ctx, welcomeMessage, client);
+        log.info("Sent welcome message to agent.");
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        log.warn(`Failed to send welcome message: ${msg}`);
+      }
+      return { cursor: seedCursor, ok: true, welcomeSent: true };
+    }
+    if (response.items.length === 0) return { cursor: null, ok: true };
+    const newItems = response.items.filter(
+      (m) => !deliveredMessageIds.has(m.messageId)
+    );
+    if (newItems.length === 0) {
+      log.debug(
+        `Poll returned ${response.items.length} item(s), all already delivered.`
+      );
+      if (response.cursor) {
+        saveCursor(ctx, response.cursor, log);
+      }
+      return { cursor: response.cursor, ok: true };
+    }
+    log.info(
+      `Received ${newItems.length} new message(s) (${response.items.length - newItems.length} duplicate(s) skipped).`
+    );
+    let deliveredCount = 0;
+    for (const message of newItems) {
+      if (message.authorType === "bot") {
+        log.debug(`Skipping bot message ${message.messageId}`);
+        deliveredMessageIds.add(message.messageId);
+        continue;
+      }
+      clearCompletedTaskId();
+      setInboundThreadId(message.taskId ?? null);
+      await deliverMessageToAgent(ctx, message, client);
+      deliveredMessageIds.add(message.messageId);
+      deliveredCount++;
+      sendWsAck(message.messageId);
+    }
+    if (deliveredMessageIds.size > 1e3) {
+      const entries = Array.from(deliveredMessageIds);
+      deliveredMessageIds.clear();
+      for (const id of entries.slice(-500)) {
+        deliveredMessageIds.add(id);
+      }
+    }
+    if (deliveredCount > 0) {
+      recordMessageDelivery(ctx.accountId, deliveredCount);
+    }
+    if (response.cursor) {
+      saveCursor(ctx, response.cursor, log);
+    }
+    return { cursor: response.cursor, ok: true };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    log.warn(`Poll failed: ${message}`);
+    reportError("warn", `Message poll failed: ${message}`, {
+      component: "gateway",
+      event: "poll_failed"
+    });
+    return { cursor: null, ok: false };
+  }
+}
+
+// src/version.ts
+import { readFileSync as readFileSync2 } from "fs";
+import { resolve } from "path";
+var PLUGIN_VERSION = JSON.parse(
+  readFileSync2(resolve(__dirname, "..", "package.json"), "utf-8")
+).version;
+
+// src/gateway.ts
+var PING_INTERVAL_MS = 5 * 60 * 1e3;
+var POLL_FALLBACK_INTERVAL_MS = 30 * 1e3;
+var WS_CONNECTION_TIMEOUT_MS = 30 * 1e3;
+var WS_PONG_TIMEOUT_MS = 10 * 1e3;
+var NOTIFY_DEBOUNCE_MS = 200;
+var BACKOFF_INITIAL_MS = 2e3;
+var BACKOFF_MAX_MS = 3e4;
+var BACKOFF_FACTOR = 1.8;
+var HEALTH_LOG_INTERVAL_MS = 30 * 60 * 1e3;
+var MAX_CONSECUTIVE_POLL_FAILURES = 5;
 function nextBackoff(state) {
   const delay = Math.min(
     BACKOFF_INITIAL_MS * Math.pow(BACKOFF_FACTOR, state.attempt),
@@ -4881,32 +5141,12 @@ function sleepWithAbort(ms, signal) {
     signal.addEventListener("abort", onAbort, { once: true });
   });
 }
-function loadCursor(ctx) {
-  try {
-    const cursorPath = resolvePluginStorePath(
-      `cursors/${ctx.accountId}/cursor`
-    );
-    return readFileSync2(cursorPath, "utf-8").trim() || null;
-  } catch {
-    return null;
-  }
-}
-function saveCursor(ctx, cursor, log) {
-  try {
-    const filePath = resolvePluginStorePath(`cursors/${ctx.accountId}/cursor`);
-    const dir = dirname2(filePath);
-    mkdirSync(dir, { recursive: true });
-    writeFileSync(filePath, cursor, "utf-8");
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    log?.warn(`Failed to persist cursor: ${message}`);
-  }
-}
 async function startDeskFreeConnection(ctx) {
   const account = ctx.account;
   const client = new DeskFreeClient(account.botToken, account.apiUrl);
   const log = ctx.log ?? getDeskFreeRuntime().logging.createLogger("deskfree");
   let cursor = loadCursor(ctx);
+  let welcomeSent = false;
   const backoff = { attempt: 0 };
   let totalReconnects = 0;
   initializeHealth(ctx.accountId);
@@ -4946,7 +5186,11 @@ async function startDeskFreeConnection(ctx) {
         ctx,
         cursor,
         log,
-        account
+        account,
+        getWelcomeSent: () => welcomeSent,
+        setWelcomeSent: (v) => {
+          welcomeSent = v;
+        }
       });
       totalReconnects++;
     } catch (err) {
@@ -4988,7 +5232,16 @@ async function startDeskFreeConnection(ctx) {
   );
 }
 async function runWebSocketConnection(opts) {
-  const { ticket, wsUrl, client, ctx, log, account } = opts;
+  const {
+    ticket,
+    wsUrl,
+    client,
+    ctx,
+    log,
+    account,
+    getWelcomeSent,
+    setWelcomeSent
+  } = opts;
   let cursor = opts.cursor;
   return new Promise((resolve2, reject) => {
     const ws = new wrapper_default(`${wsUrl}?ticket=${ticket}`);
@@ -5031,7 +5284,7 @@ async function runWebSocketConnection(opts) {
     }, WS_CONNECTION_TIMEOUT_MS);
     ws.on("open", async () => {
       isConnected = true;
-      activeWs = ws;
+      setActiveWs(ws);
       if (connectionTimer !== void 0) {
         clearTimeout(connectionTimer);
         connectionTimer = void 0;
@@ -5077,7 +5330,9 @@ async function runWebSocketConnection(opts) {
           cursor = c ?? cursor;
         },
         log,
-        account
+        account,
+        getWelcomeSent,
+        setWelcomeSent
       );
       client.listMessages({ limit: 20 }).then((res) => {
         const humanMessages = res.items?.filter(
@@ -5094,9 +5349,11 @@ async function runWebSocketConnection(opts) {
       try {
         const raw = data.toString();
         if (!raw || raw.length > 65536) {
-          log.warn(
-            `Ignoring oversized or empty WS message (${raw?.length ?? 0} bytes)`
-          );
+          if (raw && raw.length > 65536) {
+            log.warn(`Ignoring oversized WS message (${raw.length} bytes)`);
+          } else {
+            log.debug(`Ignoring empty WS frame (${raw?.length ?? 0} bytes)`);
+          }
           return;
         }
         const msg = JSON.parse(raw);
@@ -5117,7 +5374,10 @@ async function runWebSocketConnection(opts) {
               (c) => {
                 cursor = c ?? cursor;
               },
-              log
+              log,
+              account,
+              getWelcomeSent,
+              setWelcomeSent
             );
           }, NOTIFY_DEBOUNCE_MS);
         } else if (msg.action === "pong") {
@@ -5135,7 +5395,7 @@ async function runWebSocketConnection(opts) {
     ws.on("close", (code, reason) => {
       cleanup();
       isConnected = false;
-      if (activeWs === ws) activeWs = null;
+      if (activeWs === ws) setActiveWs(null);
       ctx.setStatus({ running: false, lastStopAt: Date.now() });
       if (code === 1e3) {
         log.info(`WebSocket closed normally: ${code} ${reason.toString()}`);
@@ -5185,7 +5445,7 @@ async function runWebSocketConnection(opts) {
     ws.on("error", (err) => {
       cleanup();
       isConnected = false;
-      if (activeWs === ws) activeWs = null;
+      if (activeWs === ws) setActiveWs(null);
       const errorMessage = err instanceof Error ? err.message : String(err);
       log.error(`WebSocket error: ${errorMessage}`);
       reportError("error", `WebSocket error: ${errorMessage}`, {
@@ -5209,144 +5469,51 @@ async function runWebSocketConnection(opts) {
             ws.close(1e3, "shutdown");
           }
         } catch (err) {
-          const message = err instanceof Error ? err.message : String(err);
-          log.warn(`Error closing WebSocket during shutdown: ${message}`);
-        }
-      },
-      { once: true }
-    );
-  });
-}
-async function runPollingFallback(opts) {
-  const { client, ctx, log } = opts;
-  let cursor = opts.cursor;
-  let iterations = 0;
-  const maxIterations = 10;
-  ctx.setStatus({ running: true, lastStartAt: Date.now() });
-  log.info("Running in polling fallback mode.");
-  let consecutiveFailures = 0;
-  while (!ctx.abortSignal.aborted && iterations < maxIterations) {
-    const result = await pollAndDeliver(client, ctx, cursor, log);
-    if (result.ok) {
-      if (result.cursor) cursor = result.cursor;
-      consecutiveFailures = 0;
-    } else {
-      consecutiveFailures++;
-      if (consecutiveFailures >= MAX_CONSECUTIVE_POLL_FAILURES) {
-        log.warn(
-          `${consecutiveFailures} consecutive poll failures, breaking out to retry WebSocket`
-        );
-        reportError(
-          "error",
-          `${consecutiveFailures} consecutive poll failures, switching to WebSocket retry`,
-          {
-            component: "gateway",
-            event: "poll_max_failures",
-            consecutiveFailures
-          }
-        );
-        break;
-      }
-    }
-    iterations++;
-    const jitter = Math.random() * POLL_FALLBACK_INTERVAL_MS * 0.2;
-    await sleepWithAbort(POLL_FALLBACK_INTERVAL_MS + jitter, ctx.abortSignal);
-  }
-  ctx.setStatus({ running: false, lastStopAt: Date.now() });
-  return cursor;
-}
-async function pollAndDeliver(client, ctx, cursor, log, account) {
-  try {
-    const SEED = "SEED";
-    const isFirstRun = !cursor || cursor === SEED;
-    const apiCursor = cursor && cursor !== SEED ? cursor : void 0;
-    const response = await client.listMessages({
-      ...apiCursor ? { cursor: apiCursor } : {}
-    });
-    if (isFirstRun) {
-      if (response.cursor) {
-        log.info(
-          `First run: skipping ${response.items.length} existing message(s), seeding cursor.`
-        );
-        saveCursor(ctx, response.cursor, log);
-      } else {
-        log.info("First run: no messages yet (empty inbox).");
-      }
-      log.info("Connected to DeskFree. Ready to receive messages and tasks.");
-      try {
-        const botName = account?.botName;
-        const humanName = account?.humanName;
-        const welcomeContent = botName && humanName ? `Hey ${botName}! I'm ${humanName}. We're connected through DeskFree \u2014 I'll send you tasks and you'll help me get things done. What should we work on first? (Just reply to this \u2014 don't introduce yourself again on heartbeat, wait for my response.)` : "DeskFree is connected! Send me tasks and I'll help you get things done. What should we work on first? (Just reply to this \u2014 don't introduce yourself again on heartbeat, wait for my response.)";
-        const welcomeMessage = {
-          messageId: `welcome-${Date.now()}`,
-          botId: "",
-          humanId: "system",
-          authorType: "user",
-          content: welcomeContent,
-          createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-          userName: humanName ?? "System"
-        };
-        await deliverMessageToAgent(ctx, welcomeMessage, client);
-        log.info("Sent welcome message to agent.");
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        log.warn(`Failed to send welcome message: ${msg}`);
-      }
-      return { cursor: response.cursor ?? SEED, ok: true };
-    }
-    if (response.items.length === 0) return { cursor: null, ok: true };
-    const newItems = response.items.filter(
-      (m) => !deliveredMessageIds.has(m.messageId)
-    );
-    if (newItems.length === 0) {
-      log.debug(
-        `Poll returned ${response.items.length} item(s), all already delivered.`
-      );
-      if (response.cursor) {
-        saveCursor(ctx, response.cursor, log);
-      }
-      return { cursor: response.cursor, ok: true };
-    }
-    log.info(
-      `Received ${newItems.length} new message(s) (${response.items.length - newItems.length} duplicate(s) skipped).`
+          const message = err instanceof Error ? err.message : String(err);
+          log.warn(`Error closing WebSocket during shutdown: ${message}`);
+        }
+      },
+      { once: true }
     );
-    let deliveredCount = 0;
-    for (const message of newItems) {
-      if (message.authorType === "bot") {
-        log.debug(`Skipping bot message ${message.messageId}`);
-        deliveredMessageIds.add(message.messageId);
-        continue;
-      }
-      clearCompletedTaskId();
-      setInboundThreadId(message.taskId ?? null);
-      await deliverMessageToAgent(ctx, message, client);
-      deliveredMessageIds.add(message.messageId);
-      deliveredCount++;
-      sendWsAck(message.messageId);
-    }
-    if (deliveredMessageIds.size > 1e3) {
-      const entries = Array.from(deliveredMessageIds);
-      deliveredMessageIds.clear();
-      for (const id of entries.slice(-500)) {
-        deliveredMessageIds.add(id);
+  });
+}
+async function runPollingFallback(opts) {
+  const { client, ctx, log } = opts;
+  let cursor = opts.cursor;
+  let iterations = 0;
+  const maxIterations = 10;
+  ctx.setStatus({ running: true, lastStartAt: Date.now() });
+  log.info("Running in polling fallback mode.");
+  let consecutiveFailures = 0;
+  while (!ctx.abortSignal.aborted && iterations < maxIterations) {
+    const result = await pollAndDeliver(client, ctx, cursor, log);
+    if (result.ok) {
+      if (result.cursor) cursor = result.cursor;
+      consecutiveFailures = 0;
+    } else {
+      consecutiveFailures++;
+      if (consecutiveFailures >= MAX_CONSECUTIVE_POLL_FAILURES) {
+        log.warn(
+          `${consecutiveFailures} consecutive poll failures, breaking out to retry WebSocket`
+        );
+        reportError(
+          "error",
+          `${consecutiveFailures} consecutive poll failures, switching to WebSocket retry`,
+          {
+            component: "gateway",
+            event: "poll_max_failures",
+            consecutiveFailures
+          }
+        );
+        break;
       }
     }
-    if (deliveredCount > 0) {
-      recordMessageDelivery(ctx.accountId, deliveredCount);
-    }
-    if (response.cursor) {
-      saveCursor(ctx, response.cursor, log);
-    }
-    return { cursor: response.cursor, ok: true };
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    log.warn(`Poll failed: ${message}`);
-    reportError("warn", `Message poll failed: ${message}`, {
-      component: "gateway",
-      event: "poll_failed"
-    });
-    return { cursor: null, ok: false };
+    iterations++;
+    const jitter = Math.random() * POLL_FALLBACK_INTERVAL_MS * 0.2;
+    await sleepWithAbort(POLL_FALLBACK_INTERVAL_MS + jitter, ctx.abortSignal);
   }
+  ctx.setStatus({ running: false, lastStopAt: Date.now() });
+  return cursor;
 }
 
 // node_modules/@sinclair/typebox/build/esm/type/guard/value.mjs
@@ -8042,7 +8209,7 @@ var ORCHESTRATOR_TOOLS = {
           }),
           instructions: Type.Optional(
             Type.String({
-              description: "Concise instructions in simple markdown (bold, lists, inline code \u2014 no # headers). Brief a contractor: what to do, what done looks like. Skip obvious context."
+              description: "3-8 bullet points max in simple markdown (bold, lists, inline code \u2014 no # headers). What to do, what done looks like, key constraints. Under 500 words. Skip context the worker can infer from the title."
             })
           ),
           file: Type.Optional(
@@ -8129,11 +8296,11 @@ var SHARED_TOOLS = {
         Type.Object(
           {
             reasoning: Type.String({
-              description: "Why these updates matter \u2014 what was learned from this task"
+              description: "1-2 sentences: what changed and why. No restating known context."
             }),
             globalWoW: Type.Optional(
               Type.String({
-                description: "Full updated global Ways of Working markdown content (full replacement, not diff)"
+                description: "Updated global Ways of Working (full replacement). Keep surgical \u2014 only add or modify relevant sections, do not inflate with restated context."
               })
             ),
             initiativeId: Type.Optional(
@@ -8143,7 +8310,7 @@ var SHARED_TOOLS = {
             ),
             initiativeContent: Type.Optional(
               Type.String({
-                description: "Full updated initiative content markdown (full replacement, not diff)"
+                description: "Updated initiative content (full replacement). Keep surgical \u2014 evolve what exists, do not rewrite from scratch."
               })
             )
           },
@@ -8160,7 +8327,7 @@ var SHARED_TOOLS = {
             }),
             instructions: Type.Optional(
               Type.String({
-                description: "Instructions for the follow-up task"
+                description: "Brief handoff: 2-3 bullet points max. The next worker gets parent task context."
               })
             )
           }),
@@ -8230,7 +8397,7 @@ var SHARED_TOOLS = {
           }),
           instructions: Type.Optional(
             Type.String({
-              description: "Concise instructions in simple markdown (bold, lists, inline code \u2014 no # headers). Brief a contractor: what to do, what done looks like. Skip obvious context."
+              description: "3-8 bullet points max in simple markdown (bold, lists, inline code \u2014 no # headers). What to do, what done looks like, key constraints. Under 500 words. Skip context the worker can infer from the title."
             })
           ),
           file: Type.Optional(
@@ -8349,131 +8516,6 @@ var STATUS_MESSAGES = {
 function getChannelConfig(cfg) {
   return cfg?.channels?.deskfree ?? null;
 }
-function validateStringField(value, fieldName) {
-  if (!value) {
-    return { trimmed: "", error: `${fieldName} is required` };
-  }
-  if (typeof value !== "string") {
-    return { trimmed: "", error: `${fieldName} must be a string` };
-  }
-  const trimmed = value.trim();
-  if (trimmed !== value) {
-    return {
-      trimmed: "",
-      error: `${fieldName} must not have leading or trailing whitespace`
-    };
-  }
-  return { trimmed };
-}
-function isLocalDevelopmentHost(hostname) {
-  return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1" || hostname.endsWith(".local") || hostname.endsWith(".localhost") || /^192\.168\./.test(hostname) || /^10\./.test(hostname) || /^172\.(1[6-9]|2\d|3[01])\./.test(hostname);
-}
-function validateBotToken(value) {
-  const { trimmed, error } = validateStringField(value, "Bot token");
-  if (error) return error;
-  if (!trimmed.startsWith("bot_")) {
-    return 'Bot token must start with "bot_" (check your DeskFree bot configuration)';
-  }
-  if (trimmed.length < 10) {
-    return "Bot token appears to be incomplete (minimum 10 characters expected)";
-  }
-  if (trimmed.length > 200) {
-    return "Bot token appears to be invalid (maximum 200 characters expected)";
-  }
-  if (!/^bot_[a-zA-Z0-9_-]+$/.test(trimmed)) {
-    return 'Bot token contains invalid characters. Only alphanumeric, underscore, and dash are allowed after "bot_"';
-  }
-  if (trimmed.includes(" ") || trimmed.includes("\n") || trimmed.includes("	")) {
-    return "Bot token contains whitespace characters. Please copy the token exactly as shown in DeskFree.";
-  }
-  if (trimmed === "bot_your_token_here" || trimmed === "bot_example") {
-    return "Please replace the placeholder with your actual bot token from DeskFree";
-  }
-  return null;
-}
-function validateApiUrl(value) {
-  const { trimmed, error } = validateStringField(value, "API URL");
-  if (error) return error;
-  let url;
-  try {
-    url = new URL(trimmed);
-  } catch (err) {
-    const message = err instanceof Error ? err.message : "Invalid URL format";
-    return `API URL must be a valid URL: ${message}`;
-  }
-  if (url.protocol !== "https:") {
-    return "API URL must use HTTPS protocol for security. Make sure your DeskFree deployment supports HTTPS.";
-  }
-  if (!url.hostname) {
-    return "API URL must have a valid hostname";
-  }
-  if (isLocalDevelopmentHost(url.hostname)) {
-    if (process.env.NODE_ENV === "production") {
-      return "API URL cannot use localhost or private IP addresses in production. Please use a publicly accessible URL.";
-    }
-  }
-  if (url.hostname.includes("..") || url.hostname.startsWith(".")) {
-    return "API URL hostname appears to be malformed. Please check for typos.";
-  }
-  if (url.pathname && url.pathname !== "/" && !url.pathname.includes("/api") && !url.pathname.includes("/v1")) {
-  }
-  return null;
-}
-function validateWebSocketUrl(value) {
-  const { trimmed, error } = validateStringField(value, "WebSocket URL");
-  if (error) return error;
-  let url;
-  try {
-    url = new URL(trimmed);
-  } catch (err) {
-    const message = err instanceof Error ? err.message : "Invalid URL format";
-    return `WebSocket URL must be a valid URL: ${message}`;
-  }
-  if (!["ws:", "wss:"].includes(url.protocol)) {
-    return "WebSocket URL must use ws:// or wss:// protocol";
-  }
-  if (!url.hostname) {
-    return "WebSocket URL must have a valid hostname";
-  }
-  if (isLocalDevelopmentHost(url.hostname)) {
-    if (process.env.NODE_ENV === "production") {
-      return "WebSocket URL cannot use localhost or private IP addresses in production. Please use a publicly accessible URL.";
-    }
-  }
-  if (url.protocol === "ws:" && !isLocalDevelopmentHost(url.hostname)) {
-  }
-  if (url.hostname.includes("..") || url.hostname.startsWith(".")) {
-    return "WebSocket URL hostname appears to be malformed. Please check for typos.";
-  }
-  return null;
-}
-function validateUserId(value) {
-  const { trimmed, error } = validateStringField(value, "User ID");
-  if (error) return error;
-  const normalizedUserId = trimmed.toUpperCase();
-  if (normalizedUserId !== trimmed) {
-    return "User ID should be uppercase (will be automatically converted)";
-  }
-  if (!/^[UBPT][A-Z0-9]{10}$/.test(normalizedUserId)) {
-    if (normalizedUserId.length !== 11) {
-      return `User ID must be exactly 11 characters long (got: ${normalizedUserId.length}). Example: U9QF3C6X1A`;
-    }
-    const prefix = normalizedUserId.charAt(0);
-    if (!"UBPT".includes(prefix)) {
-      return `User ID must start with U (user), B (bot), P (project), or T (team). Got: "${prefix}". Check your DeskFree account settings.`;
-    }
-    if (!/^[A-Z0-9]+$/.test(normalizedUserId.slice(1))) {
-      return "User ID contains invalid characters. Only letters A-Z and numbers 0-9 are allowed after the prefix.";
-    }
-    return "User ID must be a valid DeskFree ID format: one letter (U/B/P/T) + 10 alphanumeric characters (e.g. U9QF3C6X1A)";
-  }
-  if (["U0000000000", "B0000000000", "P0000000000", "T0000000000"].includes(
-    normalizedUserId
-  )) {
-    return "Please replace the placeholder with your actual User ID from DeskFree account settings";
-  }
-  return null;
-}
 var deskFreePlugin = {
   id: "deskfree",
   meta: CHANNEL_META,
@@ -8894,9 +8936,9 @@ You are the orchestrator. Your job: turn human intent into approved tasks, then
 
 **Match the human's energy.** Short message \u2192 short reply. Casual tone \u2192 casual response. Don't over-explain, don't lecture, don't pad responses.
 
-You do NOT claim tasks or do work directly \u2014 you have no access to deskfree_start_task. Spawn a sub-agent for each approved task and pass it the taskId.
-- When a human writes in a task thread, decide: does it need bot action? If yes \u2192 reopen and spawn sub-agent. If it's confirmation ("looks good") \u2192 complete the task. If deferred ("I'll check later") \u2192 leave it.
-- Write task instructions as rich markdown (bold, lists, inline code \u2014 no # headers). Brief a contractor who has never seen the codebase.
+You do NOT claim tasks, complete tasks, or do work directly \u2014 you have no access to deskfree_start_task or deskfree_complete_task. Spawn a sub-agent for each approved task and pass it the taskId.
+- When a human writes in a task thread, decide: does it need bot action? If yes \u2192 reopen and spawn sub-agent. If it's just confirmation or deferred \u2014 leave it for now.
+- Write task instructions as 3-8 bullet points max (bold, lists, inline code \u2014 no # headers). What to do, what done looks like, key constraints. Under 500 words \u2014 brief a contractor, not write a spec.
 - Estimate token cost per task \u2014 consider files to read, reasoning, output.
 - One initiative per proposal \u2014 make multiple calls for multiple initiatives.
 - Initiative titles should reflect aspirations and outcomes, not activities. "AI Thought Leadership on LinkedIn" over "LinkedIn Content."
@@ -8905,10 +8947,10 @@ var DESKFREE_WORKER_DIRECTIVE = `## DeskFree Worker
 You are a worker sub-agent. Call \`deskfree_start_task\` with your taskId to claim and load context.
 Tools: deskfree_start_task, deskfree_update_file, deskfree_complete_task, deskfree_send_message, deskfree_propose.
 - Claim your task first with deskfree_start_task \u2014 this loads instructions, messages, and file context.
-- Save work to linked files with deskfree_update_file (incrementally).
+- Save work to linked files with deskfree_update_file. Build up incrementally \u2014 start with structure/outline, then flesh out. Send an "ask" for review before going deep. The human should see the shape before the details.
 - Use deskfree_send_message with type "notify" for progress updates \u2014 what you're doing, what you found. Keep it brief.
 - Use deskfree_send_message with type "ask" when you need human input OR when your work is done for review. This surfaces to the main thread. Terminate after sending an ask.
-- When completing: pass "learnings" to deskfree_complete_task if you have knowledge updates (WoW or initiative content). Pass "followUps" if the work revealed clear next steps. Knowledge updates and proposals happen atomically with completion \u2014 no separate tool calls needed.
+- When completing: pass "learnings" only if you have genuine new knowledge. WoW updates should be surgical \u2014 add or modify only the relevant section, do not restate existing content. Reasoning should be 1-2 sentences. Pass "followUps" as brief handoffs (title + 2-3 bullets each).
 - Only complete when the human has confirmed or no review is needed.
 - Write like a senior colleague giving a status update \u2014 not a report. 1-3 sentences for messages.
 - On 409 or 404 errors: STOP. Do not retry the same taskId. Call deskfree_state to find available tasks.`;
@@ -9407,71 +9449,59 @@ function makeProposeHandler(client) {
     }
   };
 }
+function createTool(definition, execute) {
+  return { ...definition, execute };
+}
 function createOrchestratorTools(api) {
   const account = resolveAccountFromConfig(api);
   if (!account) return null;
   const client = new DeskFreeClient(account.botToken, account.apiUrl);
   return [
-    {
-      ...ORCHESTRATOR_TOOLS.STATE,
-      async execute(_id, _params) {
-        try {
-          const state = await client.getState();
-          return {
-            content: [{ type: "text", text: JSON.stringify(state, null, 2) }]
-          };
-        } catch (err) {
-          return errorResult(err);
-        }
+    createTool(ORCHESTRATOR_TOOLS.STATE, async (_id, _params) => {
+      try {
+        const state = await client.getState();
+        return {
+          content: [{ type: "text", text: JSON.stringify(state, null, 2) }]
+        };
+      } catch (err) {
+        return errorResult(err);
       }
-    },
-    {
-      ...ORCHESTRATOR_TOOLS.SCHEDULE_TASK,
-      async execute(_id, params) {
-        try {
-          const taskId = validateStringParam(params, "taskId", true);
-          const scheduledFor = params?.scheduledFor;
-          const reason = validateStringParam(params, "reason", true);
-          if (scheduledFor) {
-            const result = await client.snoozeTask({
-              taskId,
-              scheduledFor,
-              initiator: "human_request",
-              reason
-            });
-            return formatTaskResponse(
-              result,
-              `Task "${result.title}" scheduled for ${new Date(scheduledFor).toLocaleString()}`,
-              [
-                `Reason: ${reason}`,
-                "Task will resurface automatically at the scheduled time"
-              ]
-            );
-          } else {
-            const result = await client.unsnoozeTask({ taskId });
-            return formatTaskResponse(
-              result,
-              `Task "${result.title}" activated immediately`,
-              ["Task is now available in the active queue"]
-            );
-          }
-        } catch (err) {
-          return errorResult(err);
+    }),
+    createTool(ORCHESTRATOR_TOOLS.SCHEDULE_TASK, async (_id, params) => {
+      try {
+        const taskId = validateStringParam(params, "taskId", true);
+        const scheduledFor = params?.scheduledFor;
+        const reason = validateStringParam(params, "reason", true);
+        if (scheduledFor) {
+          const result = await client.snoozeTask({
+            taskId,
+            scheduledFor,
+            initiator: "human_request",
+            reason
+          });
+          return formatTaskResponse(
+            result,
+            `Task "${result.title}" scheduled for ${new Date(scheduledFor).toLocaleString()}`,
+            [
+              `Reason: ${reason}`,
+              "Task will resurface automatically at the scheduled time"
+            ]
+          );
+        } else {
+          const result = await client.unsnoozeTask({ taskId });
+          return formatTaskResponse(
+            result,
+            `Task "${result.title}" activated immediately`,
+            ["Task is now available in the active queue"]
+          );
         }
+      } catch (err) {
+        return errorResult(err);
       }
-    },
-    {
-      ...ORCHESTRATOR_TOOLS.REOPEN_TASK,
-      execute: makeReopenTaskHandler(client)
-    },
-    {
-      ...ORCHESTRATOR_TOOLS.SEND_MESSAGE,
-      execute: makeSendMessageHandler(client)
-    },
-    {
-      ...ORCHESTRATOR_TOOLS.PROPOSE,
-      execute: makeProposeHandler(client)
-    }
+    }),
+    createTool(ORCHESTRATOR_TOOLS.REOPEN_TASK, makeReopenTaskHandler(client)),
+    createTool(ORCHESTRATOR_TOOLS.SEND_MESSAGE, makeSendMessageHandler(client)),
+    createTool(ORCHESTRATOR_TOOLS.PROPOSE, makeProposeHandler(client))
   ];
 }
 function createWorkerTools(api) {
@@ -9480,113 +9510,95 @@ function createWorkerTools(api) {
   const client = new DeskFreeClient(account.botToken, account.apiUrl);
   const cachedSkillContext = /* @__PURE__ */ new Map();
   return [
-    {
-      ...WORKER_TOOLS.START_TASK,
-      async execute(_id, params) {
-        try {
-          const taskId = validateStringParam(params, "taskId", true);
-          const runnerId = validateStringParam(params, "runnerId", false);
-          const result = await client.claimTask({ taskId, runnerId });
-          setActiveTaskId(taskId);
-          let skillInstructions = "";
-          cachedSkillContext.clear();
-          if (result.skillContext?.length) {
-            for (const s of result.skillContext) {
-              cachedSkillContext.set(s.skillId, {
-                displayName: s.displayName,
-                instructions: s.instructions
-              });
-            }
-            skillInstructions = result.skillContext.map(
-              (s) => `
+    createTool(WORKER_TOOLS.START_TASK, async (_id, params) => {
+      try {
+        const taskId = validateStringParam(params, "taskId", true);
+        const runnerId = validateStringParam(params, "runnerId", false);
+        const result = await client.claimTask({ taskId, runnerId });
+        setActiveTaskId(taskId);
+        let skillInstructions = "";
+        cachedSkillContext.clear();
+        if (result.skillContext?.length) {
+          for (const s of result.skillContext) {
+            cachedSkillContext.set(s.skillId, {
+              displayName: s.displayName,
+              instructions: s.instructions
+            });
+          }
+          skillInstructions = result.skillContext.map(
+            (s) => `
 \u26A0\uFE0F SKILL: ${s.displayName} (ID: ${s.skillId})
 ${s.criticalSection}`
-            ).join("\n\n---\n");
-          }
-          const trimmedTask = trimTaskContext(result);
-          const taskJson = JSON.stringify(
-            {
-              summary: `Claimed task "${result.title}" \u2014 full context loaded${result.skillContext?.length ? ` (${result.skillContext.length} skill${result.skillContext.length > 1 ? "s" : ""} loaded \u2014 use deskfree_read_skill_section for full details)` : ""}`,
-              mode: trimmedTask.mode ?? "work",
-              nextActions: [
-                "Read the instructions and message history carefully",
-                ...result.fileContext ? [
-                  `Task has a linked file "${result.fileContext.name}" (ID: ${result.fileContext.fileId}) \u2014 use deskfree_update_file to save your work to it`
-                ] : [],
-                ...trimmedTask.mode === "evaluation" ? [
-                  "This is an evaluation task \u2014 review the WoW context and provide your evaluation in deskfree_complete_task"
-                ] : [],
-                "Complete with deskfree_complete_task when done (summary required)"
-              ],
-              task: trimmedTask
-            },
-            null,
-            2
-          );
-          const totalTokens = estimateTokens(skillInstructions) + estimateTokens(taskJson);
-          const budgetWarning = totalTokens > MAX_TASK_CONTEXT_TOKENS ? `
+          ).join("\n\n---\n");
+        }
+        const trimmedTask = trimTaskContext(result);
+        const taskJson = JSON.stringify(
+          {
+            summary: `Claimed task "${result.title}" \u2014 full context loaded${result.skillContext?.length ? ` (${result.skillContext.length} skill${result.skillContext.length > 1 ? "s" : ""} loaded \u2014 use deskfree_read_skill_section for full details)` : ""}`,
+            mode: trimmedTask.mode ?? "work",
+            nextActions: [
+              "Read the instructions and message history carefully",
+              ...result.fileContext ? [
+                `Task has a linked file "${result.fileContext.name}" (ID: ${result.fileContext.fileId}) \u2014 use deskfree_update_file to save your work to it`
+              ] : [],
+              ...trimmedTask.mode === "evaluation" ? [
+                "This is an evaluation task \u2014 review the WoW context and provide your evaluation in deskfree_complete_task"
+              ] : [],
+              "Complete with deskfree_complete_task when done (summary required)"
+            ],
+            task: trimmedTask
+          },
+          null,
+          2
+        );
+        const totalTokens = estimateTokens(skillInstructions) + estimateTokens(taskJson);
+        const budgetWarning = totalTokens > MAX_TASK_CONTEXT_TOKENS ? `
 \u26A0\uFE0F Context budget: ~${totalTokens} tokens loaded (~${MAX_TASK_CONTEXT_TOKENS} target). Be concise in your reasoning.` : "";
+        return {
+          content: [
+            ...skillInstructions ? [{ type: "text", text: skillInstructions }] : [],
+            {
+              type: "text",
+              text: taskJson + budgetWarning
+            }
+          ]
+        };
+      } catch (err) {
+        return errorResult(err);
+      }
+    }),
+    createTool(WORKER_TOOLS.UPDATE_FILE, makeUpdateFileHandler(client)),
+    createTool(WORKER_TOOLS.COMPLETE_TASK, makeCompleteTaskHandler(client)),
+    createTool(WORKER_TOOLS.SEND_MESSAGE, makeSendMessageHandler(client)),
+    createTool(WORKER_TOOLS.PROPOSE, makeProposeHandler(client)),
+    createTool(WORKER_TOOLS.READ_SKILL, async (_id, params) => {
+      try {
+        const skillId = validateStringParam(params, "skillId", true);
+        const cached = cachedSkillContext.get(skillId);
+        if (!cached) {
           return {
             content: [
-              ...skillInstructions ? [{ type: "text", text: skillInstructions }] : [],
               {
                 type: "text",
-                text: taskJson + budgetWarning
+                text: `Skill ${skillId} not found in current task context. Available: ${[...cachedSkillContext.keys()].join(", ") || "none"}`
               }
             ]
           };
-        } catch (err) {
-          return errorResult(err);
         }
-      }
-    },
-    {
-      ...WORKER_TOOLS.UPDATE_FILE,
-      execute: makeUpdateFileHandler(client)
-    },
-    {
-      ...WORKER_TOOLS.COMPLETE_TASK,
-      execute: makeCompleteTaskHandler(client)
-    },
-    {
-      ...WORKER_TOOLS.SEND_MESSAGE,
-      execute: makeSendMessageHandler(client)
-    },
-    {
-      ...WORKER_TOOLS.PROPOSE,
-      execute: makeProposeHandler(client)
-    },
-    {
-      ...WORKER_TOOLS.READ_SKILL,
-      async execute(_id, params) {
-        try {
-          const skillId = validateStringParam(params, "skillId", true);
-          const cached = cachedSkillContext.get(skillId);
-          if (!cached) {
-            return {
-              content: [
-                {
-                  type: "text",
-                  text: `Skill ${skillId} not found in current task context. Available: ${[...cachedSkillContext.keys()].join(", ") || "none"}`
-                }
-              ]
-            };
-          }
-          return {
-            content: [
-              {
-                type: "text",
-                text: `## ${cached.displayName} \u2014 Full Instructions
+        return {
+          content: [
+            {
+              type: "text",
+              text: `## ${cached.displayName} \u2014 Full Instructions
 
 ${cached.instructions}`
-              }
-            ]
-          };
-        } catch (err) {
-          return errorResult(err);
-        }
+            }
+          ]
+        };
+      } catch (err) {
+        return errorResult(err);
       }
-    }
+    })
   ];
 }