companionbot 0.8.2 → 0.9.0

package/dist/telegram/handlers/commands.js

@@ -20,8 +20,8 @@ ${conversationText}
     ];
     try {
         // haiku로 빠르게 요약 생성
-        const summary = await chat(summaryPrompt, undefined, "haiku");
-        return summary;
+        const result = await chat(summaryPrompt, undefined, "haiku");
+        return result.text;
     }
     catch (error) {
         console.error("Summary generation error:", error);
@@ -49,7 +49,7 @@ function validateResetToken(chatId, token) {
     resetTokens.delete(chatId); // 사용 후 삭제
     return true;
 }
-import { getHistory, clearHistory, getModel, setModel, runWithChatId, } from "../../session/state.js";
+import { getHistory, clearHistory, getModel, setModel, runWithChatId, getPinnedContexts, pinContext, unpinContext, clearPins, getSessionStats, } from "../../session/state.js";
 import { hasBootstrap, loadRecentMemories, getWorkspacePath, } from "../../workspace/index.js";
 import { getSecret, setSecret, deleteSecret } from "../../config/secrets.js";
 import { getReminders } from "../../reminders/index.js";
@@ -81,9 +81,9 @@ export function registerCommands(bot) {
                     content: "[시스템: 사용자가 /start를 눌렀습니다. 온보딩을 시작하세요.]",
                 });
                 try {
-                    const response = await chat(history, systemPrompt, modelId);
-                    history.push({ role: "assistant", content: response });
-                    await ctx.reply(response);
+                    const result = await chat(history, systemPrompt, modelId);
+                    history.push({ role: "assistant", content: result.text });
+                    await ctx.reply(result.text);
                 }
                 catch (error) {
                     console.error("Bootstrap start error:", error);
@@ -627,4 +627,91 @@ export function registerCommands(bot) {
             `❌ 에러: ${status.errorCount}개\n` +
             `🔋 상태: ${status.isHealthy ? "정상 ✅" : "점검 필요 ⚠️"}`);
     });
