agent-sin 0.1.12 → 0.1.16

package/dist/cli/index.js

@@ -1,10 +1,13 @@
 #!/usr/bin/env node
 import path from "node:path";
+import { randomBytes } from "node:crypto";
+import { networkInterfaces } from "node:os";
 import { mkdir, rm, stat } from "node:fs/promises";
 import { createInterface } from "node:readline/promises";
 import { stdin as input, stdout as output } from "node:process";
 import { findAgentSinServiceProcesses, getServiceProvider, isSchedulerCommandLine, isSchedulerProcessRunning, serviceLabel, } from "../core/service.js";
-import { configPath, defaultWorkspace, ensureDailyMemoIndexSchedule, ensureWorkspaceDirs, loadConfig, loadModels, modelsPath, setRoleModel, setupWorkspace, SetupRequiredError, writeModelsYaml, detectAvailableProviders, deriveSetupChoicePairIds, PROVIDER_CATALOG, } from "../core/config.js";
+import { agentSinInstallRoot, configPath, defaultWorkspace, ensureDailyMemoIndexSchedule, ensureNightlyTopicKnowledgeSchedule, ensureWorkspaceDirs, loadConfig, loadModels, modelsPath, setRoleModel, setupWorkspace, SetupRequiredError, writeModelsYaml, detectAvailableProviders, deriveSetupChoicePairIds, PROVIDER_CATALOG, } from "../core/config.js";
+import { ensureBetterSqlite3 } from "../core/native-modules.js";
 import { migrateLegacyBuiltinCopies } from "../core/builtin-skills.js";
 import { setSkillEnabled } from "../core/skill-settings.js";
 import { exportWorkspace, formatBytes, importWorkspace, listArchiveEntries, pathExists, } from "../core/transfer.js";
