From 83b91b3bf106d36e3260fe0eee35a159302d3fc8 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Sun, 8 Mar 2026 22:43:37 +0200 Subject: [PATCH 01/91] skill/telegram: Telegram channel integration Co-Authored-By: Claude Opus 4.6 --- .env.example | 2 +- package-lock.json | 113 ++++- package.json | 1 + src/channels/index.ts | 1 + src/channels/telegram.test.ts | 932 ++++++++++++++++++++++++++++++++++ src/channels/telegram.ts | 257 ++++++++++ 6 files changed, 1300 insertions(+), 6 deletions(-) create mode 100644 src/channels/telegram.test.ts create mode 100644 src/channels/telegram.ts diff --git a/.env.example b/.env.example index 8b13789..b90e6c9 100644 --- a/.env.example +++ b/.env.example @@ -1 +1 @@ - +TELEGRAM_BOT_TOKEN= diff --git a/package-lock.json b/package-lock.json index 4e6b681..6bc4160 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "better-sqlite3": "^11.8.1", "cron-parser": "^5.5.0", + "grammy": "^1.39.3", "pino": "^9.6.0", "pino-pretty": "^13.0.0", "yaml": "^2.8.2", @@ -531,6 +532,12 @@ "node": ">=18" } }, + "node_modules/@grammyjs/types": { + "version": "3.25.0", + "resolved": "https://registry.npmjs.org/@grammyjs/types/-/types-3.25.0.tgz", + "integrity": "sha512-iN9i5p+8ZOu9OMxWNcguojQfz4K/PDyMPOnL7PPCON+SoA/F8OKMH3uR7CVUkYfdNe0GCz8QOzAWrnqusQYFOg==", + "license": "MIT" + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", @@ -1109,6 +1116,18 @@ "url": "https://opencollective.com/vitest" } }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "license": "MIT", + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } + }, "node_modules/assertion-error": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", @@ -1258,6 +1277,23 @@ "node": "*" } }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, "node_modules/decompress-response": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", @@ -1359,6 +1395,15 @@ "@types/estree": "^1.0.0" } }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/expand-template": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", @@ -1454,6 +1499,21 @@ "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", "license": "MIT" }, + "node_modules/grammy": { + "version": "1.41.1", + "resolved": "https://registry.npmjs.org/grammy/-/grammy-1.41.1.tgz", + "integrity": "sha512-wcHAQ1e7svL3fJMpDchcQVcWUmywhuepOOjHUHmMmWAwUJEIyK5ea5sbSjZd+Gy1aMpZeP8VYJa+4tP+j1YptQ==", + "license": "MIT", + "dependencies": { + "@grammyjs/types": "3.25.0", + "abort-controller": "^3.0.0", + "debug": "^4.4.3", + "node-fetch": "^2.7.0" + }, + "engines": { + "node": "^12.20.0 || >=14.13.1" + } + }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -1654,6 +1714,12 @@ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", "license": "MIT" }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, "node_modules/nanoid": { "version": "3.3.11", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", @@ -1691,6 +1757,26 @@ "node": ">=10" } }, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/obug": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.1.tgz", @@ -1740,7 +1826,6 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -2289,13 +2374,18 @@ "node": ">=14.0.0" } }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "license": "MIT" + }, "node_modules/tsx": { "version": "4.21.0", "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.21.0.tgz", "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "esbuild": "~0.27.0", "get-tsconfig": "^4.7.5" @@ -2355,7 +2445,6 @@ "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "esbuild": "^0.27.0", "fdir": "^6.5.0", @@ -2431,7 +2520,6 @@ "integrity": "sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@vitest/expect": "4.0.18", "@vitest/mocker": "4.0.18", @@ -2504,6 +2592,22 @@ } } }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "license": "BSD-2-Clause" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/why-is-node-running": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", @@ -2532,7 +2636,6 @@ "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz", "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==", "license": "ISC", - "peer": true, "bin": { "yaml": "bin.mjs" }, diff --git a/package.json b/package.json index f4863e4..687b875 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ }, "dependencies": { "better-sqlite3": "^11.8.1", + "grammy": "^1.39.3", "cron-parser": "^5.5.0", "pino": "^9.6.0", "pino-pretty": "^13.0.0", diff --git a/src/channels/index.ts b/src/channels/index.ts index 44f4f55..48356db 100644 --- a/src/channels/index.ts +++ b/src/channels/index.ts @@ -8,5 +8,6 @@ // slack // telegram +import './telegram.js'; // whatsapp diff --git a/src/channels/telegram.test.ts b/src/channels/telegram.test.ts new file mode 100644 index 0000000..9a97223 --- /dev/null +++ b/src/channels/telegram.test.ts @@ -0,0 +1,932 @@ +import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest'; + +// --- Mocks --- + +// Mock registry (registerChannel runs at import time) +vi.mock('./registry.js', () => ({ registerChannel: vi.fn() })); + +// Mock env reader (used by the factory, not needed in unit tests) +vi.mock('../env.js', () => ({ readEnvFile: vi.fn(() => ({})) })); + +// Mock config +vi.mock('../config.js', () => ({ + ASSISTANT_NAME: 'Andy', + TRIGGER_PATTERN: /^@Andy\b/i, +})); + +// Mock logger +vi.mock('../logger.js', () => ({ + logger: { + debug: vi.fn(), + info: vi.fn(), + warn: vi.fn(), + error: vi.fn(), + }, +})); + +// --- Grammy mock --- + +type Handler = (...args: any[]) => any; + +const botRef = vi.hoisted(() => ({ current: null as any })); + +vi.mock('grammy', () => ({ + Bot: class MockBot { + token: string; + commandHandlers = new Map(); + filterHandlers = new Map(); + errorHandler: Handler | null = null; + + api = { + sendMessage: vi.fn().mockResolvedValue(undefined), + sendChatAction: vi.fn().mockResolvedValue(undefined), + }; + + constructor(token: string) { + this.token = token; + botRef.current = this; + } + + command(name: string, handler: Handler) { + this.commandHandlers.set(name, handler); + } + + on(filter: string, handler: Handler) { + const existing = this.filterHandlers.get(filter) || []; + existing.push(handler); + this.filterHandlers.set(filter, existing); + } + + catch(handler: Handler) { + this.errorHandler = handler; + } + + start(opts: { onStart: (botInfo: any) => void }) { + opts.onStart({ username: 'andy_ai_bot', id: 12345 }); + } + + stop() {} + }, +})); + +import { TelegramChannel, TelegramChannelOpts } from './telegram.js'; + +// --- Test helpers --- + +function createTestOpts( + overrides?: Partial, +): TelegramChannelOpts { + return { + onMessage: vi.fn(), + onChatMetadata: vi.fn(), + registeredGroups: vi.fn(() => ({ + 'tg:100200300': { + name: 'Test Group', + folder: 'test-group', + trigger: '@Andy', + added_at: '2024-01-01T00:00:00.000Z', + }, + })), + ...overrides, + }; +} + +function createTextCtx(overrides: { + chatId?: number; + chatType?: string; + chatTitle?: string; + text: string; + fromId?: number; + firstName?: string; + username?: string; + messageId?: number; + date?: number; + entities?: any[]; +}) { + const chatId = overrides.chatId ?? 100200300; + const chatType = overrides.chatType ?? 'group'; + return { + chat: { + id: chatId, + type: chatType, + title: overrides.chatTitle ?? 'Test Group', + }, + from: { + id: overrides.fromId ?? 99001, + first_name: overrides.firstName ?? 'Alice', + username: overrides.username ?? 'alice_user', + }, + message: { + text: overrides.text, + date: overrides.date ?? Math.floor(Date.now() / 1000), + message_id: overrides.messageId ?? 1, + entities: overrides.entities ?? [], + }, + me: { username: 'andy_ai_bot' }, + reply: vi.fn(), + }; +} + +function createMediaCtx(overrides: { + chatId?: number; + chatType?: string; + fromId?: number; + firstName?: string; + date?: number; + messageId?: number; + caption?: string; + extra?: Record; +}) { + const chatId = overrides.chatId ?? 100200300; + return { + chat: { + id: chatId, + type: overrides.chatType ?? 'group', + title: 'Test Group', + }, + from: { + id: overrides.fromId ?? 99001, + first_name: overrides.firstName ?? 'Alice', + username: 'alice_user', + }, + message: { + date: overrides.date ?? Math.floor(Date.now() / 1000), + message_id: overrides.messageId ?? 1, + caption: overrides.caption, + ...(overrides.extra || {}), + }, + me: { username: 'andy_ai_bot' }, + }; +} + +function currentBot() { + return botRef.current; +} + +async function triggerTextMessage(ctx: ReturnType) { + const handlers = currentBot().filterHandlers.get('message:text') || []; + for (const h of handlers) await h(ctx); +} + +async function triggerMediaMessage( + filter: string, + ctx: ReturnType, +) { + const handlers = currentBot().filterHandlers.get(filter) || []; + for (const h of handlers) await h(ctx); +} + +// --- Tests --- + +describe('TelegramChannel', () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + + afterEach(() => { + vi.restoreAllMocks(); + }); + + // --- Connection lifecycle --- + + describe('connection lifecycle', () => { + it('resolves connect() when bot starts', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + + await channel.connect(); + + expect(channel.isConnected()).toBe(true); + }); + + it('registers command and message handlers on connect', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + + await channel.connect(); + + expect(currentBot().commandHandlers.has('chatid')).toBe(true); + expect(currentBot().commandHandlers.has('ping')).toBe(true); + expect(currentBot().filterHandlers.has('message:text')).toBe(true); + expect(currentBot().filterHandlers.has('message:photo')).toBe(true); + expect(currentBot().filterHandlers.has('message:video')).toBe(true); + expect(currentBot().filterHandlers.has('message:voice')).toBe(true); + expect(currentBot().filterHandlers.has('message:audio')).toBe(true); + expect(currentBot().filterHandlers.has('message:document')).toBe(true); + expect(currentBot().filterHandlers.has('message:sticker')).toBe(true); + expect(currentBot().filterHandlers.has('message:location')).toBe(true); + expect(currentBot().filterHandlers.has('message:contact')).toBe(true); + }); + + it('registers error handler on connect', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + + await channel.connect(); + + expect(currentBot().errorHandler).not.toBeNull(); + }); + + it('disconnects cleanly', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + + await channel.connect(); + expect(channel.isConnected()).toBe(true); + + await channel.disconnect(); + expect(channel.isConnected()).toBe(false); + }); + + it('isConnected() returns false before connect', () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + + expect(channel.isConnected()).toBe(false); + }); + }); + + // --- Text message handling --- + + describe('text message handling', () => { + it('delivers message for registered group', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createTextCtx({ text: 'Hello everyone' }); + await triggerTextMessage(ctx); + + expect(opts.onChatMetadata).toHaveBeenCalledWith( + 'tg:100200300', + expect.any(String), + 'Test Group', + 'telegram', + true, + ); + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ + id: '1', + chat_jid: 'tg:100200300', + sender: '99001', + sender_name: 'Alice', + content: 'Hello everyone', + is_from_me: false, + }), + ); + }); + + it('only emits metadata for unregistered chats', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createTextCtx({ chatId: 999999, text: 'Unknown chat' }); + await triggerTextMessage(ctx); + + expect(opts.onChatMetadata).toHaveBeenCalledWith( + 'tg:999999', + expect.any(String), + 'Test Group', + 'telegram', + true, + ); + expect(opts.onMessage).not.toHaveBeenCalled(); + }); + + it('skips command messages (starting with /)', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createTextCtx({ text: '/start' }); + await triggerTextMessage(ctx); + + expect(opts.onMessage).not.toHaveBeenCalled(); + expect(opts.onChatMetadata).not.toHaveBeenCalled(); + }); + + it('extracts sender name from first_name', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createTextCtx({ text: 'Hi', firstName: 'Bob' }); + await triggerTextMessage(ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ sender_name: 'Bob' }), + ); + }); + + it('falls back to username when first_name missing', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createTextCtx({ text: 'Hi' }); + ctx.from.first_name = undefined as any; + await triggerTextMessage(ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ sender_name: 'alice_user' }), + ); + }); + + it('falls back to user ID when name and username missing', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createTextCtx({ text: 'Hi', fromId: 42 }); + ctx.from.first_name = undefined as any; + ctx.from.username = undefined as any; + await triggerTextMessage(ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ sender_name: '42' }), + ); + }); + + it('uses sender name as chat name for private chats', async () => { + const opts = createTestOpts({ + registeredGroups: vi.fn(() => ({ + 'tg:100200300': { + name: 'Private', + folder: 'private', + trigger: '@Andy', + added_at: '2024-01-01T00:00:00.000Z', + }, + })), + }); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createTextCtx({ + text: 'Hello', + chatType: 'private', + firstName: 'Alice', + }); + await triggerTextMessage(ctx); + + expect(opts.onChatMetadata).toHaveBeenCalledWith( + 'tg:100200300', + expect.any(String), + 'Alice', // Private chats use sender name + 'telegram', + false, + ); + }); + + it('uses chat title as name for group chats', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createTextCtx({ + text: 'Hello', + chatType: 'supergroup', + chatTitle: 'Project Team', + }); + await triggerTextMessage(ctx); + + expect(opts.onChatMetadata).toHaveBeenCalledWith( + 'tg:100200300', + expect.any(String), + 'Project Team', + 'telegram', + true, + ); + }); + + it('converts message.date to ISO timestamp', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const unixTime = 1704067200; // 2024-01-01T00:00:00.000Z + const ctx = createTextCtx({ text: 'Hello', date: unixTime }); + await triggerTextMessage(ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ + timestamp: '2024-01-01T00:00:00.000Z', + }), + ); + }); + }); + + // --- @mention translation --- + + describe('@mention translation', () => { + it('translates @bot_username mention to trigger format', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createTextCtx({ + text: '@andy_ai_bot what time is it?', + entities: [{ type: 'mention', offset: 0, length: 12 }], + }); + await triggerTextMessage(ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ + content: '@Andy @andy_ai_bot what time is it?', + }), + ); + }); + + it('does not translate if message already matches trigger', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createTextCtx({ + text: '@Andy @andy_ai_bot hello', + entities: [{ type: 'mention', offset: 6, length: 12 }], + }); + await triggerTextMessage(ctx); + + // Should NOT double-prepend — already starts with @Andy + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ + content: '@Andy @andy_ai_bot hello', + }), + ); + }); + + it('does not translate mentions of other bots', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createTextCtx({ + text: '@some_other_bot hi', + entities: [{ type: 'mention', offset: 0, length: 15 }], + }); + await triggerTextMessage(ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ + content: '@some_other_bot hi', // No translation + }), + ); + }); + + it('handles mention in middle of message', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createTextCtx({ + text: 'hey @andy_ai_bot check this', + entities: [{ type: 'mention', offset: 4, length: 12 }], + }); + await triggerTextMessage(ctx); + + // Bot is mentioned, message doesn't match trigger → prepend trigger + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ + content: '@Andy hey @andy_ai_bot check this', + }), + ); + }); + + it('handles message with no entities', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createTextCtx({ text: 'plain message' }); + await triggerTextMessage(ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ + content: 'plain message', + }), + ); + }); + + it('ignores non-mention entities', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createTextCtx({ + text: 'check https://example.com', + entities: [{ type: 'url', offset: 6, length: 19 }], + }); + await triggerTextMessage(ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ + content: 'check https://example.com', + }), + ); + }); + }); + + // --- Non-text messages --- + + describe('non-text messages', () => { + it('stores photo with placeholder', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createMediaCtx({}); + await triggerMediaMessage('message:photo', ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ content: '[Photo]' }), + ); + }); + + it('stores photo with caption', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createMediaCtx({ caption: 'Look at this' }); + await triggerMediaMessage('message:photo', ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ content: '[Photo] Look at this' }), + ); + }); + + it('stores video with placeholder', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createMediaCtx({}); + await triggerMediaMessage('message:video', ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ content: '[Video]' }), + ); + }); + + it('stores voice message with placeholder', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createMediaCtx({}); + await triggerMediaMessage('message:voice', ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ content: '[Voice message]' }), + ); + }); + + it('stores audio with placeholder', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createMediaCtx({}); + await triggerMediaMessage('message:audio', ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ content: '[Audio]' }), + ); + }); + + it('stores document with filename', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createMediaCtx({ + extra: { document: { file_name: 'report.pdf' } }, + }); + await triggerMediaMessage('message:document', ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ content: '[Document: report.pdf]' }), + ); + }); + + it('stores document with fallback name when filename missing', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createMediaCtx({ extra: { document: {} } }); + await triggerMediaMessage('message:document', ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ content: '[Document: file]' }), + ); + }); + + it('stores sticker with emoji', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createMediaCtx({ + extra: { sticker: { emoji: '😂' } }, + }); + await triggerMediaMessage('message:sticker', ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ content: '[Sticker 😂]' }), + ); + }); + + it('stores location with placeholder', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createMediaCtx({}); + await triggerMediaMessage('message:location', ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ content: '[Location]' }), + ); + }); + + it('stores contact with placeholder', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createMediaCtx({}); + await triggerMediaMessage('message:contact', ctx); + + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ content: '[Contact]' }), + ); + }); + + it('ignores non-text messages from unregistered chats', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const ctx = createMediaCtx({ chatId: 999999 }); + await triggerMediaMessage('message:photo', ctx); + + expect(opts.onMessage).not.toHaveBeenCalled(); + }); + }); + + // --- sendMessage --- + + describe('sendMessage', () => { + it('sends message via bot API', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + await channel.sendMessage('tg:100200300', 'Hello'); + + expect(currentBot().api.sendMessage).toHaveBeenCalledWith( + '100200300', + 'Hello', + ); + }); + + it('strips tg: prefix from JID', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + await channel.sendMessage('tg:-1001234567890', 'Group message'); + + expect(currentBot().api.sendMessage).toHaveBeenCalledWith( + '-1001234567890', + 'Group message', + ); + }); + + it('splits messages exceeding 4096 characters', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const longText = 'x'.repeat(5000); + await channel.sendMessage('tg:100200300', longText); + + expect(currentBot().api.sendMessage).toHaveBeenCalledTimes(2); + expect(currentBot().api.sendMessage).toHaveBeenNthCalledWith( + 1, + '100200300', + 'x'.repeat(4096), + ); + expect(currentBot().api.sendMessage).toHaveBeenNthCalledWith( + 2, + '100200300', + 'x'.repeat(904), + ); + }); + + it('sends exactly one message at 4096 characters', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const exactText = 'y'.repeat(4096); + await channel.sendMessage('tg:100200300', exactText); + + expect(currentBot().api.sendMessage).toHaveBeenCalledTimes(1); + }); + + it('handles send failure gracefully', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + currentBot().api.sendMessage.mockRejectedValueOnce( + new Error('Network error'), + ); + + // Should not throw + await expect( + channel.sendMessage('tg:100200300', 'Will fail'), + ).resolves.toBeUndefined(); + }); + + it('does nothing when bot is not initialized', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + + // Don't connect — bot is null + await channel.sendMessage('tg:100200300', 'No bot'); + + // No error, no API call + }); + }); + + // --- ownsJid --- + + describe('ownsJid', () => { + it('owns tg: JIDs', () => { + const channel = new TelegramChannel('test-token', createTestOpts()); + expect(channel.ownsJid('tg:123456')).toBe(true); + }); + + it('owns tg: JIDs with negative IDs (groups)', () => { + const channel = new TelegramChannel('test-token', createTestOpts()); + expect(channel.ownsJid('tg:-1001234567890')).toBe(true); + }); + + it('does not own WhatsApp group JIDs', () => { + const channel = new TelegramChannel('test-token', createTestOpts()); + expect(channel.ownsJid('12345@g.us')).toBe(false); + }); + + it('does not own WhatsApp DM JIDs', () => { + const channel = new TelegramChannel('test-token', createTestOpts()); + expect(channel.ownsJid('12345@s.whatsapp.net')).toBe(false); + }); + + it('does not own unknown JID formats', () => { + const channel = new TelegramChannel('test-token', createTestOpts()); + expect(channel.ownsJid('random-string')).toBe(false); + }); + }); + + // --- setTyping --- + + describe('setTyping', () => { + it('sends typing action when isTyping is true', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + await channel.setTyping('tg:100200300', true); + + expect(currentBot().api.sendChatAction).toHaveBeenCalledWith( + '100200300', + 'typing', + ); + }); + + it('does nothing when isTyping is false', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + await channel.setTyping('tg:100200300', false); + + expect(currentBot().api.sendChatAction).not.toHaveBeenCalled(); + }); + + it('does nothing when bot is not initialized', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + + // Don't connect + await channel.setTyping('tg:100200300', true); + + // No error, no API call + }); + + it('handles typing indicator failure gracefully', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + currentBot().api.sendChatAction.mockRejectedValueOnce( + new Error('Rate limited'), + ); + + await expect( + channel.setTyping('tg:100200300', true), + ).resolves.toBeUndefined(); + }); + }); + + // --- Bot commands --- + + describe('bot commands', () => { + it('/chatid replies with chat ID and metadata', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const handler = currentBot().commandHandlers.get('chatid')!; + const ctx = { + chat: { id: 100200300, type: 'group' as const }, + from: { first_name: 'Alice' }, + reply: vi.fn(), + }; + + await handler(ctx); + + expect(ctx.reply).toHaveBeenCalledWith( + expect.stringContaining('tg:100200300'), + expect.objectContaining({ parse_mode: 'Markdown' }), + ); + }); + + it('/chatid shows chat type', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const handler = currentBot().commandHandlers.get('chatid')!; + const ctx = { + chat: { id: 555, type: 'private' as const }, + from: { first_name: 'Bob' }, + reply: vi.fn(), + }; + + await handler(ctx); + + expect(ctx.reply).toHaveBeenCalledWith( + expect.stringContaining('private'), + expect.any(Object), + ); + }); + + it('/ping replies with bot status', async () => { + const opts = createTestOpts(); + const channel = new TelegramChannel('test-token', opts); + await channel.connect(); + + const handler = currentBot().commandHandlers.get('ping')!; + const ctx = { reply: vi.fn() }; + + await handler(ctx); + + expect(ctx.reply).toHaveBeenCalledWith('Andy is online.'); + }); + }); + + // --- Channel properties --- + + describe('channel properties', () => { + it('has name "telegram"', () => { + const channel = new TelegramChannel('test-token', createTestOpts()); + expect(channel.name).toBe('telegram'); + }); + }); +}); diff --git a/src/channels/telegram.ts b/src/channels/telegram.ts new file mode 100644 index 0000000..4176f03 --- /dev/null +++ b/src/channels/telegram.ts @@ -0,0 +1,257 @@ +import { Bot } from 'grammy'; + +import { ASSISTANT_NAME, TRIGGER_PATTERN } from '../config.js'; +import { readEnvFile } from '../env.js'; +import { logger } from '../logger.js'; +import { registerChannel, ChannelOpts } from './registry.js'; +import { + Channel, + OnChatMetadata, + OnInboundMessage, + RegisteredGroup, +} from '../types.js'; + +export interface TelegramChannelOpts { + onMessage: OnInboundMessage; + onChatMetadata: OnChatMetadata; + registeredGroups: () => Record; +} + +export class TelegramChannel implements Channel { + name = 'telegram'; + + private bot: Bot | null = null; + private opts: TelegramChannelOpts; + private botToken: string; + + constructor(botToken: string, opts: TelegramChannelOpts) { + this.botToken = botToken; + this.opts = opts; + } + + async connect(): Promise { + this.bot = new Bot(this.botToken); + + // Command to get chat ID (useful for registration) + this.bot.command('chatid', (ctx) => { + const chatId = ctx.chat.id; + const chatType = ctx.chat.type; + const chatName = + chatType === 'private' + ? ctx.from?.first_name || 'Private' + : (ctx.chat as any).title || 'Unknown'; + + ctx.reply( + `Chat ID: \`tg:${chatId}\`\nName: ${chatName}\nType: ${chatType}`, + { parse_mode: 'Markdown' }, + ); + }); + + // Command to check bot status + this.bot.command('ping', (ctx) => { + ctx.reply(`${ASSISTANT_NAME} is online.`); + }); + + this.bot.on('message:text', async (ctx) => { + // Skip commands + if (ctx.message.text.startsWith('/')) return; + + const chatJid = `tg:${ctx.chat.id}`; + let content = ctx.message.text; + const timestamp = new Date(ctx.message.date * 1000).toISOString(); + const senderName = + ctx.from?.first_name || + ctx.from?.username || + ctx.from?.id.toString() || + 'Unknown'; + const sender = ctx.from?.id.toString() || ''; + const msgId = ctx.message.message_id.toString(); + + // Determine chat name + const chatName = + ctx.chat.type === 'private' + ? senderName + : (ctx.chat as any).title || chatJid; + + // Translate Telegram @bot_username mentions into TRIGGER_PATTERN format. + // Telegram @mentions (e.g., @andy_ai_bot) won't match TRIGGER_PATTERN + // (e.g., ^@Andy\b), so we prepend the trigger when the bot is @mentioned. + const botUsername = ctx.me?.username?.toLowerCase(); + if (botUsername) { + const entities = ctx.message.entities || []; + const isBotMentioned = entities.some((entity) => { + if (entity.type === 'mention') { + const mentionText = content + .substring(entity.offset, entity.offset + entity.length) + .toLowerCase(); + return mentionText === `@${botUsername}`; + } + return false; + }); + if (isBotMentioned && !TRIGGER_PATTERN.test(content)) { + content = `@${ASSISTANT_NAME} ${content}`; + } + } + + // Store chat metadata for discovery + const isGroup = ctx.chat.type === 'group' || ctx.chat.type === 'supergroup'; + this.opts.onChatMetadata(chatJid, timestamp, chatName, 'telegram', isGroup); + + // Only deliver full message for registered groups + const group = this.opts.registeredGroups()[chatJid]; + if (!group) { + logger.debug( + { chatJid, chatName }, + 'Message from unregistered Telegram chat', + ); + return; + } + + // Deliver message — startMessageLoop() will pick it up + this.opts.onMessage(chatJid, { + id: msgId, + chat_jid: chatJid, + sender, + sender_name: senderName, + content, + timestamp, + is_from_me: false, + }); + + logger.info( + { chatJid, chatName, sender: senderName }, + 'Telegram message stored', + ); + }); + + // Handle non-text messages with placeholders so the agent knows something was sent + const storeNonText = (ctx: any, placeholder: string) => { + const chatJid = `tg:${ctx.chat.id}`; + const group = this.opts.registeredGroups()[chatJid]; + if (!group) return; + + const timestamp = new Date(ctx.message.date * 1000).toISOString(); + const senderName = + ctx.from?.first_name || + ctx.from?.username || + ctx.from?.id?.toString() || + 'Unknown'; + const caption = ctx.message.caption ? ` ${ctx.message.caption}` : ''; + + const isGroup = ctx.chat.type === 'group' || ctx.chat.type === 'supergroup'; + this.opts.onChatMetadata(chatJid, timestamp, undefined, 'telegram', isGroup); + this.opts.onMessage(chatJid, { + id: ctx.message.message_id.toString(), + chat_jid: chatJid, + sender: ctx.from?.id?.toString() || '', + sender_name: senderName, + content: `${placeholder}${caption}`, + timestamp, + is_from_me: false, + }); + }; + + this.bot.on('message:photo', (ctx) => storeNonText(ctx, '[Photo]')); + this.bot.on('message:video', (ctx) => storeNonText(ctx, '[Video]')); + this.bot.on('message:voice', (ctx) => + storeNonText(ctx, '[Voice message]'), + ); + this.bot.on('message:audio', (ctx) => storeNonText(ctx, '[Audio]')); + this.bot.on('message:document', (ctx) => { + const name = ctx.message.document?.file_name || 'file'; + storeNonText(ctx, `[Document: ${name}]`); + }); + this.bot.on('message:sticker', (ctx) => { + const emoji = ctx.message.sticker?.emoji || ''; + storeNonText(ctx, `[Sticker ${emoji}]`); + }); + this.bot.on('message:location', (ctx) => storeNonText(ctx, '[Location]')); + this.bot.on('message:contact', (ctx) => storeNonText(ctx, '[Contact]')); + + // Handle errors gracefully + this.bot.catch((err) => { + logger.error({ err: err.message }, 'Telegram bot error'); + }); + + // Start polling — returns a Promise that resolves when started + return new Promise((resolve) => { + this.bot!.start({ + onStart: (botInfo) => { + logger.info( + { username: botInfo.username, id: botInfo.id }, + 'Telegram bot connected', + ); + console.log(`\n Telegram bot: @${botInfo.username}`); + console.log( + ` Send /chatid to the bot to get a chat's registration ID\n`, + ); + resolve(); + }, + }); + }); + } + + async sendMessage(jid: string, text: string): Promise { + if (!this.bot) { + logger.warn('Telegram bot not initialized'); + return; + } + + try { + const numericId = jid.replace(/^tg:/, ''); + + // Telegram has a 4096 character limit per message — split if needed + const MAX_LENGTH = 4096; + if (text.length <= MAX_LENGTH) { + await this.bot.api.sendMessage(numericId, text); + } else { + for (let i = 0; i < text.length; i += MAX_LENGTH) { + await this.bot.api.sendMessage( + numericId, + text.slice(i, i + MAX_LENGTH), + ); + } + } + logger.info({ jid, length: text.length }, 'Telegram message sent'); + } catch (err) { + logger.error({ jid, err }, 'Failed to send Telegram message'); + } + } + + isConnected(): boolean { + return this.bot !== null; + } + + ownsJid(jid: string): boolean { + return jid.startsWith('tg:'); + } + + async disconnect(): Promise { + if (this.bot) { + this.bot.stop(); + this.bot = null; + logger.info('Telegram bot stopped'); + } + } + + async setTyping(jid: string, isTyping: boolean): Promise { + if (!this.bot || !isTyping) return; + try { + const numericId = jid.replace(/^tg:/, ''); + await this.bot.api.sendChatAction(numericId, 'typing'); + } catch (err) { + logger.debug({ jid, err }, 'Failed to send Telegram typing indicator'); + } + } +} + +registerChannel('telegram', (opts: ChannelOpts) => { + const envVars = readEnvFile(['TELEGRAM_BOT_TOKEN']); + const token = + process.env.TELEGRAM_BOT_TOKEN || envVars.TELEGRAM_BOT_TOKEN || ''; + if (!token) { + logger.warn('Telegram: TELEGRAM_BOT_TOKEN not set'); + return null; + } + return new TelegramChannel(token, opts); +}); From 5acab2c09d9d567cc748bea2bced75e7c5a3b40a Mon Sep 17 00:00:00 2001 From: gavrielc Date: Mon, 9 Mar 2026 23:43:19 +0200 Subject: [PATCH 02/91] ci: add upstream sync and merge-forward workflow Co-Authored-By: Claude Opus 4.6 --- .github/workflows/merge-forward-skills.yml | 200 +++++++++++++++++++++ 1 file changed, 200 insertions(+) create mode 100644 .github/workflows/merge-forward-skills.yml diff --git a/.github/workflows/merge-forward-skills.yml b/.github/workflows/merge-forward-skills.yml new file mode 100644 index 0000000..5b6d7df --- /dev/null +++ b/.github/workflows/merge-forward-skills.yml @@ -0,0 +1,200 @@ +name: Sync upstream & merge-forward skill branches + +on: + # Triggered by upstream repo via repository_dispatch + repository_dispatch: + types: [upstream-main-updated] + # Fallback: run on schedule in case dispatch isn't configured + schedule: + - cron: '0 */6 * * *' # every 6 hours + # Also run when fork's main is pushed directly + push: + branches: [main] + workflow_dispatch: + +permissions: + contents: write + issues: write + +jobs: + sync-and-merge: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GITHUB_TOKEN }} + + - uses: actions/setup-node@v4 + with: + node-version: 20 + cache: npm + + - name: Configure git + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + + - name: Sync with upstream main + id: sync + run: | + # Add upstream remote + git remote add upstream https://github.com/qwibitai/nanoclaw.git + git fetch upstream main + + # Check if upstream has new commits + if git merge-base --is-ancestor upstream/main HEAD; then + echo "Already up to date with upstream main." + echo "synced=false" >> "$GITHUB_OUTPUT" + exit 0 + fi + + # Merge upstream main into fork's main + if ! git merge upstream/main --no-edit; then + echo "::error::Failed to merge upstream/main into fork main — conflicts detected" + git merge --abort + echo "synced=false" >> "$GITHUB_OUTPUT" + echo "sync_failed=true" >> "$GITHUB_OUTPUT" + exit 0 + fi + + # Validate build + npm ci + if ! npm run build; then + echo "::error::Build failed after merging upstream/main" + git reset --hard "origin/main" + echo "synced=false" >> "$GITHUB_OUTPUT" + echo "sync_failed=true" >> "$GITHUB_OUTPUT" + exit 0 + fi + + if ! npm test 2>/dev/null; then + echo "::error::Tests failed after merging upstream/main" + git reset --hard "origin/main" + echo "synced=false" >> "$GITHUB_OUTPUT" + echo "sync_failed=true" >> "$GITHUB_OUTPUT" + exit 0 + fi + + git push origin main + echo "synced=true" >> "$GITHUB_OUTPUT" + + - name: Merge main into skill branches + id: merge + run: | + FAILED="" + SUCCEEDED="" + + # List all remote skill branches + SKILL_BRANCHES=$(git branch -r --list 'origin/skill/*' | sed 's|origin/||' | xargs) + + if [ -z "$SKILL_BRANCHES" ]; then + echo "No skill branches found." + exit 0 + fi + + for BRANCH in $SKILL_BRANCHES; do + SKILL_NAME=$(echo "$BRANCH" | sed 's|skill/||') + echo "" + echo "=== Processing $BRANCH ===" + + git checkout -B "$BRANCH" "origin/$BRANCH" + + if ! git merge main --no-edit; then + echo "::warning::Merge conflict in $BRANCH" + git merge --abort + FAILED="$FAILED $SKILL_NAME" + continue + fi + + # Check if there's anything new to push + if git diff --quiet "origin/$BRANCH"; then + echo "$BRANCH is already up to date with main." + SUCCEEDED="$SUCCEEDED $SKILL_NAME" + continue + fi + + npm ci + + if ! npm run build; then + echo "::warning::Build failed for $BRANCH" + git reset --hard "origin/$BRANCH" + FAILED="$FAILED $SKILL_NAME" + continue + fi + + if ! npm test 2>/dev/null; then + echo "::warning::Tests failed for $BRANCH" + git reset --hard "origin/$BRANCH" + FAILED="$FAILED $SKILL_NAME" + continue + fi + + git push origin "$BRANCH" + SUCCEEDED="$SUCCEEDED $SKILL_NAME" + echo "$BRANCH merged and pushed successfully." + done + + echo "" + echo "=== Results ===" + echo "Succeeded: $SUCCEEDED" + echo "Failed: $FAILED" + + echo "failed=$FAILED" >> "$GITHUB_OUTPUT" + echo "succeeded=$SUCCEEDED" >> "$GITHUB_OUTPUT" + + - name: Open issue for upstream sync failure + if: steps.sync.outputs.sync_failed == 'true' + uses: actions/github-script@v7 + with: + script: | + await github.rest.issues.create({ + owner: context.repo.owner, + repo: context.repo.repo, + title: `Upstream sync failed — merge conflict or build failure`, + body: [ + 'The automated sync with `qwibitai/nanoclaw` main failed.', + '', + 'This usually means upstream made changes that conflict with this fork\'s channel code.', + '', + 'To resolve manually:', + '```bash', + 'git fetch upstream main', + 'git merge upstream/main', + '# resolve conflicts', + 'npm run build && npm test', + 'git push', + '```', + ].join('\n'), + labels: ['upstream-sync'] + }); + + - name: Open issue for failed skill merges + if: steps.merge.outputs.failed != '' + uses: actions/github-script@v7 + with: + script: | + const failed = '${{ steps.merge.outputs.failed }}'.trim().split(/\s+/); + const body = [ + `The merge-forward workflow failed to merge \`main\` into the following skill branches:`, + '', + ...failed.map(s => `- \`skill/${s}\`: merge conflict, build failure, or test failure`), + '', + 'Please resolve manually:', + '```bash', + ...failed.map(s => [ + `git checkout skill/${s}`, + `git merge main`, + `# resolve conflicts, then: git push`, + '' + ]).flat(), + '```', + ].join('\n'); + + await github.rest.issues.create({ + owner: context.repo.owner, + repo: context.repo.repo, + title: `Merge-forward failed for ${failed.length} skill branch(es)`, + body, + labels: ['skill-maintenance'] + }); From d487faf55aecd872ef8082179b2603d7e9571e44 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Tue, 10 Mar 2026 00:53:40 +0200 Subject: [PATCH 03/91] ci: rename sync workflow to fork-sync-skills.yml to avoid merge conflicts with core --- .github/workflows/fork-sync-skills.yml | 201 +++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 .github/workflows/fork-sync-skills.yml diff --git a/.github/workflows/fork-sync-skills.yml b/.github/workflows/fork-sync-skills.yml new file mode 100644 index 0000000..14e10a0 --- /dev/null +++ b/.github/workflows/fork-sync-skills.yml @@ -0,0 +1,201 @@ +name: Sync upstream & merge-forward skill branches + +on: + # Triggered by upstream repo via repository_dispatch + repository_dispatch: + types: [upstream-main-updated] + # Fallback: run on schedule in case dispatch isn't configured + schedule: + - cron: '0 */6 * * *' # every 6 hours + # Also run when fork's main is pushed directly + push: + branches: [main] + workflow_dispatch: + +permissions: + contents: write + issues: write + +jobs: + sync-and-merge: + if: github.repository_owner != 'qwibitai' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GITHUB_TOKEN }} + + - uses: actions/setup-node@v4 + with: + node-version: 20 + cache: npm + + - name: Configure git + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + + - name: Sync with upstream main + id: sync + run: | + # Add upstream remote + git remote add upstream https://github.com/qwibitai/nanoclaw.git + git fetch upstream main + + # Check if upstream has new commits + if git merge-base --is-ancestor upstream/main HEAD; then + echo "Already up to date with upstream main." + echo "synced=false" >> "$GITHUB_OUTPUT" + exit 0 + fi + + # Merge upstream main into fork's main + if ! git merge upstream/main --no-edit; then + echo "::error::Failed to merge upstream/main into fork main — conflicts detected" + git merge --abort + echo "synced=false" >> "$GITHUB_OUTPUT" + echo "sync_failed=true" >> "$GITHUB_OUTPUT" + exit 0 + fi + + # Validate build + npm ci + if ! npm run build; then + echo "::error::Build failed after merging upstream/main" + git reset --hard "origin/main" + echo "synced=false" >> "$GITHUB_OUTPUT" + echo "sync_failed=true" >> "$GITHUB_OUTPUT" + exit 0 + fi + + if ! npm test 2>/dev/null; then + echo "::error::Tests failed after merging upstream/main" + git reset --hard "origin/main" + echo "synced=false" >> "$GITHUB_OUTPUT" + echo "sync_failed=true" >> "$GITHUB_OUTPUT" + exit 0 + fi + + git push origin main + echo "synced=true" >> "$GITHUB_OUTPUT" + + - name: Merge main into skill branches + id: merge + run: | + FAILED="" + SUCCEEDED="" + + # List all remote skill branches + SKILL_BRANCHES=$(git branch -r --list 'origin/skill/*' | sed 's|origin/||' | xargs) + + if [ -z "$SKILL_BRANCHES" ]; then + echo "No skill branches found." + exit 0 + fi + + for BRANCH in $SKILL_BRANCHES; do + SKILL_NAME=$(echo "$BRANCH" | sed 's|skill/||') + echo "" + echo "=== Processing $BRANCH ===" + + git checkout -B "$BRANCH" "origin/$BRANCH" + + if ! git merge main --no-edit; then + echo "::warning::Merge conflict in $BRANCH" + git merge --abort + FAILED="$FAILED $SKILL_NAME" + continue + fi + + # Check if there's anything new to push + if git diff --quiet "origin/$BRANCH"; then + echo "$BRANCH is already up to date with main." + SUCCEEDED="$SUCCEEDED $SKILL_NAME" + continue + fi + + npm ci + + if ! npm run build; then + echo "::warning::Build failed for $BRANCH" + git reset --hard "origin/$BRANCH" + FAILED="$FAILED $SKILL_NAME" + continue + fi + + if ! npm test 2>/dev/null; then + echo "::warning::Tests failed for $BRANCH" + git reset --hard "origin/$BRANCH" + FAILED="$FAILED $SKILL_NAME" + continue + fi + + git push origin "$BRANCH" + SUCCEEDED="$SUCCEEDED $SKILL_NAME" + echo "$BRANCH merged and pushed successfully." + done + + echo "" + echo "=== Results ===" + echo "Succeeded: $SUCCEEDED" + echo "Failed: $FAILED" + + echo "failed=$FAILED" >> "$GITHUB_OUTPUT" + echo "succeeded=$SUCCEEDED" >> "$GITHUB_OUTPUT" + + - name: Open issue for upstream sync failure + if: steps.sync.outputs.sync_failed == 'true' + uses: actions/github-script@v7 + with: + script: | + await github.rest.issues.create({ + owner: context.repo.owner, + repo: context.repo.repo, + title: `Upstream sync failed — merge conflict or build failure`, + body: [ + 'The automated sync with `qwibitai/nanoclaw` main failed.', + '', + 'This usually means upstream made changes that conflict with this fork\'s channel code.', + '', + 'To resolve manually:', + '```bash', + 'git fetch upstream main', + 'git merge upstream/main', + '# resolve conflicts', + 'npm run build && npm test', + 'git push', + '```', + ].join('\n'), + labels: ['upstream-sync'] + }); + + - name: Open issue for failed skill merges + if: steps.merge.outputs.failed != '' + uses: actions/github-script@v7 + with: + script: | + const failed = '${{ steps.merge.outputs.failed }}'.trim().split(/\s+/); + const body = [ + `The merge-forward workflow failed to merge \`main\` into the following skill branches:`, + '', + ...failed.map(s => `- \`skill/${s}\`: merge conflict, build failure, or test failure`), + '', + 'Please resolve manually:', + '```bash', + ...failed.map(s => [ + `git checkout skill/${s}`, + `git merge main`, + `# resolve conflicts, then: git push`, + '' + ]).flat(), + '```', + ].join('\n'); + + await github.rest.issues.create({ + owner: context.repo.owner, + repo: context.repo.repo, + title: `Merge-forward failed for ${failed.length} skill branch(es)`, + body, + labels: ['skill-maintenance'] + }); From b913a37c2142a3abafef64b74c46d9f77b4b5a1d Mon Sep 17 00:00:00 2001 From: gavrielc Date: Tue, 10 Mar 2026 00:53:51 +0200 Subject: [PATCH 04/91] ci: remove old merge-forward-skills.yml (replaced by fork-sync-skills.yml) --- .github/workflows/merge-forward-skills.yml | 200 --------------------- 1 file changed, 200 deletions(-) delete mode 100644 .github/workflows/merge-forward-skills.yml diff --git a/.github/workflows/merge-forward-skills.yml b/.github/workflows/merge-forward-skills.yml deleted file mode 100644 index 5b6d7df..0000000 --- a/.github/workflows/merge-forward-skills.yml +++ /dev/null @@ -1,200 +0,0 @@ -name: Sync upstream & merge-forward skill branches - -on: - # Triggered by upstream repo via repository_dispatch - repository_dispatch: - types: [upstream-main-updated] - # Fallback: run on schedule in case dispatch isn't configured - schedule: - - cron: '0 */6 * * *' # every 6 hours - # Also run when fork's main is pushed directly - push: - branches: [main] - workflow_dispatch: - -permissions: - contents: write - issues: write - -jobs: - sync-and-merge: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - token: ${{ secrets.GITHUB_TOKEN }} - - - uses: actions/setup-node@v4 - with: - node-version: 20 - cache: npm - - - name: Configure git - run: | - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - - - name: Sync with upstream main - id: sync - run: | - # Add upstream remote - git remote add upstream https://github.com/qwibitai/nanoclaw.git - git fetch upstream main - - # Check if upstream has new commits - if git merge-base --is-ancestor upstream/main HEAD; then - echo "Already up to date with upstream main." - echo "synced=false" >> "$GITHUB_OUTPUT" - exit 0 - fi - - # Merge upstream main into fork's main - if ! git merge upstream/main --no-edit; then - echo "::error::Failed to merge upstream/main into fork main — conflicts detected" - git merge --abort - echo "synced=false" >> "$GITHUB_OUTPUT" - echo "sync_failed=true" >> "$GITHUB_OUTPUT" - exit 0 - fi - - # Validate build - npm ci - if ! npm run build; then - echo "::error::Build failed after merging upstream/main" - git reset --hard "origin/main" - echo "synced=false" >> "$GITHUB_OUTPUT" - echo "sync_failed=true" >> "$GITHUB_OUTPUT" - exit 0 - fi - - if ! npm test 2>/dev/null; then - echo "::error::Tests failed after merging upstream/main" - git reset --hard "origin/main" - echo "synced=false" >> "$GITHUB_OUTPUT" - echo "sync_failed=true" >> "$GITHUB_OUTPUT" - exit 0 - fi - - git push origin main - echo "synced=true" >> "$GITHUB_OUTPUT" - - - name: Merge main into skill branches - id: merge - run: | - FAILED="" - SUCCEEDED="" - - # List all remote skill branches - SKILL_BRANCHES=$(git branch -r --list 'origin/skill/*' | sed 's|origin/||' | xargs) - - if [ -z "$SKILL_BRANCHES" ]; then - echo "No skill branches found." - exit 0 - fi - - for BRANCH in $SKILL_BRANCHES; do - SKILL_NAME=$(echo "$BRANCH" | sed 's|skill/||') - echo "" - echo "=== Processing $BRANCH ===" - - git checkout -B "$BRANCH" "origin/$BRANCH" - - if ! git merge main --no-edit; then - echo "::warning::Merge conflict in $BRANCH" - git merge --abort - FAILED="$FAILED $SKILL_NAME" - continue - fi - - # Check if there's anything new to push - if git diff --quiet "origin/$BRANCH"; then - echo "$BRANCH is already up to date with main." - SUCCEEDED="$SUCCEEDED $SKILL_NAME" - continue - fi - - npm ci - - if ! npm run build; then - echo "::warning::Build failed for $BRANCH" - git reset --hard "origin/$BRANCH" - FAILED="$FAILED $SKILL_NAME" - continue - fi - - if ! npm test 2>/dev/null; then - echo "::warning::Tests failed for $BRANCH" - git reset --hard "origin/$BRANCH" - FAILED="$FAILED $SKILL_NAME" - continue - fi - - git push origin "$BRANCH" - SUCCEEDED="$SUCCEEDED $SKILL_NAME" - echo "$BRANCH merged and pushed successfully." - done - - echo "" - echo "=== Results ===" - echo "Succeeded: $SUCCEEDED" - echo "Failed: $FAILED" - - echo "failed=$FAILED" >> "$GITHUB_OUTPUT" - echo "succeeded=$SUCCEEDED" >> "$GITHUB_OUTPUT" - - - name: Open issue for upstream sync failure - if: steps.sync.outputs.sync_failed == 'true' - uses: actions/github-script@v7 - with: - script: | - await github.rest.issues.create({ - owner: context.repo.owner, - repo: context.repo.repo, - title: `Upstream sync failed — merge conflict or build failure`, - body: [ - 'The automated sync with `qwibitai/nanoclaw` main failed.', - '', - 'This usually means upstream made changes that conflict with this fork\'s channel code.', - '', - 'To resolve manually:', - '```bash', - 'git fetch upstream main', - 'git merge upstream/main', - '# resolve conflicts', - 'npm run build && npm test', - 'git push', - '```', - ].join('\n'), - labels: ['upstream-sync'] - }); - - - name: Open issue for failed skill merges - if: steps.merge.outputs.failed != '' - uses: actions/github-script@v7 - with: - script: | - const failed = '${{ steps.merge.outputs.failed }}'.trim().split(/\s+/); - const body = [ - `The merge-forward workflow failed to merge \`main\` into the following skill branches:`, - '', - ...failed.map(s => `- \`skill/${s}\`: merge conflict, build failure, or test failure`), - '', - 'Please resolve manually:', - '```bash', - ...failed.map(s => [ - `git checkout skill/${s}`, - `git merge main`, - `# resolve conflicts, then: git push`, - '' - ]).flat(), - '```', - ].join('\n'); - - await github.rest.issues.create({ - owner: context.repo.owner, - repo: context.repo.repo, - title: `Merge-forward failed for ${failed.length} skill branch(es)`, - body, - labels: ['skill-maintenance'] - }); From 9a4fb61f6e037d3f82f0ec700ec6a888964321d9 Mon Sep 17 00:00:00 2001 From: James Schindler Date: Tue, 10 Mar 2026 11:58:00 -0400 Subject: [PATCH 05/91] feat: add Markdown formatting for outbound messages Wrap outbound sendMessage calls with parse_mode: 'Markdown' so that Claude's natural formatting (*bold*, _italic_, `code`, etc.) renders correctly in Telegram instead of showing raw asterisks and underscores. Falls back to plain text if Telegram rejects the Markdown formatting. --- src/channels/telegram.ts | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/channels/telegram.ts b/src/channels/telegram.ts index 4176f03..c7d19e5 100644 --- a/src/channels/telegram.ts +++ b/src/channels/telegram.ts @@ -1,4 +1,4 @@ -import { Bot } from 'grammy'; +import { Api, Bot } from 'grammy'; import { ASSISTANT_NAME, TRIGGER_PATTERN } from '../config.js'; import { readEnvFile } from '../env.js'; @@ -17,6 +17,29 @@ export interface TelegramChannelOpts { registeredGroups: () => Record; } +/** + * Send a message with Telegram Markdown parse mode, falling back to plain text. + * Claude's output naturally matches Telegram's Markdown v1 format: + * *bold*, _italic_, `code`, ```code blocks```, [links](url) + */ +async function sendTelegramMessage( + api: { sendMessage: Api['sendMessage'] }, + chatId: string | number, + text: string, + options: { message_thread_id?: number } = {}, +): Promise { + try { + await api.sendMessage(chatId, text, { + ...options, + parse_mode: 'Markdown', + }); + } catch (err) { + // Fallback: send as plain text if Markdown parsing fails + logger.debug({ err }, 'Markdown send failed, falling back to plain text'); + await api.sendMessage(chatId, text, options); + } +} + export class TelegramChannel implements Channel { name = 'telegram'; @@ -203,10 +226,11 @@ export class TelegramChannel implements Channel { // Telegram has a 4096 character limit per message — split if needed const MAX_LENGTH = 4096; if (text.length <= MAX_LENGTH) { - await this.bot.api.sendMessage(numericId, text); + await sendTelegramMessage(this.bot.api, numericId, text); } else { for (let i = 0; i < text.length; i += MAX_LENGTH) { - await this.bot.api.sendMessage( + await sendTelegramMessage( + this.bot.api, numericId, text.slice(i, i + MAX_LENGTH), ); From 107f9742a9ba0e13cfb334f751b7cb26aafb703e Mon Sep 17 00:00:00 2001 From: gavrielc Date: Tue, 10 Mar 2026 22:00:36 +0200 Subject: [PATCH 06/91] fix: update sync condition to check repo name, not owner --- .github/workflows/fork-sync-skills.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/fork-sync-skills.yml b/.github/workflows/fork-sync-skills.yml index 14e10a0..e1c81c7 100644 --- a/.github/workflows/fork-sync-skills.yml +++ b/.github/workflows/fork-sync-skills.yml @@ -18,7 +18,7 @@ permissions: jobs: sync-and-merge: - if: github.repository_owner != 'qwibitai' + if: github.repository != 'qwibitai/nanoclaw' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -166,7 +166,8 @@ jobs: 'npm run build && npm test', 'git push', '```', - ].join('\n'), + ].join(' +'), labels: ['upstream-sync'] }); @@ -190,7 +191,8 @@ jobs: '' ]).flat(), '```', - ].join('\n'); + ].join(' +'); await github.rest.issues.create({ owner: context.repo.owner, From 15ed3cf2a65f1a14b5e712a95a5b7400f8b7fea0 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Tue, 10 Mar 2026 22:10:37 +0200 Subject: [PATCH 07/91] fix: repair escaped newlines in fork-sync workflow --- .github/workflows/fork-sync-skills.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/fork-sync-skills.yml b/.github/workflows/fork-sync-skills.yml index e1c81c7..259dec8 100644 --- a/.github/workflows/fork-sync-skills.yml +++ b/.github/workflows/fork-sync-skills.yml @@ -4,7 +4,7 @@ on: # Triggered by upstream repo via repository_dispatch repository_dispatch: types: [upstream-main-updated] - # Fallback: run on schedule in case dispatch isn't configured + # Fallback: run on a schedule in case dispatch isn't configured schedule: - cron: '0 */6 * * *' # every 6 hours # Also run when fork's main is pushed directly @@ -166,8 +166,7 @@ jobs: 'npm run build && npm test', 'git push', '```', - ].join(' -'), + ].join('\n'), labels: ['upstream-sync'] }); @@ -191,8 +190,7 @@ jobs: '' ]).flat(), '```', - ].join(' -'); + ].join('\n'); await github.rest.issues.create({ owner: context.repo.owner, @@ -200,4 +198,4 @@ jobs: title: `Merge-forward failed for ${failed.length} skill branch(es)`, body, labels: ['skill-maintenance'] - }); + }); \ No newline at end of file From 018deca3ef027ecd6d1e4bb571b64d2aa8f636a4 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Tue, 10 Mar 2026 22:16:02 +0200 Subject: [PATCH 08/91] fix: use GitHub App token for fork-sync (workflows permission needed) --- .github/workflows/fork-sync-skills.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fork-sync-skills.yml b/.github/workflows/fork-sync-skills.yml index 259dec8..dced479 100644 --- a/.github/workflows/fork-sync-skills.yml +++ b/.github/workflows/fork-sync-skills.yml @@ -21,10 +21,16 @@ jobs: if: github.repository != 'qwibitai/nanoclaw' runs-on: ubuntu-latest steps: + - uses: actions/create-github-app-token@v1 + id: app-token + with: + app-id: ${{ secrets.APP_ID }} + private-key: ${{ secrets.APP_PRIVATE_KEY }} + - uses: actions/checkout@v4 with: fetch-depth: 0 - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ steps.app-token.outputs.token }} - uses: actions/setup-node@v4 with: From 51ad9499797836c234d6100b6d350893501adfd0 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Tue, 10 Mar 2026 22:28:12 +0200 Subject: [PATCH 09/91] fix: re-fetch before skill branch merges to avoid stale refs --- .github/workflows/fork-sync-skills.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/fork-sync-skills.yml b/.github/workflows/fork-sync-skills.yml index dced479..273bfc7 100644 --- a/.github/workflows/fork-sync-skills.yml +++ b/.github/workflows/fork-sync-skills.yml @@ -89,6 +89,9 @@ jobs: - name: Merge main into skill branches id: merge run: | + # Re-fetch to pick up any changes pushed since job start + git fetch origin + FAILED="" SUCCEEDED="" From 7061480ac008a46390017bcc1d6dfcc8250e9ca9 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Tue, 10 Mar 2026 22:43:00 +0200 Subject: [PATCH 10/91] fix: add concurrency group to prevent parallel fork-sync races --- .github/workflows/fork-sync-skills.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/fork-sync-skills.yml b/.github/workflows/fork-sync-skills.yml index 273bfc7..8d25ee2 100644 --- a/.github/workflows/fork-sync-skills.yml +++ b/.github/workflows/fork-sync-skills.yml @@ -16,6 +16,10 @@ permissions: contents: write issues: write +concurrency: + group: fork-sync + cancel-in-progress: true + jobs: sync-and-merge: if: github.repository != 'qwibitai/nanoclaw' From 272cbcf18f204df78ccf82dc45b0d27ba4341693 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Wed, 11 Mar 2026 12:06:28 +0200 Subject: [PATCH 11/91] fix: update sendMessage test expectations for Markdown parse_mode The sendTelegramMessage helper now passes { parse_mode: 'Markdown' } to bot.api.sendMessage, but three tests still expected only two args. Co-Authored-By: Claude Opus 4.6 --- src/channels/telegram.test.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/channels/telegram.test.ts b/src/channels/telegram.test.ts index 9a97223..564a20e 100644 --- a/src/channels/telegram.test.ts +++ b/src/channels/telegram.test.ts @@ -710,6 +710,7 @@ describe('TelegramChannel', () => { expect(currentBot().api.sendMessage).toHaveBeenCalledWith( '100200300', 'Hello', + { parse_mode: 'Markdown' }, ); }); @@ -723,6 +724,7 @@ describe('TelegramChannel', () => { expect(currentBot().api.sendMessage).toHaveBeenCalledWith( '-1001234567890', 'Group message', + { parse_mode: 'Markdown' }, ); }); @@ -739,11 +741,13 @@ describe('TelegramChannel', () => { 1, '100200300', 'x'.repeat(4096), + { parse_mode: 'Markdown' }, ); expect(currentBot().api.sendMessage).toHaveBeenNthCalledWith( 2, '100200300', 'x'.repeat(904), + { parse_mode: 'Markdown' }, ); }); From 845da49fa39fa27b4378b607e6c8f58e11f7af5c Mon Sep 17 00:00:00 2001 From: gavrielc Date: Wed, 11 Mar 2026 12:08:52 +0200 Subject: [PATCH 12/91] fix: prettier formatting for telegram.ts Pre-existing formatting issue that causes CI format check to fail. Co-Authored-By: Claude Opus 4.6 --- src/channels/telegram.ts | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/channels/telegram.ts b/src/channels/telegram.ts index c7d19e5..7b95924 100644 --- a/src/channels/telegram.ts +++ b/src/channels/telegram.ts @@ -117,8 +117,15 @@ export class TelegramChannel implements Channel { } // Store chat metadata for discovery - const isGroup = ctx.chat.type === 'group' || ctx.chat.type === 'supergroup'; - this.opts.onChatMetadata(chatJid, timestamp, chatName, 'telegram', isGroup); + const isGroup = + ctx.chat.type === 'group' || ctx.chat.type === 'supergroup'; + this.opts.onChatMetadata( + chatJid, + timestamp, + chatName, + 'telegram', + isGroup, + ); // Only deliver full message for registered groups const group = this.opts.registeredGroups()[chatJid]; @@ -161,8 +168,15 @@ export class TelegramChannel implements Channel { 'Unknown'; const caption = ctx.message.caption ? ` ${ctx.message.caption}` : ''; - const isGroup = ctx.chat.type === 'group' || ctx.chat.type === 'supergroup'; - this.opts.onChatMetadata(chatJid, timestamp, undefined, 'telegram', isGroup); + const isGroup = + ctx.chat.type === 'group' || ctx.chat.type === 'supergroup'; + this.opts.onChatMetadata( + chatJid, + timestamp, + undefined, + 'telegram', + isGroup, + ); this.opts.onMessage(chatJid, { id: ctx.message.message_id.toString(), chat_jid: chatJid, @@ -176,9 +190,7 @@ export class TelegramChannel implements Channel { this.bot.on('message:photo', (ctx) => storeNonText(ctx, '[Photo]')); this.bot.on('message:video', (ctx) => storeNonText(ctx, '[Video]')); - this.bot.on('message:voice', (ctx) => - storeNonText(ctx, '[Voice message]'), - ); + this.bot.on('message:voice', (ctx) => storeNonText(ctx, '[Voice message]')); this.bot.on('message:audio', (ctx) => storeNonText(ctx, '[Audio]')); this.bot.on('message:document', (ctx) => { const name = ctx.message.document?.file_name || 'file'; From cb9fba8472b629bee7f8ae1a64140eda17d27b36 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 11 Mar 2026 10:09:48 +0000 Subject: [PATCH 13/91] chore: bump version to 1.2.13 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0e7969b..34b2aa8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.12", + "version": "1.2.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.12", + "version": "1.2.13", "dependencies": { "better-sqlite3": "^11.8.1", "cron-parser": "^5.5.0", diff --git a/package.json b/package.json index 560200d..0e915d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.12", + "version": "1.2.13", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From 2dedd15ec71a2b52553f334eb4a0c2bd8398f0ab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 11 Mar 2026 10:09:50 +0000 Subject: [PATCH 14/91] =?UTF-8?q?docs:=20update=20token=20count=20to=2040.?= =?UTF-8?q?9k=20tokens=20=C2=B7=2020%=20of=20context=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo-tokens/badge.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo-tokens/badge.svg b/repo-tokens/badge.svg index 182aaa2..993856e 100644 --- a/repo-tokens/badge.svg +++ b/repo-tokens/badge.svg @@ -1,5 +1,5 @@ - - 37.5k tokens, 19% of context window + + 40.9k tokens, 20% of context window @@ -15,8 +15,8 @@ tokens - - 37.5k + + 40.9k From d000acc6873bc611563b312d6c95ea4a4ecb5622 Mon Sep 17 00:00:00 2001 From: Gabi Simons Date: Wed, 11 Mar 2026 22:46:57 +0200 Subject: [PATCH 15/91] fix: use https.globalAgent in grammY Bot to support sandbox proxy grammY creates its own https.Agent internally, bypassing any global proxy. In Docker Sandbox, NanoClaw sets https.globalAgent to a proxy agent at startup. This tells grammY to use it instead. On non-sandbox setups it's a no-op. Co-Authored-By: Claude Opus 4.6 --- src/channels/telegram.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/channels/telegram.ts b/src/channels/telegram.ts index 7b95924..0b990d2 100644 --- a/src/channels/telegram.ts +++ b/src/channels/telegram.ts @@ -1,3 +1,4 @@ +import https from 'https'; import { Api, Bot } from 'grammy'; import { ASSISTANT_NAME, TRIGGER_PATTERN } from '../config.js'; @@ -53,7 +54,11 @@ export class TelegramChannel implements Channel { } async connect(): Promise { - this.bot = new Bot(this.botToken); + this.bot = new Bot(this.botToken, { + client: { + baseFetchConfig: { agent: https.globalAgent, compress: true }, + }, + }); // Command to get chat ID (useful for registration) this.bot.command('chatid', (ctx) => { From f210fd5049a704f0404a0ebcc68e89f96d23fe9a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 11 Mar 2026 20:52:39 +0000 Subject: [PATCH 16/91] chore: bump version to 1.2.14 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 34b2aa8..b720403 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.13", + "version": "1.2.14", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.13", + "version": "1.2.14", "dependencies": { "better-sqlite3": "^11.8.1", "cron-parser": "^5.5.0", diff --git a/package.json b/package.json index 0e915d3..a0d1e63 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.13", + "version": "1.2.14", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From d81f8e122113f00e65cd9391801267bbcc56dfbd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 11 Mar 2026 20:52:43 +0000 Subject: [PATCH 17/91] =?UTF-8?q?docs:=20update=20token=20count=20to=2041.?= =?UTF-8?q?0k=20tokens=20=C2=B7=2020%=20of=20context=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo-tokens/badge.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo-tokens/badge.svg b/repo-tokens/badge.svg index 993856e..be808ed 100644 --- a/repo-tokens/badge.svg +++ b/repo-tokens/badge.svg @@ -1,5 +1,5 @@ - - 40.9k tokens, 20% of context window + + 41.0k tokens, 20% of context window @@ -15,8 +15,8 @@ tokens - - 40.9k + + 41.0k From d1975462c49b79e8023fc24a1206b65078abdb71 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Sat, 14 Mar 2026 15:16:33 +0200 Subject: [PATCH 18/91] chore: bump claude-agent-sdk to ^0.2.76 Co-Authored-By: Claude Opus 4.6 --- container/agent-runner/package-lock.json | 8 ++++---- container/agent-runner/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/container/agent-runner/package-lock.json b/container/agent-runner/package-lock.json index 89cee2c..9ae119b 100644 --- a/container/agent-runner/package-lock.json +++ b/container/agent-runner/package-lock.json @@ -8,7 +8,7 @@ "name": "nanoclaw-agent-runner", "version": "1.0.0", "dependencies": { - "@anthropic-ai/claude-agent-sdk": "^0.2.34", + "@anthropic-ai/claude-agent-sdk": "^0.2.76", "@modelcontextprotocol/sdk": "^1.12.1", "cron-parser": "^5.0.0", "zod": "^4.0.0" @@ -19,9 +19,9 @@ } }, "node_modules/@anthropic-ai/claude-agent-sdk": { - "version": "0.2.68", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk/-/claude-agent-sdk-0.2.68.tgz", - "integrity": "sha512-y4n6hTTgAqmiV/pqy1G4OgIdg6gDiAKPJaEgO1NOh7/rdsrXyc/HQoUmUy0ty4HkBq1hasm7hB92wtX3W1UMEw==", + "version": "0.2.76", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk/-/claude-agent-sdk-0.2.76.tgz", + "integrity": "sha512-HZxvnT8ZWkzCnQygaYCA0dl8RSUzuVbxE1YG4ecy6vh4nQbTT36CxUxBy+QVdR12pPQluncC0mCOLhI2918Eaw==", "license": "SEE LICENSE IN README.md", "engines": { "node": ">=18.0.0" diff --git a/container/agent-runner/package.json b/container/agent-runner/package.json index bf13328..42a994e 100644 --- a/container/agent-runner/package.json +++ b/container/agent-runner/package.json @@ -9,7 +9,7 @@ "start": "node dist/index.js" }, "dependencies": { - "@anthropic-ai/claude-agent-sdk": "^0.2.34", + "@anthropic-ai/claude-agent-sdk": "^0.2.76", "@modelcontextprotocol/sdk": "^1.12.1", "cron-parser": "^5.0.0", "zod": "^4.0.0" From 54a55affa403fceac6e87c1247f0b23580515cf5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 14 Mar 2026 13:16:49 +0000 Subject: [PATCH 19/91] chore: bump version to 1.2.15 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b720403..0db62f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.14", + "version": "1.2.15", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.14", + "version": "1.2.15", "dependencies": { "better-sqlite3": "^11.8.1", "cron-parser": "^5.5.0", diff --git a/package.json b/package.json index a0d1e63..c77580e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.14", + "version": "1.2.15", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From 662e81fc9e9858be5135078585ce643e97ef14fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 14 Mar 2026 13:17:37 +0000 Subject: [PATCH 20/91] chore: bump version to 1.2.16 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0db62f4..deffe16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.15", + "version": "1.2.16", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.15", + "version": "1.2.16", "dependencies": { "better-sqlite3": "^11.8.1", "cron-parser": "^5.5.0", diff --git a/package.json b/package.json index c77580e..4db8178 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.15", + "version": "1.2.16", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From cb20038956fdd2cc89c778614e72b62cff8b3ff7 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Sat, 14 Mar 2026 17:01:23 +0200 Subject: [PATCH 21/91] fix: only skip /chatid and /ping, let other / messages through Previously all messages starting with / were silently dropped. This prevented NanoClaw-level commands like /remote-control from reaching the onMessage callback. Now only Telegram bot commands (/chatid, /ping) are skipped; everything else flows through as a regular message. Co-Authored-By: Claude Opus 4.6 (1M context) --- src/channels/telegram.test.ts | 21 +++++++++++++++++---- src/channels/telegram.ts | 10 ++++++++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/channels/telegram.test.ts b/src/channels/telegram.test.ts index 564a20e..538c87b 100644 --- a/src/channels/telegram.test.ts +++ b/src/channels/telegram.test.ts @@ -295,16 +295,29 @@ describe('TelegramChannel', () => { expect(opts.onMessage).not.toHaveBeenCalled(); }); - it('skips command messages (starting with /)', async () => { + it('skips bot commands (/chatid, /ping) but passes other / messages through', async () => { const opts = createTestOpts(); const channel = new TelegramChannel('test-token', opts); await channel.connect(); - const ctx = createTextCtx({ text: '/start' }); - await triggerTextMessage(ctx); - + // Bot commands should be skipped + const ctx1 = createTextCtx({ text: '/chatid' }); + await triggerTextMessage(ctx1); expect(opts.onMessage).not.toHaveBeenCalled(); expect(opts.onChatMetadata).not.toHaveBeenCalled(); + + const ctx2 = createTextCtx({ text: '/ping' }); + await triggerTextMessage(ctx2); + expect(opts.onMessage).not.toHaveBeenCalled(); + + // Non-bot /commands should flow through + const ctx3 = createTextCtx({ text: '/remote-control' }); + await triggerTextMessage(ctx3); + expect(opts.onMessage).toHaveBeenCalledTimes(1); + expect(opts.onMessage).toHaveBeenCalledWith( + 'tg:100200300', + expect.objectContaining({ content: '/remote-control' }), + ); }); it('extracts sender name from first_name', async () => { diff --git a/src/channels/telegram.ts b/src/channels/telegram.ts index 0b990d2..effca6e 100644 --- a/src/channels/telegram.ts +++ b/src/channels/telegram.ts @@ -80,9 +80,15 @@ export class TelegramChannel implements Channel { ctx.reply(`${ASSISTANT_NAME} is online.`); }); + // Telegram bot commands handled above — skip them in the general handler + // so they don't also get stored as messages. All other /commands flow through. + const TELEGRAM_BOT_COMMANDS = new Set(['chatid', 'ping']); + this.bot.on('message:text', async (ctx) => { - // Skip commands - if (ctx.message.text.startsWith('/')) return; + if (ctx.message.text.startsWith('/')) { + const cmd = ctx.message.text.slice(1).split(/[\s@]/)[0].toLowerCase(); + if (TELEGRAM_BOT_COMMANDS.has(cmd)) return; + } const chatJid = `tg:${ctx.chat.id}`; let content = ctx.message.text; From 3d649c386ebef00f7024e196d6f39ea69c638aa5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 14 Mar 2026 15:08:11 +0000 Subject: [PATCH 22/91] chore: bump version to 1.2.17 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index deffe16..5f7f779 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.16", + "version": "1.2.17", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.16", + "version": "1.2.17", "dependencies": { "better-sqlite3": "^11.8.1", "cron-parser": "^5.5.0", diff --git a/package.json b/package.json index 4db8178..5c6a114 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.16", + "version": "1.2.17", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From c984e6f13da4267a64f9fd300b05bc236cf86216 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 14 Mar 2026 15:08:11 +0000 Subject: [PATCH 23/91] =?UTF-8?q?docs:=20update=20token=20count=20to=2041.?= =?UTF-8?q?1k=20tokens=20=C2=B7=2021%=20of=20context=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo-tokens/badge.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo-tokens/badge.svg b/repo-tokens/badge.svg index be808ed..1b06f80 100644 --- a/repo-tokens/badge.svg +++ b/repo-tokens/badge.svg @@ -1,5 +1,5 @@ - - 41.0k tokens, 20% of context window + + 41.1k tokens, 21% of context window @@ -15,8 +15,8 @@ tokens - - 41.0k + + 41.1k From 675acffeb1656b43a4470b01495bd88dfd8bf78f Mon Sep 17 00:00:00 2001 From: Gabi Simons Date: Wed, 18 Mar 2026 12:57:40 +0200 Subject: [PATCH 24/91] feat: add script field to ScheduledTask type and database layer Adds optional `script` field to the ScheduledTask interface, with a migration for existing DBs and full support in createTask/updateTask. Co-Authored-By: Claude Sonnet 4.6 --- src/db.ts | 20 +++++++++++++++++--- src/types.ts | 1 + 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/db.ts b/src/db.ts index 0896f41..36e3edc 100644 --- a/src/db.ts +++ b/src/db.ts @@ -93,6 +93,15 @@ function createSchema(database: Database.Database): void { /* column already exists */ } + // Add script column if it doesn't exist (migration for existing DBs) + try { + database.exec( + `ALTER TABLE scheduled_tasks ADD COLUMN script TEXT`, + ); + } catch { + /* column already exists */ + } + // Add is_bot_message column if it doesn't exist (migration for existing DBs) try { database.exec( @@ -368,14 +377,15 @@ export function createTask( ): void { db.prepare( ` - INSERT INTO scheduled_tasks (id, group_folder, chat_jid, prompt, schedule_type, schedule_value, context_mode, next_run, status, created_at) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + INSERT INTO scheduled_tasks (id, group_folder, chat_jid, prompt, script, schedule_type, schedule_value, context_mode, next_run, status, created_at) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) `, ).run( task.id, task.group_folder, task.chat_jid, task.prompt, + task.script || null, task.schedule_type, task.schedule_value, task.context_mode || 'isolated', @@ -410,7 +420,7 @@ export function updateTask( updates: Partial< Pick< ScheduledTask, - 'prompt' | 'schedule_type' | 'schedule_value' | 'next_run' | 'status' + 'prompt' | 'script' | 'schedule_type' | 'schedule_value' | 'next_run' | 'status' > >, ): void { @@ -421,6 +431,10 @@ export function updateTask( fields.push('prompt = ?'); values.push(updates.prompt); } + if (updates.script !== undefined) { + fields.push('script = ?'); + values.push(updates.script || null); + } if (updates.schedule_type !== undefined) { fields.push('schedule_type = ?'); values.push(updates.schedule_type); diff --git a/src/types.ts b/src/types.ts index acbb08a..bcef463 100644 --- a/src/types.ts +++ b/src/types.ts @@ -58,6 +58,7 @@ export interface ScheduledTask { group_folder: string; chat_jid: string; prompt: string; + script?: string | null; schedule_type: 'cron' | 'interval' | 'once'; schedule_value: string; context_mode: 'group' | 'isolated'; From a516cc5cfea2eceb14cd694df3b39d0356835ea9 Mon Sep 17 00:00:00 2001 From: Gabi Simons Date: Wed, 18 Mar 2026 13:28:36 +0200 Subject: [PATCH 25/91] feat: add script parameter to MCP task tools Add optional `script` field to schedule_task and update_task MCP tools, allowing agents to attach a pre-flight bash script that controls whether the task agent is woken up. Co-Authored-By: Claude Sonnet 4.6 --- container/agent-runner/src/ipc-mcp-stdio.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/container/agent-runner/src/ipc-mcp-stdio.ts b/container/agent-runner/src/ipc-mcp-stdio.ts index 9de0138..5b03478 100644 --- a/container/agent-runner/src/ipc-mcp-stdio.ts +++ b/container/agent-runner/src/ipc-mcp-stdio.ts @@ -91,6 +91,7 @@ SCHEDULE VALUE FORMAT (all times are LOCAL timezone): schedule_value: z.string().describe('cron: "*/5 * * * *" | interval: milliseconds like "300000" | once: local timestamp like "2026-02-01T15:30:00" (no Z suffix!)'), context_mode: z.enum(['group', 'isolated']).default('group').describe('group=runs with chat history and memory, isolated=fresh session (include context in prompt)'), target_group_jid: z.string().optional().describe('(Main group only) JID of the group to schedule the task for. Defaults to the current group.'), + script: z.string().optional().describe('Optional bash script to run before waking the agent. Script must output JSON on the last line of stdout: { "wakeAgent": boolean, "data"?: any }. If wakeAgent is false, the agent is not called. Test your script with bash -c "..." before scheduling.'), }, async (args) => { // Validate schedule_value before writing IPC @@ -136,6 +137,7 @@ SCHEDULE VALUE FORMAT (all times are LOCAL timezone): type: 'schedule_task', taskId, prompt: args.prompt, + script: args.script || undefined, schedule_type: args.schedule_type, schedule_value: args.schedule_value, context_mode: args.context_mode || 'group', @@ -255,6 +257,7 @@ server.tool( prompt: z.string().optional().describe('New prompt for the task'), schedule_type: z.enum(['cron', 'interval', 'once']).optional().describe('New schedule type'), schedule_value: z.string().optional().describe('New schedule value (see schedule_task for format)'), + script: z.string().optional().describe('New script for the task. Set to empty string to remove the script.'), }, async (args) => { // Validate schedule_value if provided @@ -288,6 +291,7 @@ server.tool( timestamp: new Date().toISOString(), }; if (args.prompt !== undefined) data.prompt = args.prompt; + if (args.script !== undefined) data.script = args.script; if (args.schedule_type !== undefined) data.schedule_type = args.schedule_type; if (args.schedule_value !== undefined) data.schedule_value = args.schedule_value; From 0f283cbdd33a594665812ac4997e9ed0f736caf1 Mon Sep 17 00:00:00 2001 From: Gabi Simons Date: Wed, 18 Mar 2026 13:31:12 +0200 Subject: [PATCH 26/91] feat: pass script through IPC task processing Thread the optional `script` field through the IPC layer so it is persisted when an agent calls schedule_task, and updated when an agent calls update_task (empty string clears the script). Co-Authored-By: Claude Sonnet 4.6 --- src/ipc.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ipc.ts b/src/ipc.ts index 48efeb5..043b07a 100644 --- a/src/ipc.ts +++ b/src/ipc.ts @@ -162,6 +162,7 @@ export async function processTaskIpc( schedule_type?: string; schedule_value?: string; context_mode?: string; + script?: string; groupFolder?: string; chatJid?: string; targetJid?: string; @@ -260,6 +261,7 @@ export async function processTaskIpc( group_folder: targetFolder, chat_jid: targetJid, prompt: data.prompt, + script: data.script || null, schedule_type: scheduleType, schedule_value: data.schedule_value, context_mode: contextMode, @@ -352,6 +354,7 @@ export async function processTaskIpc( const updates: Parameters[1] = {}; if (data.prompt !== undefined) updates.prompt = data.prompt; + if (data.script !== undefined) updates.script = data.script || null; if (data.schedule_type !== undefined) updates.schedule_type = data.schedule_type as | 'cron' From eb65121938210a1b8cb4d5909843d7be518c2fa1 Mon Sep 17 00:00:00 2001 From: Gabi Simons Date: Wed, 18 Mar 2026 13:38:14 +0200 Subject: [PATCH 27/91] feat: add script to ContainerInput and task snapshot Co-Authored-By: Claude Sonnet 4.6 --- container/agent-runner/src/index.ts | 1 + src/container-runner.ts | 2 ++ 2 files changed, 3 insertions(+) diff --git a/container/agent-runner/src/index.ts b/container/agent-runner/src/index.ts index 96cb4a4..2cd34c9 100644 --- a/container/agent-runner/src/index.ts +++ b/container/agent-runner/src/index.ts @@ -27,6 +27,7 @@ interface ContainerInput { isMain: boolean; isScheduledTask?: boolean; assistantName?: string; + script?: string; } interface ContainerOutput { diff --git a/src/container-runner.ts b/src/container-runner.ts index be6f356..469fe11 100644 --- a/src/container-runner.ts +++ b/src/container-runner.ts @@ -41,6 +41,7 @@ export interface ContainerInput { isMain: boolean; isScheduledTask?: boolean; assistantName?: string; + script?: string; } export interface ContainerOutput { @@ -649,6 +650,7 @@ export function writeTasksSnapshot( id: string; groupFolder: string; prompt: string; + script?: string | null; schedule_type: string; schedule_value: string; status: string; From 42d098c3c1f5835f8cd77dd0205f74b687239b25 Mon Sep 17 00:00:00 2001 From: Gabi Simons Date: Wed, 18 Mar 2026 13:38:28 +0200 Subject: [PATCH 28/91] feat: pass script from task scheduler to container Co-Authored-By: Claude Sonnet 4.6 --- src/task-scheduler.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/task-scheduler.ts b/src/task-scheduler.ts index d0abd2e..f2b964d 100644 --- a/src/task-scheduler.ts +++ b/src/task-scheduler.ts @@ -139,6 +139,7 @@ async function runTask( id: t.id, groupFolder: t.group_folder, prompt: t.prompt, + script: t.script, schedule_type: t.schedule_type, schedule_value: t.schedule_value, status: t.status, @@ -179,6 +180,7 @@ async function runTask( isMain, isScheduledTask: true, assistantName: ASSISTANT_NAME, + script: task.script || undefined, }, (proc, containerName) => deps.onProcess(task.chat_jid, proc, containerName, task.group_folder), From 9f5aff99b68b0dbd9c23f4ac6907f29d2a7036df Mon Sep 17 00:00:00 2001 From: Gabi Simons Date: Wed, 18 Mar 2026 13:43:56 +0200 Subject: [PATCH 29/91] feat: add script execution phase to agent-runner Co-Authored-By: Claude Opus 4.6 (1M context) --- container/agent-runner/src/index.ts | 70 +++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/container/agent-runner/src/index.ts b/container/agent-runner/src/index.ts index 2cd34c9..382439f 100644 --- a/container/agent-runner/src/index.ts +++ b/container/agent-runner/src/index.ts @@ -16,6 +16,7 @@ import fs from 'fs'; import path from 'path'; +import { execFile } from 'child_process'; import { query, HookCallback, PreCompactHookInput } from '@anthropic-ai/claude-agent-sdk'; import { fileURLToPath } from 'url'; @@ -465,6 +466,55 @@ async function runQuery( return { newSessionId, lastAssistantUuid, closedDuringQuery }; } +interface ScriptResult { + wakeAgent: boolean; + data?: unknown; +} + +const SCRIPT_TIMEOUT_MS = 30_000; + +async function runScript(script: string): Promise { + const scriptPath = '/tmp/task-script.sh'; + fs.writeFileSync(scriptPath, script, { mode: 0o755 }); + + return new Promise((resolve) => { + execFile('bash', [scriptPath], { + timeout: SCRIPT_TIMEOUT_MS, + maxBuffer: 1024 * 1024, + env: process.env, + }, (error, stdout, stderr) => { + if (stderr) { + log(`Script stderr: ${stderr.slice(0, 500)}`); + } + + if (error) { + log(`Script error: ${error.message}`); + return resolve(null); + } + + // Parse last non-empty line of stdout as JSON + const lines = stdout.trim().split('\n'); + const lastLine = lines[lines.length - 1]; + if (!lastLine) { + log('Script produced no output'); + return resolve(null); + } + + try { + const result = JSON.parse(lastLine); + if (typeof result.wakeAgent !== 'boolean') { + log(`Script output missing wakeAgent boolean: ${lastLine.slice(0, 200)}`); + return resolve(null); + } + resolve(result as ScriptResult); + } catch { + log(`Script output is not valid JSON: ${lastLine.slice(0, 200)}`); + resolve(null); + } + }); + }); +} + async function main(): Promise { let containerInput: ContainerInput; @@ -506,6 +556,26 @@ async function main(): Promise { prompt += '\n' + pending.join('\n'); } + // Script phase: run script before waking agent + if (containerInput.script && containerInput.isScheduledTask) { + log('Running task script...'); + const scriptResult = await runScript(containerInput.script); + + if (!scriptResult || !scriptResult.wakeAgent) { + const reason = scriptResult ? 'wakeAgent=false' : 'script error/no output'; + log(`Script decided not to wake agent: ${reason}`); + writeOutput({ + status: 'success', + result: `Script: ${reason}`, + }); + return; + } + + // Script says wake agent — enrich prompt with script data + log(`Script wakeAgent=true, enriching prompt with data`); + prompt = `[SCHEDULED TASK]\n\nScript output:\n${JSON.stringify(scriptResult.data, null, 2)}\n\nInstructions:\n${containerInput.prompt}`; + } + // Query loop: run query → wait for IPC message → run new query → repeat let resumeAt: string | undefined; try { From a4dc3a744668e3202ce97c740d68c4cf1b3bb1a7 Mon Sep 17 00:00:00 2001 From: Gabi Simons Date: Wed, 18 Mar 2026 13:45:01 +0200 Subject: [PATCH 30/91] docs: add task script instructions to agent CLAUDE.md --- groups/main/CLAUDE.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/groups/main/CLAUDE.md b/groups/main/CLAUDE.md index 11e846b..0580e4b 100644 --- a/groups/main/CLAUDE.md +++ b/groups/main/CLAUDE.md @@ -244,3 +244,42 @@ When scheduling tasks for other groups, use the `target_group_jid` parameter wit - `schedule_task(prompt: "...", schedule_type: "cron", schedule_value: "0 9 * * 1", target_group_jid: "120363336345536173@g.us")` The task will run in that group's context with access to their files and memory. + +--- + +## Task Scripts + +When scheduling tasks that check a condition before acting (new PRs, website changes, API status), use the `script` parameter. The script runs first — if there's nothing to do, you don't wake up. + +### How it works + +1. You provide a bash `script` alongside the `prompt` when scheduling +2. When the task fires, the script runs first (30-second timeout) +3. Script prints JSON to stdout: `{ "wakeAgent": true/false, "data": {...} }` +4. If `wakeAgent: false` — nothing happens, task waits for next run +5. If `wakeAgent: true` — you wake up and receive the script's data + prompt + +### Always test your script first + +Before scheduling, run the script in your sandbox to verify it works: + +```bash +bash -c 'node --input-type=module -e " + const r = await fetch(\"https://api.github.com/repos/owner/repo/pulls?state=open\"); + const prs = await r.json(); + console.log(JSON.stringify({ wakeAgent: prs.length > 0, data: prs.slice(0, 5) })); +"' +``` + +### When NOT to use scripts + +If a task requires your judgment every time (daily briefings, reminders, reports), skip the script — just use a regular prompt. + +### Frequent task guidance + +If a user wants tasks running more than ~2x daily and a script can't reduce agent wake-ups: + +- Explain that each wake-up uses API credits and risks rate limits +- Suggest restructuring with a script that checks the condition first +- If the user needs an LLM to evaluate data, suggest using an API key with direct Anthropic API calls inside the script +- Help the user find the minimum viable frequency From b7f1d48423646e825500e02618c2a62b12d1dd9f Mon Sep 17 00:00:00 2001 From: Gabi Simons Date: Wed, 18 Mar 2026 14:04:31 +0200 Subject: [PATCH 31/91] style: fix prettier formatting in db.ts --- src/db.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/db.ts b/src/db.ts index 36e3edc..87dd941 100644 --- a/src/db.ts +++ b/src/db.ts @@ -95,9 +95,7 @@ function createSchema(database: Database.Database): void { // Add script column if it doesn't exist (migration for existing DBs) try { - database.exec( - `ALTER TABLE scheduled_tasks ADD COLUMN script TEXT`, - ); + database.exec(`ALTER TABLE scheduled_tasks ADD COLUMN script TEXT`); } catch { /* column already exists */ } @@ -420,7 +418,12 @@ export function updateTask( updates: Partial< Pick< ScheduledTask, - 'prompt' | 'script' | 'schedule_type' | 'schedule_value' | 'next_run' | 'status' + | 'prompt' + | 'script' + | 'schedule_type' + | 'schedule_value' + | 'next_run' + | 'status' > >, ): void { From e9369617fb556a087dfdf2655f0e670c737bd13b Mon Sep 17 00:00:00 2001 From: Guy Ben Aharon Date: Wed, 18 Mar 2026 17:56:57 +0200 Subject: [PATCH 32/91] feat: replace credential proxy with OneCLI gateway for secret injection --- .claude/skills/setup/SKILL.md | 49 +++++++++++++++++++++++++++++------ container/Dockerfile | 2 +- package-lock.json | 10 +++++++ package.json | 1 + src/config.ts | 10 +++---- src/container-runner.test.ts | 10 ++++++- src/container-runner.ts | 43 +++++++++++++++--------------- src/container-runtime.ts | 30 --------------------- src/index.ts | 32 ++++++++++++++++------- 9 files changed, 109 insertions(+), 78 deletions(-) diff --git a/.claude/skills/setup/SKILL.md b/.claude/skills/setup/SKILL.md index 2041f80..dbb9028 100644 --- a/.claude/skills/setup/SKILL.md +++ b/.claude/skills/setup/SKILL.md @@ -50,7 +50,7 @@ Already configured. Continue. **Verify:** `git remote -v` should show `origin` → user's repo, `upstream` → `qwibitai/nanoclaw.git`. -## 1. Bootstrap (Node.js + Dependencies) +## 1. Bootstrap (Node.js + Dependencies + OneCLI) Run `bash setup.sh` and parse the status block. @@ -62,6 +62,20 @@ Run `bash setup.sh` and parse the status block. - If NATIVE_OK=false → better-sqlite3 failed to load. Install build tools and re-run. - Record PLATFORM and IS_WSL for later steps. +After bootstrap succeeds, install OneCLI and its CLI tool: + +```bash +curl -fsSL onecli.sh/install | sh +curl -fsSL onecli.sh/cli/install | sh +``` + +Verify both installed: `onecli version`. If the command is not found, the install script may have printed a path — add it to PATH or use the full path. + +Ensure `.env` has the OneCLI URL (create the file if it doesn't exist): +```bash +grep -q 'ONECLI_URL' .env 2>/dev/null || echo 'ONECLI_URL=http://localhost:10254' >> .env +``` + ## 2. Check Environment Run `npx tsx setup/index.ts --step environment` and parse the status block. @@ -112,15 +126,34 @@ Run `npx tsx setup/index.ts --step container -- --runtime ` and parse th **If TEST_OK=false but BUILD_OK=true:** The image built but won't run. Check logs — common cause is runtime not fully started. Wait a moment and retry the test. -## 4. Claude Authentication (No Script) +## 4. Anthropic Credentials via OneCLI -If HAS_ENV=true from step 2, read `.env` and check for `CLAUDE_CODE_OAUTH_TOKEN` or `ANTHROPIC_API_KEY`. If present, confirm with user: keep or reconfigure? +NanoClaw uses OneCLI to manage credentials — API keys are never stored in `.env` or exposed to containers. The OneCLI gateway injects them at request time. -AskUserQuestion: Claude subscription (Pro/Max) vs Anthropic API key? +Check if a secret already exists: +```bash +onecli secrets list +``` -**Subscription:** Tell user to run `claude setup-token` in another terminal, copy the token, add `CLAUDE_CODE_OAUTH_TOKEN=` to `.env`. Do NOT collect the token in chat. +If an Anthropic secret is listed, confirm with user: keep or reconfigure? If keeping, skip to step 5. -**API key:** Tell user to add `ANTHROPIC_API_KEY=` to `.env`. +First, look up the exact command for creating an Anthropic secret: +```bash +onecli secrets create --help +``` + +Then AskUserQuestion, providing the user with two options: + +1. **OneCLI dashboard** — open http://localhost:10254 in the browser and add the secret there +2. **CLI** — run the `onecli secrets create` command with the right flags for an Anthropic secret (show them the exact command with a placeholder for the key value, based on the `--help` output) + +Tell the user to get an API key from https://console.anthropic.com/settings/keys if they don't have one. + +Ask them to let you know when done. + +**If the user's response happens to contain an API key** (starts with `sk-ant-`): handle it gracefully — run the `onecli secrets create` command with that key on their behalf. + +**After user confirms:** verify with `onecli secrets list` that an Anthropic secret exists. If not, ask again. ## 5. Set Up Channels @@ -198,7 +231,7 @@ Run `npx tsx setup/index.ts --step verify` and parse the status block. **If STATUS=failed, fix each:** - SERVICE=stopped → `npm run build`, then restart: `launchctl kickstart -k gui/$(id -u)/com.nanoclaw` (macOS) or `systemctl --user restart nanoclaw` (Linux) or `bash start-nanoclaw.sh` (WSL nohup) - SERVICE=not_found → re-run step 7 -- CREDENTIALS=missing → re-run step 4 +- CREDENTIALS=missing → re-run step 4 (check `onecli secrets list` for Anthropic secret) - CHANNEL_AUTH shows `not_found` for any channel → re-invoke that channel's skill (e.g. `/add-telegram`) - REGISTERED_GROUPS=0 → re-invoke the channel skills from step 5 - MOUNT_ALLOWLIST=missing → `npx tsx setup/index.ts --step mounts -- --empty` @@ -207,7 +240,7 @@ Tell user to test: send a message in their registered chat. Show: `tail -f logs/ ## Troubleshooting -**Service not starting:** Check `logs/nanoclaw.error.log`. Common: wrong Node path (re-run step 7), missing `.env` (step 4), missing channel credentials (re-invoke channel skill). +**Service not starting:** Check `logs/nanoclaw.error.log`. Common: wrong Node path (re-run step 7), OneCLI not running (check `curl http://localhost:10254/api/health`), missing channel credentials (re-invoke channel skill). **Container agent fails ("Claude Code process exited with code 1"):** Ensure the container runtime is running — `open -a Docker` (macOS Docker), `container system start` (Apple Container), or `sudo systemctl start docker` (Linux). Check container logs in `groups/main/logs/container-*.log`. diff --git a/container/Dockerfile b/container/Dockerfile index e8537c3..2fe1b22 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -1,7 +1,7 @@ # NanoClaw Agent Container # Runs Claude Agent SDK in isolated Linux VM with browser automation -FROM node:22-slim +FROM node:24-slim # Install system dependencies for Chromium RUN apt-get update && apt-get install -y \ diff --git a/package-lock.json b/package-lock.json index fae72c7..e325d6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "nanoclaw", "version": "1.2.21", "dependencies": { + "@onecli-sh/sdk": "^0.1.6", "better-sqlite3": "^11.8.1", "cron-parser": "^5.5.0", "pino": "^9.6.0", @@ -786,6 +787,15 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@onecli-sh/sdk": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@onecli-sh/sdk/-/sdk-0.1.6.tgz", + "integrity": "sha512-kqVg8BOI6kapJaQjpTLBv91DhdKNykuSZIUsfb1pH5puyNlShWlXw5DWwxRVmxBihBMaIm+JyN9VRJMrVKZ5vQ==", + "license": "MIT", + "engines": { + "node": ">=20" + } + }, "node_modules/@pinojs/redact": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/@pinojs/redact/-/redact-0.4.0.tgz", diff --git a/package.json b/package.json index b30dd39..990f001 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "test:watch": "vitest" }, "dependencies": { + "@onecli-sh/sdk": "^0.1.6", "better-sqlite3": "^11.8.1", "cron-parser": "^5.5.0", "pino": "^9.6.0", diff --git a/src/config.ts b/src/config.ts index 43db54f..63d1207 100644 --- a/src/config.ts +++ b/src/config.ts @@ -4,9 +4,7 @@ import path from 'path'; import { readEnvFile } from './env.js'; // Read config values from .env (falls back to process.env). -// Secrets (API keys, tokens) are NOT read here — they are loaded only -// by the credential proxy (credential-proxy.ts), never exposed to containers. -const envConfig = readEnvFile(['ASSISTANT_NAME', 'ASSISTANT_HAS_OWN_NUMBER']); +const envConfig = readEnvFile(['ASSISTANT_NAME', 'ASSISTANT_HAS_OWN_NUMBER', 'ONECLI_URL']); export const ASSISTANT_NAME = process.env.ASSISTANT_NAME || envConfig.ASSISTANT_NAME || 'Andy'; @@ -47,10 +45,8 @@ export const CONTAINER_MAX_OUTPUT_SIZE = parseInt( process.env.CONTAINER_MAX_OUTPUT_SIZE || '10485760', 10, ); // 10MB default -export const CREDENTIAL_PROXY_PORT = parseInt( - process.env.CREDENTIAL_PROXY_PORT || '3001', - 10, -); +export const ONECLI_URL = + process.env.ONECLI_URL || envConfig.ONECLI_URL || 'http://localhost:10254'; export const IPC_POLL_INTERVAL = 1000; export const IDLE_TIMEOUT = parseInt(process.env.IDLE_TIMEOUT || '1800000', 10); // 30min default — how long to keep container alive after last result export const MAX_CONCURRENT_CONTAINERS = Math.max( diff --git a/src/container-runner.test.ts b/src/container-runner.test.ts index c830176..58c7e0d 100644 --- a/src/container-runner.test.ts +++ b/src/container-runner.test.ts @@ -11,10 +11,10 @@ vi.mock('./config.js', () => ({ CONTAINER_IMAGE: 'nanoclaw-agent:latest', CONTAINER_MAX_OUTPUT_SIZE: 10485760, CONTAINER_TIMEOUT: 1800000, // 30min - CREDENTIAL_PROXY_PORT: 3001, DATA_DIR: '/tmp/nanoclaw-test-data', GROUPS_DIR: '/tmp/nanoclaw-test-groups', IDLE_TIMEOUT: 1800000, // 30min + ONECLI_URL: 'http://localhost:10254', TIMEZONE: 'America/Los_Angeles', })); @@ -51,6 +51,14 @@ vi.mock('./mount-security.js', () => ({ validateAdditionalMounts: vi.fn(() => []), })); +// Mock OneCLI SDK +vi.mock('@onecli-sh/sdk', () => ({ + OneCLI: class { + applyContainerConfig = vi.fn().mockResolvedValue(true); + createAgent = vi.fn().mockResolvedValue({ id: 'test' }); + }, +})); + // Create a controllable fake ChildProcess function createFakeProcess() { const proc = new EventEmitter() as EventEmitter & { diff --git a/src/container-runner.ts b/src/container-runner.ts index a6b58d7..1dc607f 100644 --- a/src/container-runner.ts +++ b/src/container-runner.ts @@ -10,25 +10,26 @@ import { CONTAINER_IMAGE, CONTAINER_MAX_OUTPUT_SIZE, CONTAINER_TIMEOUT, - CREDENTIAL_PROXY_PORT, DATA_DIR, GROUPS_DIR, IDLE_TIMEOUT, + ONECLI_URL, TIMEZONE, } from './config.js'; import { resolveGroupFolderPath, resolveGroupIpcPath } from './group-folder.js'; import { logger } from './logger.js'; import { - CONTAINER_HOST_GATEWAY, CONTAINER_RUNTIME_BIN, hostGatewayArgs, readonlyMountArgs, stopContainer, } from './container-runtime.js'; -import { detectAuthMode } from './credential-proxy.js'; +import { OneCLI } from '@onecli-sh/sdk'; import { validateAdditionalMounts } from './mount-security.js'; import { RegisteredGroup } from './types.js'; +const onecli = new OneCLI({ url: ONECLI_URL }); + // Sentinel markers for robust output parsing (must match agent-runner) const OUTPUT_START_MARKER = '---NANOCLAW_OUTPUT_START---'; const OUTPUT_END_MARKER = '---NANOCLAW_OUTPUT_END---'; @@ -77,7 +78,7 @@ function buildVolumeMounts( }); // Shadow .env so the agent cannot read secrets from the mounted project root. - // Credentials are injected by the credential proxy, never exposed to containers. + // Credentials are injected by the OneCLI gateway, never exposed to containers. const envFile = path.join(projectRoot, '.env'); if (fs.existsSync(envFile)) { mounts.push({ @@ -212,30 +213,26 @@ function buildVolumeMounts( return mounts; } -function buildContainerArgs( +async function buildContainerArgs( mounts: VolumeMount[], containerName: string, -): string[] { + agentIdentifier?: string, +): Promise { const args: string[] = ['run', '-i', '--rm', '--name', containerName]; // Pass host timezone so container's local time matches the user's args.push('-e', `TZ=${TIMEZONE}`); - // Route API traffic through the credential proxy (containers never see real secrets) - args.push( - '-e', - `ANTHROPIC_BASE_URL=http://${CONTAINER_HOST_GATEWAY}:${CREDENTIAL_PROXY_PORT}`, - ); - - // Mirror the host's auth method with a placeholder value. - // API key mode: SDK sends x-api-key, proxy replaces with real key. - // OAuth mode: SDK exchanges placeholder token for temp API key, - // proxy injects real OAuth token on that exchange request. - const authMode = detectAuthMode(); - if (authMode === 'api-key') { - args.push('-e', 'ANTHROPIC_API_KEY=placeholder'); + // OneCLI gateway handles credential injection — containers never see real secrets. + // The gateway intercepts HTTPS traffic and injects API keys or OAuth tokens. + const onecliApplied = await onecli.applyContainerConfig(args, { + addHostMapping: false, // Nanoclaw already handles host gateway + agent: agentIdentifier, + }); + if (onecliApplied) { + logger.info({ containerName }, 'OneCLI gateway config applied'); } else { - args.push('-e', 'CLAUDE_CODE_OAUTH_TOKEN=placeholder'); + logger.warn({ containerName }, 'OneCLI gateway not reachable — container will have no credentials'); } // Runtime-specific args for host gateway resolution @@ -278,7 +275,11 @@ export async function runContainerAgent( const mounts = buildVolumeMounts(group, input.isMain); const safeName = group.folder.replace(/[^a-zA-Z0-9-]/g, '-'); const containerName = `nanoclaw-${safeName}-${Date.now()}`; - const containerArgs = buildContainerArgs(mounts, containerName); + // Main group uses the default OneCLI agent; others use their own agent. + const agentIdentifier = input.isMain + ? undefined + : group.folder.toLowerCase().replace(/_/g, '-'); + const containerArgs = await buildContainerArgs(mounts, containerName, agentIdentifier); logger.debug( { diff --git a/src/container-runtime.ts b/src/container-runtime.ts index 9f32d10..6326fde 100644 --- a/src/container-runtime.ts +++ b/src/container-runtime.ts @@ -3,7 +3,6 @@ * All runtime-specific logic lives here so swapping runtimes means changing one file. */ import { execSync } from 'child_process'; -import fs from 'fs'; import os from 'os'; import { logger } from './logger.js'; @@ -11,35 +10,6 @@ import { logger } from './logger.js'; /** The container runtime binary name. */ export const CONTAINER_RUNTIME_BIN = 'docker'; -/** Hostname containers use to reach the host machine. */ -export const CONTAINER_HOST_GATEWAY = 'host.docker.internal'; - -/** - * Address the credential proxy binds to. - * Docker Desktop (macOS): 127.0.0.1 — the VM routes host.docker.internal to loopback. - * Docker (Linux): bind to the docker0 bridge IP so only containers can reach it, - * falling back to 0.0.0.0 if the interface isn't found. - */ -export const PROXY_BIND_HOST = - process.env.CREDENTIAL_PROXY_HOST || detectProxyBindHost(); - -function detectProxyBindHost(): string { - if (os.platform() === 'darwin') return '127.0.0.1'; - - // WSL uses Docker Desktop (same VM routing as macOS) — loopback is correct. - // Check /proc filesystem, not env vars — WSL_DISTRO_NAME isn't set under systemd. - if (fs.existsSync('/proc/sys/fs/binfmt_misc/WSLInterop')) return '127.0.0.1'; - - // Bare-metal Linux: bind to the docker0 bridge IP instead of 0.0.0.0 - const ifaces = os.networkInterfaces(); - const docker0 = ifaces['docker0']; - if (docker0) { - const ipv4 = docker0.find((a) => a.family === 'IPv4'); - if (ipv4) return ipv4.address; - } - return '0.0.0.0'; -} - /** CLI args needed for the container to resolve the host gateway. */ export function hostGatewayArgs(): string[] { // On Linux, host.docker.internal isn't built-in — add it explicitly diff --git a/src/index.ts b/src/index.ts index db274f0..a7fa9e7 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,15 +1,16 @@ import fs from 'fs'; import path from 'path'; +import { OneCLI } from '@onecli-sh/sdk'; + import { ASSISTANT_NAME, - CREDENTIAL_PROXY_PORT, IDLE_TIMEOUT, + ONECLI_URL, POLL_INTERVAL, TIMEZONE, TRIGGER_PATTERN, } from './config.js'; -import { startCredentialProxy } from './credential-proxy.js'; import './channels/index.js'; import { getChannelFactory, @@ -24,7 +25,6 @@ import { import { cleanupOrphans, ensureContainerRuntimeRunning, - PROXY_BIND_HOST, } from './container-runtime.js'; import { getAllChats, @@ -72,6 +72,8 @@ let messageLoopRunning = false; const channels: Channel[] = []; const queue = new GroupQueue(); +const onecli = new OneCLI({ url: ONECLI_URL }); + function loadState(): void { lastTimestamp = getRouterState('last_timestamp') || ''; const agentTs = getRouterState('last_agent_timestamp'); @@ -112,6 +114,23 @@ function registerGroup(jid: string, group: RegisteredGroup): void { // Create group folder fs.mkdirSync(path.join(groupDir, 'logs'), { recursive: true }); + // Create a corresponding OneCLI agent (best-effort, non-blocking) + const identifier = group.folder.toLowerCase().replace(/_/g, '-'); + onecli.createAgent({ name: group.name, identifier }).then( + (agent) => { + logger.info( + { jid, agentId: agent.id, identifier }, + 'OneCLI agent created', + ); + }, + (err) => { + logger.debug( + { jid, identifier, err: String(err) }, + 'OneCLI agent creation skipped', + ); + }, + ); + logger.info( { jid, name: group.name, folder: group.folder }, 'Group registered', @@ -476,16 +495,9 @@ async function main(): Promise { loadState(); restoreRemoteControl(); - // Start credential proxy (containers route API calls through this) - const proxyServer = await startCredentialProxy( - CREDENTIAL_PROXY_PORT, - PROXY_BIND_HOST, - ); - // Graceful shutdown handlers const shutdown = async (signal: string) => { logger.info({ signal }, 'Shutdown signal received'); - proxyServer.close(); await queue.shutdown(10000); for (const ch of channels) await ch.disconnect(); process.exit(0); From b7f8c20a2535b97ccec0fc9e70b0eb2bfdb57d8f Mon Sep 17 00:00:00 2001 From: NanoClaw Setup Date: Thu, 19 Mar 2026 11:57:54 +0000 Subject: [PATCH 33/91] fix: setup skill uses 127.0.0.1 for OneCLI and offers dashboard vs CLI choice - Configure CLI api-host to local instance (defaults to cloud otherwise) - Use 127.0.0.1 instead of localhost to avoid IPv6 resolution issues - Present dashboard and CLI as two options with platform guidance - Accept ONECLI_URL as valid credentials in verify step Co-Authored-By: Claude Opus 4.6 (1M context) --- .claude/skills/setup/SKILL.md | 15 ++++++++++----- setup/verify.ts | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.claude/skills/setup/SKILL.md b/.claude/skills/setup/SKILL.md index dbb9028..b83cf61 100644 --- a/.claude/skills/setup/SKILL.md +++ b/.claude/skills/setup/SKILL.md @@ -71,9 +71,14 @@ curl -fsSL onecli.sh/cli/install | sh Verify both installed: `onecli version`. If the command is not found, the install script may have printed a path — add it to PATH or use the full path. +Point the CLI at the local OneCLI instance (it defaults to the cloud service otherwise): +```bash +onecli config set api-host http://127.0.0.1:10254 +``` + Ensure `.env` has the OneCLI URL (create the file if it doesn't exist): ```bash -grep -q 'ONECLI_URL' .env 2>/dev/null || echo 'ONECLI_URL=http://localhost:10254' >> .env +grep -q 'ONECLI_URL' .env 2>/dev/null || echo 'ONECLI_URL=http://127.0.0.1:10254' >> .env ``` ## 2. Check Environment @@ -142,10 +147,10 @@ First, look up the exact command for creating an Anthropic secret: onecli secrets create --help ``` -Then AskUserQuestion, providing the user with two options: +Then AskUserQuestion with two options. Use the `description` field to include the one-liner guidance and the concrete instructions for each option so the user sees everything in the question itself (avoids the interactive modal hiding text above it): -1. **OneCLI dashboard** — open http://localhost:10254 in the browser and add the secret there -2. **CLI** — run the `onecli secrets create` command with the right flags for an Anthropic secret (show them the exact command with a placeholder for the key value, based on the `--help` output) +1. **Dashboard** — description: "Best if you have a browser on this machine. Open http://127.0.0.1:10254 and add the secret in the UI." +2. **CLI** — description: "Best for remote/headless servers. Run: `onecli secrets create --name Anthropic --type anthropic --value YOUR_KEY --host-pattern api.anthropic.com`" Tell the user to get an API key from https://console.anthropic.com/settings/keys if they don't have one. @@ -240,7 +245,7 @@ Tell user to test: send a message in their registered chat. Show: `tail -f logs/ ## Troubleshooting -**Service not starting:** Check `logs/nanoclaw.error.log`. Common: wrong Node path (re-run step 7), OneCLI not running (check `curl http://localhost:10254/api/health`), missing channel credentials (re-invoke channel skill). +**Service not starting:** Check `logs/nanoclaw.error.log`. Common: wrong Node path (re-run step 7), OneCLI not running (check `curl http://127.0.0.1:10254/api/health`), missing channel credentials (re-invoke channel skill). **Container agent fails ("Claude Code process exited with code 1"):** Ensure the container runtime is running — `open -a Docker` (macOS Docker), `container system start` (Apple Container), or `sudo systemctl start docker` (Linux). Check container logs in `groups/main/logs/container-*.log`. diff --git a/setup/verify.ts b/setup/verify.ts index f64e4d0..e039e52 100644 --- a/setup/verify.ts +++ b/setup/verify.ts @@ -101,7 +101,7 @@ export async function run(_args: string[]): Promise { const envFile = path.join(projectRoot, '.env'); if (fs.existsSync(envFile)) { const envContent = fs.readFileSync(envFile, 'utf-8'); - if (/^(CLAUDE_CODE_OAUTH_TOKEN|ANTHROPIC_API_KEY)=/m.test(envContent)) { + if (/^(CLAUDE_CODE_OAUTH_TOKEN|ANTHROPIC_API_KEY|ONECLI_URL)=/m.test(envContent)) { credentials = 'configured'; } } From 7f6298a1bbc0d9354cd0d584f6e573d54e159e33 Mon Sep 17 00:00:00 2001 From: NanoClaw Setup Date: Thu, 19 Mar 2026 12:00:03 +0000 Subject: [PATCH 34/91] fix: add onecli CLI to PATH if not found after install Co-Authored-By: Claude Opus 4.6 (1M context) --- .claude/skills/setup/SKILL.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.claude/skills/setup/SKILL.md b/.claude/skills/setup/SKILL.md index b83cf61..2f8d821 100644 --- a/.claude/skills/setup/SKILL.md +++ b/.claude/skills/setup/SKILL.md @@ -69,7 +69,16 @@ curl -fsSL onecli.sh/install | sh curl -fsSL onecli.sh/cli/install | sh ``` -Verify both installed: `onecli version`. If the command is not found, the install script may have printed a path — add it to PATH or use the full path. +Verify both installed: `onecli version`. If the command is not found, the CLI was likely installed to `~/.local/bin/`. Add it to PATH for the current session and persist it: + +```bash +export PATH="$HOME/.local/bin:$PATH" +# Persist for future sessions (append to shell profile if not already present) +grep -q '.local/bin' ~/.bashrc 2>/dev/null || echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc +grep -q '.local/bin' ~/.zshrc 2>/dev/null || echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.zshrc +``` + +Then re-verify with `onecli version`. Point the CLI at the local OneCLI instance (it defaults to the cloud service otherwise): ```bash From 2583af7ead511cc45b4b78e706307d30aa26e77c Mon Sep 17 00:00:00 2001 From: Guy Ben Aharon Date: Mon, 23 Mar 2026 14:45:41 +0200 Subject: [PATCH 35/91] fix: ensure OneCLI agents exist for all groups on startup --- package-lock.json | 8 +++---- package.json | 2 +- src/container-runner.test.ts | 1 + src/index.ts | 44 +++++++++++++++++++++++------------- 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index e325d6e..afca823 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "nanoclaw", "version": "1.2.21", "dependencies": { - "@onecli-sh/sdk": "^0.1.6", + "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "^11.8.1", "cron-parser": "^5.5.0", "pino": "^9.6.0", @@ -788,9 +788,9 @@ } }, "node_modules/@onecli-sh/sdk": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/@onecli-sh/sdk/-/sdk-0.1.6.tgz", - "integrity": "sha512-kqVg8BOI6kapJaQjpTLBv91DhdKNykuSZIUsfb1pH5puyNlShWlXw5DWwxRVmxBihBMaIm+JyN9VRJMrVKZ5vQ==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@onecli-sh/sdk/-/sdk-0.2.0.tgz", + "integrity": "sha512-u7PqWROEvTV9f0ADVkjigTrd2AZn3klbPrv7GGpeRHIJpjAxJUdlWqxr5kiGt6qTDKL8t3nq76xr4X2pxTiyBg==", "license": "MIT", "engines": { "node": ">=20" diff --git a/package.json b/package.json index 990f001..54185a0 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "test:watch": "vitest" }, "dependencies": { - "@onecli-sh/sdk": "^0.1.6", + "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "^11.8.1", "cron-parser": "^5.5.0", "pino": "^9.6.0", diff --git a/src/container-runner.test.ts b/src/container-runner.test.ts index 58c7e0d..2de45c5 100644 --- a/src/container-runner.test.ts +++ b/src/container-runner.test.ts @@ -56,6 +56,7 @@ vi.mock('@onecli-sh/sdk', () => ({ OneCLI: class { applyContainerConfig = vi.fn().mockResolvedValue(true); createAgent = vi.fn().mockResolvedValue({ id: 'test' }); + ensureAgent = vi.fn().mockResolvedValue({ name: 'test', identifier: 'test', created: true }); }, })); diff --git a/src/index.ts b/src/index.ts index a7fa9e7..3f5e710 100644 --- a/src/index.ts +++ b/src/index.ts @@ -74,6 +74,25 @@ const queue = new GroupQueue(); const onecli = new OneCLI({ url: ONECLI_URL }); +function ensureOneCLIAgent(jid: string, group: RegisteredGroup): void { + if (group.isMain) return; + const identifier = group.folder.toLowerCase().replace(/_/g, '-'); + onecli.ensureAgent({ name: group.name, identifier }).then( + (res) => { + logger.info( + { jid, identifier, created: res.created }, + 'OneCLI agent ensured', + ); + }, + (err) => { + logger.debug( + { jid, identifier, err: String(err) }, + 'OneCLI agent ensure skipped', + ); + }, + ); +} + function loadState(): void { lastTimestamp = getRouterState('last_timestamp') || ''; const agentTs = getRouterState('last_agent_timestamp'); @@ -114,22 +133,8 @@ function registerGroup(jid: string, group: RegisteredGroup): void { // Create group folder fs.mkdirSync(path.join(groupDir, 'logs'), { recursive: true }); - // Create a corresponding OneCLI agent (best-effort, non-blocking) - const identifier = group.folder.toLowerCase().replace(/_/g, '-'); - onecli.createAgent({ name: group.name, identifier }).then( - (agent) => { - logger.info( - { jid, agentId: agent.id, identifier }, - 'OneCLI agent created', - ); - }, - (err) => { - logger.debug( - { jid, identifier, err: String(err) }, - 'OneCLI agent creation skipped', - ); - }, - ); + // Ensure a corresponding OneCLI agent exists (best-effort, non-blocking) + ensureOneCLIAgent(jid, group); logger.info( { jid, name: group.name, folder: group.folder }, @@ -493,6 +498,13 @@ async function main(): Promise { initDatabase(); logger.info('Database initialized'); loadState(); + + // Ensure OneCLI agents exist for all registered groups. + // Recovers from missed creates (e.g. OneCLI was down at registration time). + for (const [jid, group] of Object.entries(registeredGroups)) { + ensureOneCLIAgent(jid, group); + } + restoreRemoteControl(); // Graceful shutdown handlers From def3748d02f3ecde039d69b9eedcf40395f0af28 Mon Sep 17 00:00:00 2001 From: NanoClaw Setup Date: Sun, 22 Mar 2026 15:47:25 +0000 Subject: [PATCH 36/91] fix: restore subscription vs API key choice in setup step 4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The OneCLI integration removed the upstream subscription/API key question and only offered dashboard vs CLI. This restores the choice so users with a Claude Pro/Max subscription can use `claude setup-token` to get their OAuth token, while API key users get the existing flow. Both paths converge to the same `onecli secrets create --type anthropic` command — OneCLI handles both token types transparently. Co-Authored-By: Claude Opus 4.6 (1M context) --- .claude/skills/setup/SKILL.md | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/.claude/skills/setup/SKILL.md b/.claude/skills/setup/SKILL.md index 2f8d821..86726ff 100644 --- a/.claude/skills/setup/SKILL.md +++ b/.claude/skills/setup/SKILL.md @@ -151,21 +151,34 @@ onecli secrets list If an Anthropic secret is listed, confirm with user: keep or reconfigure? If keeping, skip to step 5. -First, look up the exact command for creating an Anthropic secret: -```bash -onecli secrets create --help -``` +AskUserQuestion: Do you want to use your **Claude subscription** (Pro/Max) or an **Anthropic API key**? -Then AskUserQuestion with two options. Use the `description` field to include the one-liner guidance and the concrete instructions for each option so the user sees everything in the question itself (avoids the interactive modal hiding text above it): +1. **Claude subscription (Pro/Max)** — description: "Uses your existing Claude Pro or Max subscription. You'll run `claude setup-token` in another terminal to get your token." +2. **Anthropic API key** — description: "Pay-per-use API key from console.anthropic.com." + +### Subscription path + +Tell the user to run `claude setup-token` in another terminal and copy the token it outputs. Do NOT collect the token in chat. + +Once they have the token, they register it with OneCLI. AskUserQuestion with two options: + +1. **Dashboard** — description: "Best if you have a browser on this machine. Open http://127.0.0.1:10254 and add the secret in the UI. Use type 'anthropic' and paste your token as the value." +2. **CLI** — description: "Best for remote/headless servers. Run: `onecli secrets create --name Anthropic --type anthropic --value YOUR_TOKEN --host-pattern api.anthropic.com`" + +### API key path + +Tell the user to get an API key from https://console.anthropic.com/settings/keys if they don't have one. + +Then AskUserQuestion with two options: 1. **Dashboard** — description: "Best if you have a browser on this machine. Open http://127.0.0.1:10254 and add the secret in the UI." 2. **CLI** — description: "Best for remote/headless servers. Run: `onecli secrets create --name Anthropic --type anthropic --value YOUR_KEY --host-pattern api.anthropic.com`" -Tell the user to get an API key from https://console.anthropic.com/settings/keys if they don't have one. +### After either path Ask them to let you know when done. -**If the user's response happens to contain an API key** (starts with `sk-ant-`): handle it gracefully — run the `onecli secrets create` command with that key on their behalf. +**If the user's response happens to contain a token or key** (starts with `sk-ant-`): handle it gracefully — run the `onecli secrets create` command with that value on their behalf. **After user confirms:** verify with `onecli secrets list` that an Anthropic secret exists. If not, ask again. From 4f7efd3c6758c15409fc27097be571c6d9e90c6c Mon Sep 17 00:00:00 2001 From: Koshkoshinsk Date: Mon, 23 Mar 2026 14:37:47 +0000 Subject: [PATCH 37/91] fix: make diagnostics step explicit so Claude actually follows it The diagnostics section used a markdown link that Claude never resolved, so the prompt was silently skipped. Replace with a numbered step (setup) and mandatory final step (update-nanoclaw) that instructs Claude to use the Read tool on the full file path. Update opt-out instructions to match the renamed section headings. Co-Authored-By: Claude Opus 4.6 (1M context) --- .claude/skills/setup/SKILL.md | 4 ++-- .claude/skills/setup/diagnostics.md | 2 +- .claude/skills/update-nanoclaw/SKILL.md | 4 ++-- .claude/skills/update-nanoclaw/diagnostics.md | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.claude/skills/setup/SKILL.md b/.claude/skills/setup/SKILL.md index 2041f80..f532ead 100644 --- a/.claude/skills/setup/SKILL.md +++ b/.claude/skills/setup/SKILL.md @@ -218,6 +218,6 @@ Tell user to test: send a message in their registered chat. Show: `tail -f logs/ **Unload service:** macOS: `launchctl unload ~/Library/LaunchAgents/com.nanoclaw.plist` | Linux: `systemctl --user stop nanoclaw` -## Diagnostics +## 9. Diagnostics -Read and follow [diagnostics.md](diagnostics.md). +Use the Read tool to open `.claude/skills/setup/diagnostics.md` and follow every instruction in it. Do not skip this step. diff --git a/.claude/skills/setup/diagnostics.md b/.claude/skills/setup/diagnostics.md index a76b4ab..669ea82 100644 --- a/.claude/skills/setup/diagnostics.md +++ b/.claude/skills/setup/diagnostics.md @@ -42,5 +42,5 @@ rm /tmp/nanoclaw-diagnostics.json **Never ask again**: 1. Replace contents of `.claude/skills/setup/diagnostics.md` with `# Diagnostics — opted out` 2. Replace contents of `.claude/skills/update-nanoclaw/diagnostics.md` with `# Diagnostics — opted out` -3. Remove the "Diagnostics" section from both `.claude/skills/setup/SKILL.md` and `.claude/skills/update-nanoclaw/SKILL.md` +3. Remove the `## 9. Diagnostics` section from `.claude/skills/setup/SKILL.md` and the `## Diagnostics (mandatory final step)` section from `.claude/skills/update-nanoclaw/SKILL.md` 4. `rm /tmp/nanoclaw-diagnostics.json` diff --git a/.claude/skills/update-nanoclaw/SKILL.md b/.claude/skills/update-nanoclaw/SKILL.md index 0af5713..1def6c6 100644 --- a/.claude/skills/update-nanoclaw/SKILL.md +++ b/.claude/skills/update-nanoclaw/SKILL.md @@ -235,6 +235,6 @@ Tell the user: - If running manually: restart `npm run dev` -## Diagnostics +## Diagnostics (mandatory final step) -Read and follow [diagnostics.md](diagnostics.md). +Use the Read tool to open `.claude/skills/update-nanoclaw/diagnostics.md` and follow every instruction in it. Do not skip this step. diff --git a/.claude/skills/update-nanoclaw/diagnostics.md b/.claude/skills/update-nanoclaw/diagnostics.md index bc659ab..f15b45c 100644 --- a/.claude/skills/update-nanoclaw/diagnostics.md +++ b/.claude/skills/update-nanoclaw/diagnostics.md @@ -45,5 +45,5 @@ rm /tmp/nanoclaw-diagnostics.json **Never ask again**: 1. Replace contents of `.claude/skills/setup/diagnostics.md` with `# Diagnostics — opted out` 2. Replace contents of `.claude/skills/update-nanoclaw/diagnostics.md` with `# Diagnostics — opted out` -3. Remove the "Diagnostics" section from both `.claude/skills/setup/SKILL.md` and `.claude/skills/update-nanoclaw/SKILL.md` +3. Remove the `## 9. Diagnostics` section from `.claude/skills/setup/SKILL.md` and the `## Diagnostics (mandatory final step)` section from `.claude/skills/update-nanoclaw/SKILL.md` 4. `rm /tmp/nanoclaw-diagnostics.json` From ff16e93713de67312ae029b8bfb6474d75554881 Mon Sep 17 00:00:00 2001 From: Akasha Date: Sun, 22 Mar 2026 16:53:42 -0400 Subject: [PATCH 38/91] fix: skip mount-allowlist write if file already exists /setup overwrote ~/.config/nanoclaw/mount-allowlist.json unconditionally, clobbering any user customizations made after initial setup. Now checks for the file first and skips with a 'skipped' status if it exists. Co-Authored-By: Claude Sonnet 4.6 --- setup/mounts.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/setup/mounts.ts b/setup/mounts.ts index eb2a5f6..a3377d3 100644 --- a/setup/mounts.ts +++ b/setup/mounts.ts @@ -37,6 +37,21 @@ export async function run(args: string[]): Promise { fs.mkdirSync(configDir, { recursive: true }); + if (fs.existsSync(configFile)) { + logger.info( + { configFile }, + 'Mount allowlist already exists — skipping (use --force to overwrite)', + ); + emitStatus('CONFIGURE_MOUNTS', { + PATH: configFile, + ALLOWED_ROOTS: 0, + NON_MAIN_READ_ONLY: 'unknown', + STATUS: 'skipped', + LOG: 'logs/setup.log', + }); + return; + } + let allowedRoots = 0; let nonMainReadOnly = 'true'; From 5f426465981f6e407412847cae7ea67999cb1e01 Mon Sep 17 00:00:00 2001 From: Akasha Date: Mon, 23 Mar 2026 16:57:09 -0400 Subject: [PATCH 39/91] fix: implement --force flag for mount-allowlist overwrite The skip message mentioned --force but parseArgs didn't handle it, making it a false promise. Now --force is parsed and passed through, allowing users to regenerate the mount allowlist when needed. Co-Authored-By: Claude Sonnet 4.6 --- setup/mounts.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/setup/mounts.ts b/setup/mounts.ts index a3377d3..e14d23b 100644 --- a/setup/mounts.ts +++ b/setup/mounts.ts @@ -10,21 +10,23 @@ import { logger } from '../src/logger.js'; import { isRoot } from './platform.js'; import { emitStatus } from './status.js'; -function parseArgs(args: string[]): { empty: boolean; json: string } { +function parseArgs(args: string[]): { empty: boolean; json: string; force: boolean } { let empty = false; let json = ''; + let force = false; for (let i = 0; i < args.length; i++) { if (args[i] === '--empty') empty = true; + if (args[i] === '--force') force = true; if (args[i] === '--json' && args[i + 1]) { json = args[i + 1]; i++; } } - return { empty, json }; + return { empty, json, force }; } export async function run(args: string[]): Promise { - const { empty, json } = parseArgs(args); + const { empty, json, force } = parseArgs(args); const homeDir = os.homedir(); const configDir = path.join(homeDir, '.config', 'nanoclaw'); const configFile = path.join(configDir, 'mount-allowlist.json'); @@ -37,7 +39,7 @@ export async function run(args: string[]): Promise { fs.mkdirSync(configDir, { recursive: true }); - if (fs.existsSync(configFile)) { + if (fs.existsSync(configFile) && !force) { logger.info( { configFile }, 'Mount allowlist already exists — skipping (use --force to overwrite)', From 724fe7250dd44b336abc7208d2b37f95db646b8c Mon Sep 17 00:00:00 2001 From: Ken Bolton Date: Mon, 23 Mar 2026 20:27:40 -0400 Subject: [PATCH 40/91] fix(claw): mount group folder and sessions into container claw was running containers with no volume mounts, so the agent always saw an empty /workspace/group. Add build_mounts() to replicate the same bind-mounts that container-runner.ts sets up (group folder, .claude sessions, IPC dir, agent-runner source, and project root for main). Also includes upstream fix from qwibitai/nanoclaw#1368: graceful terminate() before kill() on output sentinel, and early return after a successful structured response so exit code stays 0. Co-Authored-By: Claude Sonnet 4.6 --- .claude/skills/claw/scripts/claw | 64 ++++++++++++++++++++++++++++++-- src/claw-skill.test.ts | 45 ++++++++++++++++++++++ 2 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 src/claw-skill.test.ts diff --git a/.claude/skills/claw/scripts/claw b/.claude/skills/claw/scripts/claw index 3878e48..b64a225 100644 --- a/.claude/skills/claw/scripts/claw +++ b/.claude/skills/claw/scripts/claw @@ -121,8 +121,48 @@ def find_group(groups: list[dict], query: str) -> dict | None: return None -def run_container(runtime: str, image: str, payload: dict, timeout: int = 300) -> None: - cmd = [runtime, "run", "-i", "--rm", image] +def build_mounts(folder: str, is_main: bool) -> list[tuple[str, str, bool]]: + """Return list of (host_path, container_path, readonly) tuples.""" + groups_dir = NANOCLAW_DIR / "groups" + data_dir = NANOCLAW_DIR / "data" + sessions_dir = data_dir / "sessions" / folder + ipc_dir = data_dir / "ipc" / folder + + # Ensure required dirs exist + group_dir = groups_dir / folder + group_dir.mkdir(parents=True, exist_ok=True) + (sessions_dir / ".claude").mkdir(parents=True, exist_ok=True) + for sub in ("messages", "tasks", "input"): + (ipc_dir / sub).mkdir(parents=True, exist_ok=True) + + agent_runner_src = sessions_dir / "agent-runner-src" + project_agent_runner = NANOCLAW_DIR / "container" / "agent-runner" / "src" + if not agent_runner_src.exists() and project_agent_runner.exists(): + import shutil + shutil.copytree(project_agent_runner, agent_runner_src) + + mounts: list[tuple[str, str, bool]] = [] + if is_main: + mounts.append((str(NANOCLAW_DIR), "/workspace/project", True)) + mounts.append((str(group_dir), "/workspace/group", False)) + mounts.append((str(sessions_dir / ".claude"), "/home/node/.claude", False)) + mounts.append((str(ipc_dir), "/workspace/ipc", False)) + if agent_runner_src.exists(): + mounts.append((str(agent_runner_src), "/app/src", False)) + return mounts + + +def run_container(runtime: str, image: str, payload: dict, + folder: str | None = None, is_main: bool = False, + timeout: int = 300) -> None: + cmd = [runtime, "run", "-i", "--rm"] + if folder: + for host, container, readonly in build_mounts(folder, is_main): + if readonly: + cmd += ["--mount", f"type=bind,source={host},target={container},readonly"] + else: + cmd += ["-v", f"{host}:{container}"] + cmd.append(image) dbg(f"cmd: {' '.join(cmd)}") # Show payload sans secrets @@ -167,7 +207,12 @@ def run_container(runtime: str, image: str, payload: dict, timeout: int = 300) - dbg("output sentinel found, terminating container") done.set() try: - proc.kill() + proc.terminate() + try: + proc.wait(timeout=5) + except subprocess.TimeoutExpired: + dbg("graceful stop timed out, force killing container") + proc.kill() except ProcessLookupError: pass return @@ -197,6 +242,8 @@ def run_container(runtime: str, image: str, payload: dict, timeout: int = 300) - stdout, re.DOTALL, ) + success = False + if match: try: data = json.loads(match.group(1)) @@ -206,6 +253,7 @@ def run_container(runtime: str, image: str, payload: dict, timeout: int = 300) - session_id = data.get("newSessionId") or data.get("sessionId") if session_id: print(f"\n[session: {session_id}]", file=sys.stderr) + success = True else: print(f"[{status}] {data.get('result', '')}", file=sys.stderr) sys.exit(1) @@ -215,6 +263,9 @@ def run_container(runtime: str, image: str, payload: dict, timeout: int = 300) - # No structured output — print raw stdout print(stdout) + if success: + return + if proc.returncode not in (0, None): sys.exit(proc.returncode) @@ -273,6 +324,7 @@ def main(): # Resolve group → jid jid = args.jid group_name = None + group_folder = None is_main = False if args.group: @@ -281,6 +333,7 @@ def main(): sys.exit(f"error: group '{args.group}' not found. Run --list-groups to see options.") jid = g["jid"] group_name = g["name"] + group_folder = g["folder"] is_main = g["is_main"] elif not jid: # Default: main group @@ -288,6 +341,7 @@ def main(): if mains: jid = mains[0]["jid"] group_name = mains[0]["name"] + group_folder = mains[0]["folder"] is_main = True else: sys.exit("error: no group specified and no main group found. Use -g or -j.") @@ -311,7 +365,9 @@ def main(): payload["resumeAt"] = "latest" print(f"[{group_name or jid}] running via {runtime}...", file=sys.stderr) - run_container(runtime, args.image, payload, timeout=args.timeout) + run_container(runtime, args.image, payload, + folder=group_folder, is_main=is_main, + timeout=args.timeout) if __name__ == "__main__": diff --git a/src/claw-skill.test.ts b/src/claw-skill.test.ts new file mode 100644 index 0000000..24260c9 --- /dev/null +++ b/src/claw-skill.test.ts @@ -0,0 +1,45 @@ +import fs from 'fs'; +import os from 'os'; +import path from 'path'; +import { spawnSync } from 'child_process'; + +import { describe, expect, it } from 'vitest'; + +describe('claw skill script', () => { + it('exits zero after successful structured output even if the runtime is terminated', () => { + const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'claw-skill-test-')); + const binDir = path.join(tempDir, 'bin'); + fs.mkdirSync(binDir, { recursive: true }); + + const runtimePath = path.join(binDir, 'container'); + fs.writeFileSync( + runtimePath, + `#!/bin/sh +cat >/dev/null +printf '%s\n' '---NANOCLAW_OUTPUT_START---' '{"status":"success","result":"4","newSessionId":"sess-1"}' '---NANOCLAW_OUTPUT_END---' +sleep 30 +`, + ); + fs.chmodSync(runtimePath, 0o755); + + const result = spawnSync( + 'python3', + ['.claude/skills/claw/scripts/claw', '-j', 'tg:123', 'What is 2+2?'], + { + cwd: process.cwd(), + encoding: 'utf8', + env: { + ...process.env, + NANOCLAW_DIR: tempDir, + PATH: `${binDir}:${process.env.PATH || ''}`, + }, + timeout: 15000, + }, + ); + + expect(result.status).toBe(0); + expect(result.signal).toBeNull(); + expect(result.stdout).toContain('4'); + expect(result.stderr).toContain('[session: sess-1]'); + }); +}); From 01b6258f59c76eff7ed86c8b9d4aa1d8eecddf46 Mon Sep 17 00:00:00 2001 From: glifocat Date: Tue, 24 Mar 2026 10:40:04 +0100 Subject: [PATCH 41/91] docs: update outdated documentation, add docs portal links - README.md: add docs.nanoclaw.dev link, point architecture and security references to documentation site - CHANGELOG.md: add all releases from v1.1.0 through v1.2.21 (was only v1.2.0), link to full changelog on docs site - docs/REQUIREMENTS.md: update multi-channel references (NanoClaw now supports WhatsApp, Telegram, Discord, Slack, Gmail), update RFS to reflect existing skills, fix deployment info (macOS + Linux) - docs/SECURITY.md: generalize WhatsApp-specific language to channel-neutral - docs/DEBUG_CHECKLIST.md: use Docker commands (default runtime) instead of Apple Container syntax, generalize WhatsApp references - docs/README.md: new file pointing to docs.nanoclaw.dev as the authoritative source, with mapping table from local files to docs site pages Co-Authored-By: Claude Opus 4.6 (1M context) --- CHANGELOG.md | 138 +++++++++++++++++++++++++++++++++++++++- README.md | 7 +- docs/DEBUG_CHECKLIST.md | 14 ++-- docs/README.md | 15 +++++ docs/REQUIREMENTS.md | 45 ++++++------- docs/SECURITY.md | 6 +- 6 files changed, 182 insertions(+), 43 deletions(-) create mode 100644 docs/README.md diff --git a/CHANGELOG.md b/CHANGELOG.md index bcb6496..323c0e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,139 @@ All notable changes to NanoClaw will be documented in this file. -## [1.2.0](https://github.com/qwibitai/nanoclaw/compare/v1.1.6...v1.2.0) +For detailed release notes, see the [full changelog on the documentation site](https://docs.nanoclaw.dev/changelog). -[BREAKING] WhatsApp removed from core, now a skill. Run `/add-whatsapp` to re-add (existing auth/groups preserved). -- **fix:** Prevent scheduled tasks from executing twice when container runtime exceeds poll interval (#138, #669) +## [1.2.21] - 2026-03-22 + +- Added opt-in diagnostics via PostHog with explicit user consent (Yes / No / Never ask again) + +## [1.2.20] - 2026-03-21 + +- Added ESLint configuration with error-handling rules + +## [1.2.19] - 2026-03-19 + +- Reduced `docker stop` timeout for faster container restarts (`-t 1` flag) + +## [1.2.18] - 2026-03-19 + +- User prompt content no longer logged on container errors — only input metadata +- Added Japanese README translation + +## [1.2.17] - 2026-03-18 + +- Added `/capabilities` and `/status` container-agent skills + +## [1.2.16] - 2026-03-18 + +- Tasks snapshot now refreshes immediately after IPC task mutations + +## [1.2.15] - 2026-03-16 + +- Fixed remote-control prompt auto-accept to prevent immediate exit +- Added `KillMode=process` so remote-control survives service restarts + +## [1.2.14] - 2026-03-14 + +- Added `/remote-control` command for host-level Claude Code access from within containers + +## [1.2.13] - 2026-03-14 + +**Breaking:** Skills are now git branches, channels are separate fork repos. + +- Skills live as `skill/*` git branches merged via `git merge` +- Added Docker Sandboxes support +- Fixed setup registration to use correct CLI commands + +## [1.2.12] - 2026-03-08 + +- Added `/compact` skill for manual context compaction +- Enhanced container environment isolation via credential proxy + +## [1.2.11] - 2026-03-08 + +- Added PDF reader, image vision, and WhatsApp reactions skills +- Fixed task container to close promptly when agent uses IPC-only messaging + +## [1.2.10] - 2026-03-06 + +- Added `LIMIT` to unbounded message history queries for better performance + +## [1.2.9] - 2026-03-06 + +- Agent prompts now include timezone context for accurate time references + +## [1.2.8] - 2026-03-06 + +- Fixed misleading `send_message` tool description for scheduled tasks + +## [1.2.7] - 2026-03-06 + +- Added `/add-ollama` skill for local model inference +- Added `update_task` tool and return task ID from `schedule_task` + +## [1.2.6] - 2026-03-04 + +- Updated `claude-agent-sdk` to 0.2.68 + +## [1.2.5] - 2026-03-04 + +- CI formatting fix + +## [1.2.4] - 2026-03-04 + +- Fixed `_chatJid` rename to `chatJid` in `onMessage` callback + +## [1.2.3] - 2026-03-04 + +- Added sender allowlist for per-chat access control + +## [1.2.2] - 2026-03-04 + +- Added `/use-local-whisper` skill for local voice transcription +- Atomic task claims prevent scheduled tasks from executing twice + +## [1.2.1] - 2026-03-02 + +- Version bump (no functional changes) + +## [1.2.0] - 2026-03-02 + +**Breaking:** WhatsApp removed from core, now a skill. Run `/add-whatsapp` to re-add. + +- Channel registry: channels self-register at startup via `registerChannel()` factory pattern +- `isMain` flag replaces folder-name-based main group detection +- `ENABLED_CHANNELS` removed — channels detected by credential presence +- Prevent scheduled tasks from executing twice when container runtime exceeds poll interval + +## [1.1.6] - 2026-03-01 + +- Added CJK font support for Chromium screenshots + +## [1.1.5] - 2026-03-01 + +- Fixed wrapped WhatsApp message normalization + +## [1.1.4] - 2026-03-01 + +- Added third-party model support +- Added `/update-nanoclaw` skill for syncing with upstream + +## [1.1.3] - 2026-02-25 + +- Added `/add-slack` skill +- Restructured Gmail skill for new architecture + +## [1.1.2] - 2026-02-24 + +- Improved error handling for WhatsApp Web version fetch + +## [1.1.1] - 2026-02-24 + +- Added Qodo skills and codebase intelligence +- Fixed WhatsApp 405 connection failures + +## [1.1.0] - 2026-02-23 + +- Added `/update` skill to pull upstream changes from within Claude Code +- Enhanced container environment isolation via credential proxy diff --git a/README.md b/README.md index 3aafd85..8cfe627 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@

nanoclaw.dev  •   + docs  •   中文  •   日本語  •   Discord  •   @@ -134,7 +135,7 @@ Channels --> SQLite --> Polling loop --> Container (Claude Agent SDK) --> Respon Single Node.js process. Channels are added via skills and self-register at startup — the orchestrator connects whichever ones have credentials present. Agents execute in isolated Linux containers with filesystem isolation. Only mounted directories are accessible. Per-group message queue with concurrency control. IPC via filesystem. -For the full architecture details, see [docs/SPEC.md](docs/SPEC.md). +For the full architecture details, see the [documentation site](https://docs.nanoclaw.dev/concepts/architecture). Key files: - `src/index.ts` - Orchestrator: state, message loop, agent invocation @@ -159,7 +160,7 @@ Yes. Docker is the default runtime and works on both macOS and Linux. Just run ` **Is this secure?** -Agents run in containers, not behind application-level permission checks. They can only access explicitly mounted directories. You should still review what you're running, but the codebase is small enough that you actually can. See [docs/SECURITY.md](docs/SECURITY.md) for the full security model. +Agents run in containers, not behind application-level permission checks. They can only access explicitly mounted directories. You should still review what you're running, but the codebase is small enough that you actually can. See the [security documentation](https://docs.nanoclaw.dev/concepts/security) for the full security model. **Why no configuration files?** @@ -203,7 +204,7 @@ Questions? Ideas? [Join the Discord](https://discord.gg/VDdww8qS42). ## Changelog -See [CHANGELOG.md](CHANGELOG.md) for breaking changes and migration notes. +See [CHANGELOG.md](CHANGELOG.md) for breaking changes, or the [full release history](https://docs.nanoclaw.dev/changelog) on the documentation site. ## License diff --git a/docs/DEBUG_CHECKLIST.md b/docs/DEBUG_CHECKLIST.md index 5597067..c1d53f1 100644 --- a/docs/DEBUG_CHECKLIST.md +++ b/docs/DEBUG_CHECKLIST.md @@ -19,16 +19,16 @@ launchctl list | grep nanoclaw # Expected: PID 0 com.nanoclaw (PID = running, "-" = not running, non-zero exit = crashed) # 2. Any running containers? -container ls --format '{{.Names}} {{.Status}}' 2>/dev/null | grep nanoclaw +docker ps --format '{{.Names}} {{.Status}}' 2>/dev/null | grep nanoclaw # 3. Any stopped/orphaned containers? -container ls -a --format '{{.Names}} {{.Status}}' 2>/dev/null | grep nanoclaw +docker ps -a --format '{{.Names}} {{.Status}}' 2>/dev/null | grep nanoclaw # 4. Recent errors in service log? grep -E 'ERROR|WARN' logs/nanoclaw.log | tail -20 -# 5. Is WhatsApp connected? (look for last connection event) -grep -E 'Connected to WhatsApp|Connection closed|connection.*close' logs/nanoclaw.log | tail -5 +# 5. Are channels connected? (look for last connection event) +grep -E 'Connected|Connection closed|connection.*close|channel.*ready' logs/nanoclaw.log | tail -5 # 6. Are groups loaded? grep 'groupCount' logs/nanoclaw.log | tail -3 @@ -77,7 +77,7 @@ grep -E 'Scheduling retry|retry|Max retries' logs/nanoclaw.log | tail -10 ## Agent Not Responding ```bash -# Check if messages are being received from WhatsApp +# Check if messages are being received from channels grep 'New messages' logs/nanoclaw.log | tail -10 # Check if messages are being processed (container spawned) @@ -107,10 +107,10 @@ sqlite3 store/messages.db "SELECT name, container_config FROM registered_groups; # Test-run a container to check mounts (dry run) # Replace with the group's folder name -container run -i --rm --entrypoint ls nanoclaw-agent:latest /workspace/extra/ +docker run -i --rm --entrypoint ls nanoclaw-agent:latest /workspace/extra/ ``` -## WhatsApp Auth Issues +## Channel Auth Issues ```bash # Check if QR code was requested (means auth expired) diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..bb062e5 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,15 @@ +# NanoClaw Documentation + +The official documentation is at **[docs.nanoclaw.dev](https://docs.nanoclaw.dev)**. + +The files in this directory are original design documents and developer references. For the most current and accurate information, use the documentation site. + +| This directory | Documentation site | +|---|---| +| [SPEC.md](SPEC.md) | [Architecture](https://docs.nanoclaw.dev/concepts/architecture) | +| [SECURITY.md](SECURITY.md) | [Security model](https://docs.nanoclaw.dev/concepts/security) | +| [REQUIREMENTS.md](REQUIREMENTS.md) | [Introduction](https://docs.nanoclaw.dev/introduction) | +| [skills-as-branches.md](skills-as-branches.md) | [Skills system](https://docs.nanoclaw.dev/integrations/skills-system) | +| [DEBUG_CHECKLIST.md](DEBUG_CHECKLIST.md) | [Troubleshooting](https://docs.nanoclaw.dev/advanced/troubleshooting) | +| [docker-sandboxes.md](docker-sandboxes.md) | [Docker Sandboxes](https://docs.nanoclaw.dev/advanced/docker-sandboxes) | +| [APPLE-CONTAINER-NETWORKING.md](APPLE-CONTAINER-NETWORKING.md) | [Container runtime](https://docs.nanoclaw.dev/advanced/container-runtime) | diff --git a/docs/REQUIREMENTS.md b/docs/REQUIREMENTS.md index 227c9ad..8c1a29e 100644 --- a/docs/REQUIREMENTS.md +++ b/docs/REQUIREMENTS.md @@ -22,9 +22,9 @@ The entire codebase should be something you can read and understand. One Node.js Instead of application-level permission systems trying to prevent agents from accessing things, agents run in actual Linux containers. The isolation is at the OS level. Agents can only see what's explicitly mounted. Bash access is safe because commands run inside the container, not on your Mac. -### Built for One User +### Built for the Individual User -This isn't a framework or a platform. It's working software for my specific needs. I use WhatsApp and Email, so it supports WhatsApp and Email. I don't use Telegram, so it doesn't support Telegram. I add the integrations I actually want, not every possible integration. +This isn't a framework or a platform. It's software that fits each user's exact needs. You fork the repo, add the channels you want (WhatsApp, Telegram, Discord, Slack, Gmail), and end up with clean code that does exactly what you need. ### Customization = Code Changes @@ -44,41 +44,31 @@ When people contribute, they shouldn't add "Telegram support alongside WhatsApp. ## RFS (Request for Skills) -Skills we'd love contributors to build: +Skills we'd like to see contributed: ### Communication Channels -Skills to add or switch to different messaging platforms: -- `/add-telegram` - Add Telegram as an input channel -- `/add-slack` - Add Slack as an input channel -- `/add-discord` - Add Discord as an input channel -- `/add-sms` - Add SMS via Twilio or similar -- `/convert-to-telegram` - Replace WhatsApp with Telegram entirely +- `/add-signal` - Add Signal as a channel +- `/add-matrix` - Add Matrix integration -### Container Runtime -The project uses Docker by default (cross-platform). For macOS users who prefer Apple Container: -- `/convert-to-apple-container` - Switch from Docker to Apple Container (macOS-only) - -### Platform Support -- `/setup-linux` - Make the full setup work on Linux (depends on Docker conversion) -- `/setup-windows` - Windows support via WSL2 + Docker +> **Note:** Telegram, Slack, Discord, Gmail, and Apple Container skills already exist. See the [skills documentation](https://docs.nanoclaw.dev/integrations/skills-system) for the full list. --- ## Vision -A personal Claude assistant accessible via WhatsApp, with minimal custom code. +A personal Claude assistant accessible via messaging, with minimal custom code. **Core components:** - **Claude Agent SDK** as the core agent - **Containers** for isolated agent execution (Linux VMs) -- **WhatsApp** as the primary I/O channel +- **Multi-channel messaging** (WhatsApp, Telegram, Discord, Slack, Gmail) — add exactly the channels you need - **Persistent memory** per conversation and globally - **Scheduled tasks** that run Claude and can message back - **Web access** for search and browsing - **Browser automation** via agent-browser **Implementation approach:** -- Use existing tools (WhatsApp connector, Claude Agent SDK, MCP servers) +- Use existing tools (channel libraries, Claude Agent SDK, MCP servers) - Minimal glue code - File-based systems where possible (CLAUDE.md for memory, folders for groups) @@ -87,7 +77,7 @@ A personal Claude assistant accessible via WhatsApp, with minimal custom code. ## Architecture Decisions ### Message Routing -- A router listens to WhatsApp and routes messages based on configuration +- A router listens to connected channels and routes messages based on configuration - Only messages from registered groups are processed - Trigger: `@Andy` prefix (case insensitive), configurable via `ASSISTANT_NAME` env var - Unregistered groups are ignored completely @@ -136,10 +126,11 @@ A personal Claude assistant accessible via WhatsApp, with minimal custom code. ## Integration Points -### WhatsApp -- Using baileys library for WhatsApp Web connection +### Channels +- WhatsApp (baileys), Telegram (grammy), Discord (discord.js), Slack (@slack/bolt), Gmail (googleapis) +- Each channel lives in a separate fork repo and is added via skills (e.g., `/add-whatsapp`, `/add-telegram`) - Messages stored in SQLite, polled by router -- QR code authentication during setup +- Channels self-register at startup — unconfigured channels are skipped with a warning ### Scheduler - Built-in scheduler runs on the host, spawns containers for task execution @@ -170,12 +161,12 @@ A personal Claude assistant accessible via WhatsApp, with minimal custom code. - Each user gets a custom setup matching their exact needs ### Skills -- `/setup` - Install dependencies, authenticate WhatsApp, configure scheduler, start services -- `/customize` - General-purpose skill for adding capabilities (new channels like Telegram, new integrations, behavior changes) -- `/update` - Pull upstream changes, merge with customizations, run migrations +- `/setup` - Install dependencies, configure channels, start services +- `/customize` - General-purpose skill for adding capabilities +- `/update-nanoclaw` - Pull upstream changes, merge with customizations ### Deployment -- Runs on local Mac via launchd +- Runs on macOS (launchd) or Linux (systemd) - Single Node.js process handles everything --- diff --git a/docs/SECURITY.md b/docs/SECURITY.md index db6fc18..3562fbd 100644 --- a/docs/SECURITY.md +++ b/docs/SECURITY.md @@ -7,7 +7,7 @@ | Main group | Trusted | Private self-chat, admin control | | Non-main groups | Untrusted | Other users may be malicious | | Container agents | Sandboxed | Isolated execution environment | -| WhatsApp messages | User input | Potential prompt injection | +| Incoming messages | User input | Potential prompt injection | ## Security Boundaries @@ -76,7 +76,7 @@ Real API credentials **never enter containers**. Instead, the host runs an HTTP 5. Agents cannot discover real credentials — not in environment, stdin, files, or `/proc` **NOT Mounted:** -- WhatsApp session (`store/auth/`) - host only +- Channel auth sessions (`store/auth/`) - host only - Mount allowlist - external, never mounted - Any credentials matching blocked patterns - `.env` is shadowed with `/dev/null` in the project root mount @@ -97,7 +97,7 @@ Real API credentials **never enter containers**. Instead, the host runs an HTTP ``` ┌──────────────────────────────────────────────────────────────────┐ │ UNTRUSTED ZONE │ -│ WhatsApp Messages (potentially malicious) │ +│ Incoming Messages (potentially malicious) │ └────────────────────────────────┬─────────────────────────────────┘ │ ▼ Trigger check, input escaping From 8dcc70cf5cc45628d05b0fec604baab569d60d0a Mon Sep 17 00:00:00 2001 From: glifocat Date: Tue, 24 Mar 2026 10:48:18 +0100 Subject: [PATCH 42/91] docs: add Windows (WSL2) to supported platforms Co-Authored-By: Claude Opus 4.6 (1M context) --- README.md | 6 +++--- docs/REQUIREMENTS.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8cfe627..8d1eb37 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ Skills we'd like to see: ## Requirements -- macOS or Linux +- macOS, Linux, or Windows (via WSL2) - Node.js 20+ - [Claude Code](https://claude.ai/download) - [Apple Container](https://github.com/apple/container) (macOS) or [Docker](https://docker.com/products/docker-desktop) (macOS/Linux) @@ -154,9 +154,9 @@ Key files: Docker provides cross-platform support (macOS, Linux and even Windows via WSL2) and a mature ecosystem. On macOS, you can optionally switch to Apple Container via `/convert-to-apple-container` for a lighter-weight native runtime. For additional isolation, [Docker Sandboxes](docs/docker-sandboxes.md) run each container inside a micro VM. -**Can I run this on Linux?** +**Can I run this on Linux or Windows?** -Yes. Docker is the default runtime and works on both macOS and Linux. Just run `/setup`. +Yes. Docker is the default runtime and works on macOS, Linux, and Windows (via WSL2). Just run `/setup`. **Is this secure?** diff --git a/docs/REQUIREMENTS.md b/docs/REQUIREMENTS.md index 8c1a29e..e7c2376 100644 --- a/docs/REQUIREMENTS.md +++ b/docs/REQUIREMENTS.md @@ -166,7 +166,7 @@ A personal Claude assistant accessible via messaging, with minimal custom code. - `/update-nanoclaw` - Pull upstream changes, merge with customizations ### Deployment -- Runs on macOS (launchd) or Linux (systemd) +- Runs on macOS (launchd), Linux (systemd), or Windows (WSL2) - Single Node.js process handles everything --- From 5a12ddd4cba283bec12bb68c5c712e2dfded1700 Mon Sep 17 00:00:00 2001 From: glifocat Date: Thu, 5 Mar 2026 20:38:32 +0000 Subject: [PATCH 43/91] fix(register): create CLAUDE.md in group folder from template When registering a new group, create CLAUDE.md in the group folder from the appropriate template (groups/main/ for main groups, groups/global/ for others). Without this, the container agent runs with no CLAUDE.md since its CWD is /workspace/group (the group folder). Also update the name-replacement glob to cover all groups/*/CLAUDE.md files rather than only two hardcoded paths, so newly created files and any future group folders are updated correctly. Co-Authored-By: Claude Sonnet 4.6 --- setup/register.ts | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/setup/register.ts b/setup/register.ts index eeafa90..6e32cd8 100644 --- a/setup/register.ts +++ b/setup/register.ts @@ -116,6 +116,27 @@ export async function run(args: string[]): Promise { recursive: true, }); + // Create CLAUDE.md in the new group folder from template if it doesn't exist. + // The agent runs with CWD=/workspace/group and loads CLAUDE.md from there. + const groupClaudeMdPath = path.join( + projectRoot, + 'groups', + parsed.folder, + 'CLAUDE.md', + ); + if (!fs.existsSync(groupClaudeMdPath)) { + const templatePath = parsed.isMain + ? path.join(projectRoot, 'groups', 'main', 'CLAUDE.md') + : path.join(projectRoot, 'groups', 'global', 'CLAUDE.md'); + if (fs.existsSync(templatePath)) { + fs.copyFileSync(templatePath, groupClaudeMdPath); + logger.info( + { file: groupClaudeMdPath, template: templatePath }, + 'Created CLAUDE.md from template', + ); + } + } + // Update assistant name in CLAUDE.md files if different from default let nameUpdated = false; if (parsed.assistantName !== 'Andy') { @@ -124,10 +145,11 @@ export async function run(args: string[]): Promise { 'Updating assistant name', ); - const mdFiles = [ - path.join(projectRoot, 'groups', 'global', 'CLAUDE.md'), - path.join(projectRoot, 'groups', parsed.folder, 'CLAUDE.md'), - ]; + const groupsDir = path.join(projectRoot, 'groups'); + const mdFiles = fs + .readdirSync(groupsDir) + .map((d) => path.join(groupsDir, d, 'CLAUDE.md')) + .filter((f) => fs.existsSync(f)); for (const mdFile of mdFiles) { if (fs.existsSync(mdFile)) { From b6e18688c206b2e50961a17cc9232c2b6fd83877 Mon Sep 17 00:00:00 2001 From: glifocat Date: Tue, 24 Mar 2026 12:35:13 +0100 Subject: [PATCH 44/91] test: add coverage for CLAUDE.md template copy in register step Adds 5 tests verifying the template copy and glob-based name update logic introduced in the parent commit: - copies global template for non-main groups - copies main template for main groups - does not overwrite existing CLAUDE.md - updates name across all groups/*/CLAUDE.md files - handles missing template gracefully (no crash) Co-Authored-By: Claude Opus 4.6 (1M context) --- setup/register.test.ts | 152 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 150 insertions(+), 2 deletions(-) diff --git a/setup/register.test.ts b/setup/register.test.ts index d47d95c..b3bd463 100644 --- a/setup/register.test.ts +++ b/setup/register.test.ts @@ -1,4 +1,7 @@ -import { describe, it, expect, beforeEach } from 'vitest'; +import fs from 'fs'; +import os from 'os'; +import path from 'path'; +import { afterEach, describe, it, expect, beforeEach } from 'vitest'; import Database from 'better-sqlite3'; @@ -6,7 +9,7 @@ import Database from 'better-sqlite3'; * Tests for the register step. * * Verifies: parameterized SQL (no injection), file templating, - * apostrophe in names, .env updates. + * apostrophe in names, .env updates, CLAUDE.md template copy. */ function createTestDb(): Database.Database { @@ -255,3 +258,148 @@ describe('file templating', () => { expect(envContent).toContain('ASSISTANT_NAME="Nova"'); }); }); + +describe('CLAUDE.md template copy', () => { + let tmpDir: string; + let groupsDir: string; + + beforeEach(() => { + tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'nanoclaw-register-test-')); + groupsDir = path.join(tmpDir, 'groups'); + fs.mkdirSync(path.join(groupsDir, 'main'), { recursive: true }); + fs.mkdirSync(path.join(groupsDir, 'global'), { recursive: true }); + fs.writeFileSync( + path.join(groupsDir, 'main', 'CLAUDE.md'), + '# Andy\n\nYou are Andy, a personal assistant.\n\n## Admin Context\n\nThis is the **main channel**.', + ); + fs.writeFileSync( + path.join(groupsDir, 'global', 'CLAUDE.md'), + '# Andy\n\nYou are Andy, a personal assistant.', + ); + }); + + afterEach(() => { + fs.rmSync(tmpDir, { recursive: true, force: true }); + }); + + it('copies global template for non-main group', () => { + const folder = 'telegram_dev-team'; + const folderDir = path.join(groupsDir, folder); + fs.mkdirSync(path.join(folderDir, 'logs'), { recursive: true }); + + const dest = path.join(folderDir, 'CLAUDE.md'); + const templatePath = path.join(groupsDir, 'global', 'CLAUDE.md'); + + // Replicate register.ts logic: copy template if dest doesn't exist + if (!fs.existsSync(dest)) { + if (fs.existsSync(templatePath)) { + fs.copyFileSync(templatePath, dest); + } + } + + expect(fs.existsSync(dest)).toBe(true); + expect(fs.readFileSync(dest, 'utf-8')).toContain('You are Andy'); + // Should NOT contain main-specific content + expect(fs.readFileSync(dest, 'utf-8')).not.toContain('Admin Context'); + }); + + it('copies main template for main group', () => { + const folder = 'whatsapp_main'; + const folderDir = path.join(groupsDir, folder); + fs.mkdirSync(path.join(folderDir, 'logs'), { recursive: true }); + + const dest = path.join(folderDir, 'CLAUDE.md'); + const isMain = true; + const templatePath = isMain + ? path.join(groupsDir, 'main', 'CLAUDE.md') + : path.join(groupsDir, 'global', 'CLAUDE.md'); + + if (!fs.existsSync(dest)) { + if (fs.existsSync(templatePath)) { + fs.copyFileSync(templatePath, dest); + } + } + + expect(fs.existsSync(dest)).toBe(true); + expect(fs.readFileSync(dest, 'utf-8')).toContain('Admin Context'); + }); + + it('does not overwrite existing CLAUDE.md', () => { + const folder = 'slack_main'; + const folderDir = path.join(groupsDir, folder); + fs.mkdirSync(folderDir, { recursive: true }); + + const dest = path.join(folderDir, 'CLAUDE.md'); + fs.writeFileSync(dest, '# Custom\n\nUser-modified content.'); + + const templatePath = path.join(groupsDir, 'global', 'CLAUDE.md'); + if (!fs.existsSync(dest)) { + if (fs.existsSync(templatePath)) { + fs.copyFileSync(templatePath, dest); + } + } + + expect(fs.readFileSync(dest, 'utf-8')).toContain('User-modified content'); + expect(fs.readFileSync(dest, 'utf-8')).not.toContain('You are Andy'); + }); + + it('updates name in all groups/*/CLAUDE.md files', () => { + // Create a few group folders with CLAUDE.md + for (const folder of ['whatsapp_main', 'telegram_friends']) { + const dir = path.join(groupsDir, folder); + fs.mkdirSync(dir, { recursive: true }); + fs.writeFileSync( + path.join(dir, 'CLAUDE.md'), + '# Andy\n\nYou are Andy, a personal assistant.', + ); + } + + const assistantName = 'Luna'; + + // Replicate register.ts glob logic + const mdFiles = fs + .readdirSync(groupsDir) + .map((d) => path.join(groupsDir, d, 'CLAUDE.md')) + .filter((f) => fs.existsSync(f)); + + for (const mdFile of mdFiles) { + let content = fs.readFileSync(mdFile, 'utf-8'); + content = content.replace(/^# Andy$/m, `# ${assistantName}`); + content = content.replace(/You are Andy/g, `You are ${assistantName}`); + fs.writeFileSync(mdFile, content); + } + + // All CLAUDE.md files should be updated, including templates and groups + for (const folder of ['main', 'global', 'whatsapp_main', 'telegram_friends']) { + const content = fs.readFileSync( + path.join(groupsDir, folder, 'CLAUDE.md'), + 'utf-8', + ); + expect(content).toContain('# Luna'); + expect(content).toContain('You are Luna'); + expect(content).not.toContain('Andy'); + } + }); + + it('handles missing template gracefully', () => { + // Remove templates + fs.unlinkSync(path.join(groupsDir, 'global', 'CLAUDE.md')); + fs.unlinkSync(path.join(groupsDir, 'main', 'CLAUDE.md')); + + const folder = 'discord_general'; + const folderDir = path.join(groupsDir, folder); + fs.mkdirSync(path.join(folderDir, 'logs'), { recursive: true }); + + const dest = path.join(folderDir, 'CLAUDE.md'); + const templatePath = path.join(groupsDir, 'global', 'CLAUDE.md'); + + if (!fs.existsSync(dest)) { + if (fs.existsSync(templatePath)) { + fs.copyFileSync(templatePath, dest); + } + } + + // No crash, no file created + expect(fs.existsSync(dest)).toBe(false); + }); +}); From 07dc8c977c9b2c582896996dbe2bb4936e94269d Mon Sep 17 00:00:00 2001 From: glifocat Date: Tue, 24 Mar 2026 12:39:21 +0100 Subject: [PATCH 45/91] test: cover multi-channel main and cross-channel name propagation Replaces single-channel tests with multi-channel scenarios: - each channel can have its own main with admin context - non-main groups across channels get global template - custom name propagates to all channels and groups - user-modified CLAUDE.md preserved on re-registration - missing templates handled gracefully Co-Authored-By: Claude Opus 4.6 (1M context) --- setup/register.test.ts | 212 +++++++++++++++++++++++------------------ 1 file changed, 118 insertions(+), 94 deletions(-) diff --git a/setup/register.test.ts b/setup/register.test.ts index b3bd463..11f0f5f 100644 --- a/setup/register.test.ts +++ b/setup/register.test.ts @@ -263,6 +263,52 @@ describe('CLAUDE.md template copy', () => { let tmpDir: string; let groupsDir: string; + // Replicates register.ts template copy + name update logic + function simulateRegister( + folder: string, + isMain: boolean, + assistantName = 'Andy', + ): void { + const folderDir = path.join(groupsDir, folder); + fs.mkdirSync(path.join(folderDir, 'logs'), { recursive: true }); + + // Template copy (register.ts lines 119-138) + const dest = path.join(folderDir, 'CLAUDE.md'); + if (!fs.existsSync(dest)) { + const templatePath = isMain + ? path.join(groupsDir, 'main', 'CLAUDE.md') + : path.join(groupsDir, 'global', 'CLAUDE.md'); + if (fs.existsSync(templatePath)) { + fs.copyFileSync(templatePath, dest); + } + } + + // Name update across all groups (register.ts lines 140-165) + if (assistantName !== 'Andy') { + const mdFiles = fs + .readdirSync(groupsDir) + .map((d) => path.join(groupsDir, d, 'CLAUDE.md')) + .filter((f) => fs.existsSync(f)); + + for (const mdFile of mdFiles) { + let content = fs.readFileSync(mdFile, 'utf-8'); + content = content.replace(/^# Andy$/m, `# ${assistantName}`); + content = content.replace( + /You are Andy/g, + `You are ${assistantName}`, + ); + fs.writeFileSync(mdFile, content); + } + } + } + + function readGroupMd(folder: string): string { + return fs.readFileSync( + path.join(groupsDir, folder, 'CLAUDE.md'), + 'utf-8', + ); + } + beforeEach(() => { tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'nanoclaw-register-test-')); groupsDir = path.join(tmpDir, 'groups'); @@ -283,123 +329,101 @@ describe('CLAUDE.md template copy', () => { }); it('copies global template for non-main group', () => { - const folder = 'telegram_dev-team'; - const folderDir = path.join(groupsDir, folder); - fs.mkdirSync(path.join(folderDir, 'logs'), { recursive: true }); + simulateRegister('telegram_dev-team', false); - const dest = path.join(folderDir, 'CLAUDE.md'); - const templatePath = path.join(groupsDir, 'global', 'CLAUDE.md'); - - // Replicate register.ts logic: copy template if dest doesn't exist - if (!fs.existsSync(dest)) { - if (fs.existsSync(templatePath)) { - fs.copyFileSync(templatePath, dest); - } - } - - expect(fs.existsSync(dest)).toBe(true); - expect(fs.readFileSync(dest, 'utf-8')).toContain('You are Andy'); - // Should NOT contain main-specific content - expect(fs.readFileSync(dest, 'utf-8')).not.toContain('Admin Context'); + const content = readGroupMd('telegram_dev-team'); + expect(content).toContain('You are Andy'); + expect(content).not.toContain('Admin Context'); }); it('copies main template for main group', () => { - const folder = 'whatsapp_main'; - const folderDir = path.join(groupsDir, folder); - fs.mkdirSync(path.join(folderDir, 'logs'), { recursive: true }); + simulateRegister('whatsapp_main', true); - const dest = path.join(folderDir, 'CLAUDE.md'); - const isMain = true; - const templatePath = isMain - ? path.join(groupsDir, 'main', 'CLAUDE.md') - : path.join(groupsDir, 'global', 'CLAUDE.md'); - - if (!fs.existsSync(dest)) { - if (fs.existsSync(templatePath)) { - fs.copyFileSync(templatePath, dest); - } - } - - expect(fs.existsSync(dest)).toBe(true); - expect(fs.readFileSync(dest, 'utf-8')).toContain('Admin Context'); + expect(readGroupMd('whatsapp_main')).toContain('Admin Context'); }); - it('does not overwrite existing CLAUDE.md', () => { - const folder = 'slack_main'; - const folderDir = path.join(groupsDir, folder); - fs.mkdirSync(folderDir, { recursive: true }); + it('each channel can have its own main with admin context', () => { + simulateRegister('whatsapp_main', true); + simulateRegister('telegram_main', true); + simulateRegister('slack_main', true); + simulateRegister('discord_main', true); - const dest = path.join(folderDir, 'CLAUDE.md'); - fs.writeFileSync(dest, '# Custom\n\nUser-modified content.'); - - const templatePath = path.join(groupsDir, 'global', 'CLAUDE.md'); - if (!fs.existsSync(dest)) { - if (fs.existsSync(templatePath)) { - fs.copyFileSync(templatePath, dest); - } + for (const folder of [ + 'whatsapp_main', + 'telegram_main', + 'slack_main', + 'discord_main', + ]) { + const content = readGroupMd(folder); + expect(content).toContain('Admin Context'); + expect(content).toContain('You are Andy'); } - - expect(fs.readFileSync(dest, 'utf-8')).toContain('User-modified content'); - expect(fs.readFileSync(dest, 'utf-8')).not.toContain('You are Andy'); }); - it('updates name in all groups/*/CLAUDE.md files', () => { - // Create a few group folders with CLAUDE.md - for (const folder of ['whatsapp_main', 'telegram_friends']) { - const dir = path.join(groupsDir, folder); - fs.mkdirSync(dir, { recursive: true }); - fs.writeFileSync( - path.join(dir, 'CLAUDE.md'), - '# Andy\n\nYou are Andy, a personal assistant.', - ); + it('non-main groups across channels get global template', () => { + simulateRegister('whatsapp_main', true); + simulateRegister('telegram_friends', false); + simulateRegister('slack_engineering', false); + simulateRegister('discord_general', false); + + expect(readGroupMd('whatsapp_main')).toContain('Admin Context'); + for (const folder of [ + 'telegram_friends', + 'slack_engineering', + 'discord_general', + ]) { + const content = readGroupMd(folder); + expect(content).toContain('You are Andy'); + expect(content).not.toContain('Admin Context'); } + }); - const assistantName = 'Luna'; + it('custom name propagates to all channels and groups', () => { + // Register multiple channels, last one sets custom name + simulateRegister('whatsapp_main', true); + simulateRegister('telegram_main', true); + simulateRegister('slack_devs', false); + // Final registration triggers name update across all + simulateRegister('discord_main', true, 'Luna'); - // Replicate register.ts glob logic - const mdFiles = fs - .readdirSync(groupsDir) - .map((d) => path.join(groupsDir, d, 'CLAUDE.md')) - .filter((f) => fs.existsSync(f)); - - for (const mdFile of mdFiles) { - let content = fs.readFileSync(mdFile, 'utf-8'); - content = content.replace(/^# Andy$/m, `# ${assistantName}`); - content = content.replace(/You are Andy/g, `You are ${assistantName}`); - fs.writeFileSync(mdFile, content); - } - - // All CLAUDE.md files should be updated, including templates and groups - for (const folder of ['main', 'global', 'whatsapp_main', 'telegram_friends']) { - const content = fs.readFileSync( - path.join(groupsDir, folder, 'CLAUDE.md'), - 'utf-8', - ); + for (const folder of [ + 'main', + 'global', + 'whatsapp_main', + 'telegram_main', + 'slack_devs', + 'discord_main', + ]) { + const content = readGroupMd(folder); expect(content).toContain('# Luna'); expect(content).toContain('You are Luna'); expect(content).not.toContain('Andy'); } }); - it('handles missing template gracefully', () => { - // Remove templates + it('does not overwrite user-modified CLAUDE.md', () => { + simulateRegister('slack_main', true); + // User customizes the file + fs.writeFileSync( + path.join(groupsDir, 'slack_main', 'CLAUDE.md'), + '# Custom\n\nUser-modified content.', + ); + // Re-registering same folder (e.g. re-running /add-slack) + simulateRegister('slack_main', true); + + const content = readGroupMd('slack_main'); + expect(content).toContain('User-modified content'); + expect(content).not.toContain('Admin Context'); + }); + + it('handles missing templates gracefully', () => { fs.unlinkSync(path.join(groupsDir, 'global', 'CLAUDE.md')); fs.unlinkSync(path.join(groupsDir, 'main', 'CLAUDE.md')); - const folder = 'discord_general'; - const folderDir = path.join(groupsDir, folder); - fs.mkdirSync(path.join(folderDir, 'logs'), { recursive: true }); + simulateRegister('discord_general', false); - const dest = path.join(folderDir, 'CLAUDE.md'); - const templatePath = path.join(groupsDir, 'global', 'CLAUDE.md'); - - if (!fs.existsSync(dest)) { - if (fs.existsSync(templatePath)) { - fs.copyFileSync(templatePath, dest); - } - } - - // No crash, no file created - expect(fs.existsSync(dest)).toBe(false); + expect( + fs.existsSync(path.join(groupsDir, 'discord_general', 'CLAUDE.md')), + ).toBe(false); }); }); From 3207c35e50540618c990f8062b4c8a5d40ae0621 Mon Sep 17 00:00:00 2001 From: glifocat Date: Tue, 24 Mar 2026 12:44:24 +0100 Subject: [PATCH 46/91] fix: promote CLAUDE.md to main template when group becomes main MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a non-main group is re-registered with --is-main, the existing CLAUDE.md (copied from global template) lacked admin context. Now register.ts detects this promotion case and replaces it with the main template. Files that already contain "## Admin Context" are preserved. Adds tests for: - promoting non-main to main upgrades the template - cross-channel promotion (e.g. Telegram non-main → main) - promotion with custom assistant name - re-registration preserves user-modified main CLAUDE.md - re-registration preserves user-modified non-main CLAUDE.md Co-Authored-By: Claude Opus 4.6 (1M context) --- setup/register.test.ts | 79 +++++++++++++++++++++++++++++++++++------- setup/register.ts | 29 ++++++++++++---- 2 files changed, 88 insertions(+), 20 deletions(-) diff --git a/setup/register.test.ts b/setup/register.test.ts index 11f0f5f..859a457 100644 --- a/setup/register.test.ts +++ b/setup/register.test.ts @@ -272,18 +272,24 @@ describe('CLAUDE.md template copy', () => { const folderDir = path.join(groupsDir, folder); fs.mkdirSync(path.join(folderDir, 'logs'), { recursive: true }); - // Template copy (register.ts lines 119-138) + // Template copy + promotion (register.ts lines 119-148) const dest = path.join(folderDir, 'CLAUDE.md'); - if (!fs.existsSync(dest)) { - const templatePath = isMain - ? path.join(groupsDir, 'main', 'CLAUDE.md') - : path.join(groupsDir, 'global', 'CLAUDE.md'); + const templatePath = isMain + ? path.join(groupsDir, 'main', 'CLAUDE.md') + : path.join(groupsDir, 'global', 'CLAUDE.md'); + const fileExists = fs.existsSync(dest); + const needsPromotion = + isMain && + fileExists && + !fs.readFileSync(dest, 'utf-8').includes('## Admin Context'); + + if (!fileExists || needsPromotion) { if (fs.existsSync(templatePath)) { fs.copyFileSync(templatePath, dest); } } - // Name update across all groups (register.ts lines 140-165) + // Name update across all groups (register.ts lines 150-175) if (assistantName !== 'Andy') { const mdFiles = fs .readdirSync(groupsDir) @@ -401,19 +407,66 @@ describe('CLAUDE.md template copy', () => { } }); - it('does not overwrite user-modified CLAUDE.md', () => { + it('does not overwrite main CLAUDE.md that already has admin context', () => { simulateRegister('slack_main', true); - // User customizes the file - fs.writeFileSync( - path.join(groupsDir, 'slack_main', 'CLAUDE.md'), - '# Custom\n\nUser-modified content.', - ); + // User appends custom content to the main template + const mdPath = path.join(groupsDir, 'slack_main', 'CLAUDE.md'); + fs.appendFileSync(mdPath, '\n\n## My Custom Section\n\nUser notes here.'); // Re-registering same folder (e.g. re-running /add-slack) simulateRegister('slack_main', true); const content = readGroupMd('slack_main'); + // Preserved: has both admin context AND user additions + expect(content).toContain('Admin Context'); + expect(content).toContain('My Custom Section'); + }); + + it('does not overwrite non-main CLAUDE.md on re-registration', () => { + simulateRegister('telegram_friends', false); + // User customizes the file + const mdPath = path.join(groupsDir, 'telegram_friends', 'CLAUDE.md'); + fs.writeFileSync(mdPath, '# Custom\n\nUser-modified content.'); + // Re-registering same folder as non-main + simulateRegister('telegram_friends', false); + + const content = readGroupMd('telegram_friends'); expect(content).toContain('User-modified content'); - expect(content).not.toContain('Admin Context'); + }); + + it('promotes non-main group to main when re-registered with isMain', () => { + // Initially registered as non-main (gets global template) + simulateRegister('telegram_main', false); + expect(readGroupMd('telegram_main')).not.toContain('Admin Context'); + + // User switches this channel to main + simulateRegister('telegram_main', true); + expect(readGroupMd('telegram_main')).toContain('Admin Context'); + }); + + it('promotes across channels — WhatsApp non-main to Telegram main', () => { + // Start with WhatsApp as main, Telegram as non-main + simulateRegister('whatsapp_main', true); + simulateRegister('telegram_control', false); + + expect(readGroupMd('whatsapp_main')).toContain('Admin Context'); + expect(readGroupMd('telegram_control')).not.toContain('Admin Context'); + + // User decides Telegram should be the new main + simulateRegister('telegram_control', true); + expect(readGroupMd('telegram_control')).toContain('Admin Context'); + }); + + it('promotion updates assistant name in promoted file', () => { + // Register as non-main with default name + simulateRegister('slack_ops', false); + expect(readGroupMd('slack_ops')).toContain('You are Andy'); + + // Promote to main with custom name + simulateRegister('slack_ops', true, 'Nova'); + const content = readGroupMd('slack_ops'); + expect(content).toContain('Admin Context'); + expect(content).toContain('You are Nova'); + expect(content).not.toContain('Andy'); }); it('handles missing templates gracefully', () => { diff --git a/setup/register.ts b/setup/register.ts index 6e32cd8..270ebfa 100644 --- a/setup/register.ts +++ b/setup/register.ts @@ -116,7 +116,7 @@ export async function run(args: string[]): Promise { recursive: true, }); - // Create CLAUDE.md in the new group folder from template if it doesn't exist. + // Create or upgrade CLAUDE.md in the group folder from the appropriate template. // The agent runs with CWD=/workspace/group and loads CLAUDE.md from there. const groupClaudeMdPath = path.join( projectRoot, @@ -124,15 +124,30 @@ export async function run(args: string[]): Promise { parsed.folder, 'CLAUDE.md', ); - if (!fs.existsSync(groupClaudeMdPath)) { - const templatePath = parsed.isMain - ? path.join(projectRoot, 'groups', 'main', 'CLAUDE.md') - : path.join(projectRoot, 'groups', 'global', 'CLAUDE.md'); + const mainTemplatePath = path.join(projectRoot, 'groups', 'main', 'CLAUDE.md'); + const globalTemplatePath = path.join(projectRoot, 'groups', 'global', 'CLAUDE.md'); + const templatePath = parsed.isMain ? mainTemplatePath : globalTemplatePath; + const fileExists = fs.existsSync(groupClaudeMdPath); + + // Promotion case: group was registered as non-main (got global template) + // and is now being re-registered as main. Replace with main template. + const needsPromotion = + parsed.isMain && + fileExists && + !fs.readFileSync(groupClaudeMdPath, 'utf-8').includes('## Admin Context'); + + if (!fileExists || needsPromotion) { if (fs.existsSync(templatePath)) { fs.copyFileSync(templatePath, groupClaudeMdPath); logger.info( - { file: groupClaudeMdPath, template: templatePath }, - 'Created CLAUDE.md from template', + { + file: groupClaudeMdPath, + template: templatePath, + promoted: needsPromotion, + }, + needsPromotion + ? 'Promoted CLAUDE.md to main template' + : 'Created CLAUDE.md from template', ); } } From 57085cc02e42ef9be73ca5b5da903da11b898971 Mon Sep 17 00:00:00 2001 From: glifocat Date: Tue, 24 Mar 2026 13:09:26 +0100 Subject: [PATCH 47/91] =?UTF-8?q?fix:=20revert=20promotion=20logic=20?= =?UTF-8?q?=E2=80=94=20never=20overwrite=20existing=20CLAUDE.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The promotion logic (overwriting CLAUDE.md when a group becomes main) is unsafe. Real-world setups use is_main for groups that intentionally lack admin context — e.g. a family chat (whatsapp_casa) with 144 lines of custom persona, PARA workspace, task management, and family context. Overwriting based on missing "## Admin Context" would destroy user work. register.ts now follows a simple rule: create template for new folders, never touch existing files. Tests updated to verify preservation across re-registration and main promotion scenarios. Co-Authored-By: Claude Opus 4.6 (1M context) --- setup/register.test.ts | 98 +++++++++++++++++------------------------- setup/register.ts | 32 +++++--------- 2 files changed, 50 insertions(+), 80 deletions(-) diff --git a/setup/register.test.ts b/setup/register.test.ts index 859a457..5a70740 100644 --- a/setup/register.test.ts +++ b/setup/register.test.ts @@ -272,24 +272,18 @@ describe('CLAUDE.md template copy', () => { const folderDir = path.join(groupsDir, folder); fs.mkdirSync(path.join(folderDir, 'logs'), { recursive: true }); - // Template copy + promotion (register.ts lines 119-148) + // Template copy — never overwrite existing (register.ts lines 119-135) const dest = path.join(folderDir, 'CLAUDE.md'); - const templatePath = isMain - ? path.join(groupsDir, 'main', 'CLAUDE.md') - : path.join(groupsDir, 'global', 'CLAUDE.md'); - const fileExists = fs.existsSync(dest); - const needsPromotion = - isMain && - fileExists && - !fs.readFileSync(dest, 'utf-8').includes('## Admin Context'); - - if (!fileExists || needsPromotion) { + if (!fs.existsSync(dest)) { + const templatePath = isMain + ? path.join(groupsDir, 'main', 'CLAUDE.md') + : path.join(groupsDir, 'global', 'CLAUDE.md'); if (fs.existsSync(templatePath)) { fs.copyFileSync(templatePath, dest); } } - // Name update across all groups (register.ts lines 150-175) + // Name update across all groups (register.ts lines 140-165) if (assistantName !== 'Andy') { const mdFiles = fs .readdirSync(groupsDir) @@ -407,66 +401,54 @@ describe('CLAUDE.md template copy', () => { } }); - it('does not overwrite main CLAUDE.md that already has admin context', () => { + it('never overwrites existing CLAUDE.md on re-registration', () => { simulateRegister('slack_main', true); - // User appends custom content to the main template + // User customizes the file extensively (persona, workspace, rules) const mdPath = path.join(groupsDir, 'slack_main', 'CLAUDE.md'); - fs.appendFileSync(mdPath, '\n\n## My Custom Section\n\nUser notes here.'); + fs.writeFileSync( + mdPath, + '# Gambi\n\nCustom persona with workspace rules and family context.', + ); // Re-registering same folder (e.g. re-running /add-slack) simulateRegister('slack_main', true); const content = readGroupMd('slack_main'); - // Preserved: has both admin context AND user additions - expect(content).toContain('Admin Context'); - expect(content).toContain('My Custom Section'); + expect(content).toContain('Custom persona'); + expect(content).not.toContain('Admin Context'); }); - it('does not overwrite non-main CLAUDE.md on re-registration', () => { - simulateRegister('telegram_friends', false); - // User customizes the file - const mdPath = path.join(groupsDir, 'telegram_friends', 'CLAUDE.md'); - fs.writeFileSync(mdPath, '# Custom\n\nUser-modified content.'); - // Re-registering same folder as non-main - simulateRegister('telegram_friends', false); + it('never overwrites when non-main becomes main (isMain changes)', () => { + // User registers a family group as non-main + simulateRegister('whatsapp_casa', false); + // User extensively customizes it (PARA system, task management, etc.) + const mdPath = path.join(groupsDir, 'whatsapp_casa', 'CLAUDE.md'); + fs.writeFileSync( + mdPath, + '# Casa\n\nFamily group with PARA system, task management, shopping lists.', + ); + // Later, user promotes to main (no trigger required) — CLAUDE.md must be preserved + simulateRegister('whatsapp_casa', true); - const content = readGroupMd('telegram_friends'); - expect(content).toContain('User-modified content'); + const content = readGroupMd('whatsapp_casa'); + expect(content).toContain('PARA system'); + expect(content).not.toContain('Admin Context'); }); - it('promotes non-main group to main when re-registered with isMain', () => { - // Initially registered as non-main (gets global template) - simulateRegister('telegram_main', false); - expect(readGroupMd('telegram_main')).not.toContain('Admin Context'); - - // User switches this channel to main - simulateRegister('telegram_main', true); - expect(readGroupMd('telegram_main')).toContain('Admin Context'); - }); - - it('promotes across channels — WhatsApp non-main to Telegram main', () => { - // Start with WhatsApp as main, Telegram as non-main + it('preserves custom CLAUDE.md across channels when changing main', () => { + // Real-world scenario: WhatsApp main + customized Discord research channel simulateRegister('whatsapp_main', true); - simulateRegister('telegram_control', false); + simulateRegister('discord_main', false); + const discordPath = path.join(groupsDir, 'discord_main', 'CLAUDE.md'); + fs.writeFileSync( + discordPath, + '# Gambi HQ — Research Assistant\n\nResearch workflows for Laura and Ethan.', + ); + // Discord becomes main too — custom content must survive + simulateRegister('discord_main', true); + expect(readGroupMd('discord_main')).toContain('Research Assistant'); + // WhatsApp main also untouched expect(readGroupMd('whatsapp_main')).toContain('Admin Context'); - expect(readGroupMd('telegram_control')).not.toContain('Admin Context'); - - // User decides Telegram should be the new main - simulateRegister('telegram_control', true); - expect(readGroupMd('telegram_control')).toContain('Admin Context'); - }); - - it('promotion updates assistant name in promoted file', () => { - // Register as non-main with default name - simulateRegister('slack_ops', false); - expect(readGroupMd('slack_ops')).toContain('You are Andy'); - - // Promote to main with custom name - simulateRegister('slack_ops', true, 'Nova'); - const content = readGroupMd('slack_ops'); - expect(content).toContain('Admin Context'); - expect(content).toContain('You are Nova'); - expect(content).not.toContain('Andy'); }); it('handles missing templates gracefully', () => { diff --git a/setup/register.ts b/setup/register.ts index 270ebfa..c08d910 100644 --- a/setup/register.ts +++ b/setup/register.ts @@ -116,38 +116,26 @@ export async function run(args: string[]): Promise { recursive: true, }); - // Create or upgrade CLAUDE.md in the group folder from the appropriate template. + // Create CLAUDE.md in the new group folder from template if it doesn't exist. // The agent runs with CWD=/workspace/group and loads CLAUDE.md from there. + // Never overwrite an existing CLAUDE.md — users customize these extensively + // (persona, workspace structure, communication rules, family context, etc.) + // and a stock template replacement would destroy that work. const groupClaudeMdPath = path.join( projectRoot, 'groups', parsed.folder, 'CLAUDE.md', ); - const mainTemplatePath = path.join(projectRoot, 'groups', 'main', 'CLAUDE.md'); - const globalTemplatePath = path.join(projectRoot, 'groups', 'global', 'CLAUDE.md'); - const templatePath = parsed.isMain ? mainTemplatePath : globalTemplatePath; - const fileExists = fs.existsSync(groupClaudeMdPath); - - // Promotion case: group was registered as non-main (got global template) - // and is now being re-registered as main. Replace with main template. - const needsPromotion = - parsed.isMain && - fileExists && - !fs.readFileSync(groupClaudeMdPath, 'utf-8').includes('## Admin Context'); - - if (!fileExists || needsPromotion) { + if (!fs.existsSync(groupClaudeMdPath)) { + const templatePath = parsed.isMain + ? path.join(projectRoot, 'groups', 'main', 'CLAUDE.md') + : path.join(projectRoot, 'groups', 'global', 'CLAUDE.md'); if (fs.existsSync(templatePath)) { fs.copyFileSync(templatePath, groupClaudeMdPath); logger.info( - { - file: groupClaudeMdPath, - template: templatePath, - promoted: needsPromotion, - }, - needsPromotion - ? 'Promoted CLAUDE.md to main template' - : 'Created CLAUDE.md from template', + { file: groupClaudeMdPath, template: templatePath }, + 'Created CLAUDE.md from template', ); } } From 81f67031022a8fd2bf13f46f808c712e2f433190 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Mar 2026 12:55:54 +0000 Subject: [PATCH 48/91] chore: bump version to 1.2.22 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index afca823..cd2dbef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.21", + "version": "1.2.22", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.21", + "version": "1.2.22", "dependencies": { "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "^11.8.1", diff --git a/package.json b/package.json index 54185a0..3457b67 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.21", + "version": "1.2.22", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From b0671ef9e64784038aa89d9c0772fe3843b4ac86 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Mar 2026 12:55:57 +0000 Subject: [PATCH 49/91] =?UTF-8?q?docs:=20update=20token=20count=20to=2040.?= =?UTF-8?q?7k=20tokens=20=C2=B7=2020%=20of=20context=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo-tokens/badge.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo-tokens/badge.svg b/repo-tokens/badge.svg index 993856e..b268ecc 100644 --- a/repo-tokens/badge.svg +++ b/repo-tokens/badge.svg @@ -1,5 +1,5 @@ - - 40.9k tokens, 20% of context window + + 40.7k tokens, 20% of context window @@ -15,8 +15,8 @@ tokens - - 40.9k + + 40.7k From 14247d0b577cf77a8d1f29aa3d3796b62bd1870c Mon Sep 17 00:00:00 2001 From: Gabi Simons Date: Tue, 24 Mar 2026 15:37:27 +0200 Subject: [PATCH 50/91] skill: add /use-native-credential-proxy, remove dead proxy code Add SKILL.md for the native credential proxy feature skill. Delete src/credential-proxy.ts and src/credential-proxy.test.ts which became dead code after PR #1237 (OneCLI integration). These files live on the skill/native-credential-proxy branch. Co-Authored-By: Claude Opus 4.6 (1M context) --- .../use-native-credential-proxy/SKILL.md | 157 ++++++++++++++ src/credential-proxy.test.ts | 192 ------------------ src/credential-proxy.ts | 125 ------------ 3 files changed, 157 insertions(+), 317 deletions(-) create mode 100644 .claude/skills/use-native-credential-proxy/SKILL.md delete mode 100644 src/credential-proxy.test.ts delete mode 100644 src/credential-proxy.ts diff --git a/.claude/skills/use-native-credential-proxy/SKILL.md b/.claude/skills/use-native-credential-proxy/SKILL.md new file mode 100644 index 0000000..4cdda4c --- /dev/null +++ b/.claude/skills/use-native-credential-proxy/SKILL.md @@ -0,0 +1,157 @@ +--- +name: use-native-credential-proxy +description: Replace OneCLI gateway with the built-in credential proxy. For users who want simple .env-based credential management without installing OneCLI. Reads API key or OAuth token from .env and injects into container API requests. +--- + +# Use Native Credential Proxy + +This skill replaces the OneCLI gateway with NanoClaw's built-in credential proxy. Containers get credentials injected via a local HTTP proxy that reads from `.env` — no external services needed. + +## Phase 1: Pre-flight + +### Check if already applied + +Check if `src/credential-proxy.ts` is imported in `src/index.ts`: + +```bash +grep "credential-proxy" src/index.ts +``` + +If it shows an import for `startCredentialProxy`, the native proxy is already active. Skip to Phase 3 (Setup). + +### Check if OneCLI is active + +```bash +grep "@onecli-sh/sdk" package.json +``` + +If `@onecli-sh/sdk` appears, OneCLI is the active credential provider. Proceed with Phase 2 to replace it. + +If neither check matches, you may be on an older version. Run `/update-nanoclaw` first, then retry. + +## Phase 2: Apply Code Changes + +### Ensure upstream remote + +```bash +git remote -v +``` + +If `upstream` is missing, add it: + +```bash +git remote add upstream https://github.com/qwibitai/nanoclaw.git +``` + +### Merge the skill branch + +```bash +git fetch upstream skill/native-credential-proxy +git merge upstream/skill/native-credential-proxy || { + git checkout --theirs package-lock.json + git add package-lock.json + git merge --continue +} +``` + +This merges in: +- `src/credential-proxy.ts` and `src/credential-proxy.test.ts` (the proxy implementation) +- Restored credential proxy usage in `src/index.ts`, `src/container-runner.ts`, `src/container-runtime.ts`, `src/config.ts` +- Removed `@onecli-sh/sdk` dependency +- Restored `CREDENTIAL_PROXY_PORT` config (default 3001) +- Restored platform-aware proxy bind address detection +- Reverted setup skill to `.env`-based credential instructions + +If the merge reports conflicts beyond `package-lock.json`, resolve them by reading the conflicted files and understanding the intent of both sides. + +### Validate code changes + +```bash +npm install +npm run build +npx vitest run src/credential-proxy.test.ts src/container-runner.test.ts +``` + +All tests must pass and build must be clean before proceeding. + +## Phase 3: Setup Credentials + +AskUserQuestion: Do you want to use your **Claude subscription** (Pro/Max) or an **Anthropic API key**? + +1. **Claude subscription (Pro/Max)** — description: "Uses your existing Claude Pro or Max subscription. You'll run `claude setup-token` in another terminal to get your token." +2. **Anthropic API key** — description: "Pay-per-use API key from console.anthropic.com." + +### Subscription path + +Tell the user to run `claude setup-token` in another terminal and copy the token it outputs. Do NOT collect the token in chat. + +Once they have the token, add it to `.env`: + +```bash +# Add to .env (create file if needed) +echo 'CLAUDE_CODE_OAUTH_TOKEN=' >> .env +``` + +Note: `ANTHROPIC_AUTH_TOKEN` is also supported as a fallback. + +### API key path + +Tell the user to get an API key from https://console.anthropic.com/settings/keys if they don't have one. + +Add it to `.env`: + +```bash +echo 'ANTHROPIC_API_KEY=' >> .env +``` + +### After either path + +**If the user's response happens to contain a token or key** (starts with `sk-ant-` or looks like a token): write it to `.env` on their behalf using the appropriate variable name. + +**Optional:** If the user needs a custom API endpoint, they can add `ANTHROPIC_BASE_URL=` to `.env` (defaults to `https://api.anthropic.com`). + +## Phase 4: Verify + +1. Rebuild and restart: + +```bash +npm run build +``` + +Then restart the service: +- macOS: `launchctl kickstart -k gui/$(id -u)/com.nanoclaw` +- Linux: `systemctl --user restart nanoclaw` +- WSL/manual: stop and re-run `bash start-nanoclaw.sh` + +2. Check logs for successful proxy startup: + +```bash +tail -20 logs/nanoclaw.log | grep "Credential proxy" +``` + +Expected: `Credential proxy started` with port and auth mode. + +3. Send a test message in the registered chat to verify the agent responds. + +4. Note: after applying this skill, the OneCLI credential steps in `/setup` no longer apply. `.env` is now the credential source. + +## Troubleshooting + +**"Credential proxy upstream error" in logs:** Check that `.env` has a valid `ANTHROPIC_API_KEY` or `CLAUDE_CODE_OAUTH_TOKEN`. Verify the API is reachable: `curl -s https://api.anthropic.com/v1/messages -H "x-api-key: test" | head`. + +**Port 3001 already in use:** Set `CREDENTIAL_PROXY_PORT=` in `.env` or as an environment variable. + +**Container can't reach proxy (Linux):** The proxy binds to the `docker0` bridge IP by default. If that interface doesn't exist (e.g. rootless Docker), set `CREDENTIAL_PROXY_HOST=0.0.0.0` as an environment variable. + +**OAuth token expired (401 errors):** Re-run `claude setup-token` in a terminal and update the token in `.env`. + +## Removal + +To revert to OneCLI gateway: + +1. Find the merge commit: `git log --oneline --merges -5` +2. Revert it: `git revert -m 1` (undoes the skill branch merge, keeps your other changes) +3. `npm install` (re-adds `@onecli-sh/sdk`) +4. `npm run build` +5. Follow `/setup` step 4 to configure OneCLI credentials +6. Remove `ANTHROPIC_API_KEY` / `CLAUDE_CODE_OAUTH_TOKEN` from `.env` diff --git a/src/credential-proxy.test.ts b/src/credential-proxy.test.ts deleted file mode 100644 index de76c89..0000000 --- a/src/credential-proxy.test.ts +++ /dev/null @@ -1,192 +0,0 @@ -import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'; -import http from 'http'; -import type { AddressInfo } from 'net'; - -const mockEnv: Record = {}; -vi.mock('./env.js', () => ({ - readEnvFile: vi.fn(() => ({ ...mockEnv })), -})); - -vi.mock('./logger.js', () => ({ - logger: { info: vi.fn(), error: vi.fn(), debug: vi.fn(), warn: vi.fn() }, -})); - -import { startCredentialProxy } from './credential-proxy.js'; - -function makeRequest( - port: number, - options: http.RequestOptions, - body = '', -): Promise<{ - statusCode: number; - body: string; - headers: http.IncomingHttpHeaders; -}> { - return new Promise((resolve, reject) => { - const req = http.request( - { ...options, hostname: '127.0.0.1', port }, - (res) => { - const chunks: Buffer[] = []; - res.on('data', (c) => chunks.push(c)); - res.on('end', () => { - resolve({ - statusCode: res.statusCode!, - body: Buffer.concat(chunks).toString(), - headers: res.headers, - }); - }); - }, - ); - req.on('error', reject); - req.write(body); - req.end(); - }); -} - -describe('credential-proxy', () => { - let proxyServer: http.Server; - let upstreamServer: http.Server; - let proxyPort: number; - let upstreamPort: number; - let lastUpstreamHeaders: http.IncomingHttpHeaders; - - beforeEach(async () => { - lastUpstreamHeaders = {}; - - upstreamServer = http.createServer((req, res) => { - lastUpstreamHeaders = { ...req.headers }; - res.writeHead(200, { 'content-type': 'application/json' }); - res.end(JSON.stringify({ ok: true })); - }); - await new Promise((resolve) => - upstreamServer.listen(0, '127.0.0.1', resolve), - ); - upstreamPort = (upstreamServer.address() as AddressInfo).port; - }); - - afterEach(async () => { - await new Promise((r) => proxyServer?.close(() => r())); - await new Promise((r) => upstreamServer?.close(() => r())); - for (const key of Object.keys(mockEnv)) delete mockEnv[key]; - }); - - async function startProxy(env: Record): Promise { - Object.assign(mockEnv, env, { - ANTHROPIC_BASE_URL: `http://127.0.0.1:${upstreamPort}`, - }); - proxyServer = await startCredentialProxy(0); - return (proxyServer.address() as AddressInfo).port; - } - - it('API-key mode injects x-api-key and strips placeholder', async () => { - proxyPort = await startProxy({ ANTHROPIC_API_KEY: 'sk-ant-real-key' }); - - await makeRequest( - proxyPort, - { - method: 'POST', - path: '/v1/messages', - headers: { - 'content-type': 'application/json', - 'x-api-key': 'placeholder', - }, - }, - '{}', - ); - - expect(lastUpstreamHeaders['x-api-key']).toBe('sk-ant-real-key'); - }); - - it('OAuth mode replaces Authorization when container sends one', async () => { - proxyPort = await startProxy({ - CLAUDE_CODE_OAUTH_TOKEN: 'real-oauth-token', - }); - - await makeRequest( - proxyPort, - { - method: 'POST', - path: '/api/oauth/claude_cli/create_api_key', - headers: { - 'content-type': 'application/json', - authorization: 'Bearer placeholder', - }, - }, - '{}', - ); - - expect(lastUpstreamHeaders['authorization']).toBe( - 'Bearer real-oauth-token', - ); - }); - - it('OAuth mode does not inject Authorization when container omits it', async () => { - proxyPort = await startProxy({ - CLAUDE_CODE_OAUTH_TOKEN: 'real-oauth-token', - }); - - // Post-exchange: container uses x-api-key only, no Authorization header - await makeRequest( - proxyPort, - { - method: 'POST', - path: '/v1/messages', - headers: { - 'content-type': 'application/json', - 'x-api-key': 'temp-key-from-exchange', - }, - }, - '{}', - ); - - expect(lastUpstreamHeaders['x-api-key']).toBe('temp-key-from-exchange'); - expect(lastUpstreamHeaders['authorization']).toBeUndefined(); - }); - - it('strips hop-by-hop headers', async () => { - proxyPort = await startProxy({ ANTHROPIC_API_KEY: 'sk-ant-real-key' }); - - await makeRequest( - proxyPort, - { - method: 'POST', - path: '/v1/messages', - headers: { - 'content-type': 'application/json', - connection: 'keep-alive', - 'keep-alive': 'timeout=5', - 'transfer-encoding': 'chunked', - }, - }, - '{}', - ); - - // Proxy strips client hop-by-hop headers. Node's HTTP client may re-add - // its own Connection header (standard HTTP/1.1 behavior), but the client's - // custom keep-alive and transfer-encoding must not be forwarded. - expect(lastUpstreamHeaders['keep-alive']).toBeUndefined(); - expect(lastUpstreamHeaders['transfer-encoding']).toBeUndefined(); - }); - - it('returns 502 when upstream is unreachable', async () => { - Object.assign(mockEnv, { - ANTHROPIC_API_KEY: 'sk-ant-real-key', - ANTHROPIC_BASE_URL: 'http://127.0.0.1:59999', - }); - proxyServer = await startCredentialProxy(0); - proxyPort = (proxyServer.address() as AddressInfo).port; - - const res = await makeRequest( - proxyPort, - { - method: 'POST', - path: '/v1/messages', - headers: { 'content-type': 'application/json' }, - }, - '{}', - ); - - expect(res.statusCode).toBe(502); - expect(res.body).toBe('Bad Gateway'); - }); -}); diff --git a/src/credential-proxy.ts b/src/credential-proxy.ts deleted file mode 100644 index 8a893dd..0000000 --- a/src/credential-proxy.ts +++ /dev/null @@ -1,125 +0,0 @@ -/** - * Credential proxy for container isolation. - * Containers connect here instead of directly to the Anthropic API. - * The proxy injects real credentials so containers never see them. - * - * Two auth modes: - * API key: Proxy injects x-api-key on every request. - * OAuth: Container CLI exchanges its placeholder token for a temp - * API key via /api/oauth/claude_cli/create_api_key. - * Proxy injects real OAuth token on that exchange request; - * subsequent requests carry the temp key which is valid as-is. - */ -import { createServer, Server } from 'http'; -import { request as httpsRequest } from 'https'; -import { request as httpRequest, RequestOptions } from 'http'; - -import { readEnvFile } from './env.js'; -import { logger } from './logger.js'; - -export type AuthMode = 'api-key' | 'oauth'; - -export interface ProxyConfig { - authMode: AuthMode; -} - -export function startCredentialProxy( - port: number, - host = '127.0.0.1', -): Promise { - const secrets = readEnvFile([ - 'ANTHROPIC_API_KEY', - 'CLAUDE_CODE_OAUTH_TOKEN', - 'ANTHROPIC_AUTH_TOKEN', - 'ANTHROPIC_BASE_URL', - ]); - - const authMode: AuthMode = secrets.ANTHROPIC_API_KEY ? 'api-key' : 'oauth'; - const oauthToken = - secrets.CLAUDE_CODE_OAUTH_TOKEN || secrets.ANTHROPIC_AUTH_TOKEN; - - const upstreamUrl = new URL( - secrets.ANTHROPIC_BASE_URL || 'https://api.anthropic.com', - ); - const isHttps = upstreamUrl.protocol === 'https:'; - const makeRequest = isHttps ? httpsRequest : httpRequest; - - return new Promise((resolve, reject) => { - const server = createServer((req, res) => { - const chunks: Buffer[] = []; - req.on('data', (c) => chunks.push(c)); - req.on('end', () => { - const body = Buffer.concat(chunks); - const headers: Record = - { - ...(req.headers as Record), - host: upstreamUrl.host, - 'content-length': body.length, - }; - - // Strip hop-by-hop headers that must not be forwarded by proxies - delete headers['connection']; - delete headers['keep-alive']; - delete headers['transfer-encoding']; - - if (authMode === 'api-key') { - // API key mode: inject x-api-key on every request - delete headers['x-api-key']; - headers['x-api-key'] = secrets.ANTHROPIC_API_KEY; - } else { - // OAuth mode: replace placeholder Bearer token with the real one - // only when the container actually sends an Authorization header - // (exchange request + auth probes). Post-exchange requests use - // x-api-key only, so they pass through without token injection. - if (headers['authorization']) { - delete headers['authorization']; - if (oauthToken) { - headers['authorization'] = `Bearer ${oauthToken}`; - } - } - } - - const upstream = makeRequest( - { - hostname: upstreamUrl.hostname, - port: upstreamUrl.port || (isHttps ? 443 : 80), - path: req.url, - method: req.method, - headers, - } as RequestOptions, - (upRes) => { - res.writeHead(upRes.statusCode!, upRes.headers); - upRes.pipe(res); - }, - ); - - upstream.on('error', (err) => { - logger.error( - { err, url: req.url }, - 'Credential proxy upstream error', - ); - if (!res.headersSent) { - res.writeHead(502); - res.end('Bad Gateway'); - } - }); - - upstream.write(body); - upstream.end(); - }); - }); - - server.listen(port, host, () => { - logger.info({ port, host, authMode }, 'Credential proxy started'); - resolve(server); - }); - - server.on('error', reject); - }); -} - -/** Detect which auth mode the host is configured for. */ -export function detectAuthMode(): AuthMode { - const secrets = readEnvFile(['ANTHROPIC_API_KEY']); - return secrets.ANTHROPIC_API_KEY ? 'api-key' : 'oauth'; -} From 07cf1fb8a5eea3a38eb91a04bb0e54b389cf25a9 Mon Sep 17 00:00:00 2001 From: NanoClaw Date: Tue, 24 Mar 2026 13:47:52 +0000 Subject: [PATCH 51/91] docs: add OneCLI secrets management section to CLAUDE.md Gives Claude context on how credentials/API keys/OAuth tokens are managed via the OneCLI gateway, so it doesn't suggest storing secrets in .env or passing them to containers. Co-Authored-By: Claude Opus 4.6 (1M context) --- CLAUDE.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CLAUDE.md b/CLAUDE.md index 6351ff4..9b3ae27 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -21,6 +21,10 @@ Single Node.js process with skill-based channel system. Channels (WhatsApp, Tele | `groups/{name}/CLAUDE.md` | Per-group memory (isolated) | | `container/skills/` | Skills loaded inside agent containers (browser, status, formatting) | +## Secrets / Credentials / Proxy (OneCLI) + +API keys, secret keys, OAuth tokens, and auth credentials are managed by the OneCLI gateway — which replaces the old credential proxy and handles secret injection into containers at request time, so no keys or tokens are ever passed to containers directly. Run `onecli --help` to manage secrets, agents, and gateway config. + ## Skills Four types of skills exist in NanoClaw. See [CONTRIBUTING.md](CONTRIBUTING.md) for the full taxonomy and guidelines. From 35722801e3aea30f6e327ae61d79d116cd1a5cdf Mon Sep 17 00:00:00 2001 From: Gabi Simons Date: Tue, 24 Mar 2026 15:49:42 +0200 Subject: [PATCH 52/91] style: fix prettier formatting Co-Authored-By: Claude Opus 4.6 (1M context) --- src/config.ts | 6 +++++- src/container-runner.test.ts | 4 +++- src/container-runner.ts | 11 +++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/config.ts b/src/config.ts index 63d1207..26f31c2 100644 --- a/src/config.ts +++ b/src/config.ts @@ -4,7 +4,11 @@ import path from 'path'; import { readEnvFile } from './env.js'; // Read config values from .env (falls back to process.env). -const envConfig = readEnvFile(['ASSISTANT_NAME', 'ASSISTANT_HAS_OWN_NUMBER', 'ONECLI_URL']); +const envConfig = readEnvFile([ + 'ASSISTANT_NAME', + 'ASSISTANT_HAS_OWN_NUMBER', + 'ONECLI_URL', +]); export const ASSISTANT_NAME = process.env.ASSISTANT_NAME || envConfig.ASSISTANT_NAME || 'Andy'; diff --git a/src/container-runner.test.ts b/src/container-runner.test.ts index 2de45c5..64c3455 100644 --- a/src/container-runner.test.ts +++ b/src/container-runner.test.ts @@ -56,7 +56,9 @@ vi.mock('@onecli-sh/sdk', () => ({ OneCLI: class { applyContainerConfig = vi.fn().mockResolvedValue(true); createAgent = vi.fn().mockResolvedValue({ id: 'test' }); - ensureAgent = vi.fn().mockResolvedValue({ name: 'test', identifier: 'test', created: true }); + ensureAgent = vi + .fn() + .mockResolvedValue({ name: 'test', identifier: 'test', created: true }); }, })); diff --git a/src/container-runner.ts b/src/container-runner.ts index 1dc607f..b4436e6 100644 --- a/src/container-runner.ts +++ b/src/container-runner.ts @@ -232,7 +232,10 @@ async function buildContainerArgs( if (onecliApplied) { logger.info({ containerName }, 'OneCLI gateway config applied'); } else { - logger.warn({ containerName }, 'OneCLI gateway not reachable — container will have no credentials'); + logger.warn( + { containerName }, + 'OneCLI gateway not reachable — container will have no credentials', + ); } // Runtime-specific args for host gateway resolution @@ -279,7 +282,11 @@ export async function runContainerAgent( const agentIdentifier = input.isMain ? undefined : group.folder.toLowerCase().replace(/_/g, '-'); - const containerArgs = await buildContainerArgs(mounts, containerName, agentIdentifier); + const containerArgs = await buildContainerArgs( + mounts, + containerName, + agentIdentifier, + ); logger.debug( { From d05a8dec495713a09bbe7ed8d73c480758d49910 Mon Sep 17 00:00:00 2001 From: Daniel M Date: Tue, 24 Mar 2026 15:21:13 +0000 Subject: [PATCH 53/91] fix: refresh stale agent-runner source cache on code changes Closes #1361 Co-Authored-By: Claude Opus 4.6 (1M context) --- src/container-runner.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/container-runner.ts b/src/container-runner.ts index 1dc607f..47a8387 100644 --- a/src/container-runner.ts +++ b/src/container-runner.ts @@ -191,8 +191,17 @@ function buildVolumeMounts( group.folder, 'agent-runner-src', ); - if (!fs.existsSync(groupAgentRunnerDir) && fs.existsSync(agentRunnerSrc)) { - fs.cpSync(agentRunnerSrc, groupAgentRunnerDir, { recursive: true }); + if (fs.existsSync(agentRunnerSrc)) { + const srcIndex = path.join(agentRunnerSrc, 'index.ts'); + const cachedIndex = path.join(groupAgentRunnerDir, 'index.ts'); + const needsCopy = + !fs.existsSync(groupAgentRunnerDir) || + !fs.existsSync(cachedIndex) || + (fs.existsSync(srcIndex) && + fs.statSync(srcIndex).mtimeMs > fs.statSync(cachedIndex).mtimeMs); + if (needsCopy) { + fs.cpSync(agentRunnerSrc, groupAgentRunnerDir, { recursive: true }); + } } mounts.push({ hostPath: groupAgentRunnerDir, From 0015931e37c7d2f66251b02276fc2922c5529672 Mon Sep 17 00:00:00 2001 From: MrBob Date: Tue, 24 Mar 2026 12:26:17 -0300 Subject: [PATCH 54/91] fix: honor per-group trigger patterns --- src/config.ts | 22 +++++++++++++---- src/formatting.test.ts | 56 +++++++++++++++++++++++++++++++++++------- src/index.ts | 11 ++++++--- 3 files changed, 71 insertions(+), 18 deletions(-) diff --git a/src/config.ts b/src/config.ts index 63d1207..fc3fc95 100644 --- a/src/config.ts +++ b/src/config.ts @@ -4,7 +4,11 @@ import path from 'path'; import { readEnvFile } from './env.js'; // Read config values from .env (falls back to process.env). -const envConfig = readEnvFile(['ASSISTANT_NAME', 'ASSISTANT_HAS_OWN_NUMBER', 'ONECLI_URL']); +const envConfig = readEnvFile([ + 'ASSISTANT_NAME', + 'ASSISTANT_HAS_OWN_NUMBER', + 'ONECLI_URL', +]); export const ASSISTANT_NAME = process.env.ASSISTANT_NAME || envConfig.ASSISTANT_NAME || 'Andy'; @@ -58,10 +62,18 @@ function escapeRegex(str: string): string { return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); } -export const TRIGGER_PATTERN = new RegExp( - `^@${escapeRegex(ASSISTANT_NAME)}\\b`, - 'i', -); +export function buildTriggerPattern(trigger: string): RegExp { + return new RegExp(`^${escapeRegex(trigger.trim())}\\b`, 'i'); +} + +export const DEFAULT_TRIGGER = `@${ASSISTANT_NAME}`; + +export function getTriggerPattern(trigger?: string): RegExp { + const normalizedTrigger = trigger?.trim(); + return buildTriggerPattern(normalizedTrigger || DEFAULT_TRIGGER); +} + +export const TRIGGER_PATTERN = buildTriggerPattern(DEFAULT_TRIGGER); // Timezone for scheduled tasks (cron expressions, etc.) // Uses system timezone by default diff --git a/src/formatting.test.ts b/src/formatting.test.ts index 8a2160c..a630f20 100644 --- a/src/formatting.test.ts +++ b/src/formatting.test.ts @@ -1,6 +1,10 @@ import { describe, it, expect } from 'vitest'; -import { ASSISTANT_NAME, TRIGGER_PATTERN } from './config.js'; +import { + ASSISTANT_NAME, + getTriggerPattern, + TRIGGER_PATTERN, +} from './config.js'; import { escapeXml, formatMessages, @@ -161,6 +165,28 @@ describe('TRIGGER_PATTERN', () => { }); }); +describe('getTriggerPattern', () => { + it('uses the configured per-group trigger when provided', () => { + const pattern = getTriggerPattern('@Claw'); + + expect(pattern.test('@Claw hello')).toBe(true); + expect(pattern.test(`@${ASSISTANT_NAME} hello`)).toBe(false); + }); + + it('falls back to the default trigger when group trigger is missing', () => { + const pattern = getTriggerPattern(undefined); + + expect(pattern.test(`@${ASSISTANT_NAME} hello`)).toBe(true); + }); + + it('treats regex characters in custom triggers literally', () => { + const pattern = getTriggerPattern('@C.L.A.U.D.E'); + + expect(pattern.test('@C.L.A.U.D.E hello')).toBe(true); + expect(pattern.test('@CXLXAUXDXE hello')).toBe(false); + }); +}); + // --- Outbound formatting (internal tag stripping + prefix) --- describe('stripInternalTags', () => { @@ -207,7 +233,7 @@ describe('formatOutbound', () => { describe('trigger gating (requiresTrigger interaction)', () => { // Replicates the exact logic from processGroupMessages and startMessageLoop: - // if (!isMainGroup && group.requiresTrigger !== false) { check trigger } + // if (!isMainGroup && group.requiresTrigger !== false) { check group.trigger } function shouldRequireTrigger( isMainGroup: boolean, requiresTrigger: boolean | undefined, @@ -218,39 +244,51 @@ describe('trigger gating (requiresTrigger interaction)', () => { function shouldProcess( isMainGroup: boolean, requiresTrigger: boolean | undefined, + trigger: string | undefined, messages: NewMessage[], ): boolean { if (!shouldRequireTrigger(isMainGroup, requiresTrigger)) return true; - return messages.some((m) => TRIGGER_PATTERN.test(m.content.trim())); + const triggerPattern = getTriggerPattern(trigger); + return messages.some((m) => triggerPattern.test(m.content.trim())); } it('main group always processes (no trigger needed)', () => { const msgs = [makeMsg({ content: 'hello no trigger' })]; - expect(shouldProcess(true, undefined, msgs)).toBe(true); + expect(shouldProcess(true, undefined, undefined, msgs)).toBe(true); }); it('main group processes even with requiresTrigger=true', () => { const msgs = [makeMsg({ content: 'hello no trigger' })]; - expect(shouldProcess(true, true, msgs)).toBe(true); + expect(shouldProcess(true, true, undefined, msgs)).toBe(true); }); it('non-main group with requiresTrigger=undefined requires trigger (defaults to true)', () => { const msgs = [makeMsg({ content: 'hello no trigger' })]; - expect(shouldProcess(false, undefined, msgs)).toBe(false); + expect(shouldProcess(false, undefined, undefined, msgs)).toBe(false); }); it('non-main group with requiresTrigger=true requires trigger', () => { const msgs = [makeMsg({ content: 'hello no trigger' })]; - expect(shouldProcess(false, true, msgs)).toBe(false); + expect(shouldProcess(false, true, undefined, msgs)).toBe(false); }); it('non-main group with requiresTrigger=true processes when trigger present', () => { const msgs = [makeMsg({ content: `@${ASSISTANT_NAME} do something` })]; - expect(shouldProcess(false, true, msgs)).toBe(true); + expect(shouldProcess(false, true, undefined, msgs)).toBe(true); + }); + + it('non-main group uses its per-group trigger instead of the default trigger', () => { + const msgs = [makeMsg({ content: '@Claw do something' })]; + expect(shouldProcess(false, true, '@Claw', msgs)).toBe(true); + }); + + it('non-main group does not process when only the default trigger is present for a custom-trigger group', () => { + const msgs = [makeMsg({ content: `@${ASSISTANT_NAME} do something` })]; + expect(shouldProcess(false, true, '@Claw', msgs)).toBe(false); }); it('non-main group with requiresTrigger=false always processes (no trigger needed)', () => { const msgs = [makeMsg({ content: 'hello no trigger' })]; - expect(shouldProcess(false, false, msgs)).toBe(true); + expect(shouldProcess(false, false, undefined, msgs)).toBe(true); }); }); diff --git a/src/index.ts b/src/index.ts index 3f5e710..5116738 100644 --- a/src/index.ts +++ b/src/index.ts @@ -5,11 +5,12 @@ import { OneCLI } from '@onecli-sh/sdk'; import { ASSISTANT_NAME, + DEFAULT_TRIGGER, + getTriggerPattern, IDLE_TIMEOUT, ONECLI_URL, POLL_INTERVAL, TIMEZONE, - TRIGGER_PATTERN, } from './config.js'; import './channels/index.js'; import { @@ -194,10 +195,11 @@ async function processGroupMessages(chatJid: string): Promise { // For non-main groups, check if trigger is required and present if (!isMainGroup && group.requiresTrigger !== false) { + const triggerPattern = getTriggerPattern(group.trigger); const allowlistCfg = loadSenderAllowlist(); const hasTrigger = missedMessages.some( (m) => - TRIGGER_PATTERN.test(m.content.trim()) && + triggerPattern.test(m.content.trim()) && (m.is_from_me || isTriggerAllowed(chatJid, m.sender, allowlistCfg)), ); if (!hasTrigger) return true; @@ -376,7 +378,7 @@ async function startMessageLoop(): Promise { } messageLoopRunning = true; - logger.info(`NanoClaw running (trigger: @${ASSISTANT_NAME})`); + logger.info(`NanoClaw running (default trigger: ${DEFAULT_TRIGGER})`); while (true) { try { @@ -422,10 +424,11 @@ async function startMessageLoop(): Promise { // Non-trigger messages accumulate in DB and get pulled as // context when a trigger eventually arrives. if (needsTrigger) { + const triggerPattern = getTriggerPattern(group.trigger); const allowlistCfg = loadSenderAllowlist(); const hasTrigger = groupMessages.some( (m) => - TRIGGER_PATTERN.test(m.content.trim()) && + triggerPattern.test(m.content.trim()) && (m.is_from_me || isTriggerAllowed(chatJid, m.sender, allowlistCfg)), ); From 7366b0d7dbd1a48e74c26f2778e053db3a1490f7 Mon Sep 17 00:00:00 2001 From: NanoClaw Date: Tue, 24 Mar 2026 15:44:30 +0000 Subject: [PATCH 55/91] docs: trim OneCLI section wording Co-Authored-By: Claude Opus 4.6 (1M context) --- CLAUDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CLAUDE.md b/CLAUDE.md index 9b3ae27..2084578 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -23,7 +23,7 @@ Single Node.js process with skill-based channel system. Channels (WhatsApp, Tele ## Secrets / Credentials / Proxy (OneCLI) -API keys, secret keys, OAuth tokens, and auth credentials are managed by the OneCLI gateway — which replaces the old credential proxy and handles secret injection into containers at request time, so no keys or tokens are ever passed to containers directly. Run `onecli --help` to manage secrets, agents, and gateway config. +API keys, secret keys, OAuth tokens, and auth credentials are managed by the OneCLI gateway — which handles secret injection into containers at request time, so no keys or tokens are ever passed to containers directly. Run `onecli --help`. ## Skills From 7d640cb9f6a36ce897ecbc9462cbde58762a49be Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Mar 2026 15:45:50 +0000 Subject: [PATCH 56/91] chore: bump version to 1.2.23 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cd2dbef..cb2f894 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.22", + "version": "1.2.23", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.22", + "version": "1.2.23", "dependencies": { "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "^11.8.1", diff --git a/package.json b/package.json index 3457b67..df3e5e3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.22", + "version": "1.2.23", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From 58faf624a3e25c8e265269d20b5154a677c94548 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Mar 2026 15:45:53 +0000 Subject: [PATCH 57/91] =?UTF-8?q?docs:=20update=20token=20count=20to=2039.?= =?UTF-8?q?8k=20tokens=20=C2=B7=2020%=20of=20context=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo-tokens/badge.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo-tokens/badge.svg b/repo-tokens/badge.svg index b268ecc..ac18e24 100644 --- a/repo-tokens/badge.svg +++ b/repo-tokens/badge.svg @@ -1,5 +1,5 @@ - - 40.7k tokens, 20% of context window + + 39.8k tokens, 20% of context window @@ -15,8 +15,8 @@ tokens - - 40.7k + + 39.8k From e6df18ca8b2ff9059ce4571e44e57a8c93263994 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Mar 2026 15:55:51 +0000 Subject: [PATCH 58/91] =?UTF-8?q?docs:=20update=20token=20count=20to=2039.?= =?UTF-8?q?9k=20tokens=20=C2=B7=2020%=20of=20context=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo-tokens/badge.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo-tokens/badge.svg b/repo-tokens/badge.svg index ac18e24..f29ff27 100644 --- a/repo-tokens/badge.svg +++ b/repo-tokens/badge.svg @@ -1,5 +1,5 @@ - - 39.8k tokens, 20% of context window + + 39.9k tokens, 20% of context window @@ -15,8 +15,8 @@ tokens - - 39.8k + + 39.9k From 8d0baac8925e14abd64fd6bc7fe96187b410f371 Mon Sep 17 00:00:00 2001 From: NanoClaw Date: Tue, 24 Mar 2026 16:04:20 +0000 Subject: [PATCH 59/91] fix: remove prompt manipulation text from diagnostics steps Co-Authored-By: Claude Opus 4.6 (1M context) --- .claude/skills/setup/SKILL.md | 2 +- .claude/skills/setup/diagnostics.md | 2 +- .claude/skills/update-nanoclaw/SKILL.md | 4 ++-- .claude/skills/update-nanoclaw/diagnostics.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.claude/skills/setup/SKILL.md b/.claude/skills/setup/SKILL.md index f532ead..c26113d 100644 --- a/.claude/skills/setup/SKILL.md +++ b/.claude/skills/setup/SKILL.md @@ -220,4 +220,4 @@ Tell user to test: send a message in their registered chat. Show: `tail -f logs/ ## 9. Diagnostics -Use the Read tool to open `.claude/skills/setup/diagnostics.md` and follow every instruction in it. Do not skip this step. +Send diagnostics data by following `.claude/skills/setup/diagnostics.md`. diff --git a/.claude/skills/setup/diagnostics.md b/.claude/skills/setup/diagnostics.md index 669ea82..c6a42db 100644 --- a/.claude/skills/setup/diagnostics.md +++ b/.claude/skills/setup/diagnostics.md @@ -42,5 +42,5 @@ rm /tmp/nanoclaw-diagnostics.json **Never ask again**: 1. Replace contents of `.claude/skills/setup/diagnostics.md` with `# Diagnostics — opted out` 2. Replace contents of `.claude/skills/update-nanoclaw/diagnostics.md` with `# Diagnostics — opted out` -3. Remove the `## 9. Diagnostics` section from `.claude/skills/setup/SKILL.md` and the `## Diagnostics (mandatory final step)` section from `.claude/skills/update-nanoclaw/SKILL.md` +3. Remove the `## 9. Diagnostics` section from `.claude/skills/setup/SKILL.md` and the `## Diagnostics` section from `.claude/skills/update-nanoclaw/SKILL.md` 4. `rm /tmp/nanoclaw-diagnostics.json` diff --git a/.claude/skills/update-nanoclaw/SKILL.md b/.claude/skills/update-nanoclaw/SKILL.md index 1def6c6..2207910 100644 --- a/.claude/skills/update-nanoclaw/SKILL.md +++ b/.claude/skills/update-nanoclaw/SKILL.md @@ -235,6 +235,6 @@ Tell the user: - If running manually: restart `npm run dev` -## Diagnostics (mandatory final step) +## Diagnostics -Use the Read tool to open `.claude/skills/update-nanoclaw/diagnostics.md` and follow every instruction in it. Do not skip this step. +Send diagnostics data by following `.claude/skills/update-nanoclaw/diagnostics.md`. diff --git a/.claude/skills/update-nanoclaw/diagnostics.md b/.claude/skills/update-nanoclaw/diagnostics.md index f15b45c..8b06aa4 100644 --- a/.claude/skills/update-nanoclaw/diagnostics.md +++ b/.claude/skills/update-nanoclaw/diagnostics.md @@ -45,5 +45,5 @@ rm /tmp/nanoclaw-diagnostics.json **Never ask again**: 1. Replace contents of `.claude/skills/setup/diagnostics.md` with `# Diagnostics — opted out` 2. Replace contents of `.claude/skills/update-nanoclaw/diagnostics.md` with `# Diagnostics — opted out` -3. Remove the `## 9. Diagnostics` section from `.claude/skills/setup/SKILL.md` and the `## Diagnostics (mandatory final step)` section from `.claude/skills/update-nanoclaw/SKILL.md` +3. Remove the `## 9. Diagnostics` section from `.claude/skills/setup/SKILL.md` and the `## Diagnostics` section from `.claude/skills/update-nanoclaw/SKILL.md` 4. `rm /tmp/nanoclaw-diagnostics.json` From bf9b7d0311fe1a951c8bee21c870b809e94d8f72 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Wed, 25 Mar 2026 00:39:20 +0200 Subject: [PATCH 60/91] fix: auto-resolve package-lock/badge/version conflicts in fork sync The fork-sync and merge-forward workflows were failing on every run because package-lock.json, package.json (version), and badge.svg always conflict between upstream and forks. These are always safe to take from upstream/main. Now auto-resolves these trivial conflicts and only fails on real code conflicts. Co-Authored-By: Claude Opus 4.6 (1M context) --- .github/workflows/fork-sync-skills.yml | 57 ++++++++++++++++++---- .github/workflows/merge-forward-skills.yml | 25 ++++++++-- 2 files changed, 68 insertions(+), 14 deletions(-) diff --git a/.github/workflows/fork-sync-skills.yml b/.github/workflows/fork-sync-skills.yml index 8d25ee2..0d8433e 100644 --- a/.github/workflows/fork-sync-skills.yml +++ b/.github/workflows/fork-sync-skills.yml @@ -62,14 +62,34 @@ jobs: # Merge upstream main into fork's main if ! git merge upstream/main --no-edit; then - echo "::error::Failed to merge upstream/main into fork main — conflicts detected" - git merge --abort - echo "synced=false" >> "$GITHUB_OUTPUT" - echo "sync_failed=true" >> "$GITHUB_OUTPUT" - exit 0 + # Auto-resolve trivial conflicts (lockfile, badge, package.json version) + CONFLICTED=$(git diff --name-only --diff-filter=U) + AUTO_RESOLVABLE=true + for f in $CONFLICTED; do + case "$f" in + package-lock.json|package.json|repo-tokens/badge.svg) + git checkout --theirs "$f" + git add "$f" + ;; + *) + AUTO_RESOLVABLE=false + ;; + esac + done + + if [ "$AUTO_RESOLVABLE" = false ]; then + echo "::error::Failed to merge upstream/main into fork main — non-trivial conflicts detected" + git merge --abort + echo "synced=false" >> "$GITHUB_OUTPUT" + echo "sync_failed=true" >> "$GITHUB_OUTPUT" + exit 0 + fi + + git commit --no-edit + echo "Auto-resolved lockfile/badge/version conflicts" fi - # Validate build + # Regenerate lockfile to match merged package.json npm ci if ! npm run build; then echo "::error::Build failed after merging upstream/main" @@ -115,10 +135,27 @@ jobs: git checkout -B "$BRANCH" "origin/$BRANCH" if ! git merge main --no-edit; then - echo "::warning::Merge conflict in $BRANCH" - git merge --abort - FAILED="$FAILED $SKILL_NAME" - continue + # Auto-resolve trivial conflicts + CONFLICTED=$(git diff --name-only --diff-filter=U) + CAN_AUTO=true + for f in $CONFLICTED; do + case "$f" in + package-lock.json|package.json|repo-tokens/badge.svg) + git checkout --theirs "$f" + git add "$f" + ;; + *) + CAN_AUTO=false + ;; + esac + done + if [ "$CAN_AUTO" = false ]; then + echo "::warning::Merge conflict in $BRANCH" + git merge --abort + FAILED="$FAILED $SKILL_NAME" + continue + fi + git commit --no-edit fi # Check if there's anything new to push diff --git a/.github/workflows/merge-forward-skills.yml b/.github/workflows/merge-forward-skills.yml index 093130a..b648eb1 100644 --- a/.github/workflows/merge-forward-skills.yml +++ b/.github/workflows/merge-forward-skills.yml @@ -52,10 +52,27 @@ jobs: # Attempt merge if ! git merge main --no-edit; then - echo "::warning::Merge conflict in $BRANCH" - git merge --abort - FAILED="$FAILED $SKILL_NAME" - continue + # Auto-resolve trivial conflicts + CONFLICTED=$(git diff --name-only --diff-filter=U) + CAN_AUTO=true + for f in $CONFLICTED; do + case "$f" in + package-lock.json|package.json|repo-tokens/badge.svg) + git checkout --theirs "$f" + git add "$f" + ;; + *) + CAN_AUTO=false + ;; + esac + done + if [ "$CAN_AUTO" = false ]; then + echo "::warning::Merge conflict in $BRANCH" + git merge --abort + FAILED="$FAILED $SKILL_NAME" + continue + fi + git commit --no-edit fi # Check if there's anything new to push From e26e1b3e68d0a7d04de85d22485b707dab30c2a6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Mar 2026 22:39:38 +0000 Subject: [PATCH 61/91] chore: bump version to 1.2.24 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cb2f894..39bc424 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.23", + "version": "1.2.24", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.23", + "version": "1.2.24", "dependencies": { "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "^11.8.1", diff --git a/package.json b/package.json index e759922..ed96d45 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.23", + "version": "1.2.24", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From 4d853c5d38c2a6de7635dcf46ba4c286e0ad1f82 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Mar 2026 22:39:42 +0000 Subject: [PATCH 62/91] =?UTF-8?q?docs:=20update=20token=20count=20to=2042.?= =?UTF-8?q?2k=20tokens=20=C2=B7=2021%=20of=20context=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo-tokens/badge.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo-tokens/badge.svg b/repo-tokens/badge.svg index f29ff27..fedb84a 100644 --- a/repo-tokens/badge.svg +++ b/repo-tokens/badge.svg @@ -1,5 +1,5 @@ - - 39.9k tokens, 20% of context window + + 42.2k tokens, 21% of context window @@ -15,8 +15,8 @@ tokens - - 39.9k + + 42.2k From 2142f03eaf2abf52546fd8a8c0bcfa5d250d1a30 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Mar 2026 22:40:34 +0000 Subject: [PATCH 63/91] chore: bump version to 1.2.25 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 39bc424..64503e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.24", + "version": "1.2.25", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.24", + "version": "1.2.25", "dependencies": { "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "^11.8.1", diff --git a/package.json b/package.json index ed96d45..fa75541 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.24", + "version": "1.2.25", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From 616c1ae10a26672b621a414b90acca049c349686 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Wed, 25 Mar 2026 00:44:15 +0200 Subject: [PATCH 64/91] fix: expand auto-resolve patterns and add missing forks to dispatch - Auto-resolve .env.example (keep fork's channel-specific vars) and .github/workflows/* (always take upstream) during fork sync - Add docker-sandbox and docker-sandbox-windows to dispatch list Co-Authored-By: Claude Opus 4.6 (1M context) --- .github/workflows/fork-sync-skills.yml | 7 ++++++- .github/workflows/merge-forward-skills.yml | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fork-sync-skills.yml b/.github/workflows/fork-sync-skills.yml index 0d8433e..4191695 100644 --- a/.github/workflows/fork-sync-skills.yml +++ b/.github/workflows/fork-sync-skills.yml @@ -67,10 +67,15 @@ jobs: AUTO_RESOLVABLE=true for f in $CONFLICTED; do case "$f" in - package-lock.json|package.json|repo-tokens/badge.svg) + package-lock.json|package.json|repo-tokens/badge.svg|.github/workflows/*) git checkout --theirs "$f" git add "$f" ;; + .env.example) + # Keep fork's channel-specific env vars + git checkout --ours "$f" + git add "$f" + ;; *) AUTO_RESOLVABLE=false ;; diff --git a/.github/workflows/merge-forward-skills.yml b/.github/workflows/merge-forward-skills.yml index b648eb1..82471b0 100644 --- a/.github/workflows/merge-forward-skills.yml +++ b/.github/workflows/merge-forward-skills.yml @@ -160,6 +160,8 @@ jobs: 'nanoclaw-slack', 'nanoclaw-gmail', 'nanoclaw-docker-sandboxes', + 'nanoclaw-docker-sandbox', + 'nanoclaw-docker-sandbox-windows', ]; const sha = context.sha.substring(0, 7); for (const repo of forks) { From 11847a1af0866e7353560e5b0f6e52f6d29e342c Mon Sep 17 00:00:00 2001 From: gavrielc Date: Wed, 25 Mar 2026 01:03:43 +0200 Subject: [PATCH 65/91] fix: validate timezone to prevent crash on POSIX-style TZ values POSIX-style TZ strings like IST-2 cause a hard RangeError crash in formatMessages because Intl.DateTimeFormat only accepts IANA identifiers. - Add isValidTimezone/resolveTimezone helpers to src/timezone.ts - Make formatLocalTime fall back to UTC on invalid timezone - Validate TZ candidates in config.ts before accepting - Add timezone setup step to detect and prompt when autodetection fails - Use node:22-slim in Dockerfile (node:24-slim Trixie package renames) Co-Authored-By: Claude Opus 4.6 (1M context) --- .claude/skills/setup/SKILL.md | 7 + container/Dockerfile | 2 +- package-lock.json | 347 ++++++++++++++++------------------ package.json | 4 +- setup/index.ts | 1 + setup/timezone.ts | 67 +++++++ src/config.ts | 20 +- src/timezone.test.ts | 46 ++++- src/timezone.ts | 23 ++- 9 files changed, 326 insertions(+), 191 deletions(-) create mode 100644 setup/timezone.ts diff --git a/.claude/skills/setup/SKILL.md b/.claude/skills/setup/SKILL.md index 28a3608..e12e0ea 100644 --- a/.claude/skills/setup/SKILL.md +++ b/.claude/skills/setup/SKILL.md @@ -98,6 +98,13 @@ Run `npx tsx setup/index.ts --step environment` and parse the status block. - If HAS_REGISTERED_GROUPS=true → note existing config, offer to skip or reconfigure - Record APPLE_CONTAINER and DOCKER values for step 3 +## 2a. Timezone + +Run `npx tsx setup/index.ts --step timezone` and parse the status block. + +- If NEEDS_USER_INPUT=true → The system timezone could not be autodetected (e.g. POSIX-style TZ like `IST-2`). AskUserQuestion: "What is your timezone?" with common options (America/New_York, Europe/London, Asia/Jerusalem, Asia/Tokyo) and an "Other" escape. Then re-run: `npx tsx setup/index.ts --step timezone -- --tz `. +- If STATUS=success → Timezone is configured. Note RESOLVED_TZ for reference. + ## 3. Container Runtime ### 3a. Choose runtime diff --git a/container/Dockerfile b/container/Dockerfile index 2fe1b22..e8537c3 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -1,7 +1,7 @@ # NanoClaw Agent Container # Runs Claude Agent SDK in isolated Linux VM with browser automation -FROM node:24-slim +FROM node:22-slim # Install system dependencies for Chromium RUN apt-get update && apt-get install -y \ diff --git a/package-lock.json b/package-lock.json index 39bc424..3f17016 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "^11.8.1", "cron-parser": "^5.5.0", + "grammy": "^1.39.3", "pino": "^9.6.0", "pino-pretty": "^13.0.0", "yaml": "^2.8.2", @@ -542,7 +543,6 @@ "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz", "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==", "dev": true, - "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" }, @@ -561,7 +561,6 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, - "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -574,7 +573,6 @@ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", "dev": true, - "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } @@ -584,7 +582,6 @@ "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.2.tgz", "integrity": "sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@eslint/object-schema": "^2.1.7", "debug": "^4.3.1", @@ -599,7 +596,6 @@ "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz", "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@eslint/core": "^0.17.0" }, @@ -612,7 +608,6 @@ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz", "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@types/json-schema": "^7.0.15" }, @@ -625,7 +620,6 @@ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.5.tgz", "integrity": "sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==", "dev": true, - "license": "MIT", "dependencies": { "ajv": "^6.14.0", "debug": "^4.3.2", @@ -649,7 +643,6 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=18" }, @@ -662,7 +655,6 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" }, @@ -675,7 +667,6 @@ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.4.tgz", "integrity": "sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==", "dev": true, - "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -688,7 +679,6 @@ "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz", "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==", "dev": true, - "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } @@ -698,7 +688,6 @@ "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz", "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@eslint/core": "^0.17.0", "levn": "^0.4.1" @@ -707,12 +696,17 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@grammyjs/types": { + "version": "3.25.0", + "resolved": "https://registry.npmjs.org/@grammyjs/types/-/types-3.25.0.tgz", + "integrity": "sha512-iN9i5p+8ZOu9OMxWNcguojQfz4K/PDyMPOnL7PPCON+SoA/F8OKMH3uR7CVUkYfdNe0GCz8QOzAWrnqusQYFOg==", + "license": "MIT" + }, "node_modules/@humanfs/core": { "version": "0.19.1", "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=18.18.0" } @@ -722,7 +716,6 @@ "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz", "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@humanfs/core": "^0.19.1", "@humanwhocodes/retry": "^0.4.0" @@ -736,7 +729,6 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=12.22" }, @@ -750,7 +742,6 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=18.18" }, @@ -791,7 +782,6 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/@onecli-sh/sdk/-/sdk-0.2.0.tgz", "integrity": "sha512-u7PqWROEvTV9f0ADVkjigTrd2AZn3klbPrv7GGpeRHIJpjAxJUdlWqxr5kiGt6qTDKL8t3nq76xr4X2pxTiyBg==", - "license": "MIT", "engines": { "node": ">=20" } @@ -1198,8 +1188,7 @@ "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/@types/node": { "version": "22.19.11", @@ -1212,17 +1201,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.57.1.tgz", - "integrity": "sha512-Gn3aqnvNl4NGc6x3/Bqk1AOn0thyTU9bqDRhiRnUWezgvr2OnhYCWCgC8zXXRVqBsIL1pSDt7T9nJUe0oM0kDQ==", + "version": "8.57.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.57.2.tgz", + "integrity": "sha512-NZZgp0Fm2IkD+La5PR81sd+g+8oS6JwJje+aRWsDocxHkjyRw0J5L5ZTlN3LI1LlOcGL7ph3eaIUmTXMIjLk0w==", "dev": true, - "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.57.1", - "@typescript-eslint/type-utils": "8.57.1", - "@typescript-eslint/utils": "8.57.1", - "@typescript-eslint/visitor-keys": "8.57.1", + "@typescript-eslint/scope-manager": "8.57.2", + "@typescript-eslint/type-utils": "8.57.2", + "@typescript-eslint/utils": "8.57.2", + "@typescript-eslint/visitor-keys": "8.57.2", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.4.0" @@ -1235,7 +1223,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.57.1", + "@typescript-eslint/parser": "^8.57.2", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } @@ -1245,22 +1233,20 @@ "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 4" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.57.1.tgz", - "integrity": "sha512-k4eNDan0EIMTT/dUKc/g+rsJ6wcHYhNPdY19VoX/EOtaAG8DLtKCykhrUnuHPYvinn5jhAPgD2Qw9hXBwrahsw==", + "version": "8.57.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.57.2.tgz", + "integrity": "sha512-30ScMRHIAD33JJQkgfGW1t8CURZtjc2JpTrq5n2HFhOefbAhb7ucc7xJwdWcrEtqUIYJ73Nybpsggii6GtAHjA==", "dev": true, - "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.57.1", - "@typescript-eslint/types": "8.57.1", - "@typescript-eslint/typescript-estree": "8.57.1", - "@typescript-eslint/visitor-keys": "8.57.1", + "@typescript-eslint/scope-manager": "8.57.2", + "@typescript-eslint/types": "8.57.2", + "@typescript-eslint/typescript-estree": "8.57.2", + "@typescript-eslint/visitor-keys": "8.57.2", "debug": "^4.4.3" }, "engines": { @@ -1276,14 +1262,13 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.57.1.tgz", - "integrity": "sha512-vx1F37BRO1OftsYlmG9xay1TqnjNVlqALymwWVuYTdo18XuKxtBpCj1QlzNIEHlvlB27osvXFWptYiEWsVdYsg==", + "version": "8.57.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.57.2.tgz", + "integrity": "sha512-FuH0wipFywXRTHf+bTTjNyuNQQsQC3qh/dYzaM4I4W0jrCqjCVuUh99+xd9KamUfmCGPvbO8NDngo/vsnNVqgw==", "dev": true, - "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.57.1", - "@typescript-eslint/types": "^8.57.1", + "@typescript-eslint/tsconfig-utils": "^8.57.2", + "@typescript-eslint/types": "^8.57.2", "debug": "^4.4.3" }, "engines": { @@ -1298,14 +1283,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.57.1.tgz", - "integrity": "sha512-hs/QcpCwlwT2L5S+3fT6gp0PabyGk4Q0Rv2doJXA0435/OpnSR3VRgvrp8Xdoc3UAYSg9cyUjTeFXZEPg/3OKg==", + "version": "8.57.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.57.2.tgz", + "integrity": "sha512-snZKH+W4WbWkrBqj4gUNRIGb/jipDW3qMqVJ4C9rzdFc+wLwruxk+2a5D+uoFcKPAqyqEnSb4l2ULuZf95eSkw==", "dev": true, - "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.57.1", - "@typescript-eslint/visitor-keys": "8.57.1" + "@typescript-eslint/types": "8.57.2", + "@typescript-eslint/visitor-keys": "8.57.2" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1316,11 +1300,10 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.57.1.tgz", - "integrity": "sha512-0lgOZB8cl19fHO4eI46YUx2EceQqhgkPSuCGLlGi79L2jwYY1cxeYc1Nae8Aw1xjgW3PKVDLlr3YJ6Bxx8HkWg==", + "version": "8.57.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.57.2.tgz", + "integrity": "sha512-3Lm5DSM+DCowsUOJC+YqHHnKEfFh5CoGkj5Z31NQSNF4l5wdOwqGn99wmwN/LImhfY3KJnmordBq/4+VDe2eKw==", "dev": true, - "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -1333,15 +1316,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.57.1.tgz", - "integrity": "sha512-+Bwwm0ScukFdyoJsh2u6pp4S9ktegF98pYUU0hkphOOqdMB+1sNQhIz8y5E9+4pOioZijrkfNO/HUJVAFFfPKA==", + "version": "8.57.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.57.2.tgz", + "integrity": "sha512-Co6ZCShm6kIbAM/s+oYVpKFfW7LBc6FXoPXjTRQ449PPNBY8U0KZXuevz5IFuuUj2H9ss40atTaf9dlGLzbWZg==", "dev": true, - "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.57.1", - "@typescript-eslint/typescript-estree": "8.57.1", - "@typescript-eslint/utils": "8.57.1", + "@typescript-eslint/types": "8.57.2", + "@typescript-eslint/typescript-estree": "8.57.2", + "@typescript-eslint/utils": "8.57.2", "debug": "^4.4.3", "ts-api-utils": "^2.4.0" }, @@ -1358,11 +1340,10 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.57.1.tgz", - "integrity": "sha512-S29BOBPJSFUiblEl6RzPPjJt6w25A6XsBqRVDt53tA/tlL8q7ceQNZHTjPeONt/3S7KRI4quk+yP9jK2WjBiPQ==", + "version": "8.57.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.57.2.tgz", + "integrity": "sha512-/iZM6FnM4tnx9csuTxspMW4BOSegshwX5oBDznJ7S4WggL7Vczz5d2W11ecc4vRrQMQHXRSxzrCsyG5EsPPTbA==", "dev": true, - "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -1372,16 +1353,15 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.57.1.tgz", - "integrity": "sha512-ybe2hS9G6pXpqGtPli9Gx9quNV0TWLOmh58ADlmZe9DguLq0tiAKVjirSbtM1szG6+QH6rVXyU6GTLQbWnMY+g==", + "version": "8.57.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.57.2.tgz", + "integrity": "sha512-2MKM+I6g8tJxfSmFKOnHv2t8Sk3T6rF20A1Puk0svLK+uVapDZB/4pfAeB7nE83uAZrU6OxW+HmOd5wHVdXwXA==", "dev": true, - "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.57.1", - "@typescript-eslint/tsconfig-utils": "8.57.1", - "@typescript-eslint/types": "8.57.1", - "@typescript-eslint/visitor-keys": "8.57.1", + "@typescript-eslint/project-service": "8.57.2", + "@typescript-eslint/tsconfig-utils": "8.57.2", + "@typescript-eslint/types": "8.57.2", + "@typescript-eslint/visitor-keys": "8.57.2", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -1404,17 +1384,15 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", "dev": true, - "license": "MIT", "engines": { "node": "18 || 20 || >=22" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", - "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", "dev": true, - "license": "MIT", "dependencies": { "balanced-match": "^4.0.2" }, @@ -1427,7 +1405,6 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz", "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==", "dev": true, - "license": "BlueOak-1.0.0", "dependencies": { "brace-expansion": "^5.0.2" }, @@ -1439,16 +1416,15 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.57.1.tgz", - "integrity": "sha512-XUNSJ/lEVFttPMMoDVA2r2bwrl8/oPx8cURtczkSEswY5T3AeLmCy+EKWQNdL4u0MmAHOjcWrqJp2cdvgjn8dQ==", + "version": "8.57.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.57.2.tgz", + "integrity": "sha512-krRIbvPK1ju1WBKIefiX+bngPs+odIQUtR7kymzPfo1POVw3jlF+nLkmexdSSd4UCbDcQn+wMBATOOmpBbqgKg==", "dev": true, - "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.57.1", - "@typescript-eslint/types": "8.57.1", - "@typescript-eslint/typescript-estree": "8.57.1" + "@typescript-eslint/scope-manager": "8.57.2", + "@typescript-eslint/types": "8.57.2", + "@typescript-eslint/typescript-estree": "8.57.2" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1463,13 +1439,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.57.1.tgz", - "integrity": "sha512-YWnmJkXbofiz9KbnbbwuA2rpGkFPLbAIetcCNO6mJ8gdhdZ/v7WDXsoGFAJuM6ikUFKTlSQnjWnVO4ux+UzS6A==", + "version": "8.57.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.57.2.tgz", + "integrity": "sha512-zhahknjobV2FiD6Ee9iLbS7OV9zi10rG26odsQdfBO/hjSzUQbkIYgda+iNKK1zNiW2ey+Lf8MU5btN17V3dUw==", "dev": true, - "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.57.1", + "@typescript-eslint/types": "8.57.2", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -1485,7 +1460,6 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==", "dev": true, - "license": "Apache-2.0", "engines": { "node": "^20.19.0 || ^22.13.0 || >=24" }, @@ -1635,12 +1609,23 @@ "url": "https://opencollective.com/vitest" } }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "license": "MIT", + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } + }, "node_modules/acorn": { "version": "8.16.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "dev": true, - "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -1653,7 +1638,6 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, - "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -1663,7 +1647,6 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", "dev": true, - "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1680,7 +1663,6 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -1695,8 +1677,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true, - "license": "Python-2.0" + "dev": true }, "node_modules/assertion-error": { "version": "2.0.1", @@ -1733,8 +1714,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/base64-js": { "version": "1.5.1", @@ -1792,7 +1772,6 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, - "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1827,7 +1806,6 @@ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } @@ -1847,7 +1825,6 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -1870,7 +1847,6 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -1882,8 +1858,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/colorette": { "version": "2.0.20", @@ -1895,8 +1870,7 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/cron-parser": { "version": "5.5.0", @@ -1915,7 +1889,6 @@ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, - "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -1938,7 +1911,6 @@ "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -1980,8 +1952,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/detect-libc": { "version": "2.1.2", @@ -2055,7 +2026,6 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -2068,7 +2038,6 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.4.tgz", "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==", "dev": true, - "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -2128,7 +2097,6 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-no-catch-all/-/eslint-plugin-no-catch-all-1.1.0.tgz", "integrity": "sha512-VkP62jLTmccPrFGN/W6V7a3SEwdtTZm+Su2k4T3uyJirtkm0OMMm97h7qd8pRFAHus/jQg9FpUpLRc7sAylBEQ==", "dev": true, - "license": "MIT", "peerDependencies": { "eslint": ">=2.0.0" } @@ -2138,7 +2106,6 @@ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -2155,7 +2122,6 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, - "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -2168,7 +2134,6 @@ "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.15.0", "acorn-jsx": "^5.3.2", @@ -2186,7 +2151,6 @@ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz", "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" }, @@ -2199,7 +2163,6 @@ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -2212,7 +2175,6 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } @@ -2232,11 +2194,19 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/expand-template": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", @@ -2266,22 +2236,19 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/fast-safe-stringify": { "version": "2.1.1", @@ -2312,7 +2279,6 @@ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "dev": true, - "license": "MIT", "dependencies": { "flat-cache": "^4.0.0" }, @@ -2331,7 +2297,6 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, - "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -2348,7 +2313,6 @@ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "dev": true, - "license": "MIT", "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.4" @@ -2361,8 +2325,7 @@ "version": "3.4.2", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", - "dev": true, - "license": "ISC" + "dev": true }, "node_modules/fs-constants": { "version": "1.0.0", @@ -2409,7 +2372,6 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, - "license": "ISC", "dependencies": { "is-glob": "^4.0.3" }, @@ -2422,7 +2384,6 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", "dev": true, - "license": "MIT", "engines": { "node": ">=18" }, @@ -2430,6 +2391,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/grammy": { + "version": "1.41.1", + "resolved": "https://registry.npmjs.org/grammy/-/grammy-1.41.1.tgz", + "integrity": "sha512-wcHAQ1e7svL3fJMpDchcQVcWUmywhuepOOjHUHmMmWAwUJEIyK5ea5sbSjZd+Gy1aMpZeP8VYJa+4tP+j1YptQ==", + "license": "MIT", + "dependencies": { + "@grammyjs/types": "3.25.0", + "abort-controller": "^3.0.0", + "debug": "^4.4.3", + "node-fetch": "^2.7.0" + }, + "engines": { + "node": "^12.20.0 || >=14.13.1" + } + }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -2494,7 +2470,6 @@ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, - "license": "MIT", "engines": { "node": ">= 4" } @@ -2504,7 +2479,6 @@ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", "dev": true, - "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -2521,7 +2495,6 @@ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8.19" } @@ -2543,7 +2516,6 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -2553,7 +2525,6 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, - "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -2565,8 +2536,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true, - "license": "ISC" + "dev": true }, "node_modules/istanbul-lib-coverage": { "version": "3.2.2", @@ -2628,7 +2598,6 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -2640,29 +2609,25 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, - "license": "MIT", "dependencies": { "json-buffer": "3.0.1" } @@ -2672,7 +2637,6 @@ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, - "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -2686,7 +2650,6 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, - "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -2701,8 +2664,7 @@ "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/luxon": { "version": "3.7.2", @@ -2768,7 +2730,6 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, - "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -2795,7 +2756,6 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, "license": "MIT" }, "node_modules/nanoid": { @@ -2827,8 +2787,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/node-abi": { "version": "3.87.0", @@ -2842,6 +2801,26 @@ "node": ">=10" } }, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/obug": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.1.tgz", @@ -2876,7 +2855,6 @@ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", "dev": true, - "license": "MIT", "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", @@ -2894,7 +2872,6 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, - "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -2910,7 +2887,6 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, - "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -2926,7 +2902,6 @@ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, - "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -2939,7 +2914,6 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -2949,7 +2923,6 @@ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -3111,7 +3084,6 @@ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8.0" } @@ -3163,7 +3135,6 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } @@ -3226,7 +3197,6 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } @@ -3348,7 +3318,6 @@ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, - "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -3361,7 +3330,6 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -3575,12 +3543,17 @@ "node": ">=14.0.0" } }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "license": "MIT" + }, "node_modules/ts-api-utils": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz", "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==", "dev": true, - "license": "MIT", "engines": { "node": ">=18.12" }, @@ -3625,7 +3598,6 @@ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, - "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" }, @@ -3648,16 +3620,15 @@ } }, "node_modules/typescript-eslint": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.57.1.tgz", - "integrity": "sha512-fLvZWf+cAGw3tqMCYzGIU6yR8K+Y9NT2z23RwOjlNFF2HwSB3KhdEFI5lSBv8tNmFkkBShSjsCjzx1vahZfISA==", + "version": "8.57.2", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.57.2.tgz", + "integrity": "sha512-VEPQ0iPgWO/sBaZOU1xo4nuNdODVOajPnTIbog2GKYr31nIlZ0fWPoCQgGfF3ETyBl1vn63F/p50Um9Z4J8O8A==", "dev": true, - "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.57.1", - "@typescript-eslint/parser": "8.57.1", - "@typescript-eslint/typescript-estree": "8.57.1", - "@typescript-eslint/utils": "8.57.1" + "@typescript-eslint/eslint-plugin": "8.57.2", + "@typescript-eslint/parser": "8.57.2", + "@typescript-eslint/typescript-estree": "8.57.2", + "@typescript-eslint/utils": "8.57.2" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3683,7 +3654,6 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" } @@ -3847,12 +3817,27 @@ } } }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "license": "BSD-2-Clause" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, - "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -3885,7 +3870,6 @@ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3916,7 +3900,6 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, diff --git a/package.json b/package.json index ed96d45..b710e94 100644 --- a/package.json +++ b/package.json @@ -23,12 +23,12 @@ "dependencies": { "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "^11.8.1", - "grammy": "^1.39.3", "cron-parser": "^5.5.0", "pino": "^9.6.0", "pino-pretty": "^13.0.0", "yaml": "^2.8.2", - "zod": "^4.3.6" + "zod": "^4.3.6", + "grammy": "^1.39.3" }, "devDependencies": { "@eslint/js": "^9.35.0", diff --git a/setup/index.ts b/setup/index.ts index 7ac13e2..7e10ddc 100644 --- a/setup/index.ts +++ b/setup/index.ts @@ -9,6 +9,7 @@ const STEPS: Record< string, () => Promise<{ run: (args: string[]) => Promise }> > = { + timezone: () => import('./timezone.js'), environment: () => import('./environment.js'), container: () => import('./container.js'), groups: () => import('./groups.js'), diff --git a/setup/timezone.ts b/setup/timezone.ts new file mode 100644 index 0000000..22c0394 --- /dev/null +++ b/setup/timezone.ts @@ -0,0 +1,67 @@ +/** + * Step: timezone — Detect, validate, and persist the user's timezone. + * Writes TZ to .env if a valid IANA timezone is resolved. + * Emits NEEDS_USER_INPUT=true when autodetection fails. + */ +import fs from 'fs'; +import path from 'path'; + +import { isValidTimezone } from '../src/timezone.js'; +import { logger } from '../src/logger.js'; +import { emitStatus } from './status.js'; + +export async function run(args: string[]): Promise { + const projectRoot = process.cwd(); + const envFile = path.join(projectRoot, '.env'); + + // Check what's already in .env + let envFileTz: string | undefined; + if (fs.existsSync(envFile)) { + const content = fs.readFileSync(envFile, 'utf-8'); + const match = content.match(/^TZ=(.+)$/m); + if (match) envFileTz = match[1].trim().replace(/^["']|["']$/g, ''); + } + + const systemTz = Intl.DateTimeFormat().resolvedOptions().timeZone; + const envTz = process.env.TZ; + + // Accept --tz flag from CLI (used when setup skill collects from user) + const tzFlagIdx = args.indexOf('--tz'); + const userTz = tzFlagIdx !== -1 ? args[tzFlagIdx + 1] : undefined; + + // Resolve: user-provided > .env > process.env > system autodetect + let resolvedTz: string | undefined; + for (const candidate of [userTz, envFileTz, envTz, systemTz]) { + if (candidate && isValidTimezone(candidate)) { + resolvedTz = candidate; + break; + } + } + + const needsUserInput = !resolvedTz; + + if (resolvedTz && resolvedTz !== envFileTz) { + // Write/update TZ in .env + if (fs.existsSync(envFile)) { + let content = fs.readFileSync(envFile, 'utf-8'); + if (/^TZ=/m.test(content)) { + content = content.replace(/^TZ=.*$/m, `TZ=${resolvedTz}`); + } else { + content = content.trimEnd() + `\nTZ=${resolvedTz}\n`; + } + fs.writeFileSync(envFile, content); + } else { + fs.writeFileSync(envFile, `TZ=${resolvedTz}\n`); + } + logger.info({ timezone: resolvedTz }, 'Set TZ in .env'); + } + + emitStatus('TIMEZONE', { + SYSTEM_TZ: systemTz || 'unknown', + ENV_TZ: envTz || 'unset', + ENV_FILE_TZ: envFileTz || 'unset', + RESOLVED_TZ: resolvedTz || 'none', + NEEDS_USER_INPUT: needsUserInput, + STATUS: needsUserInput ? 'needs_input' : 'success', + }); +} diff --git a/src/config.ts b/src/config.ts index 26f31c2..d5005a0 100644 --- a/src/config.ts +++ b/src/config.ts @@ -2,12 +2,14 @@ import os from 'os'; import path from 'path'; import { readEnvFile } from './env.js'; +import { isValidTimezone } from './timezone.js'; // Read config values from .env (falls back to process.env). const envConfig = readEnvFile([ 'ASSISTANT_NAME', 'ASSISTANT_HAS_OWN_NUMBER', 'ONECLI_URL', + 'TZ', ]); export const ASSISTANT_NAME = @@ -67,7 +69,17 @@ export const TRIGGER_PATTERN = new RegExp( 'i', ); -// Timezone for scheduled tasks (cron expressions, etc.) -// Uses system timezone by default -export const TIMEZONE = - process.env.TZ || Intl.DateTimeFormat().resolvedOptions().timeZone; +// Timezone for scheduled tasks, message formatting, etc. +// Validates each candidate is a real IANA identifier before accepting. +function resolveConfigTimezone(): string { + const candidates = [ + process.env.TZ, + envConfig.TZ, + Intl.DateTimeFormat().resolvedOptions().timeZone, + ]; + for (const tz of candidates) { + if (tz && isValidTimezone(tz)) return tz; + } + return 'UTC'; +} +export const TIMEZONE = resolveConfigTimezone(); diff --git a/src/timezone.test.ts b/src/timezone.test.ts index df0525f..1003a61 100644 --- a/src/timezone.test.ts +++ b/src/timezone.test.ts @@ -1,6 +1,10 @@ import { describe, it, expect } from 'vitest'; -import { formatLocalTime } from './timezone.js'; +import { + formatLocalTime, + isValidTimezone, + resolveTimezone, +} from './timezone.js'; // --- formatLocalTime --- @@ -26,4 +30,44 @@ describe('formatLocalTime', () => { expect(ny).toContain('8:00'); expect(tokyo).toContain('9:00'); }); + + it('does not throw on invalid timezone, falls back to UTC', () => { + expect(() => + formatLocalTime('2026-01-01T00:00:00.000Z', 'IST-2'), + ).not.toThrow(); + const result = formatLocalTime('2026-01-01T12:00:00.000Z', 'IST-2'); + // Should format as UTC (noon UTC = 12:00 PM) + expect(result).toContain('12:00'); + expect(result).toContain('PM'); + }); +}); + +describe('isValidTimezone', () => { + it('accepts valid IANA identifiers', () => { + expect(isValidTimezone('America/New_York')).toBe(true); + expect(isValidTimezone('UTC')).toBe(true); + expect(isValidTimezone('Asia/Tokyo')).toBe(true); + expect(isValidTimezone('Asia/Jerusalem')).toBe(true); + }); + + it('rejects invalid timezone strings', () => { + expect(isValidTimezone('IST-2')).toBe(false); + expect(isValidTimezone('XYZ+3')).toBe(false); + }); + + it('rejects empty and garbage strings', () => { + expect(isValidTimezone('')).toBe(false); + expect(isValidTimezone('NotATimezone')).toBe(false); + }); +}); + +describe('resolveTimezone', () => { + it('returns the timezone if valid', () => { + expect(resolveTimezone('America/New_York')).toBe('America/New_York'); + }); + + it('falls back to UTC for invalid timezone', () => { + expect(resolveTimezone('IST-2')).toBe('UTC'); + expect(resolveTimezone('')).toBe('UTC'); + }); }); diff --git a/src/timezone.ts b/src/timezone.ts index e7569f4..d8cc6cc 100644 --- a/src/timezone.ts +++ b/src/timezone.ts @@ -1,11 +1,32 @@ +/** + * Check whether a timezone string is a valid IANA identifier + * that Intl.DateTimeFormat can use. + */ +export function isValidTimezone(tz: string): boolean { + try { + Intl.DateTimeFormat(undefined, { timeZone: tz }); + return true; + } catch { + return false; + } +} + +/** + * Return the given timezone if valid IANA, otherwise fall back to UTC. + */ +export function resolveTimezone(tz: string): string { + return isValidTimezone(tz) ? tz : 'UTC'; +} + /** * Convert a UTC ISO timestamp to a localized display string. * Uses the Intl API (no external dependencies). + * Falls back to UTC if the timezone is invalid. */ export function formatLocalTime(utcIso: string, timezone: string): string { const date = new Date(utcIso); return date.toLocaleString('en-US', { - timeZone: timezone, + timeZone: resolveTimezone(timezone), year: 'numeric', month: 'short', day: 'numeric', From 6d4e25153476cbb51595939f40bef1677ebc55b5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Mar 2026 23:05:15 +0000 Subject: [PATCH 66/91] chore: bump version to 1.2.25 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3f17016..50d6563 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.24", + "version": "1.2.25", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.24", + "version": "1.2.25", "dependencies": { "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "^11.8.1", diff --git a/package.json b/package.json index b710e94..8589bbd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.24", + "version": "1.2.25", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From f375dd5011df20e992d4be2555538714b7c9610a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Mar 2026 23:05:19 +0000 Subject: [PATCH 67/91] =?UTF-8?q?docs:=20update=20token=20count=20to=2042.?= =?UTF-8?q?4k=20tokens=20=C2=B7=2021%=20of=20context=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo-tokens/badge.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo-tokens/badge.svg b/repo-tokens/badge.svg index fedb84a..93aeb17 100644 --- a/repo-tokens/badge.svg +++ b/repo-tokens/badge.svg @@ -1,5 +1,5 @@ - - 42.2k tokens, 21% of context window + + 42.4k tokens, 21% of context window @@ -15,8 +15,8 @@ tokens - - 42.2k + + 42.4k From 5d5b90448c558c5409d2448ee6e23f7621d30cf8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Mar 2026 23:05:58 +0000 Subject: [PATCH 68/91] chore: bump version to 1.2.26 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 50d6563..1074356 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.25", + "version": "1.2.26", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.25", + "version": "1.2.26", "dependencies": { "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "^11.8.1", diff --git a/package.json b/package.json index 8589bbd..c476b1d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.25", + "version": "1.2.26", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From aeabfcc65a065d69bf59a56dade373d82442a911 Mon Sep 17 00:00:00 2001 From: nanoclaw3 Date: Wed, 25 Mar 2026 03:48:08 +0000 Subject: [PATCH 69/91] fix: enable loginctl linger so user service survives SSH logout Without linger enabled, systemd terminates all user-level processes (including the NanoClaw service) when the last SSH session closes. This adds `loginctl enable-linger` during setup for non-root users. Co-Authored-By: Claude Opus 4.6 (1M context) --- setup/service.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/setup/service.ts b/setup/service.ts index 71b3c63..c385267 100644 --- a/setup/service.ts +++ b/setup/service.ts @@ -266,6 +266,20 @@ WantedBy=${runningAsRoot ? 'multi-user.target' : 'default.target'}`; // Kill orphaned nanoclaw processes to avoid channel connection conflicts killOrphanedProcesses(projectRoot); + // Enable lingering so the user service survives SSH logout. + // Without linger, systemd terminates all user processes when the last session closes. + if (!runningAsRoot) { + try { + execSync('loginctl enable-linger', { stdio: 'ignore' }); + logger.info('Enabled loginctl linger for current user'); + } catch (err) { + logger.warn( + { err }, + 'loginctl enable-linger failed — service may stop on SSH logout', + ); + } + } + // Enable and start try { execSync(`${systemctlPrefix} daemon-reload`, { stdio: 'ignore' }); @@ -301,6 +315,7 @@ WantedBy=${runningAsRoot ? 'multi-user.target' : 'default.target'}`; UNIT_PATH: unitPath, SERVICE_LOADED: serviceLoaded, ...(dockerGroupStale ? { DOCKER_GROUP_STALE: true } : {}), + LINGER_ENABLED: !runningAsRoot, STATUS: 'success', LOG: 'logs/setup.log', }); From 2c46d74066c671b18cce04db551d65276f59d0a1 Mon Sep 17 00:00:00 2001 From: ingyukoh Date: Wed, 25 Mar 2026 15:21:44 +0900 Subject: [PATCH 70/91] fix: clarify WhatsApp phone number prompt to prevent auth failures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The example "1234567890" was ambiguous — users couldn't tell where the country code ended and the number began, and some included a leading "+" which caused pairing to fail. Use a realistic US example (14155551234) and explicit formatting rules in both the prompt and troubleshooting. Closes #447 --- .claude/skills/add-whatsapp/SKILL.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.claude/skills/add-whatsapp/SKILL.md b/.claude/skills/add-whatsapp/SKILL.md index 0774799..cbdf00b 100644 --- a/.claude/skills/add-whatsapp/SKILL.md +++ b/.claude/skills/add-whatsapp/SKILL.md @@ -40,7 +40,7 @@ Otherwise (macOS, desktop Linux, or WSL) → AskUserQuestion: How do you want to If they chose pairing code: -AskUserQuestion: What is your phone number? (Include country code without +, e.g., 1234567890) +AskUserQuestion: What is your phone number? (Digits only — country code followed by your 10-digit number, no + prefix, spaces, or dashes. Example: 14155551234 where 1 is the US country code and 4155551234 is the phone number.) ## Phase 2: Apply Code Changes @@ -308,7 +308,7 @@ rm -rf store/auth/ && npx tsx src/whatsapp-auth.ts --pairing-code --phone Date: Wed, 25 Mar 2026 16:17:26 +0900 Subject: [PATCH 71/91] fix: create CLAUDE.md from template when registering groups via IPC The registerGroup() function in index.ts creates the group folder and logs subdirectory but never copies the global CLAUDE.md template. Agents in newly registered groups start without identity or instructions until the container is manually fixed. Copy groups/global/CLAUDE.md into the new group folder on registration, substituting the assistant name if it differs from the default. Closes #1391 --- src/index.ts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/index.ts b/src/index.ts index 3f5e710..1465d56 100644 --- a/src/index.ts +++ b/src/index.ts @@ -5,6 +5,7 @@ import { OneCLI } from '@onecli-sh/sdk'; import { ASSISTANT_NAME, + GROUPS_DIR, IDLE_TIMEOUT, ONECLI_URL, POLL_INTERVAL, @@ -133,6 +134,25 @@ function registerGroup(jid: string, group: RegisteredGroup): void { // Create group folder fs.mkdirSync(path.join(groupDir, 'logs'), { recursive: true }); + // Copy CLAUDE.md template into the new group folder so agents have + // identity and instructions from the first run. (Fixes #1391) + const groupMdFile = path.join(groupDir, 'CLAUDE.md'); + if (!fs.existsSync(groupMdFile)) { + const templateFile = path.join(GROUPS_DIR, 'global', 'CLAUDE.md'); + if (fs.existsSync(templateFile)) { + let content = fs.readFileSync(templateFile, 'utf-8'); + if (ASSISTANT_NAME !== 'Andy') { + content = content.replace(/^# Andy$/m, `# ${ASSISTANT_NAME}`); + content = content.replace( + /You are Andy/g, + `You are ${ASSISTANT_NAME}`, + ); + } + fs.writeFileSync(groupMdFile, content); + logger.info({ folder: group.folder }, 'Created CLAUDE.md from template'); + } + } + // Ensure a corresponding OneCLI agent exists (best-effort, non-blocking) ensureOneCLIAgent(jid, group); From 63f680d0be3c7e68ab640a9e8ea1d8eed68e9e7d Mon Sep 17 00:00:00 2001 From: gavrielc Date: Wed, 25 Mar 2026 13:22:36 +0200 Subject: [PATCH 72/91] chore: remove grammy and pin better-sqlite3/cron-parser versions Co-Authored-By: Claude Opus 4.6 (1M context) --- package-lock.json | 91 +++-------------------------------------------- package.json | 7 ++-- 2 files changed, 7 insertions(+), 91 deletions(-) diff --git a/package-lock.json b/package-lock.json index 50d6563..37379df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,9 +9,8 @@ "version": "1.2.25", "dependencies": { "@onecli-sh/sdk": "^0.2.0", - "better-sqlite3": "^11.8.1", - "cron-parser": "^5.5.0", - "grammy": "^1.39.3", + "better-sqlite3": "11.10.0", + "cron-parser": "5.5.0", "pino": "^9.6.0", "pino-pretty": "^13.0.0", "yaml": "^2.8.2", @@ -696,12 +695,6 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@grammyjs/types": { - "version": "3.25.0", - "resolved": "https://registry.npmjs.org/@grammyjs/types/-/types-3.25.0.tgz", - "integrity": "sha512-iN9i5p+8ZOu9OMxWNcguojQfz4K/PDyMPOnL7PPCON+SoA/F8OKMH3uR7CVUkYfdNe0GCz8QOzAWrnqusQYFOg==", - "license": "MIT" - }, "node_modules/@humanfs/core": { "version": "0.19.1", "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", @@ -1609,18 +1602,6 @@ "url": "https://opencollective.com/vitest" } }, - "node_modules/abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "license": "MIT", - "dependencies": { - "event-target-shim": "^5.0.0" - }, - "engines": { - "node": ">=6.5" - } - }, "node_modules/acorn": { "version": "8.16.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", @@ -1911,6 +1892,7 @@ "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dev": true, "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -2198,15 +2180,6 @@ "node": ">=0.10.0" } }, - "node_modules/event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/expand-template": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", @@ -2391,21 +2364,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/grammy": { - "version": "1.41.1", - "resolved": "https://registry.npmjs.org/grammy/-/grammy-1.41.1.tgz", - "integrity": "sha512-wcHAQ1e7svL3fJMpDchcQVcWUmywhuepOOjHUHmMmWAwUJEIyK5ea5sbSjZd+Gy1aMpZeP8VYJa+4tP+j1YptQ==", - "license": "MIT", - "dependencies": { - "@grammyjs/types": "3.25.0", - "abort-controller": "^3.0.0", - "debug": "^4.4.3", - "node-fetch": "^2.7.0" - }, - "engines": { - "node": "^12.20.0 || >=14.13.1" - } - }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -2756,6 +2714,7 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, "license": "MIT" }, "node_modules/nanoid": { @@ -2801,26 +2760,6 @@ "node": ">=10" } }, - "node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "license": "MIT", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/obug": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.1.tgz", @@ -3543,12 +3482,6 @@ "node": ">=14.0.0" } }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "license": "MIT" - }, "node_modules/ts-api-utils": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz", @@ -3817,22 +3750,6 @@ } } }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "license": "BSD-2-Clause" - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "license": "MIT", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index 8589bbd..8a6361e 100644 --- a/package.json +++ b/package.json @@ -22,13 +22,12 @@ }, "dependencies": { "@onecli-sh/sdk": "^0.2.0", - "better-sqlite3": "^11.8.1", - "cron-parser": "^5.5.0", + "better-sqlite3": "11.10.0", + "cron-parser": "5.5.0", "pino": "^9.6.0", "pino-pretty": "^13.0.0", "yaml": "^2.8.2", - "zod": "^4.3.6", - "grammy": "^1.39.3" + "zod": "^4.3.6" }, "devDependencies": { "@eslint/js": "^9.35.0", From 675a6d87a322c318cd476fd47f7a0bca05dca8d1 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Wed, 25 Mar 2026 13:25:58 +0200 Subject: [PATCH 73/91] chore: remove accidentally merged Telegram channel code Co-Authored-By: Claude Opus 4.6 (1M context) --- src/channels/index.ts | 1 - src/channels/telegram.test.ts | 949 ---------------------------------- src/channels/telegram.ts | 304 ----------- 3 files changed, 1254 deletions(-) delete mode 100644 src/channels/telegram.test.ts delete mode 100644 src/channels/telegram.ts diff --git a/src/channels/index.ts b/src/channels/index.ts index 48356db..44f4f55 100644 --- a/src/channels/index.ts +++ b/src/channels/index.ts @@ -8,6 +8,5 @@ // slack // telegram -import './telegram.js'; // whatsapp diff --git a/src/channels/telegram.test.ts b/src/channels/telegram.test.ts deleted file mode 100644 index 538c87b..0000000 --- a/src/channels/telegram.test.ts +++ /dev/null @@ -1,949 +0,0 @@ -import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest'; - -// --- Mocks --- - -// Mock registry (registerChannel runs at import time) -vi.mock('./registry.js', () => ({ registerChannel: vi.fn() })); - -// Mock env reader (used by the factory, not needed in unit tests) -vi.mock('../env.js', () => ({ readEnvFile: vi.fn(() => ({})) })); - -// Mock config -vi.mock('../config.js', () => ({ - ASSISTANT_NAME: 'Andy', - TRIGGER_PATTERN: /^@Andy\b/i, -})); - -// Mock logger -vi.mock('../logger.js', () => ({ - logger: { - debug: vi.fn(), - info: vi.fn(), - warn: vi.fn(), - error: vi.fn(), - }, -})); - -// --- Grammy mock --- - -type Handler = (...args: any[]) => any; - -const botRef = vi.hoisted(() => ({ current: null as any })); - -vi.mock('grammy', () => ({ - Bot: class MockBot { - token: string; - commandHandlers = new Map(); - filterHandlers = new Map(); - errorHandler: Handler | null = null; - - api = { - sendMessage: vi.fn().mockResolvedValue(undefined), - sendChatAction: vi.fn().mockResolvedValue(undefined), - }; - - constructor(token: string) { - this.token = token; - botRef.current = this; - } - - command(name: string, handler: Handler) { - this.commandHandlers.set(name, handler); - } - - on(filter: string, handler: Handler) { - const existing = this.filterHandlers.get(filter) || []; - existing.push(handler); - this.filterHandlers.set(filter, existing); - } - - catch(handler: Handler) { - this.errorHandler = handler; - } - - start(opts: { onStart: (botInfo: any) => void }) { - opts.onStart({ username: 'andy_ai_bot', id: 12345 }); - } - - stop() {} - }, -})); - -import { TelegramChannel, TelegramChannelOpts } from './telegram.js'; - -// --- Test helpers --- - -function createTestOpts( - overrides?: Partial, -): TelegramChannelOpts { - return { - onMessage: vi.fn(), - onChatMetadata: vi.fn(), - registeredGroups: vi.fn(() => ({ - 'tg:100200300': { - name: 'Test Group', - folder: 'test-group', - trigger: '@Andy', - added_at: '2024-01-01T00:00:00.000Z', - }, - })), - ...overrides, - }; -} - -function createTextCtx(overrides: { - chatId?: number; - chatType?: string; - chatTitle?: string; - text: string; - fromId?: number; - firstName?: string; - username?: string; - messageId?: number; - date?: number; - entities?: any[]; -}) { - const chatId = overrides.chatId ?? 100200300; - const chatType = overrides.chatType ?? 'group'; - return { - chat: { - id: chatId, - type: chatType, - title: overrides.chatTitle ?? 'Test Group', - }, - from: { - id: overrides.fromId ?? 99001, - first_name: overrides.firstName ?? 'Alice', - username: overrides.username ?? 'alice_user', - }, - message: { - text: overrides.text, - date: overrides.date ?? Math.floor(Date.now() / 1000), - message_id: overrides.messageId ?? 1, - entities: overrides.entities ?? [], - }, - me: { username: 'andy_ai_bot' }, - reply: vi.fn(), - }; -} - -function createMediaCtx(overrides: { - chatId?: number; - chatType?: string; - fromId?: number; - firstName?: string; - date?: number; - messageId?: number; - caption?: string; - extra?: Record; -}) { - const chatId = overrides.chatId ?? 100200300; - return { - chat: { - id: chatId, - type: overrides.chatType ?? 'group', - title: 'Test Group', - }, - from: { - id: overrides.fromId ?? 99001, - first_name: overrides.firstName ?? 'Alice', - username: 'alice_user', - }, - message: { - date: overrides.date ?? Math.floor(Date.now() / 1000), - message_id: overrides.messageId ?? 1, - caption: overrides.caption, - ...(overrides.extra || {}), - }, - me: { username: 'andy_ai_bot' }, - }; -} - -function currentBot() { - return botRef.current; -} - -async function triggerTextMessage(ctx: ReturnType) { - const handlers = currentBot().filterHandlers.get('message:text') || []; - for (const h of handlers) await h(ctx); -} - -async function triggerMediaMessage( - filter: string, - ctx: ReturnType, -) { - const handlers = currentBot().filterHandlers.get(filter) || []; - for (const h of handlers) await h(ctx); -} - -// --- Tests --- - -describe('TelegramChannel', () => { - beforeEach(() => { - vi.clearAllMocks(); - }); - - afterEach(() => { - vi.restoreAllMocks(); - }); - - // --- Connection lifecycle --- - - describe('connection lifecycle', () => { - it('resolves connect() when bot starts', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - - await channel.connect(); - - expect(channel.isConnected()).toBe(true); - }); - - it('registers command and message handlers on connect', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - - await channel.connect(); - - expect(currentBot().commandHandlers.has('chatid')).toBe(true); - expect(currentBot().commandHandlers.has('ping')).toBe(true); - expect(currentBot().filterHandlers.has('message:text')).toBe(true); - expect(currentBot().filterHandlers.has('message:photo')).toBe(true); - expect(currentBot().filterHandlers.has('message:video')).toBe(true); - expect(currentBot().filterHandlers.has('message:voice')).toBe(true); - expect(currentBot().filterHandlers.has('message:audio')).toBe(true); - expect(currentBot().filterHandlers.has('message:document')).toBe(true); - expect(currentBot().filterHandlers.has('message:sticker')).toBe(true); - expect(currentBot().filterHandlers.has('message:location')).toBe(true); - expect(currentBot().filterHandlers.has('message:contact')).toBe(true); - }); - - it('registers error handler on connect', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - - await channel.connect(); - - expect(currentBot().errorHandler).not.toBeNull(); - }); - - it('disconnects cleanly', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - - await channel.connect(); - expect(channel.isConnected()).toBe(true); - - await channel.disconnect(); - expect(channel.isConnected()).toBe(false); - }); - - it('isConnected() returns false before connect', () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - - expect(channel.isConnected()).toBe(false); - }); - }); - - // --- Text message handling --- - - describe('text message handling', () => { - it('delivers message for registered group', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createTextCtx({ text: 'Hello everyone' }); - await triggerTextMessage(ctx); - - expect(opts.onChatMetadata).toHaveBeenCalledWith( - 'tg:100200300', - expect.any(String), - 'Test Group', - 'telegram', - true, - ); - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ - id: '1', - chat_jid: 'tg:100200300', - sender: '99001', - sender_name: 'Alice', - content: 'Hello everyone', - is_from_me: false, - }), - ); - }); - - it('only emits metadata for unregistered chats', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createTextCtx({ chatId: 999999, text: 'Unknown chat' }); - await triggerTextMessage(ctx); - - expect(opts.onChatMetadata).toHaveBeenCalledWith( - 'tg:999999', - expect.any(String), - 'Test Group', - 'telegram', - true, - ); - expect(opts.onMessage).not.toHaveBeenCalled(); - }); - - it('skips bot commands (/chatid, /ping) but passes other / messages through', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - // Bot commands should be skipped - const ctx1 = createTextCtx({ text: '/chatid' }); - await triggerTextMessage(ctx1); - expect(opts.onMessage).not.toHaveBeenCalled(); - expect(opts.onChatMetadata).not.toHaveBeenCalled(); - - const ctx2 = createTextCtx({ text: '/ping' }); - await triggerTextMessage(ctx2); - expect(opts.onMessage).not.toHaveBeenCalled(); - - // Non-bot /commands should flow through - const ctx3 = createTextCtx({ text: '/remote-control' }); - await triggerTextMessage(ctx3); - expect(opts.onMessage).toHaveBeenCalledTimes(1); - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ content: '/remote-control' }), - ); - }); - - it('extracts sender name from first_name', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createTextCtx({ text: 'Hi', firstName: 'Bob' }); - await triggerTextMessage(ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ sender_name: 'Bob' }), - ); - }); - - it('falls back to username when first_name missing', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createTextCtx({ text: 'Hi' }); - ctx.from.first_name = undefined as any; - await triggerTextMessage(ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ sender_name: 'alice_user' }), - ); - }); - - it('falls back to user ID when name and username missing', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createTextCtx({ text: 'Hi', fromId: 42 }); - ctx.from.first_name = undefined as any; - ctx.from.username = undefined as any; - await triggerTextMessage(ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ sender_name: '42' }), - ); - }); - - it('uses sender name as chat name for private chats', async () => { - const opts = createTestOpts({ - registeredGroups: vi.fn(() => ({ - 'tg:100200300': { - name: 'Private', - folder: 'private', - trigger: '@Andy', - added_at: '2024-01-01T00:00:00.000Z', - }, - })), - }); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createTextCtx({ - text: 'Hello', - chatType: 'private', - firstName: 'Alice', - }); - await triggerTextMessage(ctx); - - expect(opts.onChatMetadata).toHaveBeenCalledWith( - 'tg:100200300', - expect.any(String), - 'Alice', // Private chats use sender name - 'telegram', - false, - ); - }); - - it('uses chat title as name for group chats', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createTextCtx({ - text: 'Hello', - chatType: 'supergroup', - chatTitle: 'Project Team', - }); - await triggerTextMessage(ctx); - - expect(opts.onChatMetadata).toHaveBeenCalledWith( - 'tg:100200300', - expect.any(String), - 'Project Team', - 'telegram', - true, - ); - }); - - it('converts message.date to ISO timestamp', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const unixTime = 1704067200; // 2024-01-01T00:00:00.000Z - const ctx = createTextCtx({ text: 'Hello', date: unixTime }); - await triggerTextMessage(ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ - timestamp: '2024-01-01T00:00:00.000Z', - }), - ); - }); - }); - - // --- @mention translation --- - - describe('@mention translation', () => { - it('translates @bot_username mention to trigger format', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createTextCtx({ - text: '@andy_ai_bot what time is it?', - entities: [{ type: 'mention', offset: 0, length: 12 }], - }); - await triggerTextMessage(ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ - content: '@Andy @andy_ai_bot what time is it?', - }), - ); - }); - - it('does not translate if message already matches trigger', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createTextCtx({ - text: '@Andy @andy_ai_bot hello', - entities: [{ type: 'mention', offset: 6, length: 12 }], - }); - await triggerTextMessage(ctx); - - // Should NOT double-prepend — already starts with @Andy - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ - content: '@Andy @andy_ai_bot hello', - }), - ); - }); - - it('does not translate mentions of other bots', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createTextCtx({ - text: '@some_other_bot hi', - entities: [{ type: 'mention', offset: 0, length: 15 }], - }); - await triggerTextMessage(ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ - content: '@some_other_bot hi', // No translation - }), - ); - }); - - it('handles mention in middle of message', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createTextCtx({ - text: 'hey @andy_ai_bot check this', - entities: [{ type: 'mention', offset: 4, length: 12 }], - }); - await triggerTextMessage(ctx); - - // Bot is mentioned, message doesn't match trigger → prepend trigger - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ - content: '@Andy hey @andy_ai_bot check this', - }), - ); - }); - - it('handles message with no entities', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createTextCtx({ text: 'plain message' }); - await triggerTextMessage(ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ - content: 'plain message', - }), - ); - }); - - it('ignores non-mention entities', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createTextCtx({ - text: 'check https://example.com', - entities: [{ type: 'url', offset: 6, length: 19 }], - }); - await triggerTextMessage(ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ - content: 'check https://example.com', - }), - ); - }); - }); - - // --- Non-text messages --- - - describe('non-text messages', () => { - it('stores photo with placeholder', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createMediaCtx({}); - await triggerMediaMessage('message:photo', ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ content: '[Photo]' }), - ); - }); - - it('stores photo with caption', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createMediaCtx({ caption: 'Look at this' }); - await triggerMediaMessage('message:photo', ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ content: '[Photo] Look at this' }), - ); - }); - - it('stores video with placeholder', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createMediaCtx({}); - await triggerMediaMessage('message:video', ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ content: '[Video]' }), - ); - }); - - it('stores voice message with placeholder', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createMediaCtx({}); - await triggerMediaMessage('message:voice', ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ content: '[Voice message]' }), - ); - }); - - it('stores audio with placeholder', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createMediaCtx({}); - await triggerMediaMessage('message:audio', ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ content: '[Audio]' }), - ); - }); - - it('stores document with filename', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createMediaCtx({ - extra: { document: { file_name: 'report.pdf' } }, - }); - await triggerMediaMessage('message:document', ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ content: '[Document: report.pdf]' }), - ); - }); - - it('stores document with fallback name when filename missing', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createMediaCtx({ extra: { document: {} } }); - await triggerMediaMessage('message:document', ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ content: '[Document: file]' }), - ); - }); - - it('stores sticker with emoji', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createMediaCtx({ - extra: { sticker: { emoji: '😂' } }, - }); - await triggerMediaMessage('message:sticker', ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ content: '[Sticker 😂]' }), - ); - }); - - it('stores location with placeholder', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createMediaCtx({}); - await triggerMediaMessage('message:location', ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ content: '[Location]' }), - ); - }); - - it('stores contact with placeholder', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createMediaCtx({}); - await triggerMediaMessage('message:contact', ctx); - - expect(opts.onMessage).toHaveBeenCalledWith( - 'tg:100200300', - expect.objectContaining({ content: '[Contact]' }), - ); - }); - - it('ignores non-text messages from unregistered chats', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const ctx = createMediaCtx({ chatId: 999999 }); - await triggerMediaMessage('message:photo', ctx); - - expect(opts.onMessage).not.toHaveBeenCalled(); - }); - }); - - // --- sendMessage --- - - describe('sendMessage', () => { - it('sends message via bot API', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - await channel.sendMessage('tg:100200300', 'Hello'); - - expect(currentBot().api.sendMessage).toHaveBeenCalledWith( - '100200300', - 'Hello', - { parse_mode: 'Markdown' }, - ); - }); - - it('strips tg: prefix from JID', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - await channel.sendMessage('tg:-1001234567890', 'Group message'); - - expect(currentBot().api.sendMessage).toHaveBeenCalledWith( - '-1001234567890', - 'Group message', - { parse_mode: 'Markdown' }, - ); - }); - - it('splits messages exceeding 4096 characters', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const longText = 'x'.repeat(5000); - await channel.sendMessage('tg:100200300', longText); - - expect(currentBot().api.sendMessage).toHaveBeenCalledTimes(2); - expect(currentBot().api.sendMessage).toHaveBeenNthCalledWith( - 1, - '100200300', - 'x'.repeat(4096), - { parse_mode: 'Markdown' }, - ); - expect(currentBot().api.sendMessage).toHaveBeenNthCalledWith( - 2, - '100200300', - 'x'.repeat(904), - { parse_mode: 'Markdown' }, - ); - }); - - it('sends exactly one message at 4096 characters', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const exactText = 'y'.repeat(4096); - await channel.sendMessage('tg:100200300', exactText); - - expect(currentBot().api.sendMessage).toHaveBeenCalledTimes(1); - }); - - it('handles send failure gracefully', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - currentBot().api.sendMessage.mockRejectedValueOnce( - new Error('Network error'), - ); - - // Should not throw - await expect( - channel.sendMessage('tg:100200300', 'Will fail'), - ).resolves.toBeUndefined(); - }); - - it('does nothing when bot is not initialized', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - - // Don't connect — bot is null - await channel.sendMessage('tg:100200300', 'No bot'); - - // No error, no API call - }); - }); - - // --- ownsJid --- - - describe('ownsJid', () => { - it('owns tg: JIDs', () => { - const channel = new TelegramChannel('test-token', createTestOpts()); - expect(channel.ownsJid('tg:123456')).toBe(true); - }); - - it('owns tg: JIDs with negative IDs (groups)', () => { - const channel = new TelegramChannel('test-token', createTestOpts()); - expect(channel.ownsJid('tg:-1001234567890')).toBe(true); - }); - - it('does not own WhatsApp group JIDs', () => { - const channel = new TelegramChannel('test-token', createTestOpts()); - expect(channel.ownsJid('12345@g.us')).toBe(false); - }); - - it('does not own WhatsApp DM JIDs', () => { - const channel = new TelegramChannel('test-token', createTestOpts()); - expect(channel.ownsJid('12345@s.whatsapp.net')).toBe(false); - }); - - it('does not own unknown JID formats', () => { - const channel = new TelegramChannel('test-token', createTestOpts()); - expect(channel.ownsJid('random-string')).toBe(false); - }); - }); - - // --- setTyping --- - - describe('setTyping', () => { - it('sends typing action when isTyping is true', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - await channel.setTyping('tg:100200300', true); - - expect(currentBot().api.sendChatAction).toHaveBeenCalledWith( - '100200300', - 'typing', - ); - }); - - it('does nothing when isTyping is false', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - await channel.setTyping('tg:100200300', false); - - expect(currentBot().api.sendChatAction).not.toHaveBeenCalled(); - }); - - it('does nothing when bot is not initialized', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - - // Don't connect - await channel.setTyping('tg:100200300', true); - - // No error, no API call - }); - - it('handles typing indicator failure gracefully', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - currentBot().api.sendChatAction.mockRejectedValueOnce( - new Error('Rate limited'), - ); - - await expect( - channel.setTyping('tg:100200300', true), - ).resolves.toBeUndefined(); - }); - }); - - // --- Bot commands --- - - describe('bot commands', () => { - it('/chatid replies with chat ID and metadata', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const handler = currentBot().commandHandlers.get('chatid')!; - const ctx = { - chat: { id: 100200300, type: 'group' as const }, - from: { first_name: 'Alice' }, - reply: vi.fn(), - }; - - await handler(ctx); - - expect(ctx.reply).toHaveBeenCalledWith( - expect.stringContaining('tg:100200300'), - expect.objectContaining({ parse_mode: 'Markdown' }), - ); - }); - - it('/chatid shows chat type', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const handler = currentBot().commandHandlers.get('chatid')!; - const ctx = { - chat: { id: 555, type: 'private' as const }, - from: { first_name: 'Bob' }, - reply: vi.fn(), - }; - - await handler(ctx); - - expect(ctx.reply).toHaveBeenCalledWith( - expect.stringContaining('private'), - expect.any(Object), - ); - }); - - it('/ping replies with bot status', async () => { - const opts = createTestOpts(); - const channel = new TelegramChannel('test-token', opts); - await channel.connect(); - - const handler = currentBot().commandHandlers.get('ping')!; - const ctx = { reply: vi.fn() }; - - await handler(ctx); - - expect(ctx.reply).toHaveBeenCalledWith('Andy is online.'); - }); - }); - - // --- Channel properties --- - - describe('channel properties', () => { - it('has name "telegram"', () => { - const channel = new TelegramChannel('test-token', createTestOpts()); - expect(channel.name).toBe('telegram'); - }); - }); -}); diff --git a/src/channels/telegram.ts b/src/channels/telegram.ts deleted file mode 100644 index effca6e..0000000 --- a/src/channels/telegram.ts +++ /dev/null @@ -1,304 +0,0 @@ -import https from 'https'; -import { Api, Bot } from 'grammy'; - -import { ASSISTANT_NAME, TRIGGER_PATTERN } from '../config.js'; -import { readEnvFile } from '../env.js'; -import { logger } from '../logger.js'; -import { registerChannel, ChannelOpts } from './registry.js'; -import { - Channel, - OnChatMetadata, - OnInboundMessage, - RegisteredGroup, -} from '../types.js'; - -export interface TelegramChannelOpts { - onMessage: OnInboundMessage; - onChatMetadata: OnChatMetadata; - registeredGroups: () => Record; -} - -/** - * Send a message with Telegram Markdown parse mode, falling back to plain text. - * Claude's output naturally matches Telegram's Markdown v1 format: - * *bold*, _italic_, `code`, ```code blocks```, [links](url) - */ -async function sendTelegramMessage( - api: { sendMessage: Api['sendMessage'] }, - chatId: string | number, - text: string, - options: { message_thread_id?: number } = {}, -): Promise { - try { - await api.sendMessage(chatId, text, { - ...options, - parse_mode: 'Markdown', - }); - } catch (err) { - // Fallback: send as plain text if Markdown parsing fails - logger.debug({ err }, 'Markdown send failed, falling back to plain text'); - await api.sendMessage(chatId, text, options); - } -} - -export class TelegramChannel implements Channel { - name = 'telegram'; - - private bot: Bot | null = null; - private opts: TelegramChannelOpts; - private botToken: string; - - constructor(botToken: string, opts: TelegramChannelOpts) { - this.botToken = botToken; - this.opts = opts; - } - - async connect(): Promise { - this.bot = new Bot(this.botToken, { - client: { - baseFetchConfig: { agent: https.globalAgent, compress: true }, - }, - }); - - // Command to get chat ID (useful for registration) - this.bot.command('chatid', (ctx) => { - const chatId = ctx.chat.id; - const chatType = ctx.chat.type; - const chatName = - chatType === 'private' - ? ctx.from?.first_name || 'Private' - : (ctx.chat as any).title || 'Unknown'; - - ctx.reply( - `Chat ID: \`tg:${chatId}\`\nName: ${chatName}\nType: ${chatType}`, - { parse_mode: 'Markdown' }, - ); - }); - - // Command to check bot status - this.bot.command('ping', (ctx) => { - ctx.reply(`${ASSISTANT_NAME} is online.`); - }); - - // Telegram bot commands handled above — skip them in the general handler - // so they don't also get stored as messages. All other /commands flow through. - const TELEGRAM_BOT_COMMANDS = new Set(['chatid', 'ping']); - - this.bot.on('message:text', async (ctx) => { - if (ctx.message.text.startsWith('/')) { - const cmd = ctx.message.text.slice(1).split(/[\s@]/)[0].toLowerCase(); - if (TELEGRAM_BOT_COMMANDS.has(cmd)) return; - } - - const chatJid = `tg:${ctx.chat.id}`; - let content = ctx.message.text; - const timestamp = new Date(ctx.message.date * 1000).toISOString(); - const senderName = - ctx.from?.first_name || - ctx.from?.username || - ctx.from?.id.toString() || - 'Unknown'; - const sender = ctx.from?.id.toString() || ''; - const msgId = ctx.message.message_id.toString(); - - // Determine chat name - const chatName = - ctx.chat.type === 'private' - ? senderName - : (ctx.chat as any).title || chatJid; - - // Translate Telegram @bot_username mentions into TRIGGER_PATTERN format. - // Telegram @mentions (e.g., @andy_ai_bot) won't match TRIGGER_PATTERN - // (e.g., ^@Andy\b), so we prepend the trigger when the bot is @mentioned. - const botUsername = ctx.me?.username?.toLowerCase(); - if (botUsername) { - const entities = ctx.message.entities || []; - const isBotMentioned = entities.some((entity) => { - if (entity.type === 'mention') { - const mentionText = content - .substring(entity.offset, entity.offset + entity.length) - .toLowerCase(); - return mentionText === `@${botUsername}`; - } - return false; - }); - if (isBotMentioned && !TRIGGER_PATTERN.test(content)) { - content = `@${ASSISTANT_NAME} ${content}`; - } - } - - // Store chat metadata for discovery - const isGroup = - ctx.chat.type === 'group' || ctx.chat.type === 'supergroup'; - this.opts.onChatMetadata( - chatJid, - timestamp, - chatName, - 'telegram', - isGroup, - ); - - // Only deliver full message for registered groups - const group = this.opts.registeredGroups()[chatJid]; - if (!group) { - logger.debug( - { chatJid, chatName }, - 'Message from unregistered Telegram chat', - ); - return; - } - - // Deliver message — startMessageLoop() will pick it up - this.opts.onMessage(chatJid, { - id: msgId, - chat_jid: chatJid, - sender, - sender_name: senderName, - content, - timestamp, - is_from_me: false, - }); - - logger.info( - { chatJid, chatName, sender: senderName }, - 'Telegram message stored', - ); - }); - - // Handle non-text messages with placeholders so the agent knows something was sent - const storeNonText = (ctx: any, placeholder: string) => { - const chatJid = `tg:${ctx.chat.id}`; - const group = this.opts.registeredGroups()[chatJid]; - if (!group) return; - - const timestamp = new Date(ctx.message.date * 1000).toISOString(); - const senderName = - ctx.from?.first_name || - ctx.from?.username || - ctx.from?.id?.toString() || - 'Unknown'; - const caption = ctx.message.caption ? ` ${ctx.message.caption}` : ''; - - const isGroup = - ctx.chat.type === 'group' || ctx.chat.type === 'supergroup'; - this.opts.onChatMetadata( - chatJid, - timestamp, - undefined, - 'telegram', - isGroup, - ); - this.opts.onMessage(chatJid, { - id: ctx.message.message_id.toString(), - chat_jid: chatJid, - sender: ctx.from?.id?.toString() || '', - sender_name: senderName, - content: `${placeholder}${caption}`, - timestamp, - is_from_me: false, - }); - }; - - this.bot.on('message:photo', (ctx) => storeNonText(ctx, '[Photo]')); - this.bot.on('message:video', (ctx) => storeNonText(ctx, '[Video]')); - this.bot.on('message:voice', (ctx) => storeNonText(ctx, '[Voice message]')); - this.bot.on('message:audio', (ctx) => storeNonText(ctx, '[Audio]')); - this.bot.on('message:document', (ctx) => { - const name = ctx.message.document?.file_name || 'file'; - storeNonText(ctx, `[Document: ${name}]`); - }); - this.bot.on('message:sticker', (ctx) => { - const emoji = ctx.message.sticker?.emoji || ''; - storeNonText(ctx, `[Sticker ${emoji}]`); - }); - this.bot.on('message:location', (ctx) => storeNonText(ctx, '[Location]')); - this.bot.on('message:contact', (ctx) => storeNonText(ctx, '[Contact]')); - - // Handle errors gracefully - this.bot.catch((err) => { - logger.error({ err: err.message }, 'Telegram bot error'); - }); - - // Start polling — returns a Promise that resolves when started - return new Promise((resolve) => { - this.bot!.start({ - onStart: (botInfo) => { - logger.info( - { username: botInfo.username, id: botInfo.id }, - 'Telegram bot connected', - ); - console.log(`\n Telegram bot: @${botInfo.username}`); - console.log( - ` Send /chatid to the bot to get a chat's registration ID\n`, - ); - resolve(); - }, - }); - }); - } - - async sendMessage(jid: string, text: string): Promise { - if (!this.bot) { - logger.warn('Telegram bot not initialized'); - return; - } - - try { - const numericId = jid.replace(/^tg:/, ''); - - // Telegram has a 4096 character limit per message — split if needed - const MAX_LENGTH = 4096; - if (text.length <= MAX_LENGTH) { - await sendTelegramMessage(this.bot.api, numericId, text); - } else { - for (let i = 0; i < text.length; i += MAX_LENGTH) { - await sendTelegramMessage( - this.bot.api, - numericId, - text.slice(i, i + MAX_LENGTH), - ); - } - } - logger.info({ jid, length: text.length }, 'Telegram message sent'); - } catch (err) { - logger.error({ jid, err }, 'Failed to send Telegram message'); - } - } - - isConnected(): boolean { - return this.bot !== null; - } - - ownsJid(jid: string): boolean { - return jid.startsWith('tg:'); - } - - async disconnect(): Promise { - if (this.bot) { - this.bot.stop(); - this.bot = null; - logger.info('Telegram bot stopped'); - } - } - - async setTyping(jid: string, isTyping: boolean): Promise { - if (!this.bot || !isTyping) return; - try { - const numericId = jid.replace(/^tg:/, ''); - await this.bot.api.sendChatAction(numericId, 'typing'); - } catch (err) { - logger.debug({ jid, err }, 'Failed to send Telegram typing indicator'); - } - } -} - -registerChannel('telegram', (opts: ChannelOpts) => { - const envVars = readEnvFile(['TELEGRAM_BOT_TOKEN']); - const token = - process.env.TELEGRAM_BOT_TOKEN || envVars.TELEGRAM_BOT_TOKEN || ''; - if (!token) { - logger.warn('Telegram: TELEGRAM_BOT_TOKEN not set'); - return null; - } - return new TelegramChannel(token, opts); -}); From 093530a4180b7186e117011bed5852ad4a49d8c1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 25 Mar 2026 11:26:17 +0000 Subject: [PATCH 74/91] chore: bump version to 1.2.27 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4910b4f..1e0a7e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.26", + "version": "1.2.27", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.26", + "version": "1.2.27", "dependencies": { "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "11.10.0", diff --git a/package.json b/package.json index 83aa994..91746b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.26", + "version": "1.2.27", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From 6e5834ee3cb7543578e165946a908deee43b5b97 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 25 Mar 2026 11:26:22 +0000 Subject: [PATCH 75/91] =?UTF-8?q?docs:=20update=20token=20count=20to=2040.?= =?UTF-8?q?1k=20tokens=20=C2=B7=2020%=20of=20context=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo-tokens/badge.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo-tokens/badge.svg b/repo-tokens/badge.svg index 93aeb17..301a593 100644 --- a/repo-tokens/badge.svg +++ b/repo-tokens/badge.svg @@ -1,5 +1,5 @@ - - 42.4k tokens, 21% of context window + + 40.1k tokens, 20% of context window @@ -15,8 +15,8 @@ tokens - - 42.4k + + 40.1k From d622a79fe24aa10079a3bd39c5e777a45a9f0f8d Mon Sep 17 00:00:00 2001 From: Koshkoshinsk Date: Wed, 25 Mar 2026 11:41:25 +0000 Subject: [PATCH 76/91] fix: suppress spurious chat message on script skip When a script returns wakeAgent=false, set result to null so the host doesn't forward an internal status string to the user's chat. Co-Authored-By: Claude Opus 4.6 (1M context) --- container/agent-runner/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/agent-runner/src/index.ts b/container/agent-runner/src/index.ts index 382439f..25554f9 100644 --- a/container/agent-runner/src/index.ts +++ b/container/agent-runner/src/index.ts @@ -566,7 +566,7 @@ async function main(): Promise { log(`Script decided not to wake agent: ${reason}`); writeOutput({ status: 'success', - result: `Script: ${reason}`, + result: null, }); return; } From d4073a01c579fbdcfd699817135353ad15b2afc9 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Wed, 25 Mar 2026 14:08:47 +0200 Subject: [PATCH 77/91] chore: remove auto-sync GitHub Actions These workflows auto-resolved package.json conflicts with --theirs, silently stripping fork-specific dependencies during upstream syncs. Co-Authored-By: Claude Opus 4.6 (1M context) --- .github/workflows/fork-sync-skills.yml | 256 --------------------- .github/workflows/merge-forward-skills.yml | 179 -------------- 2 files changed, 435 deletions(-) delete mode 100644 .github/workflows/fork-sync-skills.yml delete mode 100644 .github/workflows/merge-forward-skills.yml diff --git a/.github/workflows/fork-sync-skills.yml b/.github/workflows/fork-sync-skills.yml deleted file mode 100644 index 4191695..0000000 --- a/.github/workflows/fork-sync-skills.yml +++ /dev/null @@ -1,256 +0,0 @@ -name: Sync upstream & merge-forward skill branches - -on: - # Triggered by upstream repo via repository_dispatch - repository_dispatch: - types: [upstream-main-updated] - # Fallback: run on a schedule in case dispatch isn't configured - schedule: - - cron: '0 */6 * * *' # every 6 hours - # Also run when fork's main is pushed directly - push: - branches: [main] - workflow_dispatch: - -permissions: - contents: write - issues: write - -concurrency: - group: fork-sync - cancel-in-progress: true - -jobs: - sync-and-merge: - if: github.repository != 'qwibitai/nanoclaw' - runs-on: ubuntu-latest - steps: - - uses: actions/create-github-app-token@v1 - id: app-token - with: - app-id: ${{ secrets.APP_ID }} - private-key: ${{ secrets.APP_PRIVATE_KEY }} - - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - token: ${{ steps.app-token.outputs.token }} - - - uses: actions/setup-node@v4 - with: - node-version: 20 - cache: npm - - - name: Configure git - run: | - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - - - name: Sync with upstream main - id: sync - run: | - # Add upstream remote - git remote add upstream https://github.com/qwibitai/nanoclaw.git - git fetch upstream main - - # Check if upstream has new commits - if git merge-base --is-ancestor upstream/main HEAD; then - echo "Already up to date with upstream main." - echo "synced=false" >> "$GITHUB_OUTPUT" - exit 0 - fi - - # Merge upstream main into fork's main - if ! git merge upstream/main --no-edit; then - # Auto-resolve trivial conflicts (lockfile, badge, package.json version) - CONFLICTED=$(git diff --name-only --diff-filter=U) - AUTO_RESOLVABLE=true - for f in $CONFLICTED; do - case "$f" in - package-lock.json|package.json|repo-tokens/badge.svg|.github/workflows/*) - git checkout --theirs "$f" - git add "$f" - ;; - .env.example) - # Keep fork's channel-specific env vars - git checkout --ours "$f" - git add "$f" - ;; - *) - AUTO_RESOLVABLE=false - ;; - esac - done - - if [ "$AUTO_RESOLVABLE" = false ]; then - echo "::error::Failed to merge upstream/main into fork main — non-trivial conflicts detected" - git merge --abort - echo "synced=false" >> "$GITHUB_OUTPUT" - echo "sync_failed=true" >> "$GITHUB_OUTPUT" - exit 0 - fi - - git commit --no-edit - echo "Auto-resolved lockfile/badge/version conflicts" - fi - - # Regenerate lockfile to match merged package.json - npm ci - if ! npm run build; then - echo "::error::Build failed after merging upstream/main" - git reset --hard "origin/main" - echo "synced=false" >> "$GITHUB_OUTPUT" - echo "sync_failed=true" >> "$GITHUB_OUTPUT" - exit 0 - fi - - if ! npm test 2>/dev/null; then - echo "::error::Tests failed after merging upstream/main" - git reset --hard "origin/main" - echo "synced=false" >> "$GITHUB_OUTPUT" - echo "sync_failed=true" >> "$GITHUB_OUTPUT" - exit 0 - fi - - git push origin main - echo "synced=true" >> "$GITHUB_OUTPUT" - - - name: Merge main into skill branches - id: merge - run: | - # Re-fetch to pick up any changes pushed since job start - git fetch origin - - FAILED="" - SUCCEEDED="" - - # List all remote skill branches - SKILL_BRANCHES=$(git branch -r --list 'origin/skill/*' | sed 's|origin/||' | xargs) - - if [ -z "$SKILL_BRANCHES" ]; then - echo "No skill branches found." - exit 0 - fi - - for BRANCH in $SKILL_BRANCHES; do - SKILL_NAME=$(echo "$BRANCH" | sed 's|skill/||') - echo "" - echo "=== Processing $BRANCH ===" - - git checkout -B "$BRANCH" "origin/$BRANCH" - - if ! git merge main --no-edit; then - # Auto-resolve trivial conflicts - CONFLICTED=$(git diff --name-only --diff-filter=U) - CAN_AUTO=true - for f in $CONFLICTED; do - case "$f" in - package-lock.json|package.json|repo-tokens/badge.svg) - git checkout --theirs "$f" - git add "$f" - ;; - *) - CAN_AUTO=false - ;; - esac - done - if [ "$CAN_AUTO" = false ]; then - echo "::warning::Merge conflict in $BRANCH" - git merge --abort - FAILED="$FAILED $SKILL_NAME" - continue - fi - git commit --no-edit - fi - - # Check if there's anything new to push - if git diff --quiet "origin/$BRANCH"; then - echo "$BRANCH is already up to date with main." - SUCCEEDED="$SUCCEEDED $SKILL_NAME" - continue - fi - - npm ci - - if ! npm run build; then - echo "::warning::Build failed for $BRANCH" - git reset --hard "origin/$BRANCH" - FAILED="$FAILED $SKILL_NAME" - continue - fi - - if ! npm test 2>/dev/null; then - echo "::warning::Tests failed for $BRANCH" - git reset --hard "origin/$BRANCH" - FAILED="$FAILED $SKILL_NAME" - continue - fi - - git push origin "$BRANCH" - SUCCEEDED="$SUCCEEDED $SKILL_NAME" - echo "$BRANCH merged and pushed successfully." - done - - echo "" - echo "=== Results ===" - echo "Succeeded: $SUCCEEDED" - echo "Failed: $FAILED" - - echo "failed=$FAILED" >> "$GITHUB_OUTPUT" - echo "succeeded=$SUCCEEDED" >> "$GITHUB_OUTPUT" - - - name: Open issue for upstream sync failure - if: steps.sync.outputs.sync_failed == 'true' - uses: actions/github-script@v7 - with: - script: | - await github.rest.issues.create({ - owner: context.repo.owner, - repo: context.repo.repo, - title: `Upstream sync failed — merge conflict or build failure`, - body: [ - 'The automated sync with `qwibitai/nanoclaw` main failed.', - '', - 'This usually means upstream made changes that conflict with this fork\'s channel code.', - '', - 'To resolve manually:', - '```bash', - 'git fetch upstream main', - 'git merge upstream/main', - '# resolve conflicts', - 'npm run build && npm test', - 'git push', - '```', - ].join('\n'), - labels: ['upstream-sync'] - }); - - - name: Open issue for failed skill merges - if: steps.merge.outputs.failed != '' - uses: actions/github-script@v7 - with: - script: | - const failed = '${{ steps.merge.outputs.failed }}'.trim().split(/\s+/); - const body = [ - `The merge-forward workflow failed to merge \`main\` into the following skill branches:`, - '', - ...failed.map(s => `- \`skill/${s}\`: merge conflict, build failure, or test failure`), - '', - 'Please resolve manually:', - '```bash', - ...failed.map(s => [ - `git checkout skill/${s}`, - `git merge main`, - `# resolve conflicts, then: git push`, - '' - ]).flat(), - '```', - ].join('\n'); - - await github.rest.issues.create({ - owner: context.repo.owner, - repo: context.repo.repo, - title: `Merge-forward failed for ${failed.length} skill branch(es)`, - body, - labels: ['skill-maintenance'] - }); \ No newline at end of file diff --git a/.github/workflows/merge-forward-skills.yml b/.github/workflows/merge-forward-skills.yml deleted file mode 100644 index 82471b0..0000000 --- a/.github/workflows/merge-forward-skills.yml +++ /dev/null @@ -1,179 +0,0 @@ -name: Merge-forward skill branches - -on: - push: - branches: [main] - -permissions: - contents: write - issues: write - -jobs: - merge-forward: - if: github.repository == 'qwibitai/nanoclaw' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - token: ${{ secrets.GITHUB_TOKEN }} - - - uses: actions/setup-node@v4 - with: - node-version: 20 - cache: npm - - - name: Configure git - run: | - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - - - name: Merge main into each skill branch - id: merge - run: | - FAILED="" - SUCCEEDED="" - - # List all remote skill branches - SKILL_BRANCHES=$(git branch -r --list 'origin/skill/*' | sed 's|origin/||' | xargs) - - if [ -z "$SKILL_BRANCHES" ]; then - echo "No skill branches found." - exit 0 - fi - - for BRANCH in $SKILL_BRANCHES; do - SKILL_NAME=$(echo "$BRANCH" | sed 's|skill/||') - echo "" - echo "=== Processing $BRANCH ===" - - # Checkout the skill branch - git checkout -B "$BRANCH" "origin/$BRANCH" - - # Attempt merge - if ! git merge main --no-edit; then - # Auto-resolve trivial conflicts - CONFLICTED=$(git diff --name-only --diff-filter=U) - CAN_AUTO=true - for f in $CONFLICTED; do - case "$f" in - package-lock.json|package.json|repo-tokens/badge.svg) - git checkout --theirs "$f" - git add "$f" - ;; - *) - CAN_AUTO=false - ;; - esac - done - if [ "$CAN_AUTO" = false ]; then - echo "::warning::Merge conflict in $BRANCH" - git merge --abort - FAILED="$FAILED $SKILL_NAME" - continue - fi - git commit --no-edit - fi - - # Check if there's anything new to push - if git diff --quiet "origin/$BRANCH"; then - echo "$BRANCH is already up to date with main." - SUCCEEDED="$SUCCEEDED $SKILL_NAME" - continue - fi - - # Install deps and validate - npm ci - - if ! npm run build; then - echo "::warning::Build failed for $BRANCH" - git reset --hard "origin/$BRANCH" - FAILED="$FAILED $SKILL_NAME" - continue - fi - - if ! npm test 2>/dev/null; then - echo "::warning::Tests failed for $BRANCH" - git reset --hard "origin/$BRANCH" - FAILED="$FAILED $SKILL_NAME" - continue - fi - - # Push the updated branch - git push origin "$BRANCH" - SUCCEEDED="$SUCCEEDED $SKILL_NAME" - echo "$BRANCH merged and pushed successfully." - done - - echo "" - echo "=== Results ===" - echo "Succeeded: $SUCCEEDED" - echo "Failed: $FAILED" - - # Export for issue creation - echo "failed=$FAILED" >> "$GITHUB_OUTPUT" - echo "succeeded=$SUCCEEDED" >> "$GITHUB_OUTPUT" - - - name: Open issue for failed merges - if: steps.merge.outputs.failed != '' - uses: actions/github-script@v7 - with: - script: | - const failed = '${{ steps.merge.outputs.failed }}'.trim().split(/\s+/); - const sha = context.sha.substring(0, 7); - const body = [ - `The merge-forward workflow failed to merge \`main\` (${sha}) into the following skill branches:`, - '', - ...failed.map(s => `- \`skill/${s}\`: merge conflict, build failure, or test failure`), - '', - 'Please resolve manually:', - '```bash', - ...failed.map(s => [ - `git checkout skill/${s}`, - `git merge main`, - `# resolve conflicts, then: git push`, - '' - ]).flat(), - '```', - '', - `Triggered by push to main: ${context.sha}` - ].join('\n'); - - await github.rest.issues.create({ - owner: context.repo.owner, - repo: context.repo.repo, - title: `Merge-forward failed for ${failed.length} skill branch(es) after ${sha}`, - body, - labels: ['skill-maintenance'] - }); - - - name: Notify channel forks - if: always() - uses: actions/github-script@v7 - with: - github-token: ${{ secrets.FORK_DISPATCH_TOKEN || secrets.GITHUB_TOKEN }} - script: | - const forks = [ - 'nanoclaw-whatsapp', - 'nanoclaw-telegram', - 'nanoclaw-discord', - 'nanoclaw-slack', - 'nanoclaw-gmail', - 'nanoclaw-docker-sandboxes', - 'nanoclaw-docker-sandbox', - 'nanoclaw-docker-sandbox-windows', - ]; - const sha = context.sha.substring(0, 7); - for (const repo of forks) { - try { - await github.rest.repos.createDispatchEvent({ - owner: 'qwibitai', - repo, - event_type: 'upstream-main-updated', - client_payload: { sha: context.sha }, - }); - console.log(`Notified ${repo}`); - } catch (e) { - console.log(`Failed to notify ${repo}: ${e.message}`); - } - } From 80f6fb2b9abd57a844243b4d58a6d0e573dcdf16 Mon Sep 17 00:00:00 2001 From: NanoClaw User Date: Wed, 25 Mar 2026 13:37:01 +0000 Subject: [PATCH 78/91] style: fix prettier formatting in registerGroup template copy Co-Authored-By: Claude Opus 4.6 (1M context) --- src/index.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/index.ts b/src/index.ts index 1465d56..f78d8e9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -143,10 +143,7 @@ function registerGroup(jid: string, group: RegisteredGroup): void { let content = fs.readFileSync(templateFile, 'utf-8'); if (ASSISTANT_NAME !== 'Andy') { content = content.replace(/^# Andy$/m, `# ${ASSISTANT_NAME}`); - content = content.replace( - /You are Andy/g, - `You are ${ASSISTANT_NAME}`, - ); + content = content.replace(/You are Andy/g, `You are ${ASSISTANT_NAME}`); } fs.writeFileSync(groupMdFile, content); logger.info({ folder: group.folder }, 'Created CLAUDE.md from template'); From b7434b8a76b7fb33ba85348e0f5054e048bfbd87 Mon Sep 17 00:00:00 2001 From: Koshkoshinsk Date: Wed, 25 Mar 2026 14:07:59 +0000 Subject: [PATCH 79/91] fix: use explicit Read tool directive for diagnostics instructions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous wording ("Send diagnostics data by following ...") was too passive — Claude treated the backtick-quoted path as informational rather than an action, so the diagnostics file was never actually read and the PostHog prompt was silently skipped. Co-Authored-By: Claude Opus 4.6 (1M context) --- .claude/skills/setup/SKILL.md | 3 ++- .claude/skills/update-nanoclaw/SKILL.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.claude/skills/setup/SKILL.md b/.claude/skills/setup/SKILL.md index e12e0ea..54c3d2d 100644 --- a/.claude/skills/setup/SKILL.md +++ b/.claude/skills/setup/SKILL.md @@ -287,4 +287,5 @@ Tell user to test: send a message in their registered chat. Show: `tail -f logs/ ## 9. Diagnostics -Send diagnostics data by following `.claude/skills/setup/diagnostics.md`. +1. Use the Read tool to read `.claude/skills/setup/diagnostics.md`. +2. Follow every step in that file before completing setup. diff --git a/.claude/skills/update-nanoclaw/SKILL.md b/.claude/skills/update-nanoclaw/SKILL.md index 2207910..496d409 100644 --- a/.claude/skills/update-nanoclaw/SKILL.md +++ b/.claude/skills/update-nanoclaw/SKILL.md @@ -237,4 +237,5 @@ Tell the user: ## Diagnostics -Send diagnostics data by following `.claude/skills/update-nanoclaw/diagnostics.md`. +1. Use the Read tool to read `.claude/skills/update-nanoclaw/diagnostics.md`. +2. Follow every step in that file before finishing. From 0240f48751914a3ab648245fbaec7d4f38b7da76 Mon Sep 17 00:00:00 2001 From: NanoClaw User Date: Wed, 25 Mar 2026 14:43:08 +0000 Subject: [PATCH 80/91] fix: use main template for isMain groups in runtime registration Main groups (e.g. telegram_main) should get the full main template with Admin Context section, not the minimal global template. Co-Authored-By: Claude Opus 4.6 (1M context) --- src/index.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index f78d8e9..b3746f8 100644 --- a/src/index.ts +++ b/src/index.ts @@ -138,7 +138,11 @@ function registerGroup(jid: string, group: RegisteredGroup): void { // identity and instructions from the first run. (Fixes #1391) const groupMdFile = path.join(groupDir, 'CLAUDE.md'); if (!fs.existsSync(groupMdFile)) { - const templateFile = path.join(GROUPS_DIR, 'global', 'CLAUDE.md'); + const templateFile = path.join( + GROUPS_DIR, + group.isMain ? 'main' : 'global', + 'CLAUDE.md', + ); if (fs.existsSync(templateFile)) { let content = fs.readFileSync(templateFile, 'utf-8'); if (ASSISTANT_NAME !== 'Andy') { From 31c03cf92406271a1c5866874ab8bb1a1489e14a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 25 Mar 2026 15:27:45 +0000 Subject: [PATCH 81/91] chore: bump version to 1.2.28 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1e0a7e3..0b699ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.27", + "version": "1.2.28", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.27", + "version": "1.2.28", "dependencies": { "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "11.10.0", diff --git a/package.json b/package.json index 91746b0..a7f6a5f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.27", + "version": "1.2.28", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From 9391304e7043c9c07a839d72219c7ffbe92a704e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 25 Mar 2026 15:27:47 +0000 Subject: [PATCH 82/91] =?UTF-8?q?docs:=20update=20token=20count=20to=2040.?= =?UTF-8?q?2k=20tokens=20=C2=B7=2020%=20of=20context=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo-tokens/badge.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo-tokens/badge.svg b/repo-tokens/badge.svg index 301a593..8c3b0c8 100644 --- a/repo-tokens/badge.svg +++ b/repo-tokens/badge.svg @@ -1,5 +1,5 @@ - - 40.1k tokens, 20% of context window + + 40.2k tokens, 20% of context window @@ -15,8 +15,8 @@ tokens - - 40.1k + + 40.2k From bb736f37f2ea8a23dab905c7d885492082ec2bf0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 25 Mar 2026 15:28:25 +0000 Subject: [PATCH 83/91] chore: bump version to 1.2.29 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0b699ed..4128040 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.28", + "version": "1.2.29", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.28", + "version": "1.2.29", "dependencies": { "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "11.10.0", diff --git a/package.json b/package.json index a7f6a5f..0822ed9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.28", + "version": "1.2.29", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From df76dc6797807ee9702c56a30731086fca63dab6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 25 Mar 2026 15:28:27 +0000 Subject: [PATCH 84/91] =?UTF-8?q?docs:=20update=20token=20count=20to=2041.?= =?UTF-8?q?0k=20tokens=20=C2=B7=2020%=20of=20context=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo-tokens/badge.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo-tokens/badge.svg b/repo-tokens/badge.svg index 8c3b0c8..be808ed 100644 --- a/repo-tokens/badge.svg +++ b/repo-tokens/badge.svg @@ -1,5 +1,5 @@ - - 40.2k tokens, 20% of context window + + 41.0k tokens, 20% of context window @@ -15,8 +15,8 @@ tokens - - 40.2k + + 41.0k From fd444681ef571f13a37153a4b80d6cd6a2f6b19f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 25 Mar 2026 15:36:23 +0000 Subject: [PATCH 85/91] chore: bump version to 1.2.30 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4128040..68f9244 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.29", + "version": "1.2.30", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.29", + "version": "1.2.30", "dependencies": { "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "11.10.0", diff --git a/package.json b/package.json index 0822ed9..3ceb71f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.29", + "version": "1.2.30", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From b8f6a9b794a043e6bd9a0be496322d85a5c62eb9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 25 Mar 2026 15:36:26 +0000 Subject: [PATCH 86/91] =?UTF-8?q?docs:=20update=20token=20count=20to=2041.?= =?UTF-8?q?2k=20tokens=20=C2=B7=2021%=20of=20context=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo-tokens/badge.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo-tokens/badge.svg b/repo-tokens/badge.svg index be808ed..50f3af8 100644 --- a/repo-tokens/badge.svg +++ b/repo-tokens/badge.svg @@ -1,5 +1,5 @@ - - 41.0k tokens, 20% of context window + + 41.2k tokens, 21% of context window @@ -15,8 +15,8 @@ tokens - - 41.0k + + 41.2k From 6d4f972ad02aba57a799dcf49c4160f2d1f2c0c8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 25 Mar 2026 15:37:53 +0000 Subject: [PATCH 87/91] chore: bump version to 1.2.31 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 68f9244..9cd9fae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.30", + "version": "1.2.31", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.30", + "version": "1.2.31", "dependencies": { "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "11.10.0", diff --git a/package.json b/package.json index 3ceb71f..056e931 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.30", + "version": "1.2.31", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From 7bba21af1e71422618891e1995f08ad4825eb504 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Wed, 25 Mar 2026 22:01:54 +0200 Subject: [PATCH 88/91] feat(skill): add channel-formatting skill Adds SKILL.md for channel-aware text formatting. When applied, converts Claude's Markdown output to each channel's native syntax (WhatsApp, Telegram, Slack) before delivery. Source code lives on the skill/channel-formatting branch. Co-Authored-By: Ken Bolton Co-Authored-By: Claude Sonnet 4.6 --- .claude/skills/channel-formatting/SKILL.md | 137 +++++++++++++++++++++ 1 file changed, 137 insertions(+) create mode 100644 .claude/skills/channel-formatting/SKILL.md diff --git a/.claude/skills/channel-formatting/SKILL.md b/.claude/skills/channel-formatting/SKILL.md new file mode 100644 index 0000000..b995fb8 --- /dev/null +++ b/.claude/skills/channel-formatting/SKILL.md @@ -0,0 +1,137 @@ +--- +name: channel-formatting +description: Convert Claude's Markdown output to each channel's native text syntax before delivery. Adds zero-dependency formatting for WhatsApp, Telegram, and Slack (marker substitution). Also ships a Signal rich-text helper (parseSignalStyles) used by the Signal skill. +--- + +# Channel Formatting + +This skill wires channel-aware Markdown conversion into the outbound pipeline so Claude's +responses render natively on each platform — no more literal `**asterisks**` in WhatsApp or +Telegram. + +| Channel | Transformation | +|---------|---------------| +| WhatsApp | `**bold**` → `*bold*`, `*italic*` → `_italic_`, headings → bold, links flattened | +| Telegram | same as WhatsApp | +| Slack | same as WhatsApp, but links become `` | +| Discord | passthrough (Discord already renders Markdown) | +| Signal | passthrough for `parseTextStyles`; `parseSignalStyles` in `src/text-styles.ts` produces plain text + native `textStyle` ranges for use by the Signal skill | + +Code blocks (fenced and inline) are always protected — their content is never transformed. + +## Phase 1: Pre-flight + +### Check if already applied + +```bash +test -f src/text-styles.ts && echo "already applied" || echo "not yet applied" +``` + +If `already applied`, skip to Phase 3 (Verify). + +## Phase 2: Apply Code Changes + +### Ensure the upstream remote + +```bash +git remote -v +``` + +If an `upstream` remote pointing to `https://github.com/qwibitai/nanoclaw.git` is missing, +add it: + +```bash +git remote add upstream https://github.com/qwibitai/nanoclaw.git +``` + +### Merge the skill branch + +```bash +git fetch upstream skill/channel-formatting +git merge upstream/skill/channel-formatting +``` + +If there are merge conflicts on `package-lock.json`, resolve them by accepting the incoming +version and continuing: + +```bash +git checkout --theirs package-lock.json +git add package-lock.json +git merge --continue +``` + +For any other conflict, read the conflicted file and reconcile both sides manually. + +This merge adds: + +- `src/text-styles.ts` — `parseTextStyles(text, channel)` for marker substitution and + `parseSignalStyles(text)` for Signal native rich text +- `src/router.ts` — `formatOutbound` gains an optional `channel` parameter; when provided + it calls `parseTextStyles` after stripping `` tags +- `src/index.ts` — both outbound `sendMessage` paths pass `channel.name` to `formatOutbound` +- `src/formatting.test.ts` — test coverage for both functions across all channels + +### Validate + +```bash +npm install +npm run build +npx vitest run src/formatting.test.ts +``` + +All 73 tests should pass and the build should be clean before continuing. + +## Phase 3: Verify + +### Rebuild and restart + +```bash +npm run build +launchctl kickstart -k gui/$(id -u)/com.nanoclaw # macOS +# Linux: systemctl --user restart nanoclaw +``` + +### Spot-check formatting + +Send a message through any registered WhatsApp or Telegram chat that will trigger a +response from Claude. Ask something that will produce formatted output, such as: + +> Summarise the three main advantages of TypeScript using bullet points and **bold** headings. + +Confirm that the response arrives with native bold (`*text*`) rather than raw double +asterisks. + +### Check logs if needed + +```bash +tail -f logs/nanoclaw.log +``` + +## Signal Skill Integration + +If you have the Signal skill installed, `src/channels/signal.ts` can import +`parseSignalStyles` from the newly present `src/text-styles.ts`: + +```typescript +import { parseSignalStyles, SignalTextStyle } from '../text-styles.js'; +``` + +`parseSignalStyles` returns `{ text: string, textStyle: SignalTextStyle[] }` where +`textStyle` is an array of `{ style, start, length }` objects suitable for the +`signal-cli` JSON-RPC `textStyles` parameter (format: `"start:length:STYLE"`). + +## Removal + +```bash +# Remove the new file +rm src/text-styles.ts + +# Revert router.ts to remove the channel param +git diff upstream/main src/router.ts # review changes +git checkout upstream/main -- src/router.ts + +# Revert the index.ts sendMessage call sites to plain formatOutbound(rawText) +# (edit manually or: git checkout upstream/main -- src/index.ts) + +npm run build +``` \ No newline at end of file From 1f36232ef0e8b35018c0ac2e2318c23837b94be5 Mon Sep 17 00:00:00 2001 From: flobo3 Date: Wed, 25 Mar 2026 22:25:00 +0200 Subject: [PATCH 89/91] docs: add flobo3 to contributors --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 1d4a5de..ca7f3cb 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -13,3 +13,4 @@ Thanks to everyone who has contributed to NanoClaw! - [baijunjie](https://github.com/baijunjie) — BaiJunjie - [Michaelliv](https://github.com/Michaelliv) — Michael - [kk17](https://github.com/kk17) — Kyle Zhike Chen +- [flobo3](https://github.com/flobo3) — Flo From 3a26f69c7fa558a402c248f016435a8fd64410b2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 25 Mar 2026 20:39:06 +0000 Subject: [PATCH 90/91] chore: bump version to 1.2.32 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9cd9fae..987b285 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.31", + "version": "1.2.32", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.31", + "version": "1.2.32", "dependencies": { "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "11.10.0", diff --git a/package.json b/package.json index 056e931..0095817 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.31", + "version": "1.2.32", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js", From 7bfd060536a183a667d8e5f65286ec7157a0ac92 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 25 Mar 2026 20:47:41 +0000 Subject: [PATCH 91/91] chore: bump version to 1.2.33 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 987b285..e8033ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nanoclaw", - "version": "1.2.32", + "version": "1.2.33", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nanoclaw", - "version": "1.2.32", + "version": "1.2.33", "dependencies": { "@onecli-sh/sdk": "^0.2.0", "better-sqlite3": "11.10.0", diff --git a/package.json b/package.json index 0095817..dfa9afa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nanoclaw", - "version": "1.2.32", + "version": "1.2.33", "description": "Personal Claude assistant. Lightweight, secure, customizable.", "type": "module", "main": "dist/index.js",