@letta-ai/letta-code 0.28.7 → 0.28.8

package/letta.js

@@ -4853,7 +4853,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.28.7",
+    version: "0.28.8",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     packageManager: "bun@1.3.0",
@@ -159689,6 +159689,85 @@ var init_models7 = __esm(() => {
           parallel_tool_calls: true
         }
       },
+      {
+        id: "gpt-5.6-luna-plus-pro-none",
+        handle: "chatgpt-plus-pro/gpt-5.6-luna",
+        label: "GPT-5.6 Luna (ChatGPT)",
+        description: "GPT-5.6 Luna (no reasoning) via ChatGPT Plus/Pro",
+        updateArgs: {
+          reasoning_effort: "none",
+          verbosity: "low",
+          context_window: 272000,
+          max_output_tokens: 128000,
+          parallel_tool_calls: true
+        }
+      },
+      {
+        id: "gpt-5.6-luna-plus-pro-low",
+        handle: "chatgpt-plus-pro/gpt-5.6-luna",
+        label: "GPT-5.6 Luna (ChatGPT)",
+        description: "GPT-5.6 Luna (low reasoning) via ChatGPT Plus/Pro",
+        updateArgs: {
+          reasoning_effort: "low",
+          verbosity: "low",
+          context_window: 272000,
+          max_output_tokens: 128000,
+          parallel_tool_calls: true
+        }
+      },
+      {
+        id: "gpt-5.6-luna-plus-pro-medium",
+        handle: "chatgpt-plus-pro/gpt-5.6-luna",
+        label: "GPT-5.6 Luna (ChatGPT)",
+        description: "GPT-5.6 Luna (med reasoning) via ChatGPT Plus/Pro",
+        updateArgs: {
+          reasoning_effort: "medium",
+          verbosity: "low",
+          context_window: 272000,
+          max_output_tokens: 128000,
+          parallel_tool_calls: true
+        }
+      },
+      {
+        id: "gpt-5.6-luna-plus-pro-high",
+        handle: "chatgpt-plus-pro/gpt-5.6-luna",
+        label: "GPT-5.6 Luna (ChatGPT)",
+        description: "GPT-5.6 Luna (high reasoning) via ChatGPT Plus/Pro",
+        updateArgs: {
+          reasoning_effort: "high",
+          verbosity: "low",
+          context_window: 272000,
+          max_output_tokens: 128000,
+          parallel_tool_calls: true
+        },
+        isFeatured: true
+      },
+      {
+        id: "gpt-5.6-luna-plus-pro-xhigh",
+        handle: "chatgpt-plus-pro/gpt-5.6-luna",
+        label: "GPT-5.6 Luna (ChatGPT)",
+        description: "GPT-5.6 Luna (extra-high reasoning) via ChatGPT Plus/Pro",
+        updateArgs: {
+          reasoning_effort: "xhigh",
+          verbosity: "low",
+          context_window: 272000,
+          max_output_tokens: 128000,
+          parallel_tool_calls: true
+        }
+      },
+      {
+        id: "gpt-5.6-luna-plus-pro-max",
+        handle: "chatgpt-plus-pro/gpt-5.6-luna",
+        label: "GPT-5.6 Luna (ChatGPT)",
+        description: "GPT-5.6 Luna (max reasoning) via ChatGPT Plus/Pro",
+        updateArgs: {
+          reasoning_effort: "max",
+          verbosity: "low",
+          context_window: 272000,
+          max_output_tokens: 128000,
+          parallel_tool_calls: true
+        }
+      },
       {
         id: "fable",
         handle: "anthropic/claude-fable-5",
@@ -162195,6 +162274,44 @@ var init_mode = __esm(() => {
   permissionMode = new PermissionModeManager;
 });
 
+// src/channels/slack/bot-policy.ts
+function isValidSlackAllowBotsConfigValue(value) {
+  return value === undefined || value === false || value === "mentions";
+}
+function normalizeSlackAllowBotsMode(value) {
+  if (value === "mentions")
+    return "mentions";
+  return false;
+}
+function resolveSlackAllowBotsMode(value) {
+  if (value === "mentions")
+    return "mentions";
+  return "off";
+}
+function isNonEmptyString(value) {
+  return typeof value === "string" && value.length > 0;
+}
+function isSlackBotAuthoredInboundMessage(message) {
+  return isNonEmptyString(message.bot_id) || message.subtype === "bot_message";
+}
+function isOwnSlackBotInboundMessage(params) {
+  return isNonEmptyString(params.botUserId) && params.message.user === params.botUserId || isNonEmptyString(params.botId) && params.message.bot_id === params.botId;
+}
+function shouldAcceptSlackInboundBotMessage(params) {
+  if (isOwnSlackBotInboundMessage({
+    message: params.message,
+    botUserId: params.botUserId,
+    botId: params.botId
+  })) {
+    return false;
+  }
+  if (!isSlackBotAuthoredInboundMessage(params.message)) {
+    return true;
+  }
+  const mode = resolveSlackAllowBotsMode(params.allowBots);
+  return mode === "mentions" && params.wasMentioned;
+}
+
 // src/channels/config.ts
 import { existsSync as existsSync5, readFileSync as readFileSync4 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
@@ -162337,7 +162454,8 @@ var init_config2 = __esm(() => {
         dmPolicy: parsed.dm_policy ?? "pairing",
         allowedUsers: parsed.allowed_users ?? [],
         transcribeVoice: parsed.transcribe_voice === true,
-        listenMode: parsed.listen_mode === true
+        listenMode: parsed.listen_mode === true,
+        allowBots: normalizeSlackAllowBotsMode(parsed.allow_bots)
       };
     }
   };
@@ -162591,7 +162709,7 @@ var init_plugin = __esm(() => {
 });
 
 // src/channels/schema-config.ts
-function isNonEmptyString(value) {
+function isNonEmptyString2(value) {
   return typeof value === "string" && value.length > 0;
 }
 function parseSelectOptions(value) {
@@ -162604,7 +162722,7 @@ function parseSelectOptions(value) {
     if (!isRecord(entry)) {
       return null;
     }
-    if (!isNonEmptyString(entry.value) || !isNonEmptyString(entry.label)) {
+    if (!isNonEmptyString2(entry.value) || !isNonEmptyString2(entry.label)) {
       return null;
     }
     if (seen.has(entry.value)) {
@@ -162623,10 +162741,10 @@ function parseField(value) {
   if (typeof type3 !== "string" || !FIELD_TYPES.has(type3)) {
     return null;
   }
-  if (!isNonEmptyString(value.key) || !FIELD_KEY_PATTERN.test(value.key)) {
+  if (!isNonEmptyString2(value.key) || !FIELD_KEY_PATTERN.test(value.key)) {
     return null;
   }
-  if (!isNonEmptyString(value.label)) {
+  if (!isNonEmptyString2(value.label)) {
     return null;
   }
   if (value.description !== undefined && typeof value.description !== "string") {
@@ -166094,6 +166212,7 @@ function normalizeLoadedAccount(account) {
     delete next.progress_ui;
     delete next.progressUi;
     next.listenMode = next.listenMode === true;
+    next.allowBots = normalizeSlackAllowBotsMode(next.allowBots);
   }
   if (isDiscordChannelAccount(next)) {
     const migrated = migratePermissionMode(next.defaultPermissionMode ?? "standard");
@@ -166220,6 +166339,7 @@ function makeDefaultLegacyAccount(channelId) {
     defaultPermissionMode: DEFAULT_SLACK_PERMISSION_MODE,
     transcribeVoice: config3.transcribeVoice === true,
     listenMode: config3.listenMode === true,
+    allowBots: config3.allowBots ?? false,
     createdAt: now,
     updatedAt: now
   };
@@ -166407,6 +166527,7 @@ var init_accounts = __esm(() => {
     account_uuid: "accountUuid",
     allowed_channels: "allowedChannels",
     allowed_groups: "allowedGroups",
+    allow_bots: "allowBots",
     auto_thread_on_mention: "autoThreadOnMention",
     base_url: "baseUrl",
     acknowledge_message_reaction: "acknowledgeMessageReaction",
@@ -166708,11 +166829,11 @@ function resolveSlackAppConstructor(mod) {
   }
   return App;
 }
-function isNonEmptyString2(value) {
+function isNonEmptyString3(value) {
   return typeof value === "string" && value.length > 0;
 }
 function firstNonEmptyString(...values2) {
-  return values2.find(isNonEmptyString2);
+  return values2.find(isNonEmptyString3);
 }
 function asRecord2(value) {
   return value && typeof value === "object" ? value : null;
@@ -166725,10 +166846,10 @@ function normalizeSlackText(text) {
   return text.replace(/^(?:\s*<@[A-Z0-9]+>\s*)+/, "").trim();
 }
 function isProcessableSlackInboundMessage(rawMessage) {
-  if (isNonEmptyString2(rawMessage.bot_id) || !isNonEmptyString2(rawMessage.user) || !isNonEmptyString2(rawMessage.ts) || rawMessage.hidden === true) {
+  if (!isNonEmptyString3(rawMessage.user) && !isNonEmptyString3(rawMessage.bot_id) || !isNonEmptyString3(rawMessage.ts) || rawMessage.hidden === true) {
     return false;
   }
-  const subtype = isNonEmptyString2(rawMessage.subtype) ? rawMessage.subtype : null;
+  const subtype = isNonEmptyString3(rawMessage.subtype) ? rawMessage.subtype : null;
   if (!subtype) {
     return true;
   }
@@ -166812,16 +166933,15 @@ function resolveSlackUserDisplayName(userInfo) {
   return firstNonEmptyString(profile?.display_name, profile?.real_name, user?.name);
 }
 function hasSlackMention(text, userId) {
-  return isNonEmptyString2(text) && isNonEmptyString2(userId) && (text.includes(`<@${userId}>`) || text.includes(`<@${userId}|`));
+  return isNonEmptyString3(text) && isNonEmptyString3(userId) && (text.includes(`<@${userId}>`) || text.includes(`<@${userId}|`));
 }
 function isSlackFlatChannelThreadOpener(source2) {
-  return source2.chatType === "channel" && isNonEmptyString2(source2.messageId) && (!isNonEmptyString2(source2.threadId) || source2.threadId === source2.messageId);
+  return source2.chatType === "channel" && isNonEmptyString3(source2.messageId) && (!isNonEmptyString3(source2.threadId) || source2.threadId === source2.messageId);
 }
 var IGNORED_SLACK_MESSAGE_SUBTYPES, WRAPPER_SLACK_MESSAGE_SUBTYPES;
 var init_utils5 = __esm(() => {
   IGNORED_SLACK_MESSAGE_SUBTYPES = new Set([
     "assistant_app_thread",
-    "bot_message",
     "channel_archive",
     "channel_convert_to_private",
     "channel_convert_to_public",
@@ -166863,7 +166983,7 @@ async function resolveSlackAccountDisplayName(botToken, appToken) {
     socketMode: true
   });
   const auth = await app.client.auth.test({ token: botToken });
-  if (isNonEmptyString2(auth.user_id)) {
+  if (isNonEmptyString3(auth.user_id)) {
     try {
       const userInfo = await app.client.users.info({
         token: botToken,
@@ -166875,7 +166995,7 @@ async function resolveSlackAccountDisplayName(botToken, appToken) {
       }
     } catch {}
   }
-  return isNonEmptyString2(auth.user) ? auth.user : undefined;
+  return isNonEmptyString3(auth.user) ? auth.user : undefined;
 }
 var init_account_display2 = __esm(() => {
   init_runtime2();
@@ -168247,10 +168367,10 @@ function formatSlackToolNameForDisplay(toolName) {
   return isTaskTool(toolName) ? "Subagent" : getDisplayToolName(toolName);
 }
 function resolveSlackConcreteActivity(event2) {
-  if (event2.kind === "command" && isNonEmptyString2(event2.command)) {
+  if (event2.kind === "command" && isNonEmptyString3(event2.command)) {
     return sanitizeSlackStatusText(formatSlackToolNameForDisplay(event2.command), SLACK_STATUS_TEXT_MAX);
   }
-  if (event2.kind !== "tool" || !isNonEmptyString2(event2.toolName) || event2.toolName.toLowerCase() === "messagechannel") {
+  if (event2.kind !== "tool" || !isNonEmptyString3(event2.toolName) || event2.toolName.toLowerCase() === "messagechannel") {
     return null;
   }
   for (const description of [
@@ -168259,7 +168379,7 @@ function resolveSlackConcreteActivity(event2) {
     isShellTool(event2.toolName) ? event2.message : undefined,
     formatSlackToolNameForDisplay(event2.toolName)
   ]) {
-    if (!isNonEmptyString2(description)) {
+    if (!isNonEmptyString3(description)) {
       continue;
     }
     const sanitized = sanitizeSlackStatusText(description, SLACK_STATUS_TEXT_MAX);
@@ -168311,12 +168431,12 @@ Run \`${toolName}\`?`
   ];
 }
 function parseSlackApprovalActionPayload(value) {
-  if (!isNonEmptyString2(value)) {
+  if (!isNonEmptyString3(value)) {
     return null;
   }
   try {
     const parsed = JSON.parse(value);
-    if (!isNonEmptyString2(parsed.requestId) || parsed.decision !== "allow" && parsed.decision !== "deny") {
+    if (!isNonEmptyString3(parsed.requestId) || parsed.decision !== "allow" && parsed.decision !== "deny") {
       return null;
     }
     return { requestId: parsed.requestId, decision: parsed.decision };
@@ -168513,16 +168633,16 @@ async function mapSlackThreadMessage(message, attachmentOptions, sourceThreadId)
   const attachments = await resolveSlackMessageAttachments(message, attachmentOptions, sourceThreadId);
   return {
     text: resolveSlackThreadMessageText(message),
-    userId: isNonEmptyString3(message.user) ? message.user : undefined,
-    botId: isNonEmptyString3(message.bot_id) ? message.bot_id : undefined,
-    ts: isNonEmptyString3(message.ts) ? message.ts : undefined,
+    userId: isNonEmptyString4(message.user) ? message.user : undefined,
+    botId: isNonEmptyString4(message.bot_id) ? message.bot_id : undefined,
+    ts: isNonEmptyString4(message.ts) ? message.ts : undefined,
     ...attachments.length > 0 ? { attachments } : {}
   };
 }
 function asRecord4(value) {
   return value && typeof value === "object" ? value : null;
 }
-function isNonEmptyString3(value) {
+function isNonEmptyString4(value) {
   return typeof value === "string" && value.trim().length > 0;
 }
 function normalizeSlackFileLike(value) {
@@ -168531,12 +168651,12 @@ function normalizeSlackFileLike(value) {
     return null;
   }
   return {
-    id: isNonEmptyString3(record5.id) ? record5.id : undefined,
-    name: isNonEmptyString3(record5.name) ? record5.name : undefined,
-    mimetype: isNonEmptyString3(record5.mimetype) ? record5.mimetype : undefined,
+    id: isNonEmptyString4(record5.id) ? record5.id : undefined,
+    name: isNonEmptyString4(record5.name) ? record5.name : undefined,
+    mimetype: isNonEmptyString4(record5.mimetype) ? record5.mimetype : undefined,
     size: typeof record5.size === "number" ? record5.size : undefined,
-    url_private: isNonEmptyString3(record5.url_private) ? record5.url_private : undefined,
-    url_private_download: isNonEmptyString3(record5.url_private_download) ? record5.url_private_download : undefined
+    url_private: isNonEmptyString4(record5.url_private) ? record5.url_private : undefined,
+    url_private_download: isNonEmptyString4(record5.url_private_download) ? record5.url_private_download : undefined
   };
 }
 function normalizeSlackAttachmentLike(value) {
@@ -168546,12 +168666,12 @@ function normalizeSlackAttachmentLike(value) {
   }
   const files = Array.isArray(record5.files) ? record5.files.map((entry) => normalizeSlackFileLike(entry)).filter((entry) => Boolean(entry)) : undefined;
   return {
-    text: isNonEmptyString3(record5.text) ? record5.text : undefined,
-    fallback: isNonEmptyString3(record5.fallback) ? record5.fallback : undefined,
-    pretext: isNonEmptyString3(record5.pretext) ? record5.pretext : undefined,
-    author_name: isNonEmptyString3(record5.author_name) ? record5.author_name : undefined,
-    title: isNonEmptyString3(record5.title) ? record5.title : undefined,
-    image_url: isNonEmptyString3(record5.image_url) ? record5.image_url : undefined,
+    text: isNonEmptyString4(record5.text) ? record5.text : undefined,
+    fallback: isNonEmptyString4(record5.fallback) ? record5.fallback : undefined,
+    pretext: isNonEmptyString4(record5.pretext) ? record5.pretext : undefined,
+    author_name: isNonEmptyString4(record5.author_name) ? record5.author_name : undefined,
+    title: isNonEmptyString4(record5.title) ? record5.title : undefined,
+    image_url: isNonEmptyString4(record5.image_url) ? record5.image_url : undefined,
     files
   };
 }
@@ -168584,7 +168704,7 @@ function resolveSlackThreadMessageText(message) {
   if (text) {
     return text;
   }
-  const attachmentTexts = Array.isArray(message.attachments) ? message.attachments.map((entry) => normalizeSlackAttachmentLike(entry)).filter((entry) => Boolean(entry)).map((attachment) => resolveSlackAttachmentText(attachment)).filter(isNonEmptyString3) : [];
+  const attachmentTexts = Array.isArray(message.attachments) ? message.attachments.map((entry) => normalizeSlackAttachmentLike(entry)).filter((entry) => Boolean(entry)).map((attachment) => resolveSlackAttachmentText(attachment)).filter(isNonEmptyString4) : [];
   if (attachmentTexts.length > 0) {
     return attachmentTexts.join(`
 
@@ -168885,7 +169005,7 @@ async function resolveSlackFilesAsAttachments(params) {
   return resolved;
 }
 function resolveSlackThreadAttachmentOptions(params) {
-  if (!isNonEmptyString3(params.accountId) || !isNonEmptyString3(params.token)) {
+  if (!isNonEmptyString4(params.accountId) || !isNonEmptyString4(params.token)) {
     return;
   }
   return {
@@ -168912,7 +169032,7 @@ async function resolveSlackMessageAttachments(message, attachmentOptions, source
     token: attachmentOptions.token,
     files: collectSlackFiles(message),
     sourceMessageId: message.ts,
-    sourceThreadId: sourceThreadId ?? (isNonEmptyString3(message.thread_ts) ? message.thread_ts : null),
+    sourceThreadId: sourceThreadId ?? (isNonEmptyString4(message.thread_ts) ? message.thread_ts : null),
     transcribeVoice: attachmentOptions.transcribeVoice
   });
 }
@@ -168922,8 +169042,8 @@ async function resolveSlackInboundAttachments(params) {
     accountId: params.accountId,
     token: params.token,
     files: collectSlackFiles(params.rawEvent),
-    sourceMessageId: isNonEmptyString3(rawEvent?.ts) ? rawEvent.ts : undefined,
-    sourceThreadId: isNonEmptyString3(rawEvent?.thread_ts) ? rawEvent.thread_ts : null,
+    sourceMessageId: isNonEmptyString4(rawEvent?.ts) ? rawEvent.ts : undefined,
+    sourceThreadId: isNonEmptyString4(rawEvent?.thread_ts) ? rawEvent.thread_ts : null,
     transcribeVoice: params.transcribeVoice
   });
 }
@@ -168996,7 +169116,7 @@ async function resolveSlackThreadHistory(params) {
         ...cursor ? { cursor } : {}
       });
       for (const message of response.messages ?? []) {
-        if (params.include === "bot" && !isNonEmptyString3(message.bot_id)) {
+        if (params.include === "bot" && !isNonEmptyString4(message.bot_id)) {
           continue;
         }
         if (!hasSlackThreadMessageContent(message, attachmentOptions)) {
@@ -169060,11 +169180,11 @@ var init_media2 = __esm(() => {
 });
 
 // src/channels/slack/attachment-download.ts
-function isNonEmptyString4(value) {
+function isNonEmptyString5(value) {
   return typeof value === "string" && value.trim().length > 0;
 }
 async function resolveCanonicalSlackMessage(params) {
-  if (isNonEmptyString4(params.threadTs)) {
+  if (isNonEmptyString5(params.threadTs)) {
     let cursor;
     do {
       const response2 = await params.client.conversations.replies({
@@ -169079,7 +169199,7 @@ async function resolveCanonicalSlackMessage(params) {
         return message;
       }
       const nextCursor = response2.response_metadata?.next_cursor;
-      cursor = isNonEmptyString4(nextCursor) ? nextCursor.trim() : undefined;
+      cursor = isNonEmptyString5(nextCursor) ? nextCursor.trim() : undefined;
     } while (cursor);
     return null;
   }
@@ -169230,7 +169350,7 @@ function createSlackInboundDebounceController(params) {
     const deduped = [];
     for (const entry of entries) {
       const messageId = entry.inbound.messageId;
-      const messageKey = isNonEmptyString2(messageId) ? `${entry.inbound.chatId}:${messageId}` : null;
+      const messageKey = isNonEmptyString3(messageId) ? `${entry.inbound.chatId}:${messageId}` : null;
       if (!messageKey) {
         deduped.push(entry);
         continue;
@@ -169265,7 +169385,7 @@ function createSlackInboundDebounceController(params) {
         if (pending?.size === 0)
           pendingTopLevelKeys.delete(conversationKey);
       }
-      if (isNonEmptyString2(last.inbound.messageId)) {
+      if (isNonEmptyString3(last.inbound.messageId)) {
         const seenKey = `${last.inbound.chatId}:${last.inbound.messageId}`;
         pruneAppMentionMaps(Date.now());
         if (last.opts.source === "app_mention") {
@@ -169361,7 +169481,7 @@ function createSlackIngressController(params) {
     }
   }
   function markIngressMessageSeen(channelId, messageId) {
-    if (!isNonEmptyString2(channelId) || !isNonEmptyString2(messageId)) {
+    if (!isNonEmptyString3(channelId) || !isNonEmptyString3(messageId)) {
       return false;
     }
     const key = `${channelId}:${messageId}`;
@@ -169372,12 +169492,12 @@ function createSlackIngressController(params) {
     return false;
   }
   function rememberMessageThread(messageId, threadId) {
-    if (isNonEmptyString2(messageId)) {
+    if (isNonEmptyString3(messageId)) {
       knownThreadIdsByMessageId.set(messageId, threadId);
     }
   }
   async function resolveUserName(app, userId) {
-    if (!isNonEmptyString2(userId))
+    if (!isNonEmptyString3(userId))
       return;
     const cached2 = knownUserDisplayNames.get(userId);
     if (cached2)
@@ -169392,6 +169512,21 @@ function createSlackIngressController(params) {
     knownUserDisplayNames.set(userId, userId);
     return userId;
   }
+  async function resolveInboundSenderName(app, userId, botId) {
+    if (isNonEmptyString3(userId)) {
+      return resolveUserName(app, userId);
+    }
+    return isNonEmptyString3(botId) ? `Bot (${botId})` : undefined;
+  }
+  function shouldAcceptInboundMessageByBotPolicy(input) {
+    return shouldAcceptSlackInboundBotMessage({
+      message: input.message,
+      allowBots: config3.allowBots,
+      botUserId: params.getBotUserId(),
+      botId: params.getBotId(),
+      wasMentioned: input.wasMentioned
+    });
+  }
   async function dispatchInbound(inbound, raw, source2, wasMentioned, errorLabel) {
     try {
       await params.debounce.dispatch({
@@ -169409,11 +169544,20 @@ function createSlackIngressController(params) {
         return;
       const rawMessage = asRecord2(message);
       const channelId = rawMessage?.channel;
-      if (!rawMessage || !isNonEmptyString2(channelId) || !isProcessableSlackInboundMessage(rawMessage)) {
+      if (!rawMessage || !isNonEmptyString3(channelId) || !isProcessableSlackInboundMessage(rawMessage)) {
         return;
       }
-      const text = isNonEmptyString2(rawMessage.text) ? rawMessage.text : "";
+      const text = isNonEmptyString3(rawMessage.text) ? rawMessage.text : "";
       const wasMentioned = hasSlackMention(text, params.getBotUserId());
+      if (!shouldAcceptInboundMessageByBotPolicy({
+        message: rawMessage,
+        wasMentioned
+      })) {
+        return;
+      }
+      const senderId = firstNonEmptyString(rawMessage.user, rawMessage.bot_id);
+      if (!senderId)
+        return;
       const attachments = await resolveSlackInboundAttachments({
         accountId: config3.accountId,
         token: config3.botToken,
@@ -169423,9 +169567,10 @@ function createSlackIngressController(params) {
       const chatType = resolveSlackChatType(channelId);
       const threadId = chatType === "direct" ? firstNonEmptyString(rawMessage.thread_ts) ?? null : firstNonEmptyString(rawMessage.thread_ts, rawMessage.ts) ?? null;
       rememberMessageThread(rawMessage.ts, threadId);
-      const senderName = await resolveUserName(app, rawMessage.user);
-      const isAgentThread = chatType === "channel" && isNonEmptyString2(threadId) && params.agentThreadTracker.has(channelId, threadId);
-      const effectiveMention = wasMentioned || isAgentThread;
+      const senderName = await resolveInboundSenderName(app, rawMessage.user, rawMessage.bot_id);
+      const isAgentThread = chatType === "channel" && isNonEmptyString3(threadId) && params.agentThreadTracker.has(channelId, threadId);
+      const isBotAuthored = isSlackBotAuthoredInboundMessage(rawMessage);
+      const effectiveMention = isBotAuthored ? wasMentioned : wasMentioned || isAgentThread;
       if (chatType === "direct") {
         const seenKey2 = `${channelId}:${rawMessage.ts}`;
         if (markIngressMessageSeen(channelId, rawMessage.ts))
@@ -169435,7 +169580,7 @@ function createSlackIngressController(params) {
           channel: "slack",
           accountId: config3.accountId,
           chatId: channelId,
-          senderId: rawMessage.user,
+          senderId,
           senderTeamId: resolveSlackSenderTeamId(rawMessage),
           senderName,
           text: wasMentioned ? normalizeSlackText(text) : text,
@@ -169449,7 +169594,7 @@ function createSlackIngressController(params) {
         }, rawMessage, "message", wasMentioned, "DM message");
         return;
       }
-      if (!isNonEmptyString2(rawMessage.thread_ts))
+      if (!isNonEmptyString3(rawMessage.thread_ts))
         return;
       const seenKey = `${channelId}:${rawMessage.ts}`;
       if (markIngressMessageSeen(channelId, rawMessage.ts))
@@ -169459,7 +169604,7 @@ function createSlackIngressController(params) {
         channel: "slack",
         accountId: config3.accountId,
         chatId: channelId,
-        senderId: rawMessage.user,
+        senderId,
         senderTeamId: resolveSlackSenderTeamId(rawMessage),
         senderName,
         chatLabel: channelId,
@@ -169474,26 +169619,37 @@ function createSlackIngressController(params) {
       }, rawMessage, "message", effectiveMention, "threaded channel message");
     });
     app.event("app_mention", async ({ event: event2 }) => {
-      if (!params.getAdapter().onMessage || !isNonEmptyString2(event2.channel) || !isNonEmptyString2(event2.user) || !isNonEmptyString2(event2.ts)) {
+      const rawEvent = asRecord2(event2);
+      const channelId = rawEvent?.channel;
+      const ts = rawEvent?.ts;
+      const senderId = firstNonEmptyString(rawEvent?.user, rawEvent?.bot_id);
+      if (!params.getAdapter().onMessage || !rawEvent || !isNonEmptyString3(channelId) || !isNonEmptyString3(ts) || !senderId) {
+        return;
+      }
+      if (!shouldAcceptInboundMessageByBotPolicy({
+        message: rawEvent,
+        wasMentioned: true
+      })) {
         return;
       }
-      const seenKey = `${event2.channel}:${event2.ts}`;
-      if (markIngressMessageSeen(event2.channel, event2.ts) && !params.debounce.consumeAppMentionRetry(seenKey)) {
+      const threadId = firstNonEmptyString(rawEvent.thread_ts, ts) ?? ts;
+      const seenKey = `${channelId}:${ts}`;
+      if (markIngressMessageSeen(channelId, ts) && !params.debounce.consumeAppMentionRetry(seenKey)) {
         return;
       }
-      rememberMessageThread(event2.ts, event2.thread_ts ?? event2.ts);
+      rememberMessageThread(ts, threadId);
       await dispatchInbound({
         channel: "slack",
         accountId: config3.accountId,
-        chatId: event2.channel,
-        senderId: event2.user,
-        senderTeamId: resolveSlackSenderTeamId(event2),
-        senderName: await resolveUserName(app, event2.user),
-        chatLabel: event2.channel,
-        text: normalizeSlackText(event2.text ?? ""),
-        timestamp: slackTimestampToMillis(event2.ts),
-        messageId: event2.ts,
-        threadId: event2.thread_ts ?? event2.ts,
+        chatId: channelId,
+        senderId,
+        senderTeamId: resolveSlackSenderTeamId(rawEvent),
+        senderName: await resolveInboundSenderName(app, firstNonEmptyString(rawEvent.user), firstNonEmptyString(rawEvent.bot_id)),
+        chatLabel: channelId,
+        text: normalizeSlackText(isNonEmptyString3(rawEvent.text) ? rawEvent.text : ""),
+        timestamp: slackTimestampToMillis(ts),
+        messageId: ts,
+        threadId,
         chatType: "channel",
         isMention: true,
         attachments: await resolveSlackInboundAttachments({
@@ -169503,7 +169659,7 @@ function createSlackIngressController(params) {
           transcribeVoice: config3.transcribeVoice === true
         }),
         raw: event2
-      }, event2, "app_mention", true, "channel mention");
+      }, rawEvent, "app_mention", true, "channel mention");
     });
     const handleCommand = async ({
       command,
@@ -169511,10 +169667,10 @@ function createSlackIngressController(params) {
     }) => {
       await ack();
       const adapter = params.getAdapter();
-      if (!adapter.onMessage || !isNonEmptyString2(command.command) || !isNonEmptyString2(command.channel_id) || !isNonEmptyString2(command.user_id)) {
+      if (!adapter.onMessage || !isNonEmptyString3(command.command) || !isNonEmptyString3(command.channel_id) || !isNonEmptyString3(command.user_id)) {
         return;
       }
-      const args = isNonEmptyString2(command.text) ? command.text.trim() : "";
+      const args = isNonEmptyString3(command.text) ? command.text.trim() : "";
       try {
         await adapter.onMessage({
           channel: "slack",
@@ -169578,7 +169734,7 @@ function createSlackIngressController(params) {
       const item = asRecord2(event2.item);
       const chatId = item?.channel;
       const targetMessageId = item?.ts;
-      if (!adapter.onMessage || item?.type !== "message" || !isNonEmptyString2(chatId) || !isNonEmptyString2(targetMessageId) || !isNonEmptyString2(event2.user) || !isNonEmptyString2(event2.reaction) || event2.user === params.getBotUserId()) {
+      if (!adapter.onMessage || item?.type !== "message" || !isNonEmptyString3(chatId) || !isNonEmptyString3(targetMessageId) || !isNonEmptyString3(event2.user) || !isNonEmptyString3(event2.reaction) || event2.user === params.getBotUserId()) {
         return;
       }
       const chatType = resolveSlackChatType(chatId);
@@ -169602,7 +169758,7 @@ function createSlackIngressController(params) {
             action: action3,
             emoji: event2.reaction,
             targetMessageId,
-            targetSenderId: isNonEmptyString2(event2.item_user) ? event2.item_user : undefined
+            targetSenderId: isNonEmptyString3(event2.item_user) ? event2.item_user : undefined
           },
           raw: event2
         });
@@ -169647,22 +169803,22 @@ function createSlackStatusController(params) {
   const keepaliveByConversation = new Map;
   const clearedStaleReplyKeys = new Set;
   function getConversationKey(source2) {
-    return source2.channel === "slack" && isNonEmptyString2(source2.agentId) && isNonEmptyString2(source2.conversationId) ? `${source2.agentId}:${source2.conversationId}` : null;
+    return source2.channel === "slack" && isNonEmptyString3(source2.agentId) && isNonEmptyString3(source2.conversationId) ? `${source2.agentId}:${source2.conversationId}` : null;
   }
   function getLifecycleReplyKey(source2) {
-    if (source2.channel !== "slack" || !isNonEmptyString2(source2.chatId)) {
+    if (source2.channel !== "slack" || !isNonEmptyString3(source2.chatId)) {
       return null;
     }
     const replyToMessageId = resolveSlackProgressThreadTs(source2);
-    return isNonEmptyString2(replyToMessageId) ? `${source2.chatId}:${replyToMessageId}` : null;
+    return isNonEmptyString3(replyToMessageId) ? `${source2.chatId}:${replyToMessageId}` : null;
   }
   function getLifecycleErrorReplyKey(source2) {
-    if (source2.channel !== "slack" || !isNonEmptyString2(source2.chatId)) {
+    if (source2.channel !== "slack" || !isNonEmptyString3(source2.chatId)) {
       return null;
     }
     if (source2.chatType === "direct" || resolveSlackChatType(source2.chatId) === "direct") {
       const replyToMessageId = resolveSlackSourceThreadTs(source2);
-      return isNonEmptyString2(replyToMessageId) ? `${source2.chatId}:${replyToMessageId}` : `${source2.chatId}:direct`;
+      return isNonEmptyString3(replyToMessageId) ? `${source2.chatId}:${replyToMessageId}` : `${source2.chatId}:direct`;
     }
     return getLifecycleReplyKey(source2);
   }
@@ -169821,7 +169977,7 @@ ${loadingText}`;
         markAutoClearedByKey(key);
     },
     markAutoClearedForMessage(msg) {
-      if (isNonEmptyString2(msg.agentId) && isNonEmptyString2(msg.conversationId)) {
+      if (isNonEmptyString3(msg.agentId) && isNonEmptyString3(msg.conversationId)) {
         markAutoClearedByKey(`${msg.agentId}:${msg.conversationId}`);
         return;
       }
@@ -169871,7 +170027,7 @@ function truncateThreadLabel(text, maxLength3 = 80) {
   return normalized.length <= maxLength3 ? normalized : `${normalized.slice(0, maxLength3 - 1).trimEnd()}…`;
 }
 function buildThreadLabel(msg, starterText) {
-  const roomLabel = msg.chatType === "channel" && isNonEmptyString2(msg.chatLabel) && msg.chatLabel !== msg.chatId ? ` in ${msg.chatLabel}` : "";
+  const roomLabel = msg.chatType === "channel" && isNonEmptyString3(msg.chatLabel) && msg.chatLabel !== msg.chatId ? ` in ${msg.chatLabel}` : "";
   const preview = truncateThreadLabel(starterText ?? msg.text);
   const threadLabel = msg.chatType === "direct" ? "Slack DM thread" : "Slack thread";
   if (preview)
@@ -169881,12 +170037,12 @@ function buildThreadLabel(msg, starterText) {
 function buildChannelContextLabel(msg) {
   if (msg.chatType !== "channel")
     return;
-  const roomLabel = isNonEmptyString2(msg.chatLabel) && msg.chatLabel !== msg.chatId ? ` in ${msg.chatLabel}` : "";
+  const roomLabel = isNonEmptyString3(msg.chatLabel) && msg.chatLabel !== msg.chatId ? ` in ${msg.chatLabel}` : "";
   return roomLabel ? `Slack channel context${roomLabel} before thread start` : "Slack channel context before thread start";
 }
 async function prepareSlackInboundMessage(params) {
   const { msg, config: config3 } = params;
-  if (msg.channel !== "slack" || !isNonEmptyString2(msg.threadId) || !isNonEmptyString2(msg.messageId)) {
+  if (msg.channel !== "slack" || !isNonEmptyString3(msg.threadId) || !isNonEmptyString3(msg.messageId)) {
     return msg;
   }
   const isFirstRouteTurn = params.options?.isFirstRouteTurn === true;
@@ -169935,18 +170091,18 @@ async function prepareSlackInboundMessage(params) {
     return msg;
   }
   const userIds = new Set;
-  if (isNonEmptyString2(starter?.userId))
+  if (isNonEmptyString3(starter?.userId))
     userIds.add(starter.userId);
   for (const entry of history) {
-    if (isNonEmptyString2(entry.userId))
+    if (isNonEmptyString3(entry.userId))
       userIds.add(entry.userId);
   }
   await Promise.all(Array.from(userIds).map((userId) => params.resolveUserName(app, userId)));
   const resolveSenderName = (userId, botId) => {
-    if (isNonEmptyString2(userId)) {
+    if (isNonEmptyString3(userId)) {
       return params.getKnownUserDisplayName(userId) ?? userId;
     }
-    return isNonEmptyString2(botId) ? `Bot (${botId})` : undefined;
+    return isNonEmptyString3(botId) ? `Bot (${botId})` : undefined;
   };
   return {
     ...msg,
@@ -170016,6 +170172,7 @@ function createSlackAdapter(config3) {
   let writeClientPromise = null;
   let running = false;
   let botUserId = null;
+  let botId = null;
   let adapter;
   const agentThreadTracker = createAgentThreadTracker();
   const debounce = createSlackInboundDebounceController({
@@ -170026,6 +170183,7 @@ function createSlackAdapter(config3) {
     config: config3,
     getAdapter: () => adapter,
     getBotUserId: () => botUserId,
+    getBotId: () => botId,
     agentThreadTracker,
     debounce
   });
@@ -170102,7 +170260,7 @@ function createSlackAdapter(config3) {
     if (!running)
       return;
     if (event2.type === "queued") {
-      if (isSlackFlatChannelThreadOpener(event2.source) && isNonEmptyString2(event2.source.messageId) && !agentThreadTracker.has(event2.source.chatId, event2.source.messageId)) {
+      if (isSlackFlatChannelThreadOpener(event2.source) && isNonEmptyString3(event2.source.messageId) && !agentThreadTracker.has(event2.source.chatId, event2.source.messageId)) {
         await status.activate(event2.source, SLACK_ASSISTANT_STARTUP_STATUS, SLACK_ASSISTANT_STARTUP_STATUS);
       }
       return;
@@ -170164,7 +170322,7 @@ function createSlackAdapter(config3) {
     if (msg.mediaPath) {
       const result = await uploadSlackFile(client, msg);
       const threadId = msg.threadId ?? msg.replyToMessageId ?? null;
-      if (resolveSlackChatType(msg.chatId) === "channel" && isNonEmptyString2(threadId)) {
+      if (resolveSlackChatType(msg.chatId) === "channel" && isNonEmptyString3(threadId)) {
         agentThreadTracker.remember(msg.chatId, threadId);
       }
       status.markAutoClearedForMessage(msg);
@@ -170175,7 +170333,7 @@ function createSlackAdapter(config3) {
       threadId: msg.threadId,
       replyToMessageId: msg.replyToMessageId
     });
-    const footnote = isNonEmptyString2(msg.agentId) && isNonEmptyString2(msg.conversationId) ? buildSlackChatFootnote({
+    const footnote = isNonEmptyString3(msg.agentId) && isNonEmptyString3(msg.conversationId) ? buildSlackChatFootnote({
       agentId: msg.agentId,
       conversationId: msg.conversationId
     }) : "";
@@ -170188,7 +170346,7 @@ function createSlackAdapter(config3) {
     });
     const outboundThreadId = threadTs ?? (resolveSlackChatType(msg.chatId) === "channel" ? response.ts ?? null : null);
     ingress.rememberMessageThread(response.ts, outboundThreadId);
-    if (resolveSlackChatType(msg.chatId) === "channel" && isNonEmptyString2(outboundThreadId)) {
+    if (resolveSlackChatType(msg.chatId) === "channel" && isNonEmptyString3(outboundThreadId)) {
       agentThreadTracker.remember(msg.chatId, outboundThreadId);
     }
     status.markAutoClearedForMessage(msg);
@@ -170211,7 +170369,7 @@ function createSlackAdapter(config3) {
     });
     const outboundThreadId = threadTs ?? (resolveSlackChatType(chatId) === "channel" ? response.ts ?? null : null);
     ingress.rememberMessageThread(response.ts, outboundThreadId);
-    if (resolveSlackChatType(chatId) === "channel" && isNonEmptyString2(outboundThreadId)) {
+    if (resolveSlackChatType(chatId) === "channel" && isNonEmptyString3(outboundThreadId)) {
       agentThreadTracker.remember(chatId, outboundThreadId);
     }
     status.markAutoClearedForMessage({
@@ -170237,7 +170395,7 @@ function createSlackAdapter(config3) {
     if (event2.kind === "generic_tool_approval" && response.ts) {
       approvals.rememberPrompt(event2, response.ts);
     }
-    if (resolveSlackChatType(event2.source.chatId) === "channel" && isNonEmptyString2(outboundThreadId)) {
+    if (resolveSlackChatType(event2.source.chatId) === "channel" && isNonEmptyString3(outboundThreadId)) {
       agentThreadTracker.remember(event2.source.chatId, outboundThreadId);
     }
     status.markAutoCleared(event2.source);
@@ -170252,7 +170410,9 @@ function createSlackAdapter(config3) {
         return;
       const slackApp = await ensureApp();
       const auth = await slackApp.client.auth.test();
-      botUserId = isNonEmptyString2(auth.user_id) ? auth.user_id : null;
+      const authRecord = auth;
+      botUserId = isNonEmptyString3(authRecord.user_id) ? authRecord.user_id : null;
+      botId = isNonEmptyString3(authRecord.bot_id) ? authRecord.bot_id : null;
       await slackApp.start();
       running = true;
       console.log(`[Slack] App started for workspace ${auth.team ?? "unknown"} (dm_policy: ${config3.dmPolicy})`);
@@ -170267,6 +170427,7 @@ function createSlackAdapter(config3) {
       writeClient = null;
       writeClientPromise = null;
       botUserId = null;
+      botId = null;
       status.clear();
       approvals.clear();
       debounce.clear();
@@ -171167,7 +171328,7 @@ function formatDiscordDeliveryError(error54) {
 }
 
 // src/channels/discord/utils.ts
-function isNonEmptyString5(value) {
+function isNonEmptyString6(value) {
   return typeof value === "string" && value.length > 0;
 }
 function isDiscordTextChannel(channel) {
@@ -171234,7 +171395,7 @@ function shouldAutoThreadOnDiscordMention(account, channelId) {
   return account.autoThreadOnMention ?? false;
 }
 function buildDiscordIngressMessageKey(accountId, messageId) {
-  if (!isNonEmptyString5(accountId) || !isNonEmptyString5(messageId)) {
+  if (!isNonEmptyString6(accountId) || !isNonEmptyString6(messageId)) {
     return null;
   }
   return `${accountId}:${messageId}`;
@@ -171318,13 +171479,13 @@ function createDiscordAdapter(config3) {
     return false;
   }
   function getLifecycleMessageKey(source2) {
-    if (source2.channel !== "discord" || !isNonEmptyString5(source2.chatId) || !isNonEmptyString5(source2.messageId)) {
+    if (source2.channel !== "discord" || !isNonEmptyString6(source2.chatId) || !isNonEmptyString6(source2.messageId)) {
       return null;
     }
     return `${source2.chatId}:${source2.messageId}`;
   }
   function getLifecycleReplyKey(source2) {
-    if (source2.channel !== "discord" || !isNonEmptyString5(source2.chatId)) {
+    if (source2.channel !== "discord" || !isNonEmptyString6(source2.chatId)) {
       return null;
     }
     return [
@@ -171337,7 +171498,7 @@ function createDiscordAdapter(config3) {
     if (source2.channel !== "discord")
       return null;
     const channelId = source2.threadId ?? source2.chatId;
-    return isNonEmptyString5(channelId) ? channelId : null;
+    return isNonEmptyString6(channelId) ? channelId : null;
   }
   function getTypingSourceKey(source2) {
     const channelId = getTypingChannelId(source2);
@@ -171389,7 +171550,7 @@ function createDiscordAdapter(config3) {
     return true;
   }
   async function sendLifecycleReaction(source2, emoji3, remove = false) {
-    if (!client || !isNonEmptyString5(source2.messageId))
+    if (!client || !isNonEmptyString6(source2.messageId))
       return;
     try {
       const channel = await client.channels.fetch(source2.chatId);
@@ -171928,7 +172089,7 @@ function createDiscordAdapter(config3) {
       clearTypingForChannel(chatId);
     },
     async prepareInboundMessage(msg, options3) {
-      if (!options3?.isFirstRouteTurn || msg.channel !== "discord" || msg.chatType !== "channel" || !isNonEmptyString5(msg.threadId) || !client) {
+      if (!options3?.isFirstRouteTurn || msg.channel !== "discord" || msg.chatType !== "channel" || !isNonEmptyString6(msg.threadId) || !client) {
         return msg;
       }
       const starter = await resolveDiscordThreadStarter({
@@ -182846,11 +183007,11 @@ When users ask you to perform tasks, check if any of the available skills match.
 When users reference a "slash command" or "/<something>" (e.g., "/commit", "/review-pr"), they are referring to a skill. Use this tool to invoke it.
 
 How to invoke:
-- Use this tool with the skill name and optional arguments
+- Use this tool with only the skill name
 - Examples:
   - \`skill: "pdf"\` - invoke the pdf skill
-  - \`skill: "commit", args: "-m 'Fix bug'"\` - invoke with arguments
-  - \`skill: "review-pr", args: "123"\` - invoke with arguments
+  - \`skill: "commit"\` - invoke the commit skill
+  - \`skill: "review-pr"\` - invoke the review-pr skill
   - \`skill: "ms-office-suite:pdf"\` - invoke using fully qualified name
 
 Important:
@@ -196395,7 +196556,6 @@ When to use: ${whenToUse}` : description;
     description: modelDescription,
     whenToUse,
     argumentHint: getFrontmatterString(frontmatter, "argument-hint"),
-    arguments: getFrontmatterStringList(frontmatter, "arguments"),
     disableModelInvocation: getFrontmatterBoolean(frontmatter, "disable-model-invocation") ?? false,
     userInvocable: getFrontmatterBoolean(frontmatter, "user-invocable") ?? true,
     category: getFrontmatterString(frontmatter, "category"),
@@ -382984,6 +383144,7 @@ var init_skill_content_registry = __esm(() => {
 // src/tools/impl/skill.ts
 var exports_skill = {};
 __export(exports_skill, {
+  wrapSkillPrompt: () => wrapSkillPrompt,
   wrapSkillContent: () => wrapSkillContent,
   skill: () => skill,
   renderSkillContent: () => renderSkillContent,
@@ -383081,50 +383242,6 @@ function getResolvedAgentId(args) {
     return;
   }
 }
-function splitSkillArguments(args) {
-  const parts = [];
-  const pattern4 = /"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|\S+/g;
-  for (const match3 of args.matchAll(pattern4)) {
-    const raw = match3[1] ?? match3[2] ?? match3[0];
-    parts.push(raw.replace(/\\(["'\\])/g, "$1"));
-  }
-  return parts;
-}
-function substituteSkillArguments(content, args, argumentNames) {
-  const rawArgs = args?.trim() ?? "";
-  if (!rawArgs) {
-    return content;
-  }
-  const argParts = splitSkillArguments(rawArgs);
-  let result = content;
-  let substituted = false;
-  result = result.replace(/\$ARGUMENTS\[(\d+)\]/g, (_match, index) => {
-    substituted = true;
-    return argParts[Number(index)] ?? "";
-  });
-  result = result.replace(/\$ARGUMENTS/g, () => {
-    substituted = true;
-    return rawArgs;
-  });
-  result = result.replace(/\$(\d+)\b/g, (_match, index) => {
-    substituted = true;
-    return argParts[Number(index)] ?? "";
-  });
-  for (const [index, name] of (argumentNames ?? []).entries()) {
-    const escapedName = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const namePattern = new RegExp(`\\$${escapedName}\\b`, "g");
-    result = result.replace(namePattern, () => {
-      substituted = true;
-      return argParts[index] ?? "";
-    });
-  }
-  if (!substituted) {
-    result = `${result.trimEnd()}
-
-ARGUMENTS: ${rawArgs}`;
-  }
-  return result;
-}
 function renderSkillContent(skillName, skillContent, skillPath, options3 = {}) {
   const { frontmatter } = parseFrontmatter(skillContent);
   if (!options3.allowDisabledModelInvocation && getFrontmatterBoolean(frontmatter, "disable-model-invocation") === true) {
@@ -383132,13 +383249,11 @@ function renderSkillContent(skillName, skillContent, skillPath, options3 = {}) {
   }
   const skillDir = dirname16(skillPath);
   const hasExtras = hasAdditionalFiles(skillPath);
-  const argumentNames = getFrontmatterStringList(frontmatter, "arguments");
   const withSkillDir = skillContent.replace(/<SKILL_DIR>/g, skillDir).replace(/\$\{CLAUDE_SKILL_DIR\}/g, skillDir);
-  const withArguments = substituteSkillArguments(withSkillDir, options3.args, argumentNames);
   const dirHeader = hasExtras ? `# Skill Directory: ${skillDir}
 
 ` : "";
-  return `${dirHeader}${withArguments}`;
+  return `${dirHeader}${withSkillDir}`;
 }
 async function loadRenderedSkillContent(skillName, options3 = {}) {
   const skillsDir = options3.skillsDir ?? await getResolvedSkillsDir();
@@ -383158,6 +383273,12 @@ ${content}
 ${content}
 </skill>`;
 }
+function wrapSkillPrompt(skillName, content, userRequest) {
+  const wrappedSkill = wrapSkillContent(skillName, content);
+  return userRequest ? `${wrappedSkill}
+
+${userRequest}` : wrappedSkill;
+}
 async function skill(args) {
   validateRequiredParams(args, ["skill"], "Skill");
   const { skill: skillName, toolCallId } = args;
@@ -383169,8 +383290,7 @@ async function skill(args) {
     const skillsDir = await getResolvedSkillsDir();
     const fullContent = await loadRenderedSkillContent(skillName, {
       agentId,
-      skillsDir,
-      args: args.args
+      skillsDir
     });
     if (toolCallId) {
       queueSkillContent(toolCallId, wrapSkillContent(skillName, fullContent));
@@ -386826,10 +386946,6 @@ var init_Skill2 = __esm(() => {
       skill: {
         type: "string",
         description: 'The skill name. E.g., "commit", "review-pr", or "pdf"'
-      },
-      args: {
-        type: "string",
-        description: "Optional arguments for the skill"
       }
     },
     required: ["skill"],
@@ -400213,10 +400329,6 @@ async function resolveAvailableLocalModelForTurn(input) {
     }
   };
 }
-function shouldIncludeLocalModel(provider, model) {
-  const modelId = isPiProvider(provider) ? stripProviderHandlePrefix(model, provider) ?? model : model;
-  return !(localProviderTypeForModelConfig(provider) === "chatgpt_oauth" && UNSUPPORTED_LOCAL_CHATGPT_OAUTH_MODELS.has(modelId));
-}
 async function listLocalModels(storageDir, options3 = {}) {
   const records = listLocalProviderRecords(storageDir);
   const providerNames = localProviderNamesFromRecords(records);
@@ -400225,8 +400337,6 @@ async function listLocalModels(storageDir, options3 = {}) {
   const registeredProviders2 = listRegisteredPiProviders();
   const registeredProvidersWithModels = new Set(registeredProviders2.filter((provider) => provider.config.models !== undefined).map((provider) => provider.providerName));
   const addModel = (provider, model, options4 = {}) => {
-    if (!shouldIncludeLocalModel(provider, model))
-      return;
     const handle = options4.handle ?? (typeof provider === "string" && !isPiProviderForLocalModelHandle(provider) ? `${provider}/${model}` : localModelHandle(provider, model));
     if (models3.some((entry) => entry.handle === handle))
       return;
@@ -400313,7 +400423,7 @@ async function listLocalModels(storageDir, options3 = {}) {
   }
   return models3;
 }
-var LOCAL_MODEL_DISCOVERY_TIMEOUT_MS = 2000, LOCAL_MODEL_AUTODETECT_DISCOVERY_TIMEOUT_MS = 500, UNSUPPORTED_LOCAL_CHATGPT_OAUTH_MODELS;
+var LOCAL_MODEL_DISCOVERY_TIMEOUT_MS = 2000, LOCAL_MODEL_AUTODETECT_DISCOVERY_TIMEOUT_MS = 500;
 var init_local_model_config = __esm(() => {
   init_compat2();
   init_pi_model_factory();
@@ -400321,7 +400431,6 @@ var init_local_model_config = __esm(() => {
   init_pi_provider_registry();
   init_registered_pi_provider_runtime();
   init_local_provider_auth_store();
-  UNSUPPORTED_LOCAL_CHATGPT_OAUTH_MODELS = new Set(["gpt-5.6-luna"]);
 });
 
 // src/backend/local/local-context-estimate.ts
@@ -445716,6 +445825,117 @@ var init_cron_file = __esm(() => {
   GC_AGE_MS = 24 * 60 * 60 * 1000;
 });
 
+// src/cron/prompt.ts
+function pad(value, width) {
+  return String(value).padStart(width, "0");
+}
+function formatOffset(minutes) {
+  const sign = minutes >= 0 ? "+" : "-";
+  const abs = Math.abs(minutes);
+  return `${sign}${pad(Math.floor(abs / 60), 2)}:${pad(abs % 60, 2)}`;
+}
+function getLocalDateTimeParts(date6) {
+  return {
+    year: date6.getFullYear(),
+    month: date6.getMonth() + 1,
+    day: date6.getDate(),
+    hour: date6.getHours(),
+    minute: date6.getMinutes(),
+    second: date6.getSeconds()
+  };
+}
+function isValidTimezone(timezone) {
+  try {
+    new Intl.DateTimeFormat("en-US", { timeZone: timezone });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function getSystemTimezone() {
+  const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+  if (!timezone || !isValidTimezone(timezone)) {
+    return null;
+  }
+  return timezone;
+}
+function getEffectiveTimezone(timezone) {
+  const trimmed = timezone.trim();
+  if (trimmed && isValidTimezone(trimmed)) {
+    return trimmed;
+  }
+  return getSystemTimezone();
+}
+function formatTimezoneDisplay(timezone) {
+  const trimmed = timezone.trim();
+  if (!trimmed) {
+    return "local time";
+  }
+  if (isValidTimezone(trimmed)) {
+    return trimmed;
+  }
+  return `${trimmed} (invalid; using local time)`;
+}
+function getZonedDateTimeParts(date6, timezone) {
+  const formatter = new Intl.DateTimeFormat("en-US", {
+    timeZone: timezone,
+    calendar: "iso8601",
+    numberingSystem: "latn",
+    hourCycle: "h23",
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit"
+  });
+  const parts = new Map(formatter.formatToParts(date6).map((part) => [part.type, part.value]));
+  return {
+    year: Number.parseInt(parts.get("year") ?? "0", 10),
+    month: Number.parseInt(parts.get("month") ?? "1", 10),
+    day: Number.parseInt(parts.get("day") ?? "1", 10),
+    hour: Number.parseInt(parts.get("hour") ?? "0", 10),
+    minute: Number.parseInt(parts.get("minute") ?? "0", 10),
+    second: Number.parseInt(parts.get("second") ?? "0", 10)
+  };
+}
+function formatTimezoneQualifiedIso(date6, timezone) {
+  const effectiveTimezone = getEffectiveTimezone(timezone);
+  const parts = effectiveTimezone ? getZonedDateTimeParts(date6, effectiveTimezone) : getLocalDateTimeParts(date6);
+  const millis = date6.getMilliseconds();
+  const zonedAsUtcMs = Date.UTC(parts.year, parts.month - 1, parts.day, parts.hour, parts.minute, parts.second, millis);
+  const offsetMinutes = Math.round((zonedAsUtcMs - date6.getTime()) / 60000);
+  return `${pad(parts.year, 4)}-${pad(parts.month, 2)}-${pad(parts.day, 2)}T${pad(parts.hour, 2)}:${pad(parts.minute, 2)}:${pad(parts.second, 2)}.${pad(millis, 3)}${formatOffset(offsetMinutes)}[${effectiveTimezone ?? "local"}]`;
+}
+function getIntendedCronOccurrence(task2, matchedAt) {
+  if (!task2.recurring && task2.scheduled_for) {
+    const scheduledFor = new Date(task2.scheduled_for);
+    if (Number.isFinite(scheduledFor.getTime())) {
+      return scheduledFor;
+    }
+  }
+  const occurrence = new Date(matchedAt);
+  occurrence.setSeconds(0, 0);
+  return occurrence;
+}
+function formatCronPrompt(task2, timing) {
+  const timezone = typeof task2.timezone === "string" ? task2.timezone : "";
+  const lines = [
+    `Scheduled task "${task2.name}" is firing.`,
+    `Description: ${task2.description}`,
+    `Timezone: ${formatTimezoneDisplay(timezone)}`,
+    `Scheduled for: ${formatTimezoneQualifiedIso(timing.intendedOccurrence, timezone)}`,
+    `Current time: ${formatTimezoneQualifiedIso(timing.schedulerNow, timezone)}`,
+    task2.recurring ? `This is fire #${task2.fire_count + 1} (cron: ${task2.cron}).` : "This is a one-off scheduled task.",
+    "",
+    "You are running autonomously: no user is watching this turn and questions will not be answered. Deliver results through your available channels or record them in memory, and work until the task is done or genuinely blocked.",
+    "",
+    `Prompt: ${task2.prompt}`
+  ];
+  return lines.join(`
+`);
+}
+
 // src/cron/run-log.ts
 import {
   appendFileSync as appendFileSync5,
@@ -445900,18 +446120,8 @@ var init_run_log = __esm(() => {
 function minuteKey(date6) {
   return `${date6.getFullYear()}-${String(date6.getMonth() + 1).padStart(2, "0")}-${String(date6.getDate()).padStart(2, "0")}T${String(date6.getHours()).padStart(2, "0")}:${String(date6.getMinutes()).padStart(2, "0")}`;
 }
-function wrapCronPrompt(task2) {
-  const lines = [
-    `Scheduled task "${task2.name}" is firing.`,
-    `Description: ${task2.description}`,
-    task2.recurring ? `This is fire #${task2.fire_count + 1} (cron: ${task2.cron}).` : `This is a one-off scheduled task.`,
-    "",
-    "You are running autonomously: no user is watching this turn and questions will not be answered. Deliver results through your available channels or record them in memory, and work until the task is done or genuinely blocked.",
-    "",
-    `Prompt: ${task2.prompt}`
-  ];
-  return lines.join(`
-`);
+function wrapCronPrompt(task2, timing) {
+  return formatCronPrompt(task2, timing);
 }
 function getCronConversationSummary(task2) {
   return `[Schedule] ${task2.name}`;
@@ -445974,13 +446184,13 @@ function shouldFireTask(task2, now) {
   }
   return cronMatchesTime(task2.cron, now, task2.timezone);
 }
-async function fireCronTask(task2, now, socket, opts, processQueuedTurn) {
+async function fireCronTask(task2, timing, socket, opts, processQueuedTurn) {
   const listener = getActiveRuntime();
   if (!listener) {
     setLastRunOutcome(task2.id, {
       outcome: "failed",
       reason: "runtime_unavailable",
-      runAt: now,
+      runAt: timing.schedulerNow,
       error: "No active runtime"
     });
     safeAppendCronRunLogForTask(task2, {
@@ -445988,7 +446198,7 @@ async function fireCronTask(task2, now, socket, opts, processQueuedTurn) {
       outcome: "failed",
       reason: "runtime_unavailable",
       error: "No active runtime",
-      runAtMs: now.getTime(),
+      runAtMs: timing.schedulerNow.getTime(),
       scheduledFor: task2.scheduled_for
     });
     return false;
@@ -446000,7 +446210,7 @@ async function fireCronTask(task2, now, socket, opts, processQueuedTurn) {
     safeAppendCronRunLogForTask(task2, {
       status: "error",
       error: err instanceof Error ? err.message : "failed to resolve conversation",
-      runAtMs: now.getTime(),
+      runAtMs: timing.schedulerNow.getTime(),
       scheduledFor: task2.scheduled_for
     });
     return false;
@@ -446010,7 +446220,7 @@ async function fireCronTask(task2, now, socket, opts, processQueuedTurn) {
     setLastRunOutcome(task2.id, {
       outcome: "failed",
       reason: "runtime_unavailable",
-      runAt: now,
+      runAt: timing.schedulerNow,
       error: "Conversation runtime unavailable"
     });
     safeAppendCronRunLogForTask(task2, {
@@ -446018,13 +446228,13 @@ async function fireCronTask(task2, now, socket, opts, processQueuedTurn) {
       outcome: "failed",
       reason: "runtime_unavailable",
       error: "Conversation runtime unavailable",
-      runAtMs: now.getTime(),
+      runAtMs: timing.schedulerNow.getTime(),
       scheduledFor: task2.scheduled_for
     });
     return false;
   }
   const conversationRuntime = ensureConversationQueueRuntime(listener, rawRuntime);
-  const text2 = wrapCronPrompt(task2);
+  const text2 = wrapCronPrompt(task2, timing);
   const queuedItem = conversationRuntime.queueRuntime.enqueue({
     kind: "cron_prompt",
     source: "cron",
@@ -446037,7 +446247,7 @@ async function fireCronTask(task2, now, socket, opts, processQueuedTurn) {
     setLastRunOutcome(task2.id, {
       outcome: "failed",
       reason: "queue_full",
-      runAt: now,
+      runAt: timing.schedulerNow,
       error: "queue buffer limit"
     });
     safeAppendCronRunLogForTask(task2, {
@@ -446045,13 +446255,13 @@ async function fireCronTask(task2, now, socket, opts, processQueuedTurn) {
       outcome: "failed",
       reason: "queue_full",
       error: "queue buffer limit",
-      runAtMs: now.getTime(),
+      runAtMs: timing.schedulerNow.getTime(),
       scheduledFor: task2.scheduled_for
     });
     return false;
   }
   scheduleQueuePump(conversationRuntime, socket, opts, processQueuedTurn);
-  const nowIso = now.toISOString();
+  const nowIso = timing.schedulerNow.toISOString();
   if (task2.recurring) {
     updateTask2(task2.id, (t2) => {
       t2.last_fired_at = nowIso;
@@ -446077,7 +446287,7 @@ async function fireCronTask(task2, now, socket, opts, processQueuedTurn) {
     status: "ok",
     outcome: "queued",
     reason: task2.recurring ? "scheduled_time_matched" : "one_off_due",
-    runAtMs: now.getTime(),
+    runAtMs: timing.schedulerNow.getTime(),
     queueItemId: queuedItem.id,
     scheduledFor: task2.scheduled_for,
     firedAt: nowIso,
@@ -446140,8 +446350,11 @@ async function runCronTaskNow(taskId) {
       error: "Cron scheduler is not running"
     };
   }
-  const now = new Date;
-  const fired = await fireCronTask(task2, now, ctx.socket, ctx.opts, ctx.processQueuedTurn);
+  const schedulerNow = new Date;
+  const fired = await fireCronTask(task2, {
+    intendedOccurrence: getIntendedCronOccurrence(task2, schedulerNow),
+    schedulerNow
+  }, ctx.socket, ctx.opts, ctx.processQueuedTurn);
   if (!fired) {
     return {
       success: false,
@@ -446161,8 +446374,8 @@ function tick2(state, socket, opts, processQueuedTurn) {
     stopScheduler();
     return;
   }
-  const now = new Date;
-  const currentMinuteKey = minuteKey(now);
+  const matchedAt = new Date;
+  const currentMinuteKey = minuteKey(matchedAt);
   if (currentMinuteKey !== state.lastMinuteKey) {
     state.firedThisMinute.clear();
     state.lastMinuteKey = currentMinuteKey;
@@ -446171,12 +446384,13 @@ function tick2(state, socket, opts, processQueuedTurn) {
   for (const task2 of state.cachedTasks) {
     if (task2.status !== "active")
       continue;
-    if (handleMissedOneShot(task2, now))
+    if (handleMissedOneShot(task2, matchedAt))
       continue;
     if (state.firedThisMinute.has(task2.id))
       continue;
-    if (shouldFireTask(task2, now)) {
+    if (shouldFireTask(task2, matchedAt)) {
       state.firedThisMinute.add(task2.id);
+      const intendedOccurrence = getIntendedCronOccurrence(task2, matchedAt);
       const jitterMs = task2.recurring ? task2.jitter_offset_ms : 0;
       const taskId = task2.id;
       const doFire = () => {
@@ -446185,12 +446399,13 @@ function tick2(state, socket, opts, processQueuedTurn) {
         const freshTask = getTask2(taskId);
         if (!freshTask || freshTask.status !== "active")
           return;
-        fireCronTask(freshTask, now, socket, opts, processQueuedTurn).catch((err) => {
+        const schedulerNow = new Date;
+        fireCronTask(freshTask, { intendedOccurrence, schedulerNow }, socket, opts, processQueuedTurn).catch((err) => {
           console.error(`[Cron] Error firing task ${taskId}:`, err);
           setLastRunOutcome(freshTask.id, {
             outcome: "failed",
             reason: "scheduler_error",
-            runAt: now,
+            runAt: schedulerNow,
             error: err instanceof Error ? err.message : String(err)
           });
           safeAppendCronRunLogForTask(freshTask, {
@@ -446198,7 +446413,7 @@ function tick2(state, socket, opts, processQueuedTurn) {
             outcome: "failed",
             reason: "scheduler_error",
             error: err instanceof Error ? err.message : String(err),
-            runAtMs: now.getTime(),
+            runAtMs: schedulerNow.getTime(),
             scheduledFor: freshTask.scheduled_for
           });
         });
@@ -447306,6 +447521,11 @@ function validateRequestedContextWindow(params) {
     throw new Error(`Context window cannot exceed the model.json default of ${formatContextWindowTokens(defaultContextWindow)} tokens. Use --override to apply a larger value.`);
   }
 }
+function formatMissingContextWindowDefaultError(params) {
+  const modelDescription = params.modelHandle ? `model ${params.modelHandle}` : "the current model";
+  const suggestedValue = typeof params.currentContextWindow === "number" && Number.isSafeInteger(params.currentContextWindow) && params.currentContextWindow > 0 ? String(params.currentContextWindow) : "<tokens>";
+  return `No catalog default for ${modelDescription}, so reset is unavailable. Pass an explicit value: /context-limit ${suggestedValue}.`;
+}
 async function applySetMaxContext(params) {
   const parsed = parseSetMaxContextArgs(params.args);
   const backend4 = getBackend();
@@ -447328,7 +447548,10 @@ async function applySetMaxContext(params) {
   const reset = parsed.value === null;
   const contextWindow = reset ? modelDefault.contextWindow : parsed.value;
   if (contextWindow === undefined || contextWindow === null) {
-    throw new Error("No default value for max context window found in model.json");
+    throw new Error(formatMissingContextWindowDefaultError({
+      modelHandle: effectiveModelHandle,
+      currentContextWindow: effectiveContextWindow ?? effectiveLlmConfig?.context_window ?? null
+    }));
   }
   if (!reset) {
     validateRequestedContextWindow({
@@ -448057,7 +448280,8 @@ var init_account_config4 = __esm(() => {
     "default_permission_mode",
     "transcribe_voice",
     "show_completed_reaction",
-    "listen_mode"
+    "listen_mode",
+    "allow_bots"
   ]);
   slackAccountConfigAdapter = {
     isValidConfig(config3) {
@@ -448066,7 +448290,7 @@ var init_account_config4 = __esm(() => {
           return false;
         }
       }
-      return (config3.bot_token === undefined || isString3(config3.bot_token)) && (config3.app_token === undefined || isString3(config3.app_token)) && (config3.mode === undefined || config3.mode === "socket") && (config3.agent_id === undefined || isNullableString4(config3.agent_id)) && (config3.default_permission_mode === undefined || isDefaultPermissionMode2(config3.default_permission_mode)) && (config3.transcribe_voice === undefined || isBoolean3(config3.transcribe_voice)) && (config3.show_completed_reaction === undefined || isBoolean3(config3.show_completed_reaction)) && (config3.listen_mode === undefined || isBoolean3(config3.listen_mode));
+      return (config3.bot_token === undefined || isString3(config3.bot_token)) && (config3.app_token === undefined || isString3(config3.app_token)) && (config3.mode === undefined || config3.mode === "socket") && (config3.agent_id === undefined || isNullableString4(config3.agent_id)) && (config3.default_permission_mode === undefined || isDefaultPermissionMode2(config3.default_permission_mode)) && (config3.transcribe_voice === undefined || isBoolean3(config3.transcribe_voice)) && (config3.show_completed_reaction === undefined || isBoolean3(config3.show_completed_reaction)) && (config3.listen_mode === undefined || isBoolean3(config3.listen_mode)) && isValidSlackAllowBotsConfigValue(config3.allow_bots);
     },
     toAccountPatch(config3) {
       return {
@@ -448076,7 +448300,8 @@ var init_account_config4 = __esm(() => {
         agentId: isNullableString4(config3.agent_id) ? config3.agent_id : undefined,
         defaultPermissionMode: isDefaultPermissionMode2(config3.default_permission_mode) ? migratePermissionMode(config3.default_permission_mode) : undefined,
         transcribeVoice: isBoolean3(config3.transcribe_voice) ? config3.transcribe_voice : undefined,
-        listenMode: isBoolean3(config3.listen_mode) ? config3.listen_mode : undefined
+        listenMode: isBoolean3(config3.listen_mode) ? config3.listen_mode : undefined,
+        allowBots: config3.allow_bots !== undefined && isValidSlackAllowBotsConfigValue(config3.allow_bots) ? normalizeSlackAllowBotsMode(config3.allow_bots) : undefined
       };
     },
     toAccountConfig(account) {
@@ -448087,7 +448312,8 @@ var init_account_config4 = __esm(() => {
         agent_id: account.agentId,
         default_permission_mode: account.defaultPermissionMode ?? DEFAULT_SLACK_PERMISSION_MODE,
         transcribe_voice: account.transcribeVoice === true,
-        listen_mode: account.listenMode === true
+        listen_mode: account.listenMode === true,
+        allow_bots: account.allowBots ?? false
       };
     },
     toConfigSnapshotConfig(account) {
@@ -448098,7 +448324,8 @@ var init_account_config4 = __esm(() => {
         agent_id: account.agentId,
         default_permission_mode: account.defaultPermissionMode ?? DEFAULT_SLACK_PERMISSION_MODE,
         transcribe_voice: account.transcribeVoice === true,
-        listen_mode: account.listenMode === true
+        listen_mode: account.listenMode === true,
+        allow_bots: account.allowBots ?? false
       };
     },
     shouldRefreshDisplayName(patch2) {
@@ -458863,6 +459090,7 @@ function createAccountFromPatch(channelId, accountId, patch2) {
     defaultPermissionMode: normalizedPatch.defaultPermissionMode ?? DEFAULT_SLACK_PERMISSION_MODE,
     transcribeVoice: normalizedPatch.transcribeVoice === true,
     listenMode: normalizedPatch.listenMode === true,
+    allowBots: normalizedPatch.allowBots ?? false,
     dmPolicy: normalizedPatch.dmPolicy ?? "open",
     allowedUsers: normalizedPatch.allowedUsers ?? [],
     createdAt: now,
@@ -458969,6 +459197,7 @@ function mergeAccountPatch(existing, patch2) {
     defaultPermissionMode: normalizedPatch.defaultPermissionMode ?? existing.defaultPermissionMode ?? DEFAULT_SLACK_PERMISSION_MODE,
     transcribeVoice: normalizedPatch.transcribeVoice ?? existing.transcribeVoice ?? false,
     listenMode: normalizedPatch.listenMode ?? existing.listenMode ?? false,
+    allowBots: normalizedPatch.allowBots ?? existing.allowBots ?? false,
     dmPolicy: normalizedPatch.dmPolicy ?? existing.dmPolicy,
     allowedUsers: normalizedPatch.allowedUsers ?? existing.allowedUsers,
     updatedAt: nextUpdatedAt
@@ -459150,6 +459379,7 @@ function toAccountSnapshot(account) {
     defaultPermissionMode: account.defaultPermissionMode ?? DEFAULT_SLACK_PERMISSION_MODE,
     transcribeVoice: account.transcribeVoice === true,
     listenMode: account.listenMode === true,
+    allowBots: account.allowBots ?? false,
     createdAt: account.createdAt,
     updatedAt: account.updatedAt
   };
@@ -459297,7 +459527,8 @@ function getChannelConfigSnapshot(channelId, accountId) {
     agentId: account.agentId,
     defaultPermissionMode: account.defaultPermissionMode ?? DEFAULT_SLACK_PERMISSION_MODE,
     transcribeVoice: account.transcribeVoice === true,
-    listenMode: account.listenMode === true
+    listenMode: account.listenMode === true,
+    allowBots: account.allowBots ?? false
   };
 }
 async function getChannelConfigSnapshotWithSecrets(channelId, accountId) {
@@ -459820,6 +460051,7 @@ async function setChannelConfigLive(channelId, patch2, accountId) {
       threadPolicyByChannel: normalizedPatch.threadPolicyByChannel,
       acknowledgeMessageReaction: normalizedPatch.acknowledgeMessageReaction,
       listenMode: normalizedPatch.listenMode,
+      allowBots: normalizedPatch.allowBots,
       removeStaleRoutes: normalizedPatch.removeStaleRoutes,
       inboundDebounceMs: normalizedPatch.inboundDebounceMs,
       selfChatMode: normalizedPatch.selfChatMode,
@@ -459854,6 +460086,7 @@ async function setChannelConfigLive(channelId, patch2, accountId) {
       threadPolicyByChannel: normalizedPatch.threadPolicyByChannel,
       acknowledgeMessageReaction: normalizedPatch.acknowledgeMessageReaction,
       listenMode: normalizedPatch.listenMode,
+      allowBots: normalizedPatch.allowBots,
       removeStaleRoutes: normalizedPatch.removeStaleRoutes,
       inboundDebounceMs: normalizedPatch.inboundDebounceMs,
       selfChatMode: normalizedPatch.selfChatMode,
@@ -473482,7 +473715,6 @@ When to use: ${whenToUse}` : description;
     description: modelDescription,
     whenToUse,
     argumentHint: getFrontmatterString2(frontmatter, "argument-hint"),
-    arguments: getFrontmatterStringList2(frontmatter, "arguments"),
     disableModelInvocation: getFrontmatterBoolean2(frontmatter, "disable-model-invocation") ?? false,
     userInvocable: getFrontmatterBoolean2(frontmatter, "user-invocable") ?? true,
     category: getFrontmatterString2(frontmatter, "category"),
@@ -489812,10 +490044,10 @@ function columns(parts, width) {
   let extra = spare - base3 * gaps;
   let result = first;
   for (let i4 = 1;i4 < items3.length; i4 += 1) {
-    const pad = base3 + (extra > 0 ? 1 : 0);
+    const pad3 = base3 + (extra > 0 ? 1 : 0);
     if (extra > 0)
       extra -= 1;
-    result += " ".repeat(pad) + items3[i4];
+    result += " ".repeat(pad3) + items3[i4];
   }
   return truncateToWidth(result, width);
 }
@@ -507243,8 +507475,8 @@ function splitSystemReminderBlocks(text2) {
   return blocks;
 }
 function padToColumns(text2, columns2) {
-  const pad = Math.max(0, columns2 - inkStringWidth(text2));
-  return `${text2}${" ".repeat(pad)}`;
+  const pad3 = Math.max(0, columns2 - inkStringWidth(text2));
+  return `${text2}${" ".repeat(pad3)}`;
 }
 function renderBlock(text2, contentWidth, columns2, highlighted, promptPrefix, continuationPrefix) {
   const inputLines = text2.split(`
@@ -534222,7 +534454,6 @@ ${SYSTEM_REMINDER_CLOSE}`),
           const { loadRenderedSkillContent: loadRenderedSkillContent2, wrapSkillContent: wrapSkillContent2 } = await Promise.resolve().then(() => (init_skill(), exports_skill));
           const skillContent = await loadRenderedSkillContent2("generating-mod-envs", {
             agentId,
-            args,
             allowDisabledModelInvocation: true
           });
           const request = args ? `The user ran \`/mods generate-env ${args}\`. Use the loaded skill to help them generate, review, validate, or improve a mod learning env JSON.` : "The user ran `/mods generate-env` without arguments. Use the loaded skill's bare behavior for mod learning env generation.";
@@ -534492,7 +534723,6 @@ ${SYSTEM_REMINDER_CLOSE}`),
           const { loadRenderedSkillContent: loadRenderedSkillContent2, wrapSkillContent: wrapSkillContent2 } = await Promise.resolve().then(() => (init_skill(), exports_skill));
           const skillContent = await loadRenderedSkillContent2("customizing-statusline", {
             agentId,
-            args,
             allowDisabledModelInvocation: true
           });
           const request = args ? `The user ran \`/statusline ${args}\`. Use the loaded skill to help them create, edit, or migrate their Letta Code statusline mod.` : "The user ran `/statusline` without arguments. Use the loaded skill's bare `/statusline` behavior.";
@@ -535968,13 +536198,12 @@ Resumed reflection arena choice prompt for run ${run2.runId}.`, true);
             cmd.fail(`Pending approval(s). Resolve approvals before running /${matchedSkill.id}.`);
             return { submitted: false };
           }
-          const args = trimmed.slice(`/${matchedSkill.id}`.length).trim();
+          const userRequest = trimmed.slice(`/${matchedSkill.id}`.length).trim();
           setCommandRunning(true);
           try {
-            const { loadRenderedSkillContent: loadRenderedSkillContent2, wrapSkillContent: wrapSkillContent2 } = await Promise.resolve().then(() => (init_skill(), exports_skill));
+            const { loadRenderedSkillContent: loadRenderedSkillContent2, wrapSkillPrompt: wrapSkillPrompt2 } = await Promise.resolve().then(() => (init_skill(), exports_skill));
             const skillContent = await loadRenderedSkillContent2(matchedSkill.id, {
               agentId,
-              args,
               allowDisabledModelInvocation: true
             });
             cmd.finish("Running skill...", true);
@@ -535982,7 +536211,7 @@ Resumed reflection arena choice prompt for run ${run2.runId}.`, true);
               {
                 type: "message",
                 role: "user",
-                content: buildTextParts(wrapSkillContent2(matchedSkill.id, skillContent)),
+                content: buildTextParts(wrapSkillPrompt2(matchedSkill.id, skillContent, userRequest)),
                 otid: randomUUID37()
               }
             ]);
@@ -537021,26 +537250,25 @@ function App2({
           continue;
         if (shouldFireTask(task2, now)) {
           firedThisMinute.add(task2.id);
+          const intendedOccurrence = getIntendedCronOccurrence(task2, now);
           const jitterMs = task2.recurring ? task2.jitter_offset_ms : 0;
           const taskId = task2.id;
           const doFire = () => {
             const freshTask = getTask2(taskId);
             if (!freshTask || freshTask.status !== "active")
               return;
-            const text2 = [
-              `Scheduled task "${freshTask.name}" is firing.`,
-              freshTask.recurring ? `This is fire #${freshTask.fire_count + 1} (cron: ${freshTask.cron}).` : `This is a one-off scheduled task.`,
-              "",
-              freshTask.prompt
-            ].join(`
-`);
+            const schedulerNow = new Date;
+            const text2 = wrapCronPrompt(freshTask, {
+              intendedOccurrence,
+              schedulerNow
+            });
             addToMessageQueue({
               kind: "user",
               text: text2,
               agentId: freshTask.agent_id,
               conversationId: freshTask.conversation_id
             });
-            const nowIso = new Date().toISOString();
+            const nowIso = schedulerNow.toISOString();
             if (freshTask.recurring) {
               updateTask2(freshTask.id, (t2) => {
                 t2.last_fired_at = nowIso;
@@ -537056,7 +537284,7 @@ function App2({
             }
             safeAppendCronRunLogForTask(freshTask, {
               status: "ok",
-              runAtMs: now.getTime(),
+              runAtMs: schedulerNow.getTime(),
               scheduledFor: freshTask.scheduled_for,
               firedAt: nowIso
             });
@@ -549661,15 +549889,15 @@ function convertLegacyMessage(message, nextId2) {
   return result;
 }
 function timestampSuffix(date6 = new Date) {
-  const pad = (value) => String(value).padStart(2, "0");
+  const pad3 = (value) => String(value).padStart(2, "0");
   return [
     date6.getFullYear(),
-    pad(date6.getMonth() + 1),
-    pad(date6.getDate()),
+    pad3(date6.getMonth() + 1),
+    pad3(date6.getDate()),
     "-",
-    pad(date6.getHours()),
-    pad(date6.getMinutes()),
-    pad(date6.getSeconds())
+    pad3(date6.getHours()),
+    pad3(date6.getMinutes()),
+    pad3(date6.getSeconds())
   ].join("");
 }
 function manifest(input) {
@@ -550022,13 +550250,13 @@ function getAgentRoot(agentId) {
   return dirname28(getMemoryRoot(agentId));
 }
 function formatBackupTimestamp(date6 = new Date) {
-  const pad = (value) => String(value).padStart(2, "0");
+  const pad3 = (value) => String(value).padStart(2, "0");
   const yyyy = date6.getFullYear();
-  const mm = pad(date6.getMonth() + 1);
-  const dd2 = pad(date6.getDate());
-  const hh = pad(date6.getHours());
-  const min = pad(date6.getMinutes());
-  const ss = pad(date6.getSeconds());
+  const mm = pad3(date6.getMonth() + 1);
+  const dd2 = pad3(date6.getDate());
+  const hh = pad3(date6.getHours());
+  const min = pad3(date6.getMinutes());
+  const ss = pad3(date6.getSeconds());
   return `${yyyy}${mm}${dd2}-${hh}${min}${ss}`;
 }
 async function listBackups(agentId) {
@@ -556331,4 +556559,4 @@ Error during initialization: ${message}`);
 }
 main2();
 
-//# debugId=37A057B0FA28037E64756E2164756E21
+//# debugId=5F03A493E92C4D6964756E2164756E21