@@ -12,7 +15,7 @@ import { appendEventLog, dailyConversationMemoryFile, listRunLogs, readEventLog,
 import { runSkill } from "../core/runtime.js";
 import { listSkillManifests } from "../core/skill-registry.js";
 import { buildChatLines, buildLines, buildListLines, buildStatusLines, buildTestLines, } from "../builder/build-commands.js";
-import { classifyPendingHandoff, enterBuildMode, handleBuildModeMessage, renderBuildFooter, } from "../builder/build-flow.js";
+import { classifyPendingHandoff, composeBuildSuggestionReply, enterBuildMode, enterEditModeForSkill, parseSlashBuildDirect, handleBuildModeMessage, isExplicitBuildModeStartRequest, renderBuildFooter, } from "../builder/build-flow.js";
 import { scaffoldSkill, validateInstalledSkill } from "../core/skill-scaffold.js";
 import { ensureDotenvSkeleton, getApiKeyResolution, loadDotenv, maskKey, readDotenvKeys, upsertDotenv } from "../core/secrets.js";
 import { loadSchedules, matchesCron, nextRunAfter } from "../core/scheduler.js";
@@ -23,6 +26,7 @@ import { consumeUpdateBanner, scheduleUpdateCheck } from "../core/update-notifie
 import { shutdownSharedCodexAppServer } from "../runtimes/codex-app-server.js";
 import { runDiscordBot } from "../discord/bot.js";
 import { extractTelegramIdentityCandidates, runTelegramBot, } from "../telegram/bot.js";
+import { runEvenG2Gateway } from "../even-g2/gateway.js";
 import { Spinner } from "./spinner.js";
 import { formatModelRow, modelSummary, modelsLines, skillsLines, } from "../core/info-lines.js";
 import { inferLocaleFromText, l, lLines, t, withLocale } from "../core/i18n.js";
@@ -83,6 +87,8 @@ async function main() {
                 return await cmdDiscord(args);
             case "telegram":
                 return await cmdTelegram(args);
+            case "g2":
+                return await cmdG2(args);
             case "export":
                 return await cmdExport(args);
             case "import":
@@ -132,6 +138,14 @@ async function ensureWorkspaceInitialized() {
         await migrateLegacyBuiltinCopies(config.skills_dir);
         await ensureProfileMemoryFiles(config);
         await ensureDailyMemoIndexSchedule(config);
+        await ensureNightlyTopicKnowledgeSchedule(config);
+        try {
+            const { migrateMemoFlatStructure } = await import("../core/memo-migration.js");
+            await migrateMemoFlatStructure(config);
+        }
+        catch (error) {
+            console.warn(`memo-migration: skipped: ${error.message}`);
+        }
         return;
     }
     catch (error) {
@@ -151,6 +165,59 @@ function isMissingFileError(error) {
         "code" in error &&
         error.code === "ENOENT");
 }
+async function ensureNativeModulesReady(label) {
+    const result = await ensureBetterSqlite3({
+        packageRoot: agentSinInstallRoot(),
+        logger: (line) => console.log(`[${label}] ${line}`),
+    });
+    if (result.ok) {
+        if (result.rebuilt) {
+            console.log(l(`[${label}] better-sqlite3 was rebuilt to match the current Node.js (${process.execPath}).`, `[${label}] better-sqlite3 を現在の Node.js (${process.execPath}) 用に再ビルドしました。`));
+        }
+        return true;
+    }
+    console.error(l(`[${label}] better-sqlite3 native module is unusable: ${result.detail || "unknown error"}`, `[${label}] better-sqlite3 ネイティブモジュールが使えません: ${result.detail || "原因不明"}`));
+    return false;
+}
+async function ensureNativeModulesReadyForGateway(config) {
+    const result = await ensureBetterSqlite3({
+        packageRoot: agentSinInstallRoot(),
+        logger: (line) => console.log(`[gateway] ${line}`),
+    });
+    if (result.ok && !result.rebuilt) {
+        return "ok";
+    }
+    if (result.ok && result.rebuilt) {
+        try {
+            await appendEventLog(config, {
+                level: "warn",
+                source: "schedule",
+                event: "native_module_rebuilt",
+                message: "better-sqlite3 was rebuilt to match the current Node.js",
+                details: { node_exec_path: process.execPath },
+            });
+        }
+        catch {
+            /* ignore */
+        }
+        console.log(l("[gateway] better-sqlite3 was rebuilt. Exiting so launchd restarts the service with the fresh binary.", "[gateway] better-sqlite3 を再ビルドしました。launchd が新しいバイナリで再起動できるように一度終了します。"));
+        return "restart-required";
+    }
+    try {
+        await appendEventLog(config, {
+            level: "error",
+            source: "schedule",
+            event: "native_module_broken",
+            message: "better-sqlite3 native module is unusable",
+            details: { detail: result.detail || "unknown", node_exec_path: process.execPath },
+        });
+    }
+    catch {
+        /* ignore */
+    }
+    console.error(l(`[gateway] better-sqlite3 native module is unusable: ${result.detail || "unknown error"}. Continuing in degraded mode.`, `[gateway] better-sqlite3 ネイティブモジュールが使えません: ${result.detail || "原因不明"}。劣化モードで継続します。`));
+    return "broken";
+}
 async function tryLogCliError(command, args, message) {
     try {
         const config = await loadConfig();
@@ -203,6 +270,7 @@ async function cmdSetup(args) {
     }
     const config = await setupWorkspace(setupOptions);
     await applyCodexCliOptions(config, options);
+    await ensureNativeModulesReady("setup");
     console.log(l(`Workspace ready: ${config.workspace}`, `ワークスペース準備完了: ${config.workspace}`));
     console.log(`Config: ${configPath(config.workspace)}`);
     console.log(`Notes: ${config.notes_dir}`);
@@ -466,6 +534,23 @@ async function cmdChat(args) {
             }
             continue;
         }
+        if (text === "/build" || text === "build") {
+            await refreshChatState(state);
+            const lines = await interactiveBuildPicker(state, rl, intentRuntime);
+            for (const line of lines) {
+                console.log(formatChatLine(line));
+            }
+            continue;
+        }
+        const buildDirect = parseSlashBuildDirect(text);
+        if (buildDirect) {
+            await refreshChatState(state);
+            const lines = await enterBuildModeForSlashSkill(state, intentRuntime, buildDirect, rl);
+            for (const line of lines) {
+                console.log(formatChatLine(line));
+            }
+            continue;
+        }
         const lines = await handleChatMessage(state.config, text, history, intentRuntime);
         scheduleUpdateCheck(state.config.workspace);
         const banner = await consumeUpdateBanner(state.config.workspace);
@@ -655,6 +740,44 @@ async function interactiveSkillsPicker(state, rl, options = {}) {
         return [l(`Delete failed: ${error instanceof Error ? error.message : String(error)}`, `削除に失敗しました: ${error instanceof Error ? error.message : String(error)}`)];
     }
 }
+async function enterBuildModeForSlashSkill(state, intentRuntime, skillId, rl) {
+    const userSkills = state.skills.filter((skill) => skill.source !== "builtin");
+    const exists = userSkills.some((skill) => skill.id === skillId);
+    if (!exists) {
+        if (userSkills.length === 0) {
+            return [
+                l(`No user-created skills yet, so "${skillId}" cannot be opened. Send a request in chat to create one.`, `編集できるスキルがまだないので「${skillId}」を開けません。チャットで作成を依頼してください。`),
+            ];
+        }
+        const head = l(`"${skillId}" is not a registered user skill. Pick from the list, or send /build to see options.`, `「${skillId}」は登録済みのユーザースキルではありません。下のリストから番号で選んでください (またはもう一度 /build):`);
+        const picker = await interactiveBuildPicker(state, rl, intentRuntime);
+        return [head, ...picker];
+    }
+    return enterEditModeForSkill(state.config, skillId, intentRuntime, "cli");
+}
+async function interactiveBuildPicker(state, rl, intentRuntime) {
+    const userSkills = state.skills.filter((skill) => skill.source !== "builtin");
+    if (userSkills.length === 0) {
+        return [
+            l("No user-created skills yet. Send a request in chat to create one, or run: agent-sin build <skill-id>", "編集できるスキルはまだありません。チャットで作成依頼するか、`agent-sin build <skill-id>` で新規作成してください。"),
+        ];
+    }
+    console.log(l("Pick a skill to edit:", "編集するスキルを選んでください:"));
+    userSkills.forEach((skill, index) => {
+        const enabled = skill.enabled === false ? l("disabled", "無効") : l("enabled", "有効");
+        console.log(`  ${String(index + 1).padStart(2)}) ${skill.id}\t${skill.name}\t${enabled}`);
+    });
+    const pick = (await rl.question(l("Enter a number (Enter to cancel): ", "番号を入力 (Enterでキャンセル): "))).trim();
+    if (!pick) {
+        return [];
+    }
+    const num = Number.parseInt(pick, 10);
+    if (!Number.isInteger(num) || num < 1 || num > userSkills.length) {
+        return [l("Invalid selection.", "無効な選択です。")];
+    }
+    const skill = userSkills[num - 1];
+    return enterEditModeForSkill(state.config, skill.id, intentRuntime, "cli");
+}
 async function cmdBuild(args) {
     const config = await loadConfig();
     if (args[0] === "list") {
@@ -1554,13 +1677,26 @@ function chatRunPayload(skillId, text) {
     return { text };
 }
 async function chatWithModel(config, userText, history, preferredSkillId, intentRuntime) {
-    return chatRespond(config, userText, history, {
+    let buildSuggestion = null;
+    const lines = await chatRespond(config, userText, history, {
         formatNarrative: formatAssistantNarrative,
         spinner: new Spinner(),
         eventSource: "chat",
         preferredSkillId,
-        onBuildSuggestion: (suggestion) => setPendingBuildSuggestion(intentRuntime, suggestion, userText),
+        onBuildSuggestion: (suggestion) => {
+            buildSuggestion = suggestion;
+            setPendingBuildSuggestion(intentRuntime, suggestion, userText);
+        },
     });
+    const suggestion = buildSuggestion;
+    if (suggestion && intentRuntime?.pending && isExplicitBuildModeStartRequest(userText)) {
+        const buildLines = await withCliBuildHooks(config, userText, (hooks) => enterBuildMode(config, history, intentRuntime, hooks));
+        return appendCliBuildFooter(intentRuntime, buildLines, userText);
+    }
+    if (suggestion && intentRuntime?.pending) {
+        return composeBuildSuggestionReply(lines, suggestion.type);
+    }
+    return lines;
 }
 function parseOptions(args) {
     const options = { _: [] };
@@ -2069,16 +2205,18 @@ Usage:
   agent-sin model set [chat|builder] <model-id>
   agent-sin logs [--skill skill-id]
   agent-sin logs --run <run-id>
-  agent-sin logs --events [--tail 50] [--source chat|skill|cli|setup|build|schedule|discord|telegram] [--level info|warn|error]
+  agent-sin logs --events [--tail 50] [--source chat|skill|cli|setup|build|schedule|discord|telegram|g2] [--level info|warn|error]
   agent-sin daemon [--once]
-  agent-sin gateway [--no-discord] [--no-telegram]
+  agent-sin gateway [--no-discord] [--no-telegram] [--g2]
+  agent-sin g2 [--host 127.0.0.1] [--port 8765] [--token ...]
   agent-sin service status|install|start|stop|restart
   agent-sin schedules
   agent-sin schedules trigger <id>
-  agent-sin notify --title <title> --body <body> [--channel macos|discord|telegram|slack|mail|auto] [--thread-id <id>] [--to <addr>] [--subtitle <s>] [--sound]
+  agent-sin notify --title <title> --body <body> [--channel macos|discord|telegram|slack|mail|g2|auto] [--thread-id <id>] [--to <addr>] [--subtitle <s>] [--sound]
   agent-sin discord
   agent-sin telegram
   agent-sin telegram id [--save]
+  agent-sin g2
   agent-sin export [--out <file>]
   agent-sin import <archive> [--force] [--dry-run] [--no-backup]
   agent-sin config`, `Agent-Sin CLI
@@ -2107,16 +2245,18 @@ Usage:
   agent-sin model set [chat|builder] <model-id>
   agent-sin logs [--skill skill-id]
   agent-sin logs --run <run-id>
-  agent-sin logs --events [--tail 50] [--source chat|skill|cli|setup|build|schedule|discord|telegram] [--level info|warn|error]
+  agent-sin logs --events [--tail 50] [--source chat|skill|cli|setup|build|schedule|discord|telegram|g2] [--level info|warn|error]
   agent-sin daemon [--once]
-  agent-sin gateway [--no-discord] [--no-telegram]
+  agent-sin gateway [--no-discord] [--no-telegram] [--g2]
+  agent-sin g2 [--host 127.0.0.1] [--port 8765] [--token ...]
   agent-sin service status|install|start|stop|restart
   agent-sin schedules
   agent-sin schedules trigger <id>
-  agent-sin notify --title <title> --body <body> [--channel macos|discord|telegram|slack|mail|auto] [--thread-id <id>] [--to <addr>] [--subtitle <s>] [--sound]
+  agent-sin notify --title <title> --body <body> [--channel macos|discord|telegram|slack|mail|g2|auto] [--thread-id <id>] [--to <addr>] [--subtitle <s>] [--sound]
   agent-sin discord
   agent-sin telegram
   agent-sin telegram id [--save]
+  agent-sin g2
   agent-sin export [--out <file>]
   agent-sin import <archive> [--force] [--dry-run] [--no-backup]
   agent-sin config`));
@@ -2134,10 +2274,10 @@ async function cmdNotify(args) {
     const discordThreadId = threadId || stringOption(options.discord_thread_id);
     const telegramThreadId = threadId || stringOption(options.telegram_thread_id);
     if (!title && !body) {
-        console.error(l("Usage: agent-sin notify --title <title> --body <body> [--channel macos|discord|telegram|slack|mail|auto] [--thread-id <id>] [--to <addr>] [--subtitle <s>] [--sound]", "使い方: agent-sin notify --title <title> --body <body> [--channel macos|discord|telegram|slack|mail|auto] [--thread-id <id>] [--to <addr>] [--subtitle <s>] [--sound]"));
+        console.error(l("Usage: agent-sin notify --title <title> --body <body> [--channel macos|discord|telegram|slack|mail|g2|auto] [--thread-id <id>] [--to <addr>] [--subtitle <s>] [--sound]", "使い方: agent-sin notify --title <title> --body <body> [--channel macos|discord|telegram|slack|mail|g2|auto] [--thread-id <id>] [--to <addr>] [--subtitle <s>] [--sound]"));
         return 1;
     }
-    const allowed = ["auto", "macos", "discord", "telegram", "slack", "mail", "stderr"];
+    const allowed = ["auto", "macos", "discord", "telegram", "slack", "mail", "g2", "stderr"];
     if (!allowed.includes(channelRaw)) {
         console.error(l(`Invalid --channel: ${channelRaw} (allowed: ${allowed.join(", ")})`, `--channel が不正です: ${channelRaw} (使用可: ${allowed.join(", ")})`));
         return 1;
@@ -2362,39 +2502,190 @@ async function cmdDaemon(args) {
     const config = await loadConfig();
     return runScheduleDaemon(config, { once: Boolean(options.once) });
 }
+async function cmdG2(args) {
+    const [sub, ...rest] = args;
+    if (sub === "setup") {
+        return cmdG2Setup(rest);
+    }
+    const options = parseOptions(args);
+    if (options.help) {
+        console.log(l(`Usage:
+  agent-sin g2 [--host 127.0.0.1] [--port 8765] [--token ...] [--history-channel telegram|discord|none|auto]
+  agent-sin g2 setup [--history-channel telegram|discord|none|auto] [--discord-thread auto|off|<thread-id>]
+
+Run the Even G2 gateway. Use --host 0.0.0.0 plus AGENT_SIN_G2_TOKEN
+when connecting from a phone on the same LAN. Use --history-channel to mirror
+G2 conversations to one external chat log.`, `使い方:
+  agent-sin g2 [--host 127.0.0.1] [--port 8765] [--token ...] [--history-channel telegram|discord|none|auto]
+  agent-sin g2 setup [--history-channel telegram|discord|none|auto] [--discord-thread auto|off|<thread-id>]
+
+Even G2 gateway を起動します。同じLANのスマホから接続する場合は
+--host 0.0.0.0 と AGENT_SIN_G2_TOKEN を使ってください。
+--history-channel で G2 の会話履歴を外部チャットに1つだけ残せます。`));
+        return 0;
+    }
+    const config = await loadConfig();
+    const fallbackPort = Number.parseInt(process.env.AGENT_SIN_G2_PORT || "8765", 10) || 8765;
+    return runEvenG2Gateway(config, {
+        host: stringOption(options.host),
+        port: parsePositiveIntOption(options.port, fallbackPort),
+        token: stringOption(options.token),
+        historyChannel: stringOption(options.history_channel),
+    });
+}
+async function cmdG2Setup(args) {
+    const options = parseOptions(args);
+    if (options.help) {
+        console.log(l(`Usage:
+  agent-sin g2 setup [--host 0.0.0.0] [--port 8765] [--token ...] [--history-channel telegram|discord|none|auto] [--discord-thread auto|off|<thread-id>]
+
+Writes the G2 gateway settings to ~/.agent-sin/.env.
+Use --discord-thread auto to create one Discord thread for G2 history.`, `使い方:
+  agent-sin g2 setup [--host 0.0.0.0] [--port 8765] [--token ...] [--history-channel telegram|discord|none|auto] [--discord-thread auto|off|<thread-id>]
+
+G2 gateway の設定を ~/.agent-sin/.env に保存します。
+--discord-thread auto で G2 履歴用の Discord スレッドを自動作成します。`));
+        return 0;
+    }
+    const config = await loadConfig();
+    const host = stringOption(options.host) || process.env.AGENT_SIN_G2_HOST || "0.0.0.0";
+    const port = String(parsePositiveIntOption(options.port, Number.parseInt(process.env.AGENT_SIN_G2_PORT || "8765", 10) || 8765));
+    const token = stringOption(options.token) || process.env.AGENT_SIN_G2_TOKEN || randomBytes(16).toString("hex");
+    const historyChannel = await resolveG2HistoryChannel(options);
+    const discordThread = resolveG2DiscordThreadOption(options);
+    const dotenvEntries = [
+        { key: "AGENT_SIN_G2_ENABLED", value: "1" },
+        { key: "AGENT_SIN_G2_HOST", value: host },
+        { key: "AGENT_SIN_G2_PORT", value: port },
+        { key: "AGENT_SIN_G2_TOKEN", value: token },
+        { key: "AGENT_SIN_G2_HISTORY_CHANNEL", value: historyChannel },
+    ];
+    if (discordThread !== null) {
+        dotenvEntries.push({ key: "AGENT_SIN_G2_DISCORD_THREAD", value: discordThread });
+    }
+    const result = await upsertDotenv(config.workspace, dotenvEntries);
+    const address = host === "0.0.0.0" ? localNetworkAddress() || "<PC-IP>" : host;
+    console.log(l(`Saved G2 settings to ${result.path}`, `G2 設定を保存しました: ${result.path}`));
+    console.log(l(`Server URL: http://${address}:${port}`, `Server URL: http://${address}:${port}`));
+    console.log(l(`Token: ${token}`, `Token: ${token}`));
+    console.log(l(`History channel: ${historyChannel}`, `履歴先: ${historyChannel}`));
+    if (discordThread !== null) {
+        console.log(l(`Discord thread: ${discordThread}`, `Discord thread: ${discordThread}`));
+    }
+    console.log(l("Apply with: agent-sin service restart", "反映: agent-sin service restart"));
+    return 0;
+}
+function resolveG2DiscordThreadOption(options) {
+    const explicit = stringOption(options.discord_thread) || stringOption(options.g2_discord_thread);
+    if (!explicit)
+        return null;
+    const normalized = explicit.trim().toLowerCase();
+    if (/^(auto|create|1|true|yes)$/.test(normalized))
+        return "auto";
+    if (/^(none|off|false|0)$/.test(normalized))
+        return "off";
+    if (/^\d+$/.test(explicit.trim()))
+        return explicit.trim();
+    throw new Error(l(`Invalid --discord-thread: ${explicit} (allowed: auto, off, or Discord thread id)`, `--discord-thread が不正です: ${explicit} (使用可: auto, off, Discord thread id)`));
+}
+async function resolveG2HistoryChannel(options) {
+    const explicit = stringOption(options.history_channel) || stringOption(options.g2_history_channel);
+    if (explicit) {
+        const normalized = normalizeG2HistoryChannel(explicit);
+        if (!normalized) {
+            throw new Error(l(`Invalid --history-channel: ${explicit} (allowed: telegram, discord, none, auto)`, `--history-channel が不正です: ${explicit} (使用可: telegram, discord, none, auto)`));
+        }
+        return normalized;
+    }
+    const existing = normalizeG2HistoryChannel(process.env.AGENT_SIN_G2_HISTORY_CHANNEL || "");
+    const fallback = existing || "none";
+    if (!input.isTTY || process.env.CI) {
+        return fallback;
+    }
+    const choices = ["none", "telegram", "discord", "auto"];
+    console.log(l("Where should G2 conversation history be mirrored?", "G2 の会話履歴をどこに残しますか?"));
+    choices.forEach((choice, index) => {
+        console.log(`  ${index + 1}) ${choice}`);
+    });
+    const rl = createInterface({ input, output });
+    try {
+        const answer = (await rl.question(l(`Enter a number (Enter for ${fallback}): `, `番号を入力 (Enterで ${fallback}): `))).trim();
+        if (!answer)
+            return fallback;
+        const index = Number.parseInt(answer, 10);
+        if (Number.isInteger(index) && index >= 1 && index <= choices.length) {
+            return choices[index - 1];
+        }
+        const byName = normalizeG2HistoryChannel(answer);
+        if (byName)
+            return byName;
+        throw new Error(l("Invalid selection.", "無効な選択です。"));
+    }
+    finally {
+        rl.close();
+    }
+}
+function normalizeG2HistoryChannel(value) {
+    const normalized = value.trim().toLowerCase();
+    if (normalized === "telegram" || normalized === "discord" || normalized === "none" || normalized === "auto") {
+        return normalized;
+    }
+    if (normalized === "off" || normalized === "false" || normalized === "0") {
+        return "none";
+    }
+    return null;
+}
+function localNetworkAddress() {
+    const nets = networkInterfaces();
+    for (const entries of Object.values(nets)) {
+        for (const entry of entries || []) {
+            if (entry.family === "IPv4" && !entry.internal) {
+                return entry.address;
+            }
+        }
+    }
+    return null;
+}
 async function cmdGateway(args) {
     const options = parseOptions(args);
     if (options.help) {
         console.log(l(`Usage:
-  agent-sin gateway [--no-discord] [--no-telegram] [--once]
+  agent-sin gateway [--no-discord] [--no-telegram] [--g2] [--once] [--g2-history-channel telegram|discord|none|auto]
   agent-sin start --daemon
   agent-sin service run
 
 Run Agent-Sin as a long-lived gateway. It starts the scheduler when enabled
 schedules exist, and starts Discord / Telegram bots when their environment variables
-are configured. Use agent-sin service install on macOS to keep it running.`, `使い方:
-  agent-sin gateway [--no-discord] [--no-telegram] [--once]
+are configured. Use --g2 to also start the Even G2 gateway.
+Use agent-sin service install on macOS to keep it running.`, `使い方:
+  agent-sin gateway [--no-discord] [--no-telegram] [--g2] [--once] [--g2-history-channel telegram|discord|none|auto]
   agent-sin start --daemon
   agent-sin service run
 
 Agent-Sin を常駐 gateway として起動します。有効なスケジュールがあれば scheduler を、
 環境変数が設定済みなら Discord / Telegram bot を起動します。
+--g2 で Even G2 gateway も起動します。
 macOS で常駐させるには agent-sin service install を使ってください。`));
         return 0;
     }
     const config = await loadConfig();
+    const nativeStatus = await ensureNativeModulesReadyForGateway(config);
+    if (nativeStatus === "restart-required") {
+        return 0;
+    }
     await maybePromoteDailyMemory(config, { eventSource: "schedule" });
     const schedules = await loadSchedules(config.workspace);
     const enabled = schedules.filter((schedule) => schedule.enabled);
     const startScheduler = enabled.length > 0;
     const startDiscord = !options.no_discord && hasDiscordConfig();
     const startTelegram = !options.no_telegram && hasTelegramConfig();
-    if (!startScheduler && !startDiscord && !startTelegram) {
+    const startG2 = Boolean(options.g2) || process.env.AGENT_SIN_G2_ENABLED === "1";
+    if (!startScheduler && !startDiscord && !startTelegram && !startG2) {
         console.log(l("agent-sin gateway: no enabled schedules and chat bots are not configured.", "agent-sin gateway: 有効なスケジュールがなく、チャット bot も未設定です。"));
-        console.log(l("Add schedules, or set Discord allowed user IDs / Telegram bot token.", "スケジュールを追加するか、Discord allowed user IDs / Telegram bot token を設定してください。"));
+        console.log(l("Add schedules, set Discord/Telegram config, or run with --g2.", "スケジュールを追加するか、Discord/Telegram を設定するか、--g2 を付けてください。"));
         return 0;
     }
-    console.log(l(`agent-sin gateway: starting (${startScheduler ? `${enabled.length} schedule(s)` : "scheduler idle"}, ${startDiscord ? "discord on" : "discord off"}, ${startTelegram ? "telegram on" : "telegram off"})`, `agent-sin gateway: 起動します (${startScheduler ? `${enabled.length}件のスケジュール` : "scheduler 待機"}, ${startDiscord ? "discord 有効" : "discord 無効"}, ${startTelegram ? "telegram 有効" : "telegram 無効"})`));
+    console.log(l(`agent-sin gateway: starting (${startScheduler ? `${enabled.length} schedule(s)` : "scheduler idle"}, ${startDiscord ? "discord on" : "discord off"}, ${startTelegram ? "telegram on" : "telegram off"}, ${startG2 ? "g2 on" : "g2 off"})`, `agent-sin gateway: 起動します (${startScheduler ? `${enabled.length}件のスケジュール` : "scheduler 待機"}, ${startDiscord ? "discord 有効" : "discord 無効"}, ${startTelegram ? "telegram 有効" : "telegram 無効"}, ${startG2 ? "g2 有効" : "g2 無効"})`));
     const startupVersion = agentSinVersionFresh();
     const versionCheckInterval = setInterval(() => {
         const current = agentSinVersionFresh();
@@ -2421,6 +2712,14 @@ macOS で常駐させるには agent-sin service install を使ってくださ
     else if (!options.no_telegram && !startDiscord) {
         console.log(l("agent-sin gateway: Telegram not configured.", "agent-sin gateway: Telegram は未設定です。"));
     }
+    if (startG2) {
+        tasks.push(runEvenG2Gateway(config, {
+            host: stringOption(options.g2_host) || stringOption(options.host),
+            port: parsePositiveIntOption(options.g2_port || options.port, Number.parseInt(process.env.AGENT_SIN_G2_PORT || "8765", 10) || 8765),
+            token: stringOption(options.g2_token) || stringOption(options.token),
+            historyChannel: stringOption(options.g2_history_channel) || stringOption(options.history_channel),
+        }));
+    }
     const results = await Promise.all(tasks);
     clearInterval(versionCheckInterval);
     return Math.max(...results);
@@ -2624,7 +2923,7 @@ Usage:
   agent-sin service run
 
 ${platformLine}
-The service runs the scheduler and, when configured, Discord / Telegram bots.`, `Agent-Sin service
+The service runs the scheduler, configured Discord / Telegram bots, and G2 when AGENT_SIN_G2_ENABLED=1.`, `Agent-Sin service
 
 使い方:
   agent-sin service status
@@ -2636,7 +2935,7 @@ The service runs the scheduler and, when configured, Discord / Telegram bots.`,
   agent-sin service run
 
 ${platformLine}
-service は scheduler と、設定済みの場合は Discord / Telegram bot を起動します。`));
+service は scheduler、設定済みの Discord / Telegram bot、AGENT_SIN_G2_ENABLED=1 のときは G2 を起動します。`));
 }
 async function installService(config, options) {
     const provider = getServiceProvider();
@@ -2644,6 +2943,10 @@ async function installService(config, options) {
         console.error(provider.notSupportedReason());
         return 1;
     }
+    const nativeOk = await ensureNativeModulesReady("service install");
+    if (!nativeOk) {
+        return 1;
+    }
     try {
         await provider.install(config, { noStart: Boolean(options.no_start) });
     }

package/dist/core/ai-provider.d.ts

@@ -51,6 +51,7 @@ export interface AiProviderResponse {
     text: string;
     model_id: string;
     provider: string;
+    generated_images?: string[];
 }
 export declare class AiProviderError extends Error {
     readonly model_id: string;

package/dist/core/ai-provider.js

@@ -430,14 +430,19 @@ async function dispatchCodex(request, entry) {
     const effort = resolveCodexEffort(request, entry);
     try {
         const session = getSharedCodexAppServer(entry.model);
-        const text = await session.sendTurn(prompt, {
+        const result = await session.sendTurn(prompt, {
             effort,
             cwd: request.cwd || process.cwd(),
             sandbox,
             approvalPolicy,
             onProgress: request.onProgress,
         });
-        return { text, model_id: request.model_id, provider: "codex" };
+        return {
+            text: result.text,
+            model_id: request.model_id,
+            provider: "codex",
+            generated_images: result.generatedImagePaths,
+        };
     }
     catch (error) {
         if (mode === "appserver") {
@@ -563,7 +568,7 @@ function messagesToPrompt(messages) {
 }
 // OpenAI の chat/completions は `role: "tool"` を直前の assistant メッセージの
 // `tool_calls` への返答としてしか許容しない（無いと HTTP 400）。
-// agent-sin は markdown の skill-call ブロックで独自に skill 呼び出しを行うため
+// agent-sin は JSON envelope で独自に skill 呼び出しを行うため
 // tool_calls プロトコルには乗らない。よって OpenAI に投げる際だけ
 // tool ロールは [tool-result] プレフィックス付きの user メッセージに畳む。
 function toOpenAIChatMessages(request) {

package/dist/core/chat-engine.d.ts

@@ -47,23 +47,29 @@ export interface ChatRespondOptions {
     onChatProgress?: (event: ChatProgressEvent) => void;
     onAiProgress?: AiProgressHandler;
     onBuildSuggestion?: (suggestion: ChatBuildSuggestion) => void;
+    onLocalAttachments?: (paths: string[]) => void;
+    onGeneratedImages?: (paths: string[]) => void;
     preferredSkillId?: string;
     userImages?: AiImagePart[];
 }
 export declare const HISTORY_LIMIT = 20;
-export declare const TOOL_CALL_MAX_ITERATIONS = 3;
+export declare const TOOL_CALL_MAX_ITERATIONS = 8;
 export declare function chatRespond(config: AppConfig, userText: string, history: ChatTurn[], options?: ChatRespondOptions): Promise<string[]>;
 export declare function makeSpinnerProgress(spinner: SpinnerLike, baseLabel: string): (event: AiProgressEvent) => void;
 export declare function formatProgressLabel(baseLabel: string, event: AiProgressEvent): string | null;
 export declare function isToolEligible(skill: SkillManifest): boolean;
-export declare function buildSystemPrompt(skills: SkillManifest[], preferredSkillId?: string, profileMemory?: ProfileMemoryFiles): string;
+export declare function buildSystemPrompt(skills: SkillManifest[], preferredSkillId?: string, profileMemory?: ProfileMemoryFiles, config?: AppConfig): string;
+export declare function buildTopicKnowledgeIndexContext(config: AppConfig): Promise<string>;
 export declare function parseSkillCalls(text: string): SkillCall[];
 export declare function stripSkillCalls(text: string): string;
 export declare function extractSkillCallBlocks(text: string): string;
 export declare function parseBuildSuggestion(text: string): ChatBuildSuggestion | null;
 export declare function stripBuildSuggestions(text: string): string;
 export declare function stripInternalControlBlocks(text: string): string;
-export declare function toolResultJson(id: string, status: string, summary: string, saved?: string[], data?: unknown): string;
+export declare function toolResultJson(id: string, status: string, summary: string, saved?: string[], data?: unknown, notes?: Array<{
+    level: "warn" | "error";
+    message: string;
+}>): string;
 export declare function toAiMessages(history: ChatTurn[], multimodalTurn?: {
     index: number;
     images: AiImagePart[];