+    // /pin 명령어 - 중요 맥락 핀하기
+    bot.command("pin", async (ctx) => {
+        const chatId = ctx.chat.id;
+        const text = ctx.message?.text?.split(" ").slice(1).join(" ");
+        if (!text) {
+            await ctx.reply("📌 핀 사용법\n\n" +
+                "중요한 정보를 핀해서 대화가 길어져도 기억하게 해요.\n\n" +
+                "예시:\n" +
+                "/pin 내 이름은 민수야\n" +
+                "/pin 나는 채식주의자야\n" +
+                "/pin 다음주 화요일 치과 예약\n\n" +
+                "또는 대화 중에 \"기억해: ...\" 라고 하면 자동으로 핀됩니다.");
+            return;
+        }
+        const success = pinContext(chatId, text, "user");
+        if (success) {
+            await ctx.reply(`📌 핀됨: "${text.slice(0, 50)}${text.length > 50 ? "..." : ""}"\n\n대화가 길어져도 이 정보는 항상 기억할게요!`);
+        }
+        else {
+            await ctx.reply("핀 한도(~5000 토큰)에 도달했어요. /pins 에서 일부를 삭제해주세요.");
+        }
+    });
+    // /pins 명령어 - 핀 목록 보기
+    bot.command("pins", async (ctx) => {
+        const chatId = ctx.chat.id;
+        const pins = getPinnedContexts(chatId);
+        if (pins.length === 0) {
+            await ctx.reply("📌 핀된 맥락이 없어요.\n\n" +
+                "/pin [내용] 으로 중요한 정보를 핀해보세요.");
+            return;
+        }
+        let message = "📌 핀된 맥락\n\n";
+        pins.forEach((pin, i) => {
+            const source = pin.source === "auto" ? "🤖" : "👤";
+            const time = new Date(pin.createdAt).toLocaleDateString("ko-KR");
+            message += `${i + 1}. ${source} ${pin.text.slice(0, 60)}${pin.text.length > 60 ? "..." : ""}\n   📅 ${time}\n\n`;
+        });
+        message += "삭제: /unpin [번호] 또는 /clear_pins (전체)";
+        await ctx.reply(message);
+    });
+    // /unpin 명령어 - 핀 삭제
+    bot.command("unpin", async (ctx) => {
+        const chatId = ctx.chat.id;
+        const arg = ctx.message?.text?.split(" ")[1];
+        if (!arg) {
+            await ctx.reply("사용법: /unpin [번호]\n\n/pins 에서 번호를 확인하세요.");
+            return;
+        }
+        const index = parseInt(arg) - 1; // 1-based to 0-based
+        const pins = getPinnedContexts(chatId);
+        if (isNaN(index) || index < 0 || index >= pins.length) {
+            await ctx.reply(`유효하지 않은 번호예요. 1-${pins.length} 사이로 입력해주세요.`);
+            return;
+        }
+        const removed = pins[index].text;
+        const success = unpinContext(chatId, index);
+        if (success) {
+            await ctx.reply(`📌 핀 삭제됨: "${removed.slice(0, 40)}..."`);
+        }
+        else {
+            await ctx.reply("핀 삭제에 실패했어요.");
+        }
+    });
+    // /clear_pins 명령어 - 모든 핀 삭제
+    bot.command("clear_pins", async (ctx) => {
+        const chatId = ctx.chat.id;
+        const pins = getPinnedContexts(chatId);
+        if (pins.length === 0) {
+            await ctx.reply("삭제할 핀이 없어요.");
+            return;
+        }
+        clearPins(chatId);
+        await ctx.reply(`📌 ${pins.length}개 핀이 모두 삭제되었습니다.`);
+    });
+    // /context 명령어 - 현재 맥락 상태 확인
+    bot.command("context", async (ctx) => {
+        const chatId = ctx.chat.id;
+        const stats = getSessionStats(chatId);
+        await ctx.reply(`📊 맥락 상태\n\n` +
+            `💬 히스토리: ${stats.historyLength}개 메시지 (~${stats.historyTokens} 토큰)\n` +
+            `📌 핀: ${stats.pinnedCount}개 (~${stats.pinnedTokens} 토큰)\n` +
+            `📜 요약: ${stats.summaryCount}개\n\n` +
+            `명령어:\n` +
+            `/pins - 핀 목록\n` +
+            `/compact - 히스토리 압축\n` +
+            `/clear - 히스토리 초기화 (핀 유지)`);
+    });
 }

package/dist/telegram/handlers/messages.js

@@ -1,8 +1,8 @@
 import { chat, chatSmart } from "../../ai/claude.js";
 import { recordActivity, recordError } from "../../health/index.js";
-import { getHistory, getModel, runWithChatId, trimHistoryByTokens, } from "../../session/state.js";
+import { getHistory, getModel, runWithChatId, trimHistoryByTokens, smartTrimHistory, detectImportantContext, pinContext, } from "../../session/state.js";
 import { updateLastMessageTime } from "../../heartbeat/index.js";
-import { extractUrls, fetchWebContent, buildSystemPrompt, } from "../utils/index.js";
+import { extractUrls, fetchWebContent, formatUrlContent, buildSystemPrompt, } from "../utils/index.js";
 import { estimateMessagesTokens } from "../../utils/tokens.js";
 const MAX_CONTEXT_TOKENS = 100000; // Claude 컨텍스트
 const COMPACTION_THRESHOLD = 0.35; // 35% (35,000 토큰) - MAX_HISTORY_TOKENS(50k)보다 먼저 트리거되도록
@@ -23,11 +23,11 @@ async function autoCompactIfNeeded(ctx, history) {
                 oldMessages
                     .map((m) => `${m.role}: ${typeof m.content === "string" ? m.content : "[media]"}`)
                     .join("\n");
-            const summary = await chat([{ role: "user", content: summaryPrompt }], "", "haiku");
+            const summaryResult = await chat([{ role: "user", content: summaryPrompt }], "", "haiku");
             // 히스토리 교체
             const recentMessages = history.slice(-4);
             history.splice(0, history.length);
-            history.push({ role: "user", content: `[이전 대화 요약]\n${summary}` });
+            history.push({ role: "user", content: `[이전 대화 요약]\n${summaryResult.text}` });
             history.push(...recentMessages);
             const newTokens = estimateMessagesTokens(history);
             await ctx.reply(`📦 자동 정리: ${tokens} → ${newTokens} 토큰`);
@@ -149,10 +149,18 @@ export function registerMessageHandlers(bot) {
                 try {
                     const systemPrompt = await buildSystemPrompt(modelId, history);
                     const result = await chat(history, systemPrompt, modelId);
-                    history.push({ role: "assistant", content: result });
+                    // 도구 사용 정보를 포함한 응답 기록
+                    let assistantContent = result.text;
+                    if (result.toolsUsed.length > 0) {
+                        const toolsSummary = result.toolsUsed
+                            .map(t => `[${t.name}] ${t.output.slice(0, 100)}...`)
+                            .join("\n");
+                        assistantContent = `[도구 사용: ${result.toolsUsed.map(t => t.name).join(", ")}]\n${toolsSummary}\n\n---\n${result.text}`;
+                    }
+                    history.push({ role: "assistant", content: assistantContent });
                     // 토큰 기반 히스토리 트리밍
                     trimHistoryByTokens(history);
-                    await ctx.reply(result);
+                    await ctx.reply(result.text);
                 }
                 catch (innerError) {
                     // 에러 발생해도 사용자 메시지는 보존 (대화 컨텍스트 유지)
@@ -206,35 +214,69 @@ export function registerMessageHandlers(bot) {
             updateLastMessageTime(chatId);
             const history = getHistory(chatId);
             const modelId = getModel(chatId);
+            // 중요 맥락 자동 감지 및 핀
+            const importantContext = detectImportantContext(userMessage);
+            if (importantContext) {
+                pinContext(chatId, importantContext, "auto");
+                console.log(`[AutoPin] chatId=${chatId}: ${importantContext.slice(0, 50)}...`);
+            }
             await ctx.replyWithChatAction("typing");
             // URL 감지 및 내용 가져오기 (병렬 처리)
             const urls = extractUrls(userMessage);
-            let enrichedMessage = userMessage;
+            let messageForHistory = userMessage;
+            let urlContextForApi = ""; // 현재 요청에만 주입될 URL 내용
             if (urls.length > 0) {
                 const urlsToFetch = urls.slice(0, 3); // 최대 3개 URL
                 const contents = await Promise.all(urlsToFetch.map((url) => fetchWebContent(url)));
-                const webContents = contents
-                    .map((content, index) => {
+                const urlRefs = [];
+                for (let i = 0; i < contents.length; i++) {
+                    const content = contents[i];
                     if (!content)
-                        return null;
-                    return `\n\n---\n📎 Link: ${urlsToFetch[index]}\n📌 Title: ${content.title}\n📄 Content:\n${content.content}\n---`;
-                })
-                    .filter((item) => item !== null);
-                if (webContents.length > 0) {
-                    enrichedMessage = userMessage + webContents.join("\n");
+                        continue;
+                    const formatted = formatUrlContent(urlsToFetch[i], content);
+                    urlRefs.push(formatted.forHistory);
+                    urlContextForApi += formatted.forContext;
+                }
+                // 히스토리에는 간략한 링크 참조만 저장
+                if (urlRefs.length > 0) {
+                    messageForHistory = userMessage + "\n\n" + urlRefs.join("\n");
                 }
             }
-            // 사용자 메시지 추가 (URL 내용 포함)
-            history.push({ role: "user", content: enrichedMessage });
+            // 히스토리에는 간략 버전 저장
+            history.push({ role: "user", content: messageForHistory });
             try {
                 const systemPrompt = await buildSystemPrompt(modelId, history);
+                // API 호출용 메시지 준비 (URL 전체 내용 포함)
+                const messagesForApi = [...history];
+                if (urlContextForApi) {
+                    // 마지막 user 메시지에 URL 내용 추가 (API 호출 시에만)
+                    const lastIdx = messagesForApi.length - 1;
+                    const lastMsg = messagesForApi[lastIdx];
+                    if (typeof lastMsg.content === "string") {
+                        messagesForApi[lastIdx] = {
+                            ...lastMsg,
+                            content: lastMsg.content + urlContextForApi
+                        };
+                    }
+                }
                 // 스트리밍 응답 사용 (실시간 업데이트)
-                const response = await sendStreamingResponse(ctx, history, systemPrompt, modelId);
+                const response = await sendStreamingResponse(ctx, messagesForApi, // URL 내용이 포함된 버전
+                systemPrompt, modelId);
                 history.push({ role: "assistant", content: response });
-                // 토큰 기반 히스토리 트리밍
-                trimHistoryByTokens(history);
-                // 자동 compaction 체크
-                await autoCompactIfNeeded(ctx, history);
+                // 스마트 트리밍 (요약 포함) - autoCompactIfNeeded 대체
+                const summarizeFn = async (messages) => {
+                    const summaryPrompt = "다음 대화를 핵심만 3-4문장으로 요약해. 중요한 정보(이름, 선호도, 약속 등)는 반드시 포함:\n\n" +
+                        messages
+                            .map((m) => `${m.role}: ${typeof m.content === "string" ? m.content : "[media]"}`)
+                            .join("\n");
+                    const result = await chat([{ role: "user", content: summaryPrompt }], "", "haiku");
+                    return result.text;
+                };
+                const wasSummarized = await smartTrimHistory(chatId, summarizeFn);
+                if (!wasSummarized) {
+                    // 요약 안 됐으면 기본 트리밍
+                    trimHistoryByTokens(history);
+                }
             }
             catch (error) {
                 recordError();

package/dist/telegram/utils/index.js

@@ -1,5 +1,5 @@
 // URL utilities
-export { extractUrls, fetchWebContent, isSafeUrl } from "./url.js";
+export { extractUrls, fetchWebContent, isSafeUrl, formatUrlContent, clearUrlCache } from "./url.js";
 // Prompt utilities
 export { buildSystemPrompt, extractName } from "./prompt.js";
 // Cache utilities

package/dist/telegram/utils/prompt.js

@@ -4,9 +4,44 @@ import { getToolsDescription } from "../../tools/index.js";
 import { getWorkspace } from "./cache.js";
 import { embed } from "../../memory/embeddings.js";
 import { search } from "../../memory/vectorStore.js";
-/**
- * identity.md에서 이름을 추출합니다.
- */
+import { buildContextForPrompt, getCurrentChatId } from "../../session/state.js";
+import * as os from "os";
+function getRuntimeInfo(modelId) {
+    const model = MODELS[modelId];
+    return {
+        host: os.hostname(),
+        os: `${os.type()} ${os.release()}`,
+        arch: os.arch(),
+        nodeVersion: process.version,
+        model: model.name,
+        channel: "telegram",
+        capabilities: ["markdown", "inline_keyboard", "reactions", "voice_messages"],
+    };
+}
+function buildRuntimeLine(runtime) {
+    return `Runtime: host=${runtime.host} | os=${runtime.os} (${runtime.arch}) | node=${runtime.nodeVersion} | model=${runtime.model} | channel=${runtime.channel} | capabilities=${runtime.capabilities.join(",")}`;
+}
+function getKoreanDateTime() {
+    const now = new Date();
+    const timezone = "Asia/Seoul";
+    const formatter = new Intl.DateTimeFormat("ko-KR", {
+        timeZone: timezone,
+        year: "numeric",
+        month: "long",
+        day: "numeric",
+        weekday: "long",
+        hour: "numeric",
+        minute: "2-digit",
+        second: "2-digit",
+        hour12: true,
+    });
+    return {
+        formatted: formatter.format(now),
+        timezone: `${timezone} (GMT+9)`,
+        iso: now.toISOString(),
+    };
+}
+// ============== 이름 추출 ==============
 export function extractName(identityContent) {
     if (!identityContent)
         return null;
@@ -19,9 +54,7 @@ export function extractName(identityContent) {
     }
     return null;
 }
-/**
- * 최근 대화에서 검색 쿼리 컨텍스트를 추출합니다.
- */
+// ============== 메모리 검색 ==============
 function extractSearchContext(history) {
     const recent = history.slice(-3);
     return recent
@@ -30,110 +63,233 @@ function extractSearchContext(history) {
         .join(" ")
         .slice(0, 500);
 }
-/**
- * 대화 컨텍스트와 관련된 메모리를 검색합니다.
- */
 async function getRelevantMemories(history) {
     try {
         const context = extractSearchContext(history);
         if (!context.trim())
             return "";
         const queryEmbedding = await embed(context);
-        const results = await search(queryEmbedding, 3, 0.4); // 상위 3개, 유사도 0.4 이상
+        const results = await search(queryEmbedding, 3, 0.4);
         if (results.length === 0)
             return "";
-        return ("\n\n## 관련 기억\n" +
-            results
-                .map((r) => `- (${r.source}): ${r.text.slice(0, 200)}${r.text.length > 200 ? "..." : ""}`)
-                .join("\n"));
+        return results
+            .map((r) => `- (${r.source}): ${r.text.slice(0, 200)}${r.text.length > 200 ? "..." : ""}`)
+            .join("\n");
     }
     catch {
         return "";
     }
 }
-/**
- * 현재 날짜/시간을 한국어 포맷으로 반환합니다.
- */
-function getKoreanDateTime() {
-    const now = new Date();
-    const timezone = "Asia/Seoul";
-    const formatter = new Intl.DateTimeFormat("ko-KR", {
-        timeZone: timezone,
-        year: "numeric",
-        month: "long",
-        day: "numeric",
-        weekday: "short",
-        hour: "numeric",
-        minute: "2-digit",
-        hour12: true,
-    });
-    const formatted = formatter.format(now);
-    return {
-        formatted,
-        timezone: `${timezone} (GMT+9)`,
-    };
+// ============== 도구 설명 섹션 ==============
+const TOOL_SUMMARIES = {
+    read_file: "Read file contents",
+    write_file: "Create or overwrite files",
+    edit_file: "Make precise edits to files",
+    list_directory: "List directory contents",
+    run_command: "Run shell commands (supports background mode)",
+    list_sessions: "List background command sessions",
+    get_session_log: "Get logs from a background session",
+    kill_session: "Terminate a background session",
+    web_search: "Search the web (Brave API)",
+    web_fetch: "Fetch and extract readable content from a URL",
+    set_reminder: "Set a reminder (cron-based)",
+    list_reminders: "List active reminders",
+    delete_reminder: "Delete a reminder",
+    cron_add: "Add a cron job",
+    cron_list: "List cron jobs",
+    cron_remove: "Remove a cron job",
+    cron_toggle: "Enable/disable a cron job",
+    cron_run: "Run a cron job immediately",
+    calendar_today: "Get today's calendar events",
+    calendar_list: "List calendar events in a date range",
+    calendar_add: "Add a calendar event",
+    calendar_delete: "Delete a calendar event",
+    heartbeat_set: "Configure heartbeat polling",
+    heartbeat_get: "Get heartbeat configuration",
+    heartbeat_disable: "Disable heartbeat",
+    heartbeat_run: "Run heartbeat check now",
+    briefing_set: "Configure daily briefing",
+    briefing_get: "Get briefing configuration",
+    briefing_disable: "Disable briefing",
+    briefing_send: "Send briefing now",
+    save_persona: "Save persona during onboarding",
+    save_memory: "Append to memory file",
+    spawn_agent: "Spawn a background agent for complex tasks",
+    list_agents: "List running background agents",
+    cancel_agent: "Cancel a background agent",
+    memory_search: "Search memories by semantic similarity",
+    memory_reindex: "Reindex all memory files",
+};
+function buildToolAvailabilitySection() {
+    const lines = [
+        "## Tooling",
+        "Tool availability:",
+        "",
+    ];
+    for (const [name, description] of Object.entries(TOOL_SUMMARIES)) {
+        lines.push(`- ${name}: ${description}`);
+    }
+    return lines.join("\n");
+}
+// ============== 메시지 가이드 섹션 ==============
+function buildMessagingSection() {
+    return `## Messaging
+- Reply naturally in the conversation; your response is automatically sent to Telegram.
+- Use \`spawn_agent\` for complex, long-running tasks that need background processing.
+- Agent results are automatically reported back to the chat.
+
+## Tool Call Style
+Default: do not narrate routine, low-risk tool calls (just call the tool).
+Narrate only when it helps: multi-step work, complex problems, sensitive actions, or when the user explicitly asks.
+Keep narration brief and value-dense; avoid repeating obvious steps.`;
+}
+// ============== 하트비트/침묵 응답 섹션 ==============
+function buildHeartbeatSection() {
+    return `## Heartbeats
+When you receive a heartbeat poll, and there is nothing that needs attention, reply exactly:
+HEARTBEAT_OK
+
+If something needs attention, reply with the alert text instead (do NOT include "HEARTBEAT_OK").
+
+Things to check during heartbeats (rotate through these):
+- Upcoming reminders or calendar events
+- Pending tasks or follow-ups
+- Anything noteworthy to proactively mention`;
 }
-/**
- * 시스템 프롬프트를 동적으로 생성합니다.
- * @param modelId 사용할 모델 ID
- * @param history 대화 히스토리 (관련 메모리 검색에 사용)
- */
+// ============== 메인 빌드 함수 ==============
 export async function buildSystemPrompt(modelId, history) {
-    const model = MODELS[modelId];
     const workspace = await getWorkspace();
-    const parts = [];
-    // 기본 정보
-    parts.push(`You are a personal AI companion running on ${model.name}.`);
-    parts.push(`Workspace: ${getWorkspacePath()}`);
-    // 런타임 정보 (날짜/시간)
+    const runtime = getRuntimeInfo(modelId);
     const dateTime = getKoreanDateTime();
+    const parts = [];
+    // ===== 1. Core Identity =====
+    parts.push("You are a personal AI companion running on CompanionBot.");
+    parts.push("");
+    // ===== 2. Tooling Section =====
+    parts.push(buildToolAvailabilitySection());
+    parts.push("");
+    // ===== 3. Messaging & Tool Style =====
+    parts.push(buildMessagingSection());
+    parts.push("");
+    // ===== 4. Workspace =====
+    parts.push("## Workspace");
+    parts.push(`Your working directory is: ${getWorkspacePath()}`);
+    parts.push("Treat this directory as the single global workspace for file operations unless explicitly instructed otherwise.");
+    parts.push("");
+    // ===== 5. Current Date & Time =====
+    parts.push("## Current Date & Time");
+    parts.push(`Time zone: ${dateTime.timezone}`);
     parts.push(`Current time: ${dateTime.formatted}`);
-    parts.push(`Timezone: ${dateTime.timezone}`);
-    // 채널/플랫폼 정보
-    parts.push(`Runtime: channel=telegram | capabilities=markdown,inline_keyboard,reactions | version=0.4.x`);
-    // BOOTSTRAP 모드인 경우
+    parts.push("");
+    // ===== 6. Heartbeat Guide =====
+    parts.push(buildHeartbeatSection());
+    parts.push("");
+    // ===== 7. Runtime =====
+    parts.push("## Runtime");
+    parts.push(buildRuntimeLine(runtime));
+    parts.push("");
+    // ===== 8. Project Context (Workspace Files) =====
+    parts.push("# Project Context");
+    parts.push("");
+    parts.push("The following workspace files have been loaded:");
+    parts.push("");
+    // BOOTSTRAP 모드
     if (workspace.bootstrap) {
-        parts.push("---");
-        parts.push("# 온보딩 모드 활성화");
+        parts.push("## BOOTSTRAP.md (Onboarding Mode)");
+        parts.push("");
         parts.push(workspace.bootstrap);
+        parts.push("");
         parts.push("---");
-        parts.push(`온보딩 완료 후 save_persona 도구를 사용하여 설정을 저장하세요.`);
+        parts.push("Complete onboarding, then use `save_persona` tool to save settings.");
+        parts.push("");
     }
     else {
-        // 일반 모드: 워크스페이스 파일들 로드
+        // 일반 모드: 워크스페이스 파일들
         if (workspace.identity) {
-            parts.push("---");
+            parts.push("## IDENTITY.md");
+            parts.push("");
             parts.push(workspace.identity);
+            parts.push("");
         }
         if (workspace.soul) {
-            parts.push("---");
+            parts.push("## SOUL.md");
+            parts.push("");
+            parts.push("If SOUL.md is present, embody its persona and tone. Avoid stiff, generic replies; follow its guidance.");
+            parts.push("");
             parts.push(workspace.soul);
+            parts.push("");
         }
         if (workspace.user) {
-            parts.push("---");
+            parts.push("## USER.md");
+            parts.push("");
             parts.push(workspace.user);
+            parts.push("");
         }
         if (workspace.agents) {
-            parts.push("---");
+            parts.push("## AGENTS.md");
+            parts.push("");
             parts.push(workspace.agents);
+            parts.push("");
+        }
+        // TOOLS.md - 도구 사용 로컬 설정/노트
+        if (workspace.tools) {
+            parts.push("## TOOLS.md");
+            parts.push("");
+            parts.push("Local notes for tool usage (camera names, SSH details, voice preferences, etc.)");
+            parts.push("");
+            parts.push(workspace.tools);
+            parts.push("");
+        }
+        // 핀된 맥락 (히스토리 트리밍과 무관하게 유지됨)
+        const chatId = getCurrentChatId();
+        if (chatId) {
+            const pinnedContext = buildContextForPrompt(chatId);
+            if (pinnedContext) {
+                parts.push("## 📌 Pinned Context (always remember)");
+                parts.push("");
+                parts.push(pinnedContext);
+                parts.push("");
+            }
+        }
+        // 최근 Daily Memory (오늘/어제 - 벡터 검색 없이 직접 포함)
+        if (workspace.recentDaily) {
+            parts.push("## Recent Daily Memory (Today/Yesterday)");
+            parts.push("");
+            parts.push("These are your recent conversation logs. Use them for context continuity.");
+            parts.push("");
+            parts.push(workspace.recentDaily);
+            parts.push("");
         }
-        // 관련 기억 로드 (대화 컨텍스트 기반)
+        // 관련 기억 (벡터 검색 - 더 오래된 기록에서)
         if (history && history.length > 0) {
             const relevantMemories = await getRelevantMemories(history);
             if (relevantMemories) {
-                parts.push("---");
-                parts.push("# 관련 기억");
+                parts.push("## Relevant Memories (vector search from older records)");
+                parts.push("");
                 parts.push(relevantMemories);
+                parts.push("");
             }
         }
+        // 장기 기억
         if (workspace.memory) {
-            parts.push("---");
-            parts.push("# 장기 기억");
+            parts.push("## MEMORY.md (Long-term Memory)");
+            parts.push("");
+            parts.push("Curated important information. Update this when you learn significant things about the user.");
+            parts.push("");
             parts.push(workspace.memory);
+            parts.push("");
         }
     }
-    // 도구 설명
+    // 잘린 파일 경고
+    if (workspace.truncated && workspace.truncated.length > 0) {
+        parts.push("");
+        parts.push(`⚠️ Note: These files were truncated due to size limits: ${workspace.truncated.join(", ")}`);
+        parts.push("Use read_file tool to see full contents if needed.");
+        parts.push("");
+    }
+    // ===== 9. Tools Schema (for Claude) =====
     parts.push("---");
+    parts.push("");
     parts.push(getToolsDescription(modelId));
-    return parts.join("\n\n");
+    return parts.join("\n");
 }