agent-sin 0.1.12 → 0.1.15

package/dist/core/skill-registry.d.ts

@@ -6,6 +6,7 @@ export interface SkillOutputDefinition {
     path: string;
     filename: string;
     append?: boolean;
+    merge_mode?: "overwrite" | "append" | "update_or_append";
     show_saved?: boolean;
 }
 export type DiscordSlashOptionType = "string" | "integer" | "number" | "boolean";
@@ -53,6 +54,10 @@ export interface SkillManifest {
         read?: boolean;
         write?: boolean;
     };
+    history?: {
+        read?: boolean;
+        write?: boolean;
+    };
     retry?: {
         max_attempts?: number;
         delay_ms?: number;

package/dist/core/skill-registry.js

@@ -67,11 +67,22 @@ export async function loadSkillManifest(skillDir) {
         enabled: parsed.enabled ?? true,
         output_mode: parsed.output_mode,
         side_effect: parsed.side_effect === true,
+        history: normalizeHistoryConfig(parsed.history),
         dir: skillDir,
         source,
         override,
     };
 }
+function normalizeHistoryConfig(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return undefined;
+    const raw = value;
+    const read = raw.read === true;
+    const write = raw.write === true;
+    if (!read && !write)
+        return undefined;
+    return { read, write };
+}
 export async function resolveSkillEntryPath(manifest) {
     assertSafeRelativeSkillPath(manifest.entry, "entry");
     const logicalDir = path.resolve(manifest.dir);

package/dist/discord/bot.d.ts

@@ -23,6 +23,7 @@ export interface DiscordMessage {
     author: DiscordUser;
     content: string;
     mentions: DiscordUser[];
+    mention_roles?: string[];
     attachments?: DiscordAttachment[];
 }
 export interface DiscordAttachment {

package/dist/discord/bot.js

@@ -3,10 +3,11 @@ import path from "node:path";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { loadConfig, loadModels } from "../core/config.js";
 import { appendEventLog } from "../core/logger.js";
-import { createIntentRuntime, renderBuildFooter, shouldShowBuildFooter, } from "../builder/build-flow.js";
+import { createIntentRuntime, enterEditModeForSkill, parseSlashBuildDirect, renderBuildFooter, shouldShowBuildFooter, } from "../builder/build-flow.js";
 import { routeConversationMessage, } from "../builder/conversation-router.js";
 import { formatBuildProgress, progressIntervalMs } from "../builder/progress-format.js";
 import { chunkText, cleanAttachmentText, formatAttachmentLabel, formatBytes, guessImageMimeType as guessImageMimeTypeFromName, indentAttachmentContent, isImageLikeFile, isTextLikeFile, } from "../core/message-utils.js";
+import { collectLocalFileAttachments, collectLocalImageAttachments, } from "../core/image-attachments.js";
 import { isEmptyIntentRuntime, loadIntentRuntimeMap, saveIntentRuntimeMap, } from "../builder/intent-runtime-store.js";
 import { inferLocaleFromText, l, lLines, withLocale } from "../core/i18n.js";
 import { modelsLines, skillsLines } from "../core/info-lines.js";
@@ -106,6 +107,7 @@ export async function runDiscordBot(config) {
         historiesLoaded: new Set(),
         intentRuntimes: persistedIntentRuntimes,
         intentRuntimesFile,
+        buildPickPending: new Map(),
         ws: null,
         seq: null,
         sessionId: null,
@@ -173,11 +175,12 @@ export function parseSnowflakeList(raw) {
 export const parseAllowedUserIds = parseSnowflakeList;
 export function classifyMessage(message, botUserId, allowedUserIds, listenChannelIds = new Set(), botThreadIds = new Set()) {
     const isDirect = !message.guild_id;
-    const isMentioned = botUserId
+    const isListenChannel = listenChannelIds.has(message.channel_id);
+    const hasBotUserMention = botUserId
         ? Array.isArray(message.mentions) && message.mentions.some((user) => user.id === botUserId)
         : false;
+    const isMentioned = hasBotUserMention || (isListenChannel && hasLeadingRoleMention(message));
     const isAllowed = allowedUserIds.has(message.author.id);
-    const isListenChannel = listenChannelIds.has(message.channel_id);
     const isBotThread = botThreadIds.has(message.channel_id);
     return { isDirect, isMentioned, isAllowed, isListenChannel, isBotThread };
 }
@@ -186,7 +189,13 @@ export function stripBotMention(content, botUserId) {
         return content.trim();
     }
     const pattern = new RegExp(`<@!?${botUserId}>`, "g");
-    return content.replace(pattern, "").trim();
+    return stripLeadingRoleMentions(content.replace(pattern, "")).trim();
+}
+function hasLeadingRoleMention(message) {
+    return /^\s*(?:<@&\d+>\s*)+/u.test(message.content || "");
+}
+function stripLeadingRoleMentions(content) {
+    return content.replace(/^\s*(?:<@&\d+>\s*)+/u, "");
 }
 const BADGE_PREFIX_PATTERN = /^(💬|🔧|✏️|✏)/u;
 const BUILD_FOOTER_FIRST_LINE = /^(?:(?:✏️|✏|🔧)\s*現在ビルドモードです|（(?:現在：「[^」]*」の)?ビルドモード(?:です。抜けるには|を抜けるには).+?と返事してください）)\s*$/u;
@@ -453,7 +462,7 @@ async function persistDiscordAttachmentBuffer(state, attachment, buffer, mimeTyp
         const HH = String(now.getHours()).padStart(2, "0");
         const mm = String(now.getMinutes()).padStart(2, "0");
         const ss = String(now.getSeconds()).padStart(2, "0");
-        const dir = path.join(state.config.notes_dir, "attachments", yyyy, MM);
+        const dir = path.join(state.config.memory_dir, "attachments", yyyy, MM);
         await mkdir(dir, { recursive: true });
         const ext = pickAttachmentExtension(attachment.filename || attachment.title, mimeType);
         const random = Math.random().toString(36).slice(2, 8);
@@ -726,9 +735,11 @@ async function handleMessage(state, message) {
                     is_listen_channel: ctx.isListenChannel,
                     is_bot_thread: ctx.isBotThread,
                     mention_count: Array.isArray(message.mentions) ? message.mentions.length : 0,
+                    role_mention_count: Array.isArray(message.mention_roles) ? message.mention_roles.length : 0,
                     mention_user_ids: Array.isArray(message.mentions)
                         ? message.mentions.map((user) => user.id).slice(0, 5)
                         : [],
+                    mention_role_ids: Array.isArray(message.mention_roles) ? message.mention_roles.slice(0, 5) : [],
                     bot_user_id: state.botUserId,
                 },
             });
@@ -745,6 +756,7 @@ async function handleMessage(state, message) {
     if (cleanText === "!reset") {
         state.histories.delete(message.channel_id);
         state.historiesLoaded.delete(message.channel_id);
+        state.buildPickPending.delete(message.channel_id);
         await sendChannelMessage(state, message.channel_id, l("Chat history reset.", "会話履歴をリセットしました。"));
         return;
     }
@@ -753,6 +765,25 @@ async function handleMessage(state, message) {
         await sendChannelMessage(state, message.channel_id, lines.join("\n"));
         return;
     }
+    if (cleanText === "/build") {
+        const lines = await startBuildPickerForChannel(state, message.channel_id);
+        await sendChannelMessage(state, message.channel_id, lines.join("\n"));
+        return;
+    }
+    const buildSlashSkillId = parseSlashBuildDirect(cleanText);
+    if (buildSlashSkillId) {
+        const lines = await enterBuildModeFromSlashForChannel(state, message.channel_id, buildSlashSkillId);
+        if (lines) {
+            await sendChannelMessage(state, message.channel_id, lines.join("\n"));
+            return;
+        }
+    }
+    const pendingPick = state.buildPickPending.get(message.channel_id);
+    if (pendingPick && /^\d+$/.test(cleanText.trim())) {
+        const lines = await resolveBuildPickSelection(state, message.channel_id, pendingPick, cleanText.trim());
+        await sendChannelMessage(state, message.channel_id, lines.join("\n"));
+        return;
+    }
     if (cleanText === "/models") {
         const lines = await modelsLines(state.config);
         await sendChannelMessage(state, message.channel_id, lines.join("\n"));
@@ -838,20 +869,20 @@ async function handleMessage(state, message) {
         const typing = startTypingKeepalive(state, replyChannelId);
         const prevMode = intentRuntime.mode;
         try {
-            const lines = await routeDiscordMessage(state, userText, history, intentRuntime, status, replyChannelId, userMessage.images);
+            const routed = await routeDiscordMessage(state, userText, history, intentRuntime, status, replyChannelId, userMessage.images);
             typing.stop();
             void saveIntentRuntimes(state);
             const isBuildEntry = prevMode !== "build" && intentRuntime.mode === "build";
-            const decorated = withModeBadge(intentRuntime, lines, { userText, isBuildEntry });
+            const decorated = withModeBadge(intentRuntime, routed.lines, { userText, isBuildEntry });
             scheduleUpdateCheck(state.config.workspace);
             const banner = await consumeUpdateBanner(state.config.workspace);
             const finalLines = banner ? [banner, "", ...decorated] : decorated;
             const reply = finalLines.filter((line) => line !== undefined && line !== null).join("\n").trim();
             if (reply) {
-                await sendChannelMessage(state, replyChannelId, reply);
+                await sendChannelMessageWithLocalAttachments(state, replyChannelId, reply, routed.localAttachmentPaths);
             }
             else {
-                await sendChannelMessage(state, replyChannelId, l("(no response)", "（応答なし）"));
+                await sendChannelMessageWithLocalAttachments(state, replyChannelId, l("(no response)", "（応答なし）"), routed.localAttachmentPaths);
             }
         }
         catch (error) {
@@ -900,6 +931,7 @@ async function refreshDiscordHistoryBeforeCurrentMessage(state, channelId, befor
 }
 async function routeDiscordMessage(state, text, history, intentRuntime, status, replyChannelId, images = []) {
     let modelFailed = false;
+    const localAttachmentPaths = [];
     const lines = await routeConversationMessage({
         config: state.config,
         text,
@@ -916,9 +948,12 @@ async function routeDiscordMessage(state, text, history, intentRuntime, status,
                 modelFailed = true;
             }
         },
+        onLocalAttachments: (paths) => {
+            localAttachmentPaths.push(...paths);
+        },
     });
     await status.set(modelFailed ? "error" : "done");
-    return lines;
+    return { lines, localAttachmentPaths };
 }
 async function onChatProgressForReactions(event, status) {
     switch (event.kind) {
@@ -2431,6 +2466,72 @@ async function editInteractionOriginal(state, interaction, content) {
         }
     }
 }
+async function enterBuildModeFromSlashForChannel(state, channelId, skillId) {
+    if (!skillId)
+        return null;
+    const skills = await listSkillManifests(state.config.skills_dir);
+    const userSkills = skills.filter((skill) => skill.source !== "builtin");
+    const exists = userSkills.some((skill) => skill.id === skillId);
+    if (!exists) {
+        const head = l(`"${skillId}" is not a registered user skill. Pick one below:`, `「${skillId}」は登録済みのユーザースキルではありません。下から番号で選んでください:`);
+        const picker = await startBuildPickerForChannel(state, channelId);
+        return [head, ...picker];
+    }
+    state.buildPickPending.delete(channelId);
+    let intentRuntime = state.intentRuntimes.get(channelId);
+    if (!intentRuntime) {
+        intentRuntime = createIntentRuntime(true);
+        state.intentRuntimes.set(channelId, intentRuntime);
+    }
+    const lines = await enterEditModeForSkill(state.config, skillId, intentRuntime, "discord");
+    if (isEmptyIntentRuntime(intentRuntime)) {
+        state.intentRuntimes.delete(channelId);
+    }
+    else {
+        state.intentRuntimes.set(channelId, intentRuntime);
+    }
+    void saveIntentRuntimes(state);
+    return lines;
+}
+async function startBuildPickerForChannel(state, channelId) {
+    const skills = await listSkillManifests(state.config.skills_dir);
+    const userSkills = skills.filter((skill) => skill.source !== "builtin");
+    if (userSkills.length === 0) {
+        state.buildPickPending.delete(channelId);
+        return [
+            l("No user-created skills yet. Ask in chat to create one.", "編集できるスキルはまだありません。チャットで新しく作成を依頼してください。"),
+        ];
+    }
+    state.buildPickPending.set(channelId, { skillIds: userSkills.map((skill) => skill.id) });
+    const header = l("Pick a skill to edit. Reply with a number:", "編集するスキルを番号で返信してください:");
+    const rows = userSkills.map((skill, index) => {
+        const enabled = skill.enabled === false ? l("disabled", "無効") : l("enabled", "有効");
+        return `  ${String(index + 1).padStart(2)}) ${skill.id} — ${skill.name} (${enabled})`;
+    });
+    return [header, ...rows];
+}
+async function resolveBuildPickSelection(state, channelId, pending, pickText) {
+    const num = Number.parseInt(pickText, 10);
+    if (!Number.isInteger(num) || num < 1 || num > pending.skillIds.length) {
+        return [l("Invalid selection. Send `/build` again to redisplay the list.", "無効な選択です。もう一度 `/build` を送ってください。")];
+    }
+    state.buildPickPending.delete(channelId);
+    const skillId = pending.skillIds[num - 1];
+    let intentRuntime = state.intentRuntimes.get(channelId);
+    if (!intentRuntime) {
+        intentRuntime = createIntentRuntime(true);
+        state.intentRuntimes.set(channelId, intentRuntime);
+    }
+    const lines = await enterEditModeForSkill(state.config, skillId, intentRuntime, "discord");
+    if (isEmptyIntentRuntime(intentRuntime)) {
+        state.intentRuntimes.delete(channelId);
+    }
+    else {
+        state.intentRuntimes.set(channelId, intentRuntime);
+    }
+    void saveIntentRuntimes(state);
+    return lines;
+}
 function handleProgressCommand(state, channelId, text) {
     if (text !== "!progress" && !text.startsWith("!progress ")) {
         return null;
@@ -2535,6 +2636,76 @@ async function sendChannelMessage(state, channelId, content) {
         }
     }
 }
+async function sendChannelMessageWithLocalAttachments(state, channelId, content, localAttachmentPaths = []) {
+    const explicitAttachments = await collectLocalFileAttachments({
+        paths: localAttachmentPaths,
+        cwd: state.config.workspace,
+        allowedRoots: [state.config.workspace, state.config.notes_dir],
+    });
+    const inlineImages = await collectLocalImageAttachments({
+        text: content,
+        cwd: state.config.workspace,
+        allowedRoots: [state.config.workspace, state.config.notes_dir],
+    });
+    const attachments = dedupeLocalAttachments([...explicitAttachments, ...inlineImages]);
+    if (content.trim()) {
+        await sendChannelMessage(state, channelId, content);
+    }
+    for (const attachment of attachments) {
+        await sendDiscordFileAttachment(state, channelId, attachment);
+    }
+}
+async function sendDiscordFileAttachment(state, channelId, attachment) {
+    try {
+        const buffer = await readFile(attachment.path);
+        const form = new FormData();
+        form.append("payload_json", JSON.stringify({ content: "" }));
+        form.append("files[0]", blobFromBuffer(buffer, attachment.mimeType), attachment.filename);
+        const response = await fetch(`${REST_BASE}/channels/${channelId}/messages`, {
+            method: "POST",
+            headers: { authorization: `Bot ${state.token}` },
+            body: form,
+        });
+        if (!response.ok) {
+            const detail = await response.text().catch(() => "");
+            console.error(`agent-sin discord: file send failed: HTTP ${response.status}: ${detail.slice(0, 200)}`);
+            await appendEventLog(state.config, {
+                level: "error",
+                source: "discord",
+                event: "file_send_failed",
+                message: `HTTP ${response.status}`,
+                details: { channel_id: channelId, path: attachment.path },
+            });
+        }
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        console.error(`agent-sin discord: file send error: ${message}`);
+        await appendEventLog(state.config, {
+            level: "error",
+            source: "discord",
+            event: "file_send_error",
+            message,
+            details: { channel_id: channelId, path: attachment.path },
+        });
+    }
+}
+function dedupeLocalAttachments(attachments) {
+    const seen = new Set();
+    const out = [];
+    for (const attachment of attachments) {
+        if (seen.has(attachment.path))
+            continue;
+        seen.add(attachment.path);
+        out.push(attachment);
+    }
+    return out;
+}
+function blobFromBuffer(buffer, type) {
+    const bytes = new Uint8Array(buffer.length);
+    bytes.set(buffer);
+    return new Blob([bytes.buffer], { type });
+}
 async function sendTypingIndicator(state, channelId) {
     try {
         await fetch(`${REST_BASE}/channels/${channelId}/typing`, {

package/dist/even-g2/gateway.d.ts

@@ -0,0 +1,15 @@
+import type { AppConfig } from "../core/config.js";
+export interface EvenG2GatewayOptions {
+    host?: string;
+    port?: number;
+    token?: string;
+    historyChannel?: string;
+}
+export interface EvenG2GatewayHandle {
+    host: string;
+    port: number;
+    url: string;
+    close(): Promise<void>;
+}
+export declare function startEvenG2Gateway(config: AppConfig, options?: EvenG2GatewayOptions): Promise<EvenG2GatewayHandle>;
+export declare function runEvenG2Gateway(config: AppConfig, options?: EvenG2GatewayOptions): Promise<number>;