agent-sin 0.1.12 → 0.1.16

package/dist/builder/build-action-classifier.js

@@ -41,6 +41,56 @@ export async function classifyBuildModeAction(config, userText, history, build,
         reason: typeof parsed.reason === "string" ? parsed.reason.slice(0, 240) : undefined,
     };
 }
+export async function classifyScheduleRequest(config, userText, history, build, options = {}) {
+    const trimmed = userText.trim();
+    if (!trimmed) {
+        return { matched: false, reason: "empty input" };
+    }
+    const system = scheduleRequestPrompt(build);
+    const messages = buildMessages(system, history, trimmed);
+    const parsed = await callJsonClassifier(config, messages, options.modelId);
+    if (!parsed) {
+        return { matched: false, reason: "classifier fallback" };
+    }
+    const matched = parsed.matched === true;
+    const reason = typeof parsed.reason === "string" ? parsed.reason.slice(0, 240) : undefined;
+    if (!matched) {
+        return { matched: false, reason };
+    }
+    const cron = typeof parsed.cron === "string" ? parsed.cron.trim() : "";
+    if (!cron) {
+        return { matched: false, reason: reason || "missing cron" };
+    }
+    const skillRaw = typeof parsed.skill === "string" ? parsed.skill.trim() : "";
+    const skill = skillRaw || build.skill_id;
+    const idRaw = typeof parsed.id === "string" ? parsed.id.trim() : "";
+    const id = idRaw && /^[A-Za-z0-9_-]+$/.test(idRaw)
+        ? idRaw
+        : autoScheduleId(skill);
+    const payload = { id, cron, skill };
+    if (typeof parsed.description === "string" && parsed.description.trim()) {
+        payload.description = parsed.description.trim();
+    }
+    if (parsed.args && typeof parsed.args === "object" && !Array.isArray(parsed.args)) {
+        const inner = parsed.args;
+        if (Object.keys(inner).length > 0) {
+            payload.args = inner;
+        }
+    }
+    if (typeof parsed.enabled === "boolean") {
+        payload.enabled = parsed.enabled;
+    }
+    if (typeof parsed.approve === "boolean") {
+        payload.approve = parsed.approve;
+    }
+    return { matched: true, payload, reason };
+}
+function autoScheduleId(skill) {
+    const base = skill.replace(/[^A-Za-z0-9_-]/g, "-").replace(/-+/g, "-").replace(/^-+|-+$/g, "");
+    const suffix = Math.floor(Date.now() / 1000).toString(36);
+    const prefix = base || "schedule";
+    return `${prefix}-${suffix}`;
+}
 function buildMessages(system, history, userText) {
     const recent = history.slice(-RECENT_HISTORY_TURNS).map((turn) => ({
         role: (turn.role === "tool" ? "tool" : turn.role),
@@ -123,16 +173,47 @@ function buildModeActionPrompt(build) {
         "Choose one of four actions:",
         '- "exit": the user wants to leave build mode and return to plain chat ("stop", "go back", "/back", やめる, 戻る, もういい, 中止, キャンセル, or any natural cancel/exit phrase in any language).',
         '- "register": the user wants to register/install the current draft as a usable skill ("register it", "install", 登録して, 本登録, これでOK, これで保存, 公開して).',
-        '- "test": the user wants to test/run the current draft ("test it", "run it", 動かして, 試して, テスト).',
+        '- "test": the user wants a one-off run of the current draft ("test it", "run it", 動かして, 試して, テスト).',
         '- "continue": anything else — additional requirements, edits, design discussion, environment variables, default request to keep building.',
         "",
         "If the user is asking to fix or change implementation details, prefer 'continue' over 'register' or 'test'.",
+        "If the message includes any time-of-day, day-of-week, interval, recurrence, or cron hint (\"every day\", \"weekly\", \"every 30 minutes\", \"cron\", \"毎日X時\", \"毎週\", \"毎時\", \"スケジュール\", etc.), choose 'continue' — schedule registration is handled separately, not by 'test'.",
         "If unsure, choose 'continue'.",
         "",
         "Return exactly one JSON object. No markdown fences:",
         '{"action":"exit|register|test|continue","reason":"short why"}',
     ].join("\n");
 }
+function scheduleRequestPrompt(build) {
+    const typeLabel = build.type === "edit" ? "editing an existing skill" : "creating a new skill";
+    return [
+        "You decide whether the user wants to register a recurring (cron) schedule for the skill currently being built.",
+        "Current build session:",
+        `- mode: ${typeLabel}`,
+        `- skill_id: ${build.skill_id}`,
+        "",
+        "Return matched=true ONLY when the user clearly asks for a recurring/timed run (examples: \"run this every day at 9am\", \"毎日9時に動かして\", \"weekly on monday\", \"スケジュールに追加して\", \"cron 0 9 * * *\"). A bare \"run it\" / \"動かして\" / \"テスト\" without time/recurrence is NOT a schedule.",
+        "",
+        "When matched, output:",
+        '{"matched":true,"cron":"min hour dom month dow","skill":"<skill id>","id":"<short kebab id>","description":"...","args":{},"enabled":true,"approve":false,"reason":"..."}',
+        "",
+        "Rules:",
+        "- cron must be a valid 5-field POSIX cron \"min hour dom month dow\". Convert natural language carefully:",
+        "  - \"every day at 9am\" / \"毎日9時\" -> \"0 9 * * *\"",
+        "  - \"every hour at :15\" / \"毎時15分\" -> \"15 * * * *\"",
+        "  - \"every monday 8am\" / \"毎週月曜8時\" -> \"0 8 * * 1\"",
+        "  - \"every 30 minutes\" / \"30分ごと\" -> \"*/30 * * * *\"",
+        `- skill defaults to "${build.skill_id}" unless the user explicitly names a different existing skill.`,
+        "- id should be a short kebab-case identifier (letters/digits/-/_). Combine skill + cadence (e.g. \"my-skill-daily-9am\", \"my-skill-weekly-mon\").",
+        "- Include args only if the user explicitly provided arguments for the skill. Otherwise omit args.",
+        "- Omit description unless the user gave one.",
+        "- enabled defaults to true; approve defaults to false. Only include when the user explicitly asked otherwise.",
+        "",
+        "If the user is NOT clearly asking to schedule, return {\"matched\":false,\"reason\":\"...\"}. When unsure, choose matched=false.",
+        "",
+        "Return exactly one JSON object. No markdown fences.",
+    ].join("\n");
+}
 function truncate(text, max) {
     if (!text)
         return "";

package/dist/builder/build-flow.d.ts

@@ -11,7 +11,7 @@ export interface PendingHandoff {
 export interface PendingBuildExit {
     reason: string;
 }
-export type BuilderEventSource = "discord" | "telegram" | "cli";
+export type BuilderEventSource = "discord" | "telegram" | "g2" | "cli";
 export interface BuildModeState {
     type: "create" | "edit";
     skill_id: string;
@@ -31,14 +31,30 @@ export interface IntentRuntime {
     build: BuildModeState | null;
 }
 export declare function createIntentRuntime(enabled?: boolean): IntentRuntime;
+/**
+ * Parse `/build <skill-id>` (or `build <skill-id>`) from a chat line. Returns
+ * the requested skill id, or null when the input is not a direct build slash
+ * command. Subcommand-style first words (list/register/test/chat/status) are
+ * not treated as skill ids so the existing CLI subcommands keep working.
+ */
+export declare function parseSlashBuildDirect(text: string): string | null;
+export declare function parseSwitchEditTarget(text: string): string | null;
+export declare function isExplicitBuildModeStartRequest(text: string): boolean;
+export declare function renderBuildSuggestionConfirmation(type: "create" | "edit"): string[];
+/**
+ * When the chat engine emits build_suggestion, keep whatever summary the model
+ * wrote in its visible narrative (what will be fixed / created), strip any
+ * sentences that leak internal handoff terminology ("渡します", "build mode",
+ * etc.), and append the confirmation question if the model did not already ask
+ * it. This way the user sees "<what will change> → この内容で直しますか？"
+ * instead of just the bare confirmation.
+ */
+export declare function composeBuildSuggestionReply(modelLines: string[], type: "create" | "edit"): string[];
 export declare function parseEnvDirective(text: string): {
     name: string;
     value: string;
 } | null;
 export declare function isReservedAgentSinEnv(name: string): boolean;
-export declare function looksLikeRawSecretValue(text: string): boolean;
-export declare function extractAutoSaveSecretValue(text: string, envName?: string): string | null;
-export declare function tryAutoSaveBuildEnv(config: AppConfig, build: BuildModeState, text: string): Promise<string[] | null>;
 export interface BuildHandoffApproval {
     decision: "approve" | "reject" | "discuss";
     carry_over_text?: string;
@@ -68,5 +84,18 @@ export interface BuildAutoExitDecision {
     preferred_skill_id: string | null;
     reason: string;
 }
+/**
+ * Switch the active edit target to a different skill from within build mode.
+ * Equivalent to `enterEditModeForSkill` but does not announce "Entered" —
+ * it tells the user we switched. Used when the user mentions another skill
+ * in the middle of an existing build session.
+ */
+export declare function switchEditTargetSkill(config: AppConfig, skillId: string, intentRuntime: IntentRuntime, eventSource?: BuilderEventSource): Promise<string[]>;
+/**
+ * Put `intentRuntime` directly into edit mode for an existing skill, without
+ * calling the builder agent. Used by deterministic UI flows like the CLI/Discord
+ * `/build` picker where the user has already chosen the target skill.
+ */
+export declare function enterEditModeForSkill(config: AppConfig, skillId: string, intentRuntime: IntentRuntime, eventSource?: BuilderEventSource): Promise<string[]>;
 export declare function enterBuildMode(config: AppConfig, history: ChatTurn[], intentRuntime: IntentRuntime, hooks?: BuildModeHandlerOptions, extraText?: string, eventSource?: BuilderEventSource): Promise<string[]>;
 export declare function handleBuildModeMessage(config: AppConfig, text: string, intentRuntime: IntentRuntime, hooks?: BuildModeHandlerOptions, eventSource?: BuilderEventSource): Promise<string[] | null>;

package/dist/builder/build-flow.js

@@ -2,11 +2,9 @@ import { classifyIntent } from "../core/intent-router.js";
 import { listSkillManifests } from "../core/skill-registry.js";
 import { buildDraftWithAgent, prepareEditDraft, } from "./builder-session.js";
 import { buildRegisterLines } from "./build-commands.js";
-import { loadDotenv, upsertDotenv } from "../core/secrets.js";
-import { createBuildSession } from "./builder-session.js";
-import { findMissingRequiredEnv } from "../core/runtime.js";
-import { loadSkillManifest } from "../core/skill-registry.js";
-import { classifyBuildModeAction, classifyHandoffApproval, } from "./build-action-classifier.js";
+import { upsertDotenv } from "../core/secrets.js";
+import { runSkill } from "../core/runtime.js";
+import { classifyBuildModeAction, classifyHandoffApproval, classifyScheduleRequest, } from "./build-action-classifier.js";
 import { detectLocale, l } from "../core/i18n.js";
 export function createIntentRuntime(enabled = true) {
     return {
@@ -28,7 +26,60 @@ const SLASH_EXIT_COMMANDS = new Set([
     "!exit-build",
 ]);
 const SLASH_REGISTER_COMMANDS = new Set(["/register", "!register"]);
+const SLASH_BUILD_SUBCOMMANDS = new Set(["list", "register", "test", "chat", "status"]);
+/**
+ * Parse `/build <skill-id>` (or `build <skill-id>`) from a chat line. Returns
+ * the requested skill id, or null when the input is not a direct build slash
+ * command. Subcommand-style first words (list/register/test/chat/status) are
+ * not treated as skill ids so the existing CLI subcommands keep working.
+ */
+export function parseSlashBuildDirect(text) {
+    if (!text)
+        return null;
+    const match = text.match(/^\s*\/?build\s+(.+)$/i);
+    if (!match)
+        return null;
+    const rest = match[1].trim();
+    if (!rest)
+        return null;
+    const first = rest.split(/\s+/)[0] || "";
+    if (SLASH_BUILD_SUBCOMMANDS.has(first.toLowerCase()))
+        return null;
+    return first;
+}
 const SLASH_TEST_COMMANDS = new Set(["/test", "!test"]);
+const SLASH_EDIT_SWITCH_PATTERN = /^\s*[\/!]?(?:edit|switch|target)\s+([a-z][a-z0-9-]*)\s*$/i;
+export function parseSwitchEditTarget(text) {
+    if (!text)
+        return null;
+    const match = text.trim().match(SLASH_EDIT_SWITCH_PATTERN);
+    if (!match)
+        return null;
+    return match[1].toLowerCase();
+}
+const EDIT_VERB_PATTERN = /(直[しすせる]|修正|編集|改善|変更|手を入れ|触っ|更新|fix|update|edit|tweak|change)/i;
+async function detectImplicitEditSwitch(config, text, currentSkillId) {
+    if (!text || !EDIT_VERB_PATTERN.test(text))
+        return null;
+    let skills;
+    try {
+        skills = await listSkillManifests(config.skills_dir);
+    }
+    catch {
+        return null;
+    }
+    const candidates = skills.map((skill) => skill.id).filter((id) => id !== currentSkillId);
+    if (candidates.length === 0)
+        return null;
+    const sorted = [...candidates].sort((a, b) => b.length - a.length);
+    for (const id of sorted) {
+        const escaped = id.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
+        const re = new RegExp(`(?:^|[^a-z0-9-])${escaped}(?:[^a-z0-9-]|$)`, "i");
+        if (re.test(text))
+            return id;
+    }
+    return null;
+}
 function isSlashExitCommand(text) {
     return SLASH_EXIT_COMMANDS.has(text.trim().toLowerCase());
 }
@@ -38,6 +89,64 @@ function isSlashRegisterCommand(text) {
 function isSlashTestCommand(text) {
     return SLASH_TEST_COMMANDS.has(text.trim().toLowerCase());
 }
+export function isExplicitBuildModeStartRequest(text) {
+    const normalized = text.trim().replace(/\s+/g, " ").toLowerCase();
+    if (!normalized)
+        return false;
+    if (/(?:作って|つくって|作成して|作成し(?:て|よう)|スキル化して|実装して|組んで|直して|修正して|改善して|ビルドして|この方向で進めて|それで進めて|その内容で進めて)/u.test(normalized)) {
+        return true;
+    }
+    if (/(?:^|\b)(?:build|create|make|implement|fix|update) (?:it|this|that|the skill)(?:\b|$)/i.test(normalized)) {
+        return true;
+    }
+    if (/(?:^|\b)(?:go ahead|do it|please proceed|let's do it|looks good,? proceed)(?:\b|$)/i.test(normalized)) {
+        return true;
+    }
+    return /^(?:ok|okay|yes|yep|sure),? (?:go ahead|do it|proceed)$/i.test(normalized);
+}
+export function renderBuildSuggestionConfirmation(type) {
+    return [
+        type === "edit"
+            ? l("I can fix it with that approach. Should I proceed?", "この内容で直しますか？")
+            : l("I can create it with that approach. Should I proceed?", "この内容で作りますか？"),
+    ];
+}
+/**
+ * When the chat engine emits build_suggestion, keep whatever summary the model
+ * wrote in its visible narrative (what will be fixed / created), strip any
+ * sentences that leak internal handoff terminology ("渡します", "build mode",
+ * etc.), and append the confirmation question if the model did not already ask
+ * it. This way the user sees "<what will change> → この内容で直しますか？"
+ * instead of just the bare confirmation.
+ */
+export function composeBuildSuggestionReply(modelLines, type) {
+    const confirmation = type === "edit"
+        ? l("I can fix it with that approach. Should I proceed?", "この内容で直しますか？")
+        : l("I can create it with that approach. Should I proceed?", "この内容で作りますか？");
+    const cleaned = [];
+    for (const raw of modelLines) {
+        const sanitized = stripHandoffSentences(raw);
+        if (sanitized.trim().length > 0)
+            cleaned.push(sanitized);
+    }
+    const joined = cleaned.join("\n");
+    if (!/直しますか|作りますか|Should I proceed/i.test(joined)) {
+        cleaned.push(confirmation);
+    }
+    return cleaned.length > 0 ? cleaned : [confirmation];
+}
+const HANDOFF_LEAK_PATTERN = /(?:ビルドモード(?:に|へ)?(?:渡|移|入|切り替)|渡します|渡しますね|渡しますか|build\s*mode|hand(?:ed|ing)?\s*off|hand\s+off|handoff|pass(?:ing)?\s+(?:it|this|the\s+task))/i;
+function stripHandoffSentences(line) {
+    if (!line)
+        return "";
+    const sentences = line.split(/(?<=[。！？\.!?])\s*/);
+    const kept = sentences.filter((sentence) => {
+        if (!sentence.trim())
+            return false;
+        return !HANDOFF_LEAK_PATTERN.test(sentence);
+    });
+    return kept.join("");
+}
 export function parseEnvDirective(text) {
     const trimmed = text.trim();
     const match = trimmed.match(/^env\s+([A-Za-z_][A-Za-z0-9_]*)\s*=\s*([\s\S]*)$/i);
@@ -48,84 +157,6 @@ export function parseEnvDirective(text) {
 export function isReservedAgentSinEnv(name) {
     return /^AGENT_SIN_/i.test(name);
 }
-export function looksLikeRawSecretValue(text) {
-    const trimmed = text.trim();
-    if (!trimmed)
-        return false;
-    if (/\s/.test(trimmed))
-        return false;
-    if (trimmed.length < 16 || trimmed.length > 512)
-        return false;
-    if (!/^[A-Za-z0-9._\-:/+=~]+$/.test(trimmed))
-        return false;
-    if (!/[0-9]/.test(trimmed) && !/[A-Z]/.test(trimmed))
-        return false;
-    return true;
-}
-export function extractAutoSaveSecretValue(text, envName) {
-    const candidates = collectAutoSaveSecretCandidates(text);
-    const values = Array.from(new Set(candidates
-        .map((candidate) => normalizeAutoSaveSecretCandidate(candidate, envName))
-        .filter((value) => Boolean(value))));
-    return values.length === 1 ? values[0] : null;
-}
-function collectAutoSaveSecretCandidates(text) {
-    const candidates = [];
-    const assignmentPattern = /\b[A-Za-z_][A-Za-z0-9_]*\s*=\s*([A-Za-z0-9._\-:/+=~]{16,512})/g;
-    for (const match of text.matchAll(assignmentPattern)) {
-        candidates.push(match[0], match[1]);
-    }
-    const tokenPattern = /[A-Za-z0-9_][A-Za-z0-9._\-:/+=~]{15,511}/g;
-    for (const match of text.matchAll(tokenPattern)) {
-        candidates.push(match[0]);
-    }
-    return candidates;
-}
-function normalizeAutoSaveSecretCandidate(raw, envName) {
-    let value = raw
-        .trim()
-        .replace(/^[`"'「『]+/g, "")
-        .replace(/[`"'」』、。,.]+$/g, "");
-    const inlineAssignment = value.match(/^[A-Za-z_][A-Za-z0-9_]*=(.+)$/);
-    if (inlineAssignment) {
-        value = inlineAssignment[1].trim();
-    }
-    if (/^https?:\/\//i.test(value) && !allowsUrlSecret(envName)) {
-        return null;
-    }
-    return looksLikeRawSecretValue(value) ? value : null;
-}
-function allowsUrlSecret(envName) {
-    return Boolean(envName && /(?:URL|URI|ENDPOINT|WEBHOOK)/i.test(envName));
-}
-export async function tryAutoSaveBuildEnv(config, build, text) {
-    if (collectAutoSaveSecretCandidates(text).length === 0)
-        return null;
-    let manifest;
-    try {
-        const session = await createBuildSession(config, build.skill_id);
-        manifest = await loadSkillManifest(session.draft_dir);
-    }
-    catch {
-        return null;
-    }
-    await loadDotenv(config.workspace);
-    const missing = findMissingRequiredEnv(manifest).filter((entry) => !isReservedAgentSinEnv(entry.name));
-    if (missing.length !== 1)
-        return null;
-    const envName = missing[0].name;
-    const value = extractAutoSaveSecretValue(text, envName);
-    if (!value)
-        return null;
-    try {
-        const result = await upsertDotenv(config.workspace, [{ key: envName, value }]);
-        return [l(`Saved ${envName} to ${result.path}.`, `${envName} を ${result.path} に保存しました。`)];
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        return [l(`Failed to save environment variable: ${message}`, `環境変数の保存に失敗: ${message}`)];
-    }
-}
 export async function classifyPendingHandoff(config, text, history, intentRuntime) {
     const pending = intentRuntime.pending;
     if (!pending) {
@@ -262,6 +293,69 @@ async function detectBuildAutoExit(config, text, history) {
     }
     return null;
 }
+/**
+ * Switch the active edit target to a different skill from within build mode.
+ * Equivalent to `enterEditModeForSkill` but does not announce "Entered" —
+ * it tells the user we switched. Used when the user mentions another skill
+ * in the middle of an existing build session.
+ */
+export async function switchEditTargetSkill(config, skillId, intentRuntime, eventSource) {
+    try {
+        await prepareEditDraft(config, skillId);
+    }
+    catch (error) {
+        return [await renderEditModeFailureMessage(config, skillId, error)];
+    }
+    const displayName = await resolveSkillDisplayName(config, skillId);
+    intentRuntime.pending = null;
+    intentRuntime.pending_exit = null;
+    intentRuntime.preferred_skill_id = null;
+    intentRuntime.mode = "build";
+    intentRuntime.build = {
+        type: "edit",
+        skill_id: skillId,
+        skill_name: displayName,
+        context_seed: [],
+        context_consumed: true,
+        original_text: "",
+        event_source: eventSource ?? intentRuntime.build?.event_source,
+    };
+    const label = displayName?.trim() || skillId;
+    return [
+        l(`Switched edit target to "${label}". Tell me what to change.`, `編集対象を「${label}」に切り替えました。直したい内容を教えてください。`),
+    ];
+}
+/**
+ * Put `intentRuntime` directly into edit mode for an existing skill, without
+ * calling the builder agent. Used by deterministic UI flows like the CLI/Discord
+ * `/build` picker where the user has already chosen the target skill.
+ */
+export async function enterEditModeForSkill(config, skillId, intentRuntime, eventSource) {
+    try {
+        await prepareEditDraft(config, skillId);
+    }
+    catch (error) {
+        return [await renderEditModeFailureMessage(config, skillId, error)];
+    }
+    const displayName = await resolveSkillDisplayName(config, skillId);
+    intentRuntime.pending = null;
+    intentRuntime.pending_exit = null;
+    intentRuntime.preferred_skill_id = null;
+    intentRuntime.mode = "build";
+    intentRuntime.build = {
+        type: "edit",
+        skill_id: skillId,
+        skill_name: displayName,
+        context_seed: [],
+        context_consumed: true,
+        original_text: "",
+        event_source: eventSource,
+    };
+    const label = displayName?.trim() || skillId;
+    return [
+        l(`Entered edit mode for "${label}". Tell me what to change.`, `「${label}」の編集モードに入りました。直したい内容を教えてください。`),
+    ];
+}
 export async function enterBuildMode(config, history, intentRuntime, hooks = {}, extraText, eventSource) {
     const pending = intentRuntime.pending;
     if (!pending) {
@@ -294,7 +388,29 @@ export async function enterBuildMode(config, history, intentRuntime, hooks = {},
     const initialText = extraText && extraText.trim().length > 0
         ? `${pending.original_text}\n\n[追加要件]\n${extraText.trim()}`
         : pending.original_text;
-    return forwardToBuilder(config, intentRuntime.build, initialText, hooks);
+    const replyLines = await forwardToBuilder(config, intentRuntime.build, initialText, hooks);
+    const scheduleLines = await maybeAutoRegisterSchedule(config, intentRuntime.build, initialText, hooks.history || []);
+    return scheduleLines.length > 0 ? [...replyLines, ...scheduleLines] : replyLines;
+}
+/**
+ * After a build draft is created from the user's original request, also register
+ * a recurring schedule when that request clearly asked for one (e.g. "毎朝4時の
+ * ブリーフィング"). The classifier already covers follow-up messages inside build
+ * mode; this fills the gap for the very first creation prompt.
+ */
+async function maybeAutoRegisterSchedule(config, build, originalText, history) {
+    const trimmed = originalText.trim();
+    if (!trimmed)
+        return [];
+    try {
+        const decision = await classifyScheduleRequest(config, trimmed, history, build);
+        if (!decision.matched)
+            return [];
+        return await handleScheduleAddAction(config, decision.payload);
+    }
+    catch {
+        return [];
+    }
 }
 export async function handleBuildModeMessage(config, text, intentRuntime, hooks = {}, eventSource) {
     const build = intentRuntime.build;
@@ -309,6 +425,7 @@ export async function handleBuildModeMessage(config, text, intentRuntime, hooks
     // Deterministic slash-command exit.
     if (isSlashExitCommand(text)) {
         intentRuntime.mode = "chat";
+        intentRuntime.preferred_skill_id = build.skill_id;
         intentRuntime.build = null;
         intentRuntime.pending_exit = null;
         return [l("Back to chat.", "◀︎ チャットに戻りました。")];
@@ -332,11 +449,6 @@ export async function handleBuildModeMessage(config, text, intentRuntime, hooks
             return [l(`Failed to save environment variable: ${message}`, `環境変数の保存に失敗: ${message}`)];
         }
     }
-    // User pasted a raw API key value — auto-save into the only missing required_env if any.
-    const autoSaved = await tryAutoSaveBuildEnv(config, build, text);
-    if (autoSaved) {
-        return autoSaved;
-    }
     // Deterministic slash-command shortcuts for register / test.
     if (isSlashRegisterCommand(text)) {
         return handleRegisterAction(config, build, intentRuntime);
@@ -344,10 +456,23 @@ export async function handleBuildModeMessage(config, text, intentRuntime, hooks
     if (isSlashTestCommand(text)) {
         return handleTestAction(build, intentRuntime);
     }
+    // Explicit "/edit <skill-id>" switches the current edit target without
+    // leaving build mode, so the user can fix multiple skills in one session.
+    const explicitSwitch = parseSwitchEditTarget(text);
+    if (explicitSwitch && explicitSwitch !== build.skill_id) {
+        return switchEditTargetSkill(config, explicitSwitch, intentRuntime, eventSource);
+    }
+    // Implicit switch: user mentions another known skill id together with an
+    // edit verb (e.g. "memo-save も直して").
+    const implicitSwitch = await detectImplicitEditSwitch(config, text, build.skill_id);
+    if (implicitSwitch) {
+        return switchEditTargetSkill(config, implicitSwitch, intentRuntime, eventSource);
+    }
     // Classify the user's intent inside build mode (exit / register / test / continue).
     const action = await classifyBuildModeAction(config, text, hooks.history || [], build);
     if (action.action === "exit") {
         intentRuntime.mode = "chat";
+        intentRuntime.preferred_skill_id = build.skill_id;
         intentRuntime.build = null;
         intentRuntime.pending_exit = null;
         return [l("Back to chat.", "◀︎ チャットに戻りました。")];
@@ -358,6 +483,12 @@ export async function handleBuildModeMessage(config, text, intentRuntime, hooks
     if (action.action === "test") {
         return handleTestAction(build, intentRuntime);
     }
+    // Recurring schedule requests should be honored inside build mode so the user
+    // doesn't have to leave the session just to call schedule-add.
+    const scheduleDecision = await classifyScheduleRequest(config, text, hooks.history || [], build);
+    if (scheduleDecision.matched) {
+        return handleScheduleAddAction(config, scheduleDecision.payload);
+    }
     // If the user's message looks like a routine chat / existing-skill request
     // (e.g. "メール調べて…"), quietly leave build mode so the normal chat engine
     // can run skills. Return null so the router falls through to chatRespond.
@@ -378,6 +509,37 @@ function handleTestAction(build, intentRuntime) {
     intentRuntime.pending_exit = null;
     return null;
 }
+async function handleScheduleAddAction(config, payload) {
+    const args = {
+        id: payload.id,
+        cron: payload.cron,
+        skill: payload.skill,
+    };
+    if (payload.description)
+        args.description = payload.description;
+    if (payload.args)
+        args.args = payload.args;
+    if (payload.enabled !== undefined)
+        args.enabled = payload.enabled;
+    if (payload.approve !== undefined)
+        args.approve = payload.approve;
+    try {
+        const response = await runSkill(config, "schedule-add", args);
+        const summary = response.result.summary?.trim();
+        if (response.result.status === "ok") {
+            return [summary || l("Schedule registered.", "スケジュールを登録しました。")];
+        }
+        return [
+            summary
+                ? l(`Could not register schedule: ${summary}`, `スケジュールを登録できませんでした: ${summary}`)
+                : l("Could not register schedule.", "スケジュールを登録できませんでした。"),
+        ];
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        return [l(`Could not register schedule: ${message}`, `スケジュールを登録できませんでした: ${message}`)];
+    }
+}
 async function handleRegisterAction(config, build, intentRuntime) {
     try {
         const lines = await buildRegisterLines(config, build.skill_id, {

package/dist/builder/builder-session.d.ts

@@ -44,7 +44,7 @@ export interface BuilderHandoffTurn {
     role: "user" | "assistant" | "tool";
     content: string;
 }
-export type BuilderEventSource = "discord" | "telegram" | "cli";
+export type BuilderEventSource = "discord" | "telegram" | "g2" | "cli";
 export interface BuildTestResult {
     session: BuildSession;
     validation: ValidateSkillResult;