@jcheesepkg/nanobot 0.5.5 → 0.6.1

package/dist/agent/loop.d.mts

@@ -6,7 +6,6 @@ import { ToolRegistry } from "./tools/registry.mjs";
 import { ExecToolConfig } from "../config/schema.mjs";
 import { SubagentManager } from "./subagent.mjs";
 import { SessionManager } from "../session/manager.mjs";
-import { CronService } from "../cron/service.mjs";
 
 //#region src/agent/loop.d.ts
 /**
@@ -42,7 +41,6 @@ declare class AgentLoop {
     braveApiKey?: string;
     execConfig?: ExecToolConfig;
     restrictToWorkspace?: boolean;
-    cronService?: CronService;
     toolsEnabled?: string[];
     toolsDisabled?: string[];
     customTools?: Tool[];
@@ -58,8 +56,6 @@ declare class AgentLoop {
   private runAgentLoop;
   /** Generate a fallback interim message based on which tools are being called. */
   private getToolCallFallbackText;
-  /** Check if the worker reports no credits for this user. Returns true if blocked. */
-  private checkNoCredits;
   private updateToolContexts;
   /** Process a message directly (for CLI or cron usage). */
   processDirect(content: string, sessionKey?: string, channel?: string, chatId?: string): Promise<string>;

package/dist/agent/loop.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"loop.d.mts","names":[],"sources":["../../src/agent/loop.ts"],"mappings":";;;;;;;;;;;;;AAmCA;;;;;;;cAAa,SAAA;EAAA,QACH,GAAA;EAAA,QACA,QAAA;EAAA,QACA,SAAA;EAAA,QACA,KAAA;EAAA,QACA,SAAA;EAAA,QACA,aAAA;EAAA,SAEC,OAAA,EAAS,cAAA;EAAA,SACT,QAAA,EAAU,cAAA;EAAA,SACV,KAAA,EAAO,YAAA;EAAA,SACP,SAAA,EAAW,eAAA;EAAA,QAEZ,QAAA;EATA;EAAA,QAYA,QAAA;cAEI,MAAA;IACV,GAAA,EAAK,UAAA;IACL,QAAA,EAAU,WAAA;IACV,SAAA;IACA,KAAA;IACA,SAAA;IACA,aAAA;IACA,WAAA;IACA,UAAA,GAAa,cAAA;IACb,mBAAA;IACA,WAAA,GAAc,WAAA;IACd,YAAA;IACA,aAAA;IACA,WAAA,GAAc,IAAA;EAAA;EAAA,QAoCR,oBAAA;EA9CN;EA8GI,GAAA,CAAA,GAAO,OAAA;EA5GX;EA6IF,IAAA,CAAA;EA3IE;EAAA,QAiJY,cAAA;EAAA,QAuFA,oBAAA;EAAA,QA4CA,YAAA;EAjRZ;EAAA,QA6WM,uBAAA;EA5WN;EAAA,QA8XY,cAAA;EAAA,QAsBN,kBAAA;EAlZQ;EAoaV,aAAA,CACJ,OAAA,UACA,UAAA,WACA,OAAA,WACA,MAAA,YACC,OAAA;AAAA"}
+{"version":3,"file":"loop.d.mts","names":[],"sources":["../../src/agent/loop.ts"],"mappings":";;;;;;;;;;;;AAkCA;;;;;;;cAAa,SAAA;EAAA,QACH,GAAA;EAAA,QACA,QAAA;EAAA,QACA,SAAA;EAAA,QACA,KAAA;EAAA,QACA,SAAA;EAAA,QACA,aAAA;EAAA,SAEC,OAAA,EAAS,cAAA;EAAA,SACT,QAAA,EAAU,cAAA;EAAA,SACV,KAAA,EAAO,YAAA;EAAA,SACP,SAAA,EAAW,eAAA;EAAA,QAEZ,QAAA;EARA;EAAA,QAWA,QAAA;cAEI,MAAA;IACV,GAAA,EAAK,UAAA;IACL,QAAA,EAAU,WAAA;IACV,SAAA;IACA,KAAA;IACA,SAAA;IACA,aAAA;IACA,WAAA;IACA,UAAA,GAAa,cAAA;IACb,mBAAA;IACA,YAAA;IACA,aAAA;IACA,WAAA,GAAc,IAAA;EAAA;EAAA,QAmCR,oBAAA;EA5CN;EAyGI,GAAA,CAAA,GAAO,OAAA;EAvGX;EAwIF,IAAA,CAAA;EAtIE;EAAA,QA4IY,cAAA;EAAA,QAuFA,oBAAA;EAAA,QA4CA,YAAA;EA5QZ;EAAA,QAwWM,uBAAA;EAAA,QAiBA,kBAAA;EAvXQ;EAyYV,aAAA,CACJ,OAAA,UACA,UAAA,WACA,OAAA,WACA,MAAA,YACC,OAAA;AAAA"}

package/dist/agent/loop.mjs

@@ -55,9 +55,9 @@ var AgentLoop = class {
 			execConfig,
 			restrictToWorkspace
 		});
-		this.registerDefaultTools(execConfig, restrictToWorkspace, params.braveApiKey, params.cronService, params.toolsEnabled, params.toolsDisabled, params.customTools);
+		this.registerDefaultTools(execConfig, restrictToWorkspace, params.braveApiKey, params.toolsEnabled, params.toolsDisabled, params.customTools);
 	}
-	registerDefaultTools(execConfig, restrictToWorkspace, braveApiKey, cronService, toolsEnabled, toolsDisabled, customTools) {
+	registerDefaultTools(execConfig, restrictToWorkspace, braveApiKey, toolsEnabled, toolsDisabled, customTools) {
 		const enabled = new Set(toolsEnabled ?? []);
 		const disabled = new Set(toolsDisabled ?? []);
 		const hasAllowlist = enabled.size > 0;
@@ -79,7 +79,7 @@ var AgentLoop = class {
 		registerIfEnabled(new WebFetchTool());
 		registerIfEnabled(new MessageTool({ sendCallback: (msg) => this.bus.publishOutbound(msg) }));
 		registerIfEnabled(new SpawnTool(this.subagents));
-		if (cronService) registerIfEnabled(new CronTool(cronService));
+		registerIfEnabled(new CronTool());
 		if (customTools && customTools.length > 0) for (const tool of customTools) registerIfEnabled(tool);
 	}
 	/** Run the agent loop, processing messages from the bus. */
@@ -266,22 +266,6 @@ var AgentLoop = class {
 		for (const name of toolNames) if (fallbacks[name]) return fallbacks[name];
 		return "ちょっと待ってね...";
 	}
-	/** Check if the worker reports no credits for this user. Returns true if blocked. */
-	async checkNoCredits() {
-		const workerUrl = process.env.WORKER_URL;
-		const userId = process.env.NANOBOT_USER_ID;
-		if (!workerUrl || !userId) return false;
-		try {
-			const res = await fetch(`${workerUrl}/api/users/${userId}/has-credits`, { signal: AbortSignal.timeout(5e3) });
-			if (res.ok) {
-				if (!(await res.json()).hasCredits) {
-					console.log("Credit gate: no credits, skipping");
-					return true;
-				}
-			}
-		} catch {}
-		return false;
-	}
 	updateToolContexts(channel, chatId) {
 		const messageTool = this.tools.get("message");
 		if (messageTool instanceof MessageTool) messageTool.setContext(channel, chatId);
@@ -292,7 +276,6 @@ var AgentLoop = class {
 	}
 	/** Process a message directly (for CLI or cron usage). */
 	async processDirect(content, sessionKey = "cli:direct", channel = "cli", chatId = "direct") {
-		if (await this.checkNoCredits()) return "";
 		const session = this.sessions.getOrCreate(sessionKey);
 		this.updateToolContexts(channel, chatId);
 		const messages = this.context.buildMessages({

package/dist/agent/loop.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"loop.mjs","names":[],"sources":["../../src/agent/loop.ts"],"sourcesContent":["import type { LLMProvider, ChatMessage, ToolCallRequest } from \"../providers/base.js\";\nimport type { MessageBus } from \"../bus/queue.js\";\nimport type {\n  InboundMessage,\n  OutboundMessage,\n} from \"../bus/events.js\";\nimport { createOutboundMessage } from \"../bus/events.js\";\nimport { ContextBuilder } from \"./context.js\";\nimport { ToolRegistry } from \"./tools/registry.js\";\nimport {\n  ReadFileTool,\n  WriteFileTool,\n  EditFileTool,\n  ListDirTool,\n} from \"./tools/filesystem.js\";\nimport { ExecTool } from \"./tools/shell.js\";\nimport { WebSearchTool, WebFetchTool } from \"./tools/web.js\";\nimport { MessageTool } from \"./tools/message.js\";\nimport { SpawnTool } from \"./tools/spawn.js\";\nimport { CronTool } from \"./tools/cron.js\";\nimport { SubagentManager } from \"./subagent.js\";\nimport { SessionManager } from \"../session/manager.js\";\nimport type { ExecToolConfig } from \"../config/schema.js\";\nimport type { Tool } from \"./tools/base.js\";\nimport type { CronService } from \"../cron/service.js\";\n\n/**\n * The agent loop: core processing engine.\n *\n * 1. Receives messages from the bus\n * 2. Builds context with history, memory, skills\n * 3. Calls the LLM\n * 4. Executes tool calls\n * 5. Sends responses back\n */\nexport class AgentLoop {\n  private bus: MessageBus;\n  private provider: LLMProvider;\n  private workspace: string;\n  private model: string;\n  private maxTokens: number;\n  private maxIterations: number;\n\n  readonly context: ContextBuilder;\n  readonly sessions: SessionManager;\n  readonly tools: ToolRegistry;\n  readonly subagents: SubagentManager;\n\n  private _running = false;\n\n  /** In-flight AbortControllers keyed by session key. */\n  private inflight = new Map<string, AbortController>();\n\n  constructor(params: {\n    bus: MessageBus;\n    provider: LLMProvider;\n    workspace: string;\n    model?: string;\n    maxTokens?: number;\n    maxIterations?: number;\n    braveApiKey?: string;\n    execConfig?: ExecToolConfig;\n    restrictToWorkspace?: boolean;\n    cronService?: CronService;\n    toolsEnabled?: string[];\n    toolsDisabled?: string[];\n    customTools?: Tool[];\n  }) {\n    this.bus = params.bus;\n    this.provider = params.provider;\n    this.workspace = params.workspace;\n    this.model = params.model ?? params.provider.getDefaultModel();\n    this.maxTokens = params.maxTokens ?? 8192;\n    this.maxIterations = params.maxIterations ?? 20;\n\n    const execConfig = params.execConfig ?? { timeout: 60 };\n    const restrictToWorkspace = params.restrictToWorkspace ?? false;\n\n    this.context = new ContextBuilder(params.workspace);\n    this.sessions = new SessionManager(params.workspace);\n    this.tools = new ToolRegistry();\n    this.subagents = new SubagentManager({\n      provider: params.provider,\n      workspace: params.workspace,\n      bus: params.bus,\n      model: this.model,\n      braveApiKey: params.braveApiKey,\n      execConfig,\n      restrictToWorkspace,\n    });\n\n    this.registerDefaultTools(\n      execConfig,\n      restrictToWorkspace,\n      params.braveApiKey,\n      params.cronService,\n      params.toolsEnabled,\n      params.toolsDisabled,\n      params.customTools,\n    );\n  }\n\n  private registerDefaultTools(\n    execConfig: ExecToolConfig,\n    restrictToWorkspace: boolean,\n    braveApiKey?: string,\n    cronService?: CronService,\n    toolsEnabled?: string[],\n    toolsDisabled?: string[],\n    customTools?: Tool[],\n  ): void {\n    const enabled = new Set(toolsEnabled ?? []);\n    const disabled = new Set(toolsDisabled ?? []);\n    const hasAllowlist = enabled.size > 0;\n    const shouldRegister = (name: string): boolean =>\n      (hasAllowlist ? enabled.has(name) : true) && !disabled.has(name);\n\n    const registerIfEnabled = (tool: Tool): void => {\n      if (shouldRegister(tool.name)) {\n        this.tools.register(tool);\n      }\n    };\n\n    // File tools — pass allowedDir when restrictToWorkspace is enabled\n    const allowedDir = restrictToWorkspace ? this.workspace : undefined;\n    registerIfEnabled(new ReadFileTool({ allowedDir }));\n    registerIfEnabled(new WriteFileTool({ allowedDir }));\n    registerIfEnabled(new EditFileTool({ allowedDir }));\n    registerIfEnabled(new ListDirTool({ allowedDir }));\n\n    // Shell tool\n    registerIfEnabled(\n      new ExecTool({\n        workingDir: this.workspace,\n        timeout: execConfig.timeout,\n        restrictToWorkspace,\n      }),\n    );\n\n    // Web tools\n    registerIfEnabled(new WebSearchTool({ apiKey: braveApiKey }));\n    registerIfEnabled(new WebFetchTool());\n\n    // Message tool\n    const messageTool = new MessageTool({\n      sendCallback: (msg) => this.bus.publishOutbound(msg),\n    });\n    registerIfEnabled(messageTool);\n\n    // Spawn tool\n    const spawnTool = new SpawnTool(this.subagents);\n    registerIfEnabled(spawnTool);\n\n    // Cron tool\n    if (cronService) {\n      registerIfEnabled(new CronTool(cronService));\n    }\n\n    if (customTools && customTools.length > 0) {\n      for (const tool of customTools) {\n        registerIfEnabled(tool);\n      }\n    }\n  }\n\n  /** Run the agent loop, processing messages from the bus. */\n  async run(): Promise<void> {\n    this._running = true;\n    console.log(\"Agent loop started\");\n\n    while (this._running) {\n      try {\n        const msg = await this.bus.consumeInboundTimeout(1000);\n\n        // Process concurrently so new messages can abort in-flight ones\n        this.processMessage(msg)\n          .then(async (response) => {\n            if (response) {\n              await this.bus.publishOutbound(response);\n            }\n          })\n          .catch(async (err) => {\n            if (isAbortError(err)) return; // Already handled\n            console.error(\"Error processing message:\", err);\n            await this.bus.publishOutbound(\n              createOutboundMessage({\n                channel: msg.channel,\n                chatId: msg.chatId,\n                content: `Sorry, I encountered an error: ${err instanceof Error ? err.message : err}`,\n              }),\n            );\n          });\n      } catch {\n        // timeout, continue\n      }\n    }\n  }\n\n  /** Stop the agent loop. */\n  stop(): void {\n    this._running = false;\n    console.log(\"Agent loop stopping\");\n  }\n\n  /** Process a single inbound message. */\n  private async processMessage(\n    msg: InboundMessage,\n  ): Promise<OutboundMessage | null> {\n    // Handle system messages (subagent announces)\n    if (msg.channel === \"system\") {\n      return this.processSystemMessage(msg);\n    }\n\n    console.log(`Processing message from ${msg.channel}:${msg.senderId}`);\n\n    const sessionKey = `${msg.channel}:${msg.chatId}`;\n\n    // Abort any in-flight request for this session\n    const existing = this.inflight.get(sessionKey);\n    if (existing) {\n      console.log(`Aborting in-flight request for ${sessionKey}`);\n      existing.abort();\n    }\n\n    // Create a new AbortController for this request\n    const controller = new AbortController();\n    this.inflight.set(sessionKey, controller);\n\n    const session = this.sessions.getOrCreate(sessionKey);\n\n    // Update tool contexts\n    this.updateToolContexts(msg.channel, msg.chatId);\n\n    // Build initial messages\n    const messages = this.context.buildMessages({\n      history: session.getHistory(),\n      currentMessage: msg.content,\n      media: msg.media.length > 0 ? msg.media : undefined,\n      channel: msg.channel,\n      chatId: msg.chatId,\n    });\n\n    // The messages array is: [system, ...history, currentUser]\n    // We want to save from the current user message onward (skip system + old history).\n    const savedHistoryLen = session.getHistory().length;\n    const newMsgStart = 1 + savedHistoryLen; // 1 for system prompt\n\n    try {\n      // Agent loop (mutates messages by appending assistant/tool messages)\n      const finalContent = await this.runAgentLoop(messages, controller.signal, (text) => {\n        if (text && text.trim().length > 0) {\n          this.bus.publishOutbound(\n            createOutboundMessage({\n              channel: msg.channel,\n              chatId: msg.chatId,\n              content: text,\n            }),\n          );\n        }\n      });\n\n      // Save the new messages from this turn (user + all agent loop messages)\n      session.addTurnMessages(messages.slice(newMsgStart));\n      this.sessions.save(session);\n\n      return createOutboundMessage({\n        channel: msg.channel,\n        chatId: msg.chatId,\n        content: finalContent,\n      });\n    } catch (err) {\n      if (isAbortError(err)) {\n        // Request was aborted because a new message arrived.\n        // Save the user message to history so the next request has context,\n        // but don't save any assistant response.\n        const userMessages = messages.slice(newMsgStart).filter((m) => m.role === \"user\");\n        if (userMessages.length > 0) {\n          session.addTurnMessages(userMessages);\n          this.sessions.save(session);\n        }\n        console.log(`Request aborted for ${sessionKey}, user message saved to history`);\n        return null; // No response -- the new message will handle it\n      }\n      throw err; // Re-throw non-abort errors\n    } finally {\n      // Clean up if this is still our controller\n      if (this.inflight.get(sessionKey) === controller) {\n        this.inflight.delete(sessionKey);\n      }\n    }\n  }\n\n  private async processSystemMessage(\n    msg: InboundMessage,\n  ): Promise<OutboundMessage | null> {\n    console.log(`Processing system message from ${msg.senderId}`);\n\n    let originChannel: string;\n    let originChatId: string;\n\n    if (msg.chatId.includes(\":\")) {\n      const [ch, id] = msg.chatId.split(\":\", 2);\n      originChannel = ch;\n      originChatId = id;\n    } else {\n      originChannel = \"cli\";\n      originChatId = msg.chatId;\n    }\n\n    const sessionKey = `${originChannel}:${originChatId}`;\n    const session = this.sessions.getOrCreate(sessionKey);\n\n    this.updateToolContexts(originChannel, originChatId);\n\n    const messages = this.context.buildMessages({\n      history: session.getHistory(),\n      currentMessage: msg.content,\n      channel: originChannel,\n      chatId: originChatId,\n    });\n\n    const savedHistoryLen = session.getHistory().length;\n    const newMsgStart = 1 + savedHistoryLen;\n\n    const finalContent = await this.runAgentLoop(messages);\n\n    session.addTurnMessages(messages.slice(newMsgStart));\n    this.sessions.save(session);\n\n    return createOutboundMessage({\n      channel: originChannel,\n      chatId: originChatId,\n      content: finalContent,\n    });\n  }\n\n  private async runAgentLoop(\n    messages: ChatMessage[],\n    signal?: AbortSignal,\n    onToolCallText?: (text: string) => void,\n  ): Promise<string> {\n    let finalContent: string | null = null;\n    let sentToolCallNotice = false;\n\n    for (let i = 0; i < this.maxIterations; i++) {\n      const response = await this.provider.chat({\n        messages,\n        tools: this.tools.getDefinitions(),\n        model: this.model,\n        maxTokens: this.maxTokens,\n        signal,\n      });\n\n      if (response.hasToolCalls) {\n        // Send an interim message so the user knows we're working\n        if (!sentToolCallNotice && onToolCallText) {\n          const interimText = response.content?.trim()\n            || this.getToolCallFallbackText(response.toolCalls);\n          if (interimText) {\n            onToolCallText(interimText);\n          }\n          sentToolCallNotice = true;\n        }\n        const toolCallDicts = response.toolCalls.map((tc) => ({\n          id: tc.id,\n          type: \"function\" as const,\n          function: {\n            name: tc.name,\n            arguments: JSON.stringify(tc.arguments),\n          },\n        }));\n\n        this.context.addAssistantMessage(\n          messages,\n          response.content,\n          toolCallDicts,\n        );\n\n        for (const tc of response.toolCalls) {\n          console.log(`Tool: ${tc.name}(${JSON.stringify(tc.arguments)})`);\n\n          // Detect skill reads\n          if (tc.name === \"read_file\") {\n            const path = String(tc.arguments?.path ?? \"\");\n            const skillMatch = path.match(/skills\\/([^/]+)\\/SKILL\\.md$/);\n            if (skillMatch) {\n              console.log(`Skill activated: ${skillMatch[1]}`);\n            }\n          }\n\n          const result = await this.tools.execute(tc.name, tc.arguments);\n          this.context.addToolResult(messages, tc.id, tc.name, result);\n        }\n      } else {\n        finalContent = response.content;\n\n        // If the LLM returned empty content after tool use, nudge it to respond\n        if ((!finalContent || finalContent.trim().length === 0) && i > 0) {\n          messages.push({\n            role: \"assistant\",\n            content: \"\",\n          });\n          messages.push({\n            role: \"user\",\n            content: \"(You used tools but didn't respond to the user. Please provide a brief response summarizing what you did.)\",\n          });\n          continue;\n        }\n\n        // Push the final assistant message so it gets persisted with the turn\n        messages.push({ role: \"assistant\", content: finalContent ?? \"\" });\n        break;\n      }\n    }\n\n    if (!finalContent || finalContent.trim().length === 0) {\n      finalContent = \"I've completed processing but have no response to give.\";\n    }\n\n    // If we exhausted iterations without a non-tool-call response, still persist the final text\n    if (messages[messages.length - 1]?.role !== \"assistant\" || messages[messages.length - 1]?.content !== finalContent) {\n      messages.push({ role: \"assistant\", content: finalContent });\n    }\n\n    return finalContent;\n  }\n\n  /** Generate a fallback interim message based on which tools are being called. */\n  private getToolCallFallbackText(toolCalls: ToolCallRequest[]): string {\n    const toolNames = toolCalls.map((tc) => tc.name);\n    const fallbacks: Record<string, string> = {\n      web_search: \"検索中...\",\n      web_fetch: \"ページを読み込み中...\",\n      read_file: \"ファイルを確認中...\",\n      write_file: \"ファイルを書き込み中...\",\n      edit_file: \"ファイルを編集中...\",\n      exec: \"コマンドを実行中...\",\n      spawn: \"サブエージェントを起動中...\",\n    };\n    for (const name of toolNames) {\n      if (fallbacks[name]) return fallbacks[name];\n    }\n    return \"ちょっと待ってね...\";\n  }\n\n  /** Check if the worker reports no credits for this user. Returns true if blocked. */\n  private async checkNoCredits(): Promise<boolean> {\n    const workerUrl = process.env.WORKER_URL;\n    const userId = process.env.NANOBOT_USER_ID;\n    if (!workerUrl || !userId) return false; // no gate configured\n\n    try {\n      const res = await fetch(`${workerUrl}/api/users/${userId}/has-credits`, {\n        signal: AbortSignal.timeout(5000),\n      });\n      if (res.ok) {\n        const data = await res.json() as { hasCredits: boolean };\n        if (!data.hasCredits) {\n          console.log(\"Credit gate: no credits, skipping\");\n          return true;\n        }\n      }\n    } catch {\n      // Fail open — if worker is unreachable, allow the request\n    }\n    return false;\n  }\n\n  private updateToolContexts(channel: string, chatId: string): void {\n    const messageTool = this.tools.get(\"message\");\n    if (messageTool instanceof MessageTool) {\n      messageTool.setContext(channel, chatId);\n    }\n\n    const spawnTool = this.tools.get(\"spawn\");\n    if (spawnTool instanceof SpawnTool) {\n      spawnTool.setContext(channel, chatId);\n    }\n\n    const cronTool = this.tools.get(\"cron\");\n    if (cronTool instanceof CronTool) {\n      cronTool.setContext(channel, chatId);\n    }\n  }\n\n  /** Process a message directly (for CLI or cron usage). */\n  async processDirect(\n    content: string,\n    sessionKey = \"cli:direct\",\n    channel = \"cli\",\n    chatId = \"direct\",\n  ): Promise<string> {\n    // Credit gate: skip if worker reports no credits\n    if (await this.checkNoCredits()) {\n      return \"\";\n    }\n\n    // Use inline version of processMessage for direct calls\n    const session = this.sessions.getOrCreate(sessionKey);\n    this.updateToolContexts(channel, chatId);\n\n    const messages = this.context.buildMessages({\n      history: session.getHistory(),\n      currentMessage: content,\n      channel,\n      chatId,\n    });\n\n    const savedHistoryLen = session.getHistory().length;\n    const newMsgStart = 1 + savedHistoryLen;\n\n    const finalContent = await this.runAgentLoop(messages);\n\n    session.addTurnMessages(messages.slice(newMsgStart));\n    this.sessions.save(session);\n\n    return finalContent;\n  }\n}\n\n/** Check if an error is an abort/cancellation error. */\nfunction isAbortError(err: unknown): boolean {\n  if (err instanceof DOMException && err.name === \"AbortError\") return true;\n  if (err instanceof Error) {\n    if (err.name === \"AbortError\") return true;\n    // OpenAI SDK wraps abort as APIUserAbortError\n    if (err.name === \"APIUserAbortError\") return true;\n    if (err.message.includes(\"abort\")) return true;\n  }\n  return false;\n}\n"],"mappings":"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"}
+{"version":3,"file":"loop.mjs","names":[],"sources":["../../src/agent/loop.ts"],"sourcesContent":["import type { LLMProvider, ChatMessage, ToolCallRequest } from \"../providers/base.js\";\nimport type { MessageBus } from \"../bus/queue.js\";\nimport type {\n  InboundMessage,\n  OutboundMessage,\n} from \"../bus/events.js\";\nimport { createOutboundMessage } from \"../bus/events.js\";\nimport { ContextBuilder } from \"./context.js\";\nimport { ToolRegistry } from \"./tools/registry.js\";\nimport {\n  ReadFileTool,\n  WriteFileTool,\n  EditFileTool,\n  ListDirTool,\n} from \"./tools/filesystem.js\";\nimport { ExecTool } from \"./tools/shell.js\";\nimport { WebSearchTool, WebFetchTool } from \"./tools/web.js\";\nimport { MessageTool } from \"./tools/message.js\";\nimport { SpawnTool } from \"./tools/spawn.js\";\nimport { CronTool } from \"./tools/cron.js\";\nimport { SubagentManager } from \"./subagent.js\";\nimport { SessionManager } from \"../session/manager.js\";\nimport type { ExecToolConfig } from \"../config/schema.js\";\nimport type { Tool } from \"./tools/base.js\";\n\n/**\n * The agent loop: core processing engine.\n *\n * 1. Receives messages from the bus\n * 2. Builds context with history, memory, skills\n * 3. Calls the LLM\n * 4. Executes tool calls\n * 5. Sends responses back\n */\nexport class AgentLoop {\n  private bus: MessageBus;\n  private provider: LLMProvider;\n  private workspace: string;\n  private model: string;\n  private maxTokens: number;\n  private maxIterations: number;\n\n  readonly context: ContextBuilder;\n  readonly sessions: SessionManager;\n  readonly tools: ToolRegistry;\n  readonly subagents: SubagentManager;\n\n  private _running = false;\n\n  /** In-flight AbortControllers keyed by session key. */\n  private inflight = new Map<string, AbortController>();\n\n  constructor(params: {\n    bus: MessageBus;\n    provider: LLMProvider;\n    workspace: string;\n    model?: string;\n    maxTokens?: number;\n    maxIterations?: number;\n    braveApiKey?: string;\n    execConfig?: ExecToolConfig;\n    restrictToWorkspace?: boolean;\n    toolsEnabled?: string[];\n    toolsDisabled?: string[];\n    customTools?: Tool[];\n  }) {\n    this.bus = params.bus;\n    this.provider = params.provider;\n    this.workspace = params.workspace;\n    this.model = params.model ?? params.provider.getDefaultModel();\n    this.maxTokens = params.maxTokens ?? 8192;\n    this.maxIterations = params.maxIterations ?? 20;\n\n    const execConfig = params.execConfig ?? { timeout: 60 };\n    const restrictToWorkspace = params.restrictToWorkspace ?? false;\n\n    this.context = new ContextBuilder(params.workspace);\n    this.sessions = new SessionManager(params.workspace);\n    this.tools = new ToolRegistry();\n    this.subagents = new SubagentManager({\n      provider: params.provider,\n      workspace: params.workspace,\n      bus: params.bus,\n      model: this.model,\n      braveApiKey: params.braveApiKey,\n      execConfig,\n      restrictToWorkspace,\n    });\n\n    this.registerDefaultTools(\n      execConfig,\n      restrictToWorkspace,\n      params.braveApiKey,\n      params.toolsEnabled,\n      params.toolsDisabled,\n      params.customTools,\n    );\n  }\n\n  private registerDefaultTools(\n    execConfig: ExecToolConfig,\n    restrictToWorkspace: boolean,\n    braveApiKey?: string,\n    toolsEnabled?: string[],\n    toolsDisabled?: string[],\n    customTools?: Tool[],\n  ): void {\n    const enabled = new Set(toolsEnabled ?? []);\n    const disabled = new Set(toolsDisabled ?? []);\n    const hasAllowlist = enabled.size > 0;\n    const shouldRegister = (name: string): boolean =>\n      (hasAllowlist ? enabled.has(name) : true) && !disabled.has(name);\n\n    const registerIfEnabled = (tool: Tool): void => {\n      if (shouldRegister(tool.name)) {\n        this.tools.register(tool);\n      }\n    };\n\n    // File tools — pass allowedDir when restrictToWorkspace is enabled\n    const allowedDir = restrictToWorkspace ? this.workspace : undefined;\n    registerIfEnabled(new ReadFileTool({ allowedDir }));\n    registerIfEnabled(new WriteFileTool({ allowedDir }));\n    registerIfEnabled(new EditFileTool({ allowedDir }));\n    registerIfEnabled(new ListDirTool({ allowedDir }));\n\n    // Shell tool\n    registerIfEnabled(\n      new ExecTool({\n        workingDir: this.workspace,\n        timeout: execConfig.timeout,\n        restrictToWorkspace,\n      }),\n    );\n\n    // Web tools\n    registerIfEnabled(new WebSearchTool({ apiKey: braveApiKey }));\n    registerIfEnabled(new WebFetchTool());\n\n    // Message tool\n    const messageTool = new MessageTool({\n      sendCallback: (msg) => this.bus.publishOutbound(msg),\n    });\n    registerIfEnabled(messageTool);\n\n    // Spawn tool\n    const spawnTool = new SpawnTool(this.subagents);\n    registerIfEnabled(spawnTool);\n\n    // Cron tool — always registered, uses DO scheduling via worker API\n    registerIfEnabled(new CronTool());\n\n    if (customTools && customTools.length > 0) {\n      for (const tool of customTools) {\n        registerIfEnabled(tool);\n      }\n    }\n  }\n\n  /** Run the agent loop, processing messages from the bus. */\n  async run(): Promise<void> {\n    this._running = true;\n    console.log(\"Agent loop started\");\n\n    while (this._running) {\n      try {\n        const msg = await this.bus.consumeInboundTimeout(1000);\n\n        // Process concurrently so new messages can abort in-flight ones\n        this.processMessage(msg)\n          .then(async (response) => {\n            if (response) {\n              await this.bus.publishOutbound(response);\n            }\n          })\n          .catch(async (err) => {\n            if (isAbortError(err)) return; // Already handled\n            console.error(\"Error processing message:\", err);\n            await this.bus.publishOutbound(\n              createOutboundMessage({\n                channel: msg.channel,\n                chatId: msg.chatId,\n                content: `Sorry, I encountered an error: ${err instanceof Error ? err.message : err}`,\n              }),\n            );\n          });\n      } catch {\n        // timeout, continue\n      }\n    }\n  }\n\n  /** Stop the agent loop. */\n  stop(): void {\n    this._running = false;\n    console.log(\"Agent loop stopping\");\n  }\n\n  /** Process a single inbound message. */\n  private async processMessage(\n    msg: InboundMessage,\n  ): Promise<OutboundMessage | null> {\n    // Handle system messages (subagent announces)\n    if (msg.channel === \"system\") {\n      return this.processSystemMessage(msg);\n    }\n\n    console.log(`Processing message from ${msg.channel}:${msg.senderId}`);\n\n    const sessionKey = `${msg.channel}:${msg.chatId}`;\n\n    // Abort any in-flight request for this session\n    const existing = this.inflight.get(sessionKey);\n    if (existing) {\n      console.log(`Aborting in-flight request for ${sessionKey}`);\n      existing.abort();\n    }\n\n    // Create a new AbortController for this request\n    const controller = new AbortController();\n    this.inflight.set(sessionKey, controller);\n\n    const session = this.sessions.getOrCreate(sessionKey);\n\n    // Update tool contexts\n    this.updateToolContexts(msg.channel, msg.chatId);\n\n    // Build initial messages\n    const messages = this.context.buildMessages({\n      history: session.getHistory(),\n      currentMessage: msg.content,\n      media: msg.media.length > 0 ? msg.media : undefined,\n      channel: msg.channel,\n      chatId: msg.chatId,\n    });\n\n    // The messages array is: [system, ...history, currentUser]\n    // We want to save from the current user message onward (skip system + old history).\n    const savedHistoryLen = session.getHistory().length;\n    const newMsgStart = 1 + savedHistoryLen; // 1 for system prompt\n\n    try {\n      // Agent loop (mutates messages by appending assistant/tool messages)\n      const finalContent = await this.runAgentLoop(messages, controller.signal, (text) => {\n        if (text && text.trim().length > 0) {\n          this.bus.publishOutbound(\n            createOutboundMessage({\n              channel: msg.channel,\n              chatId: msg.chatId,\n              content: text,\n            }),\n          );\n        }\n      });\n\n      // Save the new messages from this turn (user + all agent loop messages)\n      session.addTurnMessages(messages.slice(newMsgStart));\n      this.sessions.save(session);\n\n      return createOutboundMessage({\n        channel: msg.channel,\n        chatId: msg.chatId,\n        content: finalContent,\n      });\n    } catch (err) {\n      if (isAbortError(err)) {\n        // Request was aborted because a new message arrived.\n        // Save the user message to history so the next request has context,\n        // but don't save any assistant response.\n        const userMessages = messages.slice(newMsgStart).filter((m) => m.role === \"user\");\n        if (userMessages.length > 0) {\n          session.addTurnMessages(userMessages);\n          this.sessions.save(session);\n        }\n        console.log(`Request aborted for ${sessionKey}, user message saved to history`);\n        return null; // No response -- the new message will handle it\n      }\n      throw err; // Re-throw non-abort errors\n    } finally {\n      // Clean up if this is still our controller\n      if (this.inflight.get(sessionKey) === controller) {\n        this.inflight.delete(sessionKey);\n      }\n    }\n  }\n\n  private async processSystemMessage(\n    msg: InboundMessage,\n  ): Promise<OutboundMessage | null> {\n    console.log(`Processing system message from ${msg.senderId}`);\n\n    let originChannel: string;\n    let originChatId: string;\n\n    if (msg.chatId.includes(\":\")) {\n      const [ch, id] = msg.chatId.split(\":\", 2);\n      originChannel = ch;\n      originChatId = id;\n    } else {\n      originChannel = \"cli\";\n      originChatId = msg.chatId;\n    }\n\n    const sessionKey = `${originChannel}:${originChatId}`;\n    const session = this.sessions.getOrCreate(sessionKey);\n\n    this.updateToolContexts(originChannel, originChatId);\n\n    const messages = this.context.buildMessages({\n      history: session.getHistory(),\n      currentMessage: msg.content,\n      channel: originChannel,\n      chatId: originChatId,\n    });\n\n    const savedHistoryLen = session.getHistory().length;\n    const newMsgStart = 1 + savedHistoryLen;\n\n    const finalContent = await this.runAgentLoop(messages);\n\n    session.addTurnMessages(messages.slice(newMsgStart));\n    this.sessions.save(session);\n\n    return createOutboundMessage({\n      channel: originChannel,\n      chatId: originChatId,\n      content: finalContent,\n    });\n  }\n\n  private async runAgentLoop(\n    messages: ChatMessage[],\n    signal?: AbortSignal,\n    onToolCallText?: (text: string) => void,\n  ): Promise<string> {\n    let finalContent: string | null = null;\n    let sentToolCallNotice = false;\n\n    for (let i = 0; i < this.maxIterations; i++) {\n      const response = await this.provider.chat({\n        messages,\n        tools: this.tools.getDefinitions(),\n        model: this.model,\n        maxTokens: this.maxTokens,\n        signal,\n      });\n\n      if (response.hasToolCalls) {\n        // Send an interim message so the user knows we're working\n        if (!sentToolCallNotice && onToolCallText) {\n          const interimText = response.content?.trim()\n            || this.getToolCallFallbackText(response.toolCalls);\n          if (interimText) {\n            onToolCallText(interimText);\n          }\n          sentToolCallNotice = true;\n        }\n        const toolCallDicts = response.toolCalls.map((tc) => ({\n          id: tc.id,\n          type: \"function\" as const,\n          function: {\n            name: tc.name,\n            arguments: JSON.stringify(tc.arguments),\n          },\n        }));\n\n        this.context.addAssistantMessage(\n          messages,\n          response.content,\n          toolCallDicts,\n        );\n\n        for (const tc of response.toolCalls) {\n          console.log(`Tool: ${tc.name}(${JSON.stringify(tc.arguments)})`);\n\n          // Detect skill reads\n          if (tc.name === \"read_file\") {\n            const path = String(tc.arguments?.path ?? \"\");\n            const skillMatch = path.match(/skills\\/([^/]+)\\/SKILL\\.md$/);\n            if (skillMatch) {\n              console.log(`Skill activated: ${skillMatch[1]}`);\n            }\n          }\n\n          const result = await this.tools.execute(tc.name, tc.arguments);\n          this.context.addToolResult(messages, tc.id, tc.name, result);\n        }\n      } else {\n        finalContent = response.content;\n\n        // If the LLM returned empty content after tool use, nudge it to respond\n        if ((!finalContent || finalContent.trim().length === 0) && i > 0) {\n          messages.push({\n            role: \"assistant\",\n            content: \"\",\n          });\n          messages.push({\n            role: \"user\",\n            content: \"(You used tools but didn't respond to the user. Please provide a brief response summarizing what you did.)\",\n          });\n          continue;\n        }\n\n        // Push the final assistant message so it gets persisted with the turn\n        messages.push({ role: \"assistant\", content: finalContent ?? \"\" });\n        break;\n      }\n    }\n\n    if (!finalContent || finalContent.trim().length === 0) {\n      finalContent = \"I've completed processing but have no response to give.\";\n    }\n\n    // If we exhausted iterations without a non-tool-call response, still persist the final text\n    if (messages[messages.length - 1]?.role !== \"assistant\" || messages[messages.length - 1]?.content !== finalContent) {\n      messages.push({ role: \"assistant\", content: finalContent });\n    }\n\n    return finalContent;\n  }\n\n  /** Generate a fallback interim message based on which tools are being called. */\n  private getToolCallFallbackText(toolCalls: ToolCallRequest[]): string {\n    const toolNames = toolCalls.map((tc) => tc.name);\n    const fallbacks: Record<string, string> = {\n      web_search: \"検索中...\",\n      web_fetch: \"ページを読み込み中...\",\n      read_file: \"ファイルを確認中...\",\n      write_file: \"ファイルを書き込み中...\",\n      edit_file: \"ファイルを編集中...\",\n      exec: \"コマンドを実行中...\",\n      spawn: \"サブエージェントを起動中...\",\n    };\n    for (const name of toolNames) {\n      if (fallbacks[name]) return fallbacks[name];\n    }\n    return \"ちょっと待ってね...\";\n  }\n\n  private updateToolContexts(channel: string, chatId: string): void {\n    const messageTool = this.tools.get(\"message\");\n    if (messageTool instanceof MessageTool) {\n      messageTool.setContext(channel, chatId);\n    }\n\n    const spawnTool = this.tools.get(\"spawn\");\n    if (spawnTool instanceof SpawnTool) {\n      spawnTool.setContext(channel, chatId);\n    }\n\n    const cronTool = this.tools.get(\"cron\");\n    if (cronTool instanceof CronTool) {\n      cronTool.setContext(channel, chatId);\n    }\n  }\n\n  /** Process a message directly (for CLI or cron usage). */\n  async processDirect(\n    content: string,\n    sessionKey = \"cli:direct\",\n    channel = \"cli\",\n    chatId = \"direct\",\n  ): Promise<string> {\n    // Use inline version of processMessage for direct calls\n    const session = this.sessions.getOrCreate(sessionKey);\n    this.updateToolContexts(channel, chatId);\n\n    const messages = this.context.buildMessages({\n      history: session.getHistory(),\n      currentMessage: content,\n      channel,\n      chatId,\n    });\n\n    const savedHistoryLen = session.getHistory().length;\n    const newMsgStart = 1 + savedHistoryLen;\n\n    const finalContent = await this.runAgentLoop(messages);\n\n    session.addTurnMessages(messages.slice(newMsgStart));\n    this.sessions.save(session);\n\n    return finalContent;\n  }\n}\n\n/** Check if an error is an abort/cancellation error. */\nfunction isAbortError(err: unknown): boolean {\n  if (err instanceof DOMException && err.name === \"AbortError\") return true;\n  if (err instanceof Error) {\n    if (err.name === \"AbortError\") return true;\n    // OpenAI SDK wraps abort as APIUserAbortError\n    if (err.name === \"APIUserAbortError\") return true;\n    if (err.message.includes(\"abort\")) return true;\n  }\n  return false;\n}\n"],"mappings":"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"}

package/dist/agent/tools/cron.d.mts

@@ -1,8 +1,7 @@
 import { Tool } from "./base.mjs";
-import { CronService } from "../../cron/service.mjs";
 
 //#region src/agent/tools/cron.d.ts
-/** Tool to schedule reminders and recurring tasks. */
+/** Tool to schedule reminders and recurring tasks via the DO scheduler. */
 declare class CronTool extends Tool {
   readonly name = "cron";
   readonly description = "Schedule one-off or recurring tasks. Actions: add, list, remove.";
@@ -37,10 +36,13 @@ declare class CronTool extends Tool {
     };
     required: string[];
   };
-  private cronService;
   private channel;
   private chatId;
-  constructor(cronService: CronService);
+  /** Worker URL for DO scheduling. */
+  private workerUrl;
+  /** User ID for DO scheduling. */
+  private userId;
+  constructor();
   /** Set the current session context for delivery. */
   setContext(channel: string, chatId: string): void;
   execute(args: Record<string, unknown>): Promise<string>;

package/dist/agent/tools/cron.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"cron.d.mts","names":[],"sources":["../../../src/agent/tools/cron.ts"],"mappings":";;;;;cAKa,QAAA,SAAiB,IAAA;EAAA,SACnB,IAAA;EAAA,SACA,WAAA;EAAA,SAEA,UAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAiCD,WAAA;EAAA,QACA,OAAA;EAAA,QACA,MAAA;cAEI,WAAA,EAAa,WAAA;EAFjB;EAQR,UAAA,CAAW,OAAA,UAAiB,MAAA;EAKtB,OAAA,CAAQ,IAAA,EAAM,MAAA,oBAA0B,OAAA;EAAA,QActC,MAAA;EAAA,QA8CA,QAAA;EAAA,QASA,SAAA;AAAA"}
+{"version":3,"file":"cron.d.mts","names":[],"sources":["../../../src/agent/tools/cron.ts"],"mappings":";;;;cAGa,QAAA,SAAiB,IAAA;EAAA,SACnB,IAAA;EAAA,SACA,WAAA;EAAA,SAEA,UAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAiCD,OAAA;EAAA,QACA,MAAA;EAAA;EAAA,QAGA,SAAA;EAEA;EAAA,QAAA,MAAA;;EASG;EAAX,UAAA,CAAW,OAAA,UAAiB,MAAA;EAKtB,OAAA,CAAQ,IAAA,EAAM,MAAA,oBAA0B,OAAA;EAAA,QAkBhC,MAAA;EAAA,QAsDA,QAAA;EAAA,QAyBA,SAAA;AAAA"}

package/dist/agent/tools/cron.mjs

@@ -1,7 +1,7 @@
 import { Tool } from "./base.mjs";
 
 //#region src/agent/tools/cron.ts
-/** Tool to schedule reminders and recurring tasks. */
+/** Tool to schedule reminders and recurring tasks via the DO scheduler. */
 var CronTool = class extends Tool {
 	name = "cron";
 	description = "Schedule one-off or recurring tasks. Actions: add, list, remove.";
@@ -40,12 +40,16 @@ var CronTool = class extends Tool {
 		},
 		required: ["action"]
 	};
-	cronService;
 	channel = "";
 	chatId = "";
-	constructor(cronService) {
+	/** Worker URL for DO scheduling. */
+	workerUrl;
+	/** User ID for DO scheduling. */
+	userId;
+	constructor() {
 		super();
-		this.cronService = cronService;
+		this.workerUrl = process.env.WORKER_URL ?? "";
+		this.userId = process.env.NANOBOT_USER_ID ?? "";
 	}
 	/** Set the current session context for delivery. */
 	setContext(channel, chatId) {
@@ -53,6 +57,7 @@ var CronTool = class extends Tool {
 		this.chatId = chatId;
 	}
 	async execute(args) {
+		if (!this.workerUrl || !this.userId) return "Error: cron scheduling requires WORKER_URL and NANOBOT_USER_ID";
 		const action = String(args.action);
 		switch (action) {
 			case "add": return this.addJob(args);
@@ -61,7 +66,7 @@ var CronTool = class extends Tool {
 			default: return `Unknown action: ${action}`;
 		}
 	}
-	addJob(args) {
+	async addJob(args) {
 		const message = args.message ? String(args.message) : "";
 		const everySeconds = args.every_seconds ? Number(args.every_seconds) : null;
 		const cronExpr = args.cron_expr ? String(args.cron_expr) : null;
@@ -69,50 +74,56 @@ var CronTool = class extends Tool {
 		if (!message) return "Error: message is required for add";
 		if (!this.channel || !this.chatId) return "Error: no session context (channel/chatId)";
 		let schedule;
-		let deleteAfterRun = false;
 		if (atRaw) {
 			const atMs = Date.parse(atRaw);
 			if (isNaN(atMs)) return `Error: could not parse time '${atRaw}' — use ISO 8601 format`;
 			if (atMs <= Date.now()) return "Error: scheduled time is in the past";
-			schedule = {
-				kind: "at",
-				atMs
-			};
-			deleteAfterRun = true;
-		} else if (everySeconds) schedule = {
-			kind: "every",
-			everyMs: everySeconds * 1e3
-		};
-		else if (cronExpr) schedule = {
-			kind: "cron",
-			expr: cronExpr
-		};
+			schedule = atRaw;
+		} else if (everySeconds) schedule = everySeconds;
+		else if (cronExpr) schedule = cronExpr;
 		else return "Error: one of 'at', 'every_seconds', or 'cron_expr' is required";
-		const job = this.cronService.addJob({
-			name: message.slice(0, 30),
-			schedule,
-			message,
-			deliver: true,
-			channel: this.channel,
-			to: this.chatId,
-			deleteAfterRun
-		});
-		if (schedule.kind === "at") {
-			const when = new Date(schedule.atMs).toISOString();
-			return `Created one-off job '${job.name}' (id: ${job.id}) scheduled for ${when}`;
+		try {
+			const res = await fetch(`${this.workerUrl}/api/users/${this.userId}/cron`, {
+				method: "POST",
+				headers: { "Content-Type": "application/json" },
+				body: JSON.stringify({
+					name: message,
+					type: everySeconds ? "every" : cronExpr ? "cron" : "scheduled",
+					schedule,
+					message,
+					deliver: true,
+					channel: this.channel,
+					chatId: this.chatId
+				}),
+				signal: AbortSignal.timeout(1e4)
+			});
+			const data = await res.json();
+			if (!res.ok) return `Error: ${data.error ?? res.statusText}`;
+			return `Created job (id: ${data.id})`;
+		} catch (err) {
+			return `Error scheduling job: ${err instanceof Error ? err.message : err}`;
 		}
-		return `Created job '${job.name}' (id: ${job.id})`;
 	}
-	listJobs() {
-		const jobs = this.cronService.listJobs();
-		if (jobs.length === 0) return "No scheduled jobs.";
-		return "Scheduled jobs:\n" + jobs.map((j) => `- ${j.name} (id: ${j.id}, ${j.schedule.kind})`).join("\n");
+	async listJobs() {
+		try {
+			const data = await (await fetch(`${this.workerUrl}/api/users/${this.userId}/cron`, { signal: AbortSignal.timeout(1e4) })).json();
+			if (data.crons.length === 0) return "No scheduled jobs.";
+			return "Scheduled jobs:\n" + data.crons.map((c) => `- ${c.name} (id: ${c.id}, ${c.type}, next: ${new Date(c.nextRunAt).toISOString()})`).join("\n");
+		} catch (err) {
+			return `Error listing jobs: ${err instanceof Error ? err.message : err}`;
+		}
 	}
-	removeJob(args) {
+	async removeJob(args) {
 		const jobId = args.job_id ? String(args.job_id) : null;
 		if (!jobId) return "Error: job_id is required for remove";
-		if (this.cronService.removeJob(jobId)) return `Removed job ${jobId}`;
-		return `Job ${jobId} not found`;
+		try {
+			return (await (await fetch(`${this.workerUrl}/api/users/${this.userId}/cron/${jobId}`, {
+				method: "DELETE",
+				signal: AbortSignal.timeout(1e4)
+			})).json()).ok ? `Removed job ${jobId}` : `Job ${jobId} not found`;
+		} catch (err) {
+			return `Error removing job: ${err instanceof Error ? err.message : err}`;
+		}
 	}
 };
 

package/dist/agent/tools/cron.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"cron.mjs","names":[],"sources":["../../../src/agent/tools/cron.ts"],"sourcesContent":["import { Tool } from \"./base.js\";\nimport type { CronService } from \"../../cron/service.js\";\nimport type { CronSchedule } from \"../../cron/types.js\";\n\n/** Tool to schedule reminders and recurring tasks. */\nexport class CronTool extends Tool {\n  readonly name = \"cron\";\n  readonly description =\n    \"Schedule one-off or recurring tasks. Actions: add, list, remove.\";\n  readonly parameters = {\n    type: \"object\",\n    properties: {\n      action: {\n        type: \"string\",\n        enum: [\"add\", \"list\", \"remove\"],\n        description: \"Action to perform\",\n      },\n      message: {\n        type: \"string\",\n        description: \"Reminder message (for add)\",\n      },\n      every_seconds: {\n        type: \"integer\",\n        description: \"Interval in seconds (for recurring tasks)\",\n      },\n      cron_expr: {\n        type: \"string\",\n        description: \"Cron expression like '0 9 * * *' (for scheduled tasks)\",\n      },\n      at: {\n        type: \"string\",\n        description:\n          \"Run once at a specific time. ISO 8601 string (e.g. '2025-03-01T09:00:00Z')\",\n      },\n      job_id: {\n        type: \"string\",\n        description: \"Job ID (for remove)\",\n      },\n    },\n    required: [\"action\"],\n  };\n\n  private cronService: CronService;\n  private channel = \"\";\n  private chatId = \"\";\n\n  constructor(cronService: CronService) {\n    super();\n    this.cronService = cronService;\n  }\n\n  /** Set the current session context for delivery. */\n  setContext(channel: string, chatId: string): void {\n    this.channel = channel;\n    this.chatId = chatId;\n  }\n\n  async execute(args: Record<string, unknown>): Promise<string> {\n    const action = String(args.action);\n    switch (action) {\n      case \"add\":\n        return this.addJob(args);\n      case \"list\":\n        return this.listJobs();\n      case \"remove\":\n        return this.removeJob(args);\n      default:\n        return `Unknown action: ${action}`;\n    }\n  }\n\n  private addJob(args: Record<string, unknown>): string {\n    const message = args.message ? String(args.message) : \"\";\n    const everySeconds = args.every_seconds\n      ? Number(args.every_seconds)\n      : null;\n    const cronExpr = args.cron_expr ? String(args.cron_expr) : null;\n    const atRaw = args.at ? String(args.at) : null;\n\n    if (!message) return \"Error: message is required for add\";\n    if (!this.channel || !this.chatId)\n      return \"Error: no session context (channel/chatId)\";\n\n    let schedule: CronSchedule;\n    let deleteAfterRun = false;\n\n    if (atRaw) {\n      const atMs = Date.parse(atRaw);\n      if (isNaN(atMs)) return `Error: could not parse time '${atRaw}' — use ISO 8601 format`;\n      if (atMs <= Date.now()) return \"Error: scheduled time is in the past\";\n      schedule = { kind: \"at\", atMs };\n      deleteAfterRun = true;\n    } else if (everySeconds) {\n      schedule = { kind: \"every\", everyMs: everySeconds * 1000 };\n    } else if (cronExpr) {\n      schedule = { kind: \"cron\", expr: cronExpr };\n    } else {\n      return \"Error: one of 'at', 'every_seconds', or 'cron_expr' is required\";\n    }\n\n    const job = this.cronService.addJob({\n      name: message.slice(0, 30),\n      schedule,\n      message,\n      deliver: true,\n      channel: this.channel,\n      to: this.chatId,\n      deleteAfterRun,\n    });\n\n    if (schedule.kind === \"at\") {\n      const when = new Date(schedule.atMs!).toISOString();\n      return `Created one-off job '${job.name}' (id: ${job.id}) scheduled for ${when}`;\n    }\n    return `Created job '${job.name}' (id: ${job.id})`;\n  }\n\n  private listJobs(): string {\n    const jobs = this.cronService.listJobs();\n    if (jobs.length === 0) return \"No scheduled jobs.\";\n    const lines = jobs.map(\n      (j) => `- ${j.name} (id: ${j.id}, ${j.schedule.kind})`,\n    );\n    return \"Scheduled jobs:\\n\" + lines.join(\"\\n\");\n  }\n\n  private removeJob(args: Record<string, unknown>): string {\n    const jobId = args.job_id ? String(args.job_id) : null;\n    if (!jobId) return \"Error: job_id is required for remove\";\n    if (this.cronService.removeJob(jobId)) {\n      return `Removed job ${jobId}`;\n    }\n    return `Job ${jobId} not found`;\n  }\n}\n"],"mappings":";;;;AAKA,IAAa,WAAb,cAA8B,KAAK;CACjC,AAAS,OAAO;CAChB,AAAS,cACP;CACF,AAAS,aAAa;EACpB,MAAM;EACN,YAAY;GACV,QAAQ;IACN,MAAM;IACN,MAAM;KAAC;KAAO;KAAQ;KAAS;IAC/B,aAAa;IACd;GACD,SAAS;IACP,MAAM;IACN,aAAa;IACd;GACD,eAAe;IACb,MAAM;IACN,aAAa;IACd;GACD,WAAW;IACT,MAAM;IACN,aAAa;IACd;GACD,IAAI;IACF,MAAM;IACN,aACE;IACH;GACD,QAAQ;IACN,MAAM;IACN,aAAa;IACd;GACF;EACD,UAAU,CAAC,SAAS;EACrB;CAED,AAAQ;CACR,AAAQ,UAAU;CAClB,AAAQ,SAAS;CAEjB,YAAY,aAA0B;AACpC,SAAO;AACP,OAAK,cAAc;;;CAIrB,WAAW,SAAiB,QAAsB;AAChD,OAAK,UAAU;AACf,OAAK,SAAS;;CAGhB,MAAM,QAAQ,MAAgD;EAC5D,MAAM,SAAS,OAAO,KAAK,OAAO;AAClC,UAAQ,QAAR;GACE,KAAK,MACH,QAAO,KAAK,OAAO,KAAK;GAC1B,KAAK,OACH,QAAO,KAAK,UAAU;GACxB,KAAK,SACH,QAAO,KAAK,UAAU,KAAK;GAC7B,QACE,QAAO,mBAAmB;;;CAIhC,AAAQ,OAAO,MAAuC;EACpD,MAAM,UAAU,KAAK,UAAU,OAAO,KAAK,QAAQ,GAAG;EACtD,MAAM,eAAe,KAAK,gBACtB,OAAO,KAAK,cAAc,GAC1B;EACJ,MAAM,WAAW,KAAK,YAAY,OAAO,KAAK,UAAU,GAAG;EAC3D,MAAM,QAAQ,KAAK,KAAK,OAAO,KAAK,GAAG,GAAG;AAE1C,MAAI,CAAC,QAAS,QAAO;AACrB,MAAI,CAAC,KAAK,WAAW,CAAC,KAAK,OACzB,QAAO;EAET,IAAI;EACJ,IAAI,iBAAiB;AAErB,MAAI,OAAO;GACT,MAAM,OAAO,KAAK,MAAM,MAAM;AAC9B,OAAI,MAAM,KAAK,CAAE,QAAO,gCAAgC,MAAM;AAC9D,OAAI,QAAQ,KAAK,KAAK,CAAE,QAAO;AAC/B,cAAW;IAAE,MAAM;IAAM;IAAM;AAC/B,oBAAiB;aACR,aACT,YAAW;GAAE,MAAM;GAAS,SAAS,eAAe;GAAM;WACjD,SACT,YAAW;GAAE,MAAM;GAAQ,MAAM;GAAU;MAE3C,QAAO;EAGT,MAAM,MAAM,KAAK,YAAY,OAAO;GAClC,MAAM,QAAQ,MAAM,GAAG,GAAG;GAC1B;GACA;GACA,SAAS;GACT,SAAS,KAAK;GACd,IAAI,KAAK;GACT;GACD,CAAC;AAEF,MAAI,SAAS,SAAS,MAAM;GAC1B,MAAM,OAAO,IAAI,KAAK,SAAS,KAAM,CAAC,aAAa;AACnD,UAAO,wBAAwB,IAAI,KAAK,SAAS,IAAI,GAAG,kBAAkB;;AAE5E,SAAO,gBAAgB,IAAI,KAAK,SAAS,IAAI,GAAG;;CAGlD,AAAQ,WAAmB;EACzB,MAAM,OAAO,KAAK,YAAY,UAAU;AACxC,MAAI,KAAK,WAAW,EAAG,QAAO;AAI9B,SAAO,sBAHO,KAAK,KAChB,MAAM,KAAK,EAAE,KAAK,QAAQ,EAAE,GAAG,IAAI,EAAE,SAAS,KAAK,GACrD,CACkC,KAAK,KAAK;;CAG/C,AAAQ,UAAU,MAAuC;EACvD,MAAM,QAAQ,KAAK,SAAS,OAAO,KAAK,OAAO,GAAG;AAClD,MAAI,CAAC,MAAO,QAAO;AACnB,MAAI,KAAK,YAAY,UAAU,MAAM,CACnC,QAAO,eAAe;AAExB,SAAO,OAAO,MAAM"}
+{"version":3,"file":"cron.mjs","names":[],"sources":["../../../src/agent/tools/cron.ts"],"sourcesContent":["import { Tool } from \"./base.js\";\n\n/** Tool to schedule reminders and recurring tasks via the DO scheduler. */\nexport class CronTool extends Tool {\n  readonly name = \"cron\";\n  readonly description =\n    \"Schedule one-off or recurring tasks. Actions: add, list, remove.\";\n  readonly parameters = {\n    type: \"object\",\n    properties: {\n      action: {\n        type: \"string\",\n        enum: [\"add\", \"list\", \"remove\"],\n        description: \"Action to perform\",\n      },\n      message: {\n        type: \"string\",\n        description: \"Reminder message (for add)\",\n      },\n      every_seconds: {\n        type: \"integer\",\n        description: \"Interval in seconds (for recurring tasks)\",\n      },\n      cron_expr: {\n        type: \"string\",\n        description: \"Cron expression like '0 9 * * *' (for scheduled tasks)\",\n      },\n      at: {\n        type: \"string\",\n        description:\n          \"Run once at a specific time. ISO 8601 string (e.g. '2025-03-01T09:00:00Z')\",\n      },\n      job_id: {\n        type: \"string\",\n        description: \"Job ID (for remove)\",\n      },\n    },\n    required: [\"action\"],\n  };\n\n  private channel = \"\";\n  private chatId = \"\";\n\n  /** Worker URL for DO scheduling. */\n  private workerUrl: string;\n  /** User ID for DO scheduling. */\n  private userId: string;\n\n  constructor() {\n    super();\n    this.workerUrl = process.env.WORKER_URL ?? \"\";\n    this.userId = process.env.NANOBOT_USER_ID ?? \"\";\n  }\n\n  /** Set the current session context for delivery. */\n  setContext(channel: string, chatId: string): void {\n    this.channel = channel;\n    this.chatId = chatId;\n  }\n\n  async execute(args: Record<string, unknown>): Promise<string> {\n    if (!this.workerUrl || !this.userId) {\n      return \"Error: cron scheduling requires WORKER_URL and NANOBOT_USER_ID\";\n    }\n\n    const action = String(args.action);\n    switch (action) {\n      case \"add\":\n        return this.addJob(args);\n      case \"list\":\n        return this.listJobs();\n      case \"remove\":\n        return this.removeJob(args);\n      default:\n        return `Unknown action: ${action}`;\n    }\n  }\n\n  private async addJob(args: Record<string, unknown>): Promise<string> {\n    const message = args.message ? String(args.message) : \"\";\n    const everySeconds = args.every_seconds\n      ? Number(args.every_seconds)\n      : null;\n    const cronExpr = args.cron_expr ? String(args.cron_expr) : null;\n    const atRaw = args.at ? String(args.at) : null;\n\n    if (!message) return \"Error: message is required for add\";\n    if (!this.channel || !this.chatId)\n      return \"Error: no session context (channel/chatId)\";\n\n    let schedule: string | number;\n    if (atRaw) {\n      const atMs = Date.parse(atRaw);\n      if (isNaN(atMs)) return `Error: could not parse time '${atRaw}' — use ISO 8601 format`;\n      if (atMs <= Date.now()) return \"Error: scheduled time is in the past\";\n\n      schedule = atRaw;\n    } else if (everySeconds) {\n      // For recurring by interval, use seconds\n      schedule = everySeconds;\n    } else if (cronExpr) {\n      schedule = cronExpr;\n    } else {\n      return \"Error: one of 'at', 'every_seconds', or 'cron_expr' is required\";\n    }\n\n    try {\n      const res = await fetch(\n        `${this.workerUrl}/api/users/${this.userId}/cron`,\n        {\n          method: \"POST\",\n          headers: { \"Content-Type\": \"application/json\" },\n          body: JSON.stringify({\n            name: message,\n            type: everySeconds ? \"every\" : cronExpr ? \"cron\" : \"scheduled\",\n            schedule,\n            message,\n            deliver: true,\n            channel: this.channel,\n            chatId: this.chatId,\n          }),\n          signal: AbortSignal.timeout(10_000),\n        },\n      );\n      const data = await res.json() as { id?: string; error?: string };\n      if (!res.ok) return `Error: ${data.error ?? res.statusText}`;\n      return `Created job (id: ${data.id})`;\n    } catch (err) {\n      return `Error scheduling job: ${err instanceof Error ? err.message : err}`;\n    }\n  }\n\n  private async listJobs(): Promise<string> {\n    try {\n      const res = await fetch(\n        `${this.workerUrl}/api/users/${this.userId}/cron`,\n        { signal: AbortSignal.timeout(10_000) },\n      );\n      const data = await res.json() as {\n        crons: Array<{\n          id: string;\n          type: string;\n          name: string;\n          message: string;\n          nextRunAt: number;\n        }>;\n      };\n      if (data.crons.length === 0) return \"No scheduled jobs.\";\n      const lines = data.crons.map(\n        (c) => `- ${c.name} (id: ${c.id}, ${c.type}, next: ${new Date(c.nextRunAt).toISOString()})`,\n      );\n      return \"Scheduled jobs:\\n\" + lines.join(\"\\n\");\n    } catch (err) {\n      return `Error listing jobs: ${err instanceof Error ? err.message : err}`;\n    }\n  }\n\n  private async removeJob(args: Record<string, unknown>): Promise<string> {\n    const jobId = args.job_id ? String(args.job_id) : null;\n    if (!jobId) return \"Error: job_id is required for remove\";\n\n    try {\n      const res = await fetch(\n        `${this.workerUrl}/api/users/${this.userId}/cron/${jobId}`,\n        {\n          method: \"DELETE\",\n          signal: AbortSignal.timeout(10_000),\n        },\n      );\n      const data = await res.json() as { ok: boolean };\n      return data.ok ? `Removed job ${jobId}` : `Job ${jobId} not found`;\n    } catch (err) {\n      return `Error removing job: ${err instanceof Error ? err.message : err}`;\n    }\n  }\n}\n"],"mappings":"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"}

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { PROVIDERS } from "../providers/registry.mjs";
 import { ConfigSchema, getApiBase, getApiKey, getConfigWorkspacePath, getExtraHeaders } from "../config/schema.mjs";
-import { getConfigPath, getDataDir, loadConfig, saveConfig } from "../config/loader.mjs";
+import { getConfigPath, loadConfig, saveConfig } from "../config/loader.mjs";
 import { LOGO, VERSION } from "../index.mjs";
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";
@@ -148,8 +148,6 @@ program.command("gateway").description("Start the nanobot gateway").option("-p,
 	const { OpenAIProvider } = await import("../providers/openai-provider.mjs");
 	const { AgentLoop } = await import("../agent/loop.mjs");
 	const { ChannelManager } = await import("../channels/manager.mjs");
-	const { CronService } = await import("../cron/service.mjs");
-	const { HeartbeatService } = await import("../heartbeat/service.mjs");
 	const bus = new MessageBus();
 	const workspace = getConfigWorkspacePath(config);
 	const provider = new OpenAIProvider({
@@ -159,7 +157,6 @@ program.command("gateway").description("Start the nanobot gateway").option("-p,
 		extraHeaders
 	});
 	const customTools = await loadCustomTools(config);
-	const cron = new CronService(join(getDataDir(), "cron", "jobs.json"));
 	const agent = new AgentLoop({
 		bus,
 		provider,
@@ -170,38 +167,20 @@ program.command("gateway").description("Start the nanobot gateway").option("-p,
 		braveApiKey: config.tools.web.search.apiKey || void 0,
 		execConfig: config.tools.exec,
 		restrictToWorkspace: config.tools.restrictToWorkspace,
-		cronService: cron,
 		toolsEnabled: config.tools.enabled,
 		toolsDisabled: config.tools.disabled,
 		customTools
 	});
 	const channels = new ChannelManager(config, bus);
-	cron.onJob = async (job) => {
-		const sessionKey = `cron:${job.id}`;
-		const response = await agent.processDirect(job.payload.message, sessionKey, job.payload.channel ?? "cron", job.payload.to ?? job.id);
-		if (job.payload.deliver && job.payload.to && response) {
-			const { createOutboundMessage } = await import("../bus/events.mjs");
-			await bus.publishOutbound(createOutboundMessage({
-				channel: job.payload.channel ?? "cli",
-				chatId: job.payload.to,
-				content: response
-			}));
-		}
-		return response;
-	};
+	const { HeartbeatService } = await import("../heartbeat/service.mjs");
 	const heartbeat = new HeartbeatService({
 		workspace,
-		onHeartbeat: (prompt) => agent.processDirect(prompt, "heartbeat"),
-		intervalS: 1800,
-		enabled: true
+		onHeartbeat: (prompt) => agent.processDirect(prompt, "heartbeat")
 	});
-	const cronStatus = cron.status();
-	if (cronStatus.jobs > 0) console.log(`Cron: ${cronStatus.jobs} scheduled jobs`);
-	console.log("Heartbeat: every 30m");
+	console.log("Heartbeat: managed by DO (local endpoint /api/heartbeat)");
+	console.log("Cron: managed by DO");
 	const shutdown = async () => {
 		console.log("\nShutting down...");
-		heartbeat.stop();
-		cron.stop();
 		agent.stop();
 		await channels.stopAll();
 		process.exit(0);
@@ -212,12 +191,11 @@ program.command("gateway").description("Start the nanobot gateway").option("-p,
 	createGatewayServer({
 		agent,
 		port: Number(opts.port),
-		channels
+		channels,
+		heartbeat
 	});
 	try {
 		await channels.init();
-		await cron.start();
-		await heartbeat.start();
 		await Promise.all([agent.run(), channels.startAll()]);
 	} catch (err) {
 		console.error("Gateway error:", err);
@@ -301,71 +279,6 @@ program.command("channels").description("Manage channels").command("status").des
 	const lnToken = ln.channelAccessToken ? `token: ${ln.channelAccessToken.slice(0, 10)}...` : "not configured";
 	console.log(`  LINE      ${ln.enabled ? "[enabled]" : "[disabled]"}  ${lnToken}`);
 });
-const cronCmd = program.command("cron").description("Manage scheduled tasks");
-cronCmd.command("list").description("List scheduled jobs").option("-a, --all", "Include disabled jobs", false).action(async (opts) => {
-	const { CronService } = await import("../cron/service.mjs");
-	const jobs = new CronService(join(getDataDir(), "cron", "jobs.json")).listJobs(opts.all);
-	if (jobs.length === 0) {
-		console.log("No scheduled jobs.");
-		return;
-	}
-	console.log("Scheduled Jobs");
-	console.log("─".repeat(70));
-	console.log(`${"ID".padEnd(10)} ${"Name".padEnd(20)} ${"Schedule".padEnd(18)} ${"Status".padEnd(10)} Next Run`);
-	console.log("─".repeat(70));
-	for (const job of jobs) {
-		let sched;
-		if (job.schedule.kind === "every") sched = `every ${(job.schedule.everyMs ?? 0) / 1e3}s`;
-		else if (job.schedule.kind === "cron") sched = job.schedule.expr ?? "";
-		else sched = "one-time";
-		let nextRun = "";
-		if (job.state.nextRunAtMs) nextRun = new Date(job.state.nextRunAtMs).toLocaleString();
-		const status = job.enabled ? "enabled" : "disabled";
-		console.log(`${job.id.padEnd(10)} ${job.name.padEnd(20)} ${sched.padEnd(18)} ${status.padEnd(10)} ${nextRun}`);
-	}
-});
-cronCmd.command("add").description("Add a scheduled job").requiredOption("-n, --name <name>", "Job name").requiredOption("-m, --message <text>", "Message for agent").option("-e, --every <seconds>", "Run every N seconds").option("-c, --cron <expr>", "Cron expression (e.g. '0 9 * * *')").option("--at <iso>", "Run once at time (ISO format)").option("-d, --deliver", "Deliver response to channel", false).option("--to <recipient>", "Recipient for delivery").option("--channel <name>", "Channel for delivery").action(async (opts) => {
-	const { CronService } = await import("../cron/service.mjs");
-	let schedule;
-	if (opts.every) schedule = {
-		kind: "every",
-		everyMs: Number(opts.every) * 1e3
-	};
-	else if (opts.cron) schedule = {
-		kind: "cron",
-		expr: opts.cron
-	};
-	else if (opts.at) schedule = {
-		kind: "at",
-		atMs: new Date(opts.at).getTime()
-	};
-	else {
-		console.error("Error: Must specify --every, --cron, or --at");
-		process.exit(1);
-	}
-	const job = new CronService(join(getDataDir(), "cron", "jobs.json")).addJob({
-		name: opts.name,
-		schedule,
-		message: opts.message,
-		deliver: opts.deliver,
-		to: opts.to,
-		channel: opts.channel
-	});
-	console.log(`Added job '${job.name}' (${job.id})`);
-});
-cronCmd.command("remove").description("Remove a scheduled job").argument("<jobId>", "Job ID to remove").action(async (jobId) => {
-	const { CronService } = await import("../cron/service.mjs");
-	if (new CronService(join(getDataDir(), "cron", "jobs.json")).removeJob(jobId)) console.log(`Removed job ${jobId}`);
-	else console.error(`Job ${jobId} not found`);
-});
-cronCmd.command("enable").description("Enable or disable a job").argument("<jobId>", "Job ID").option("--disable", "Disable instead of enable", false).action(async (jobId, opts) => {
-	const { CronService } = await import("../cron/service.mjs");
-	const job = new CronService(join(getDataDir(), "cron", "jobs.json")).enableJob(jobId, !opts.disable);
-	if (job) {
-		const status = opts.disable ? "disabled" : "enabled";
-		console.log(`Job '${job.name}' ${status}`);
-	} else console.error(`Job ${jobId} not found`);
-});
 program.command("status").description("Show nanobot status").action(() => {
 	const configPath = getConfigPath();
 	const config = loadConfig();