@yeaft/webchat-agent 0.1.444 → 0.1.446

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.444",
+  "version": "0.1.446",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",

package/unify/prompts.js

@@ -4,6 +4,9 @@
  * Single source of truth for system prompts. Both engine.js and cli.js
  * import buildSystemPrompt() from here. Supports 'en' and 'zh'.
  *
+ * Template files from agent/unify/templates/ are loaded once at startup
+ * and used to enrich the system prompt beyond the hardcoded fallbacks.
+ *
  * Phase 2 additions:
  *   - Memory section (user profile + recalled entries)
  *   - Compact summary section (conversation history summary)
@@ -11,7 +14,99 @@
  * Reference: yeaft-unify-system-prompt-budget.md — Static + Dynamic + Context layers
  */
 
-// ─── Prompt Templates ─────────────────────────────────────────
+import { readFileSync, existsSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+// ─── Template Loading (one-time at startup) ──────────────────────
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const TEMPLATES_DIR = join(__dirname, 'templates');
+
+/**
+ * Read a template file from the templates/ directory.
+ * Returns empty string if file doesn't exist or can't be read.
+ * @param {string} name — filename (e.g. 'base.md')
+ * @returns {string}
+ */
+function readTemplate(name) {
+  const path = join(TEMPLATES_DIR, name);
+  if (!existsSync(path)) return '';
+  try {
+    return readFileSync(path, 'utf8').trim();
+  } catch {
+    return '';
+  }
+}
+
+/**
+ * Extract the section for a given language from a bilingual template.
+ * Templates use `<!-- lang:en -->` / `<!-- lang:zh -->` HTML comment markers
+ * to delimit language sections. Returns the content between the matching
+ * marker and the next marker (or EOF).
+ *
+ * If no markers exist, returns the full content regardless of language.
+ *
+ * @param {string} content — full template content
+ * @param {string} language — 'en' or 'zh'
+ * @returns {string}
+ */
+function extractLangSection(content, language) {
+  if (!content) return '';
+
+  const marker = `<!-- lang:${language} -->`;
+  const markerIdx = content.indexOf(marker);
+
+  if (markerIdx === -1) {
+    // No marker for this language — if language is 'zh', try 'en' fallback
+    if (language === 'zh') {
+      const enMarker = '<!-- lang:en -->';
+      const enIdx = content.indexOf(enMarker);
+      if (enIdx !== -1) {
+        // Has en marker but no zh — return en section as fallback
+        return extractLangSection(content, 'en');
+      }
+    }
+    // No markers at all — return full content
+    if (!content.includes('<!-- lang:')) return content;
+    // Has markers but not for this language — fallback to en
+    return extractLangSection(content, 'en');
+  }
+
+  // Extract from after the marker to the next <!-- lang: marker or EOF
+  const sectionStart = markerIdx + marker.length;
+  const nextMarkerIdx = content.indexOf('<!-- lang:', sectionStart);
+
+  if (nextMarkerIdx === -1) {
+    // This is the last section — take everything after the marker
+    return content.slice(sectionStart).trim();
+  }
+
+  return content.slice(sectionStart, nextMarkerIdx).trim();
+}
+
+/** Loaded templates — read once at module load time. */
+const RAW_TEMPLATES = {
+  base: readTemplate('base.md'),
+  modeChat: readTemplate('mode-chat.md'),
+  modeWorker: readTemplate('mode-worker.md'),
+  modeDream: readTemplate('mode-dream.md'),
+  toolGuidance: readTemplate('tool-guidance.md'),
+};
+
+/**
+ * Get a template section for the given language.
+ * @param {string} key — template key (e.g. 'base', 'modeChat')
+ * @param {string} language — 'en' or 'zh'
+ * @returns {string}
+ */
+function getTemplate(key, language) {
+  const raw = RAW_TEMPLATES[key];
+  if (!raw) return '';
+  return extractLangSection(raw, language);
+}
+
+// ─── Prompt Templates (hardcoded fallbacks) ──────────────────────
 
 const PROMPTS = {
   en: {
@@ -46,12 +141,22 @@ export const SUPPORTED_LANGUAGES = Object.keys(PROMPTS);
 /**
  * Build the system prompt for a given language and mode.
  *
+ * Prompt structure:
+ *   1. Core identity (from template or fallback)
+ *   2. Mode + date metadata
+ *   3. Mode-specific behavioral instructions (from template or fallback)
+ *   4. Tool list + tool guidance (from template)
+ *   5. Skills section
+ *   6. Memory section
+ *   7. Compact summary section
+ *
  * @param {{
  *   language?: string,
  *   mode?: string,
  *   toolNames?: string[],
  *   memory?: { profile?: string, entries?: object[] },
- *   compactSummary?: string
+ *   compactSummary?: string,
+ *   skillContent?: string,
  * }} params
  * @returns {string}
  */
@@ -65,29 +170,54 @@ export function buildSystemPrompt({
 } = {}) {
   // Fallback to English for unknown languages
   const lang = PROMPTS[language] || PROMPTS.en;
+  const effectiveLang = PROMPTS[language] ? language : 'en';
 
-  const parts = [
-    lang.identity,
-    lang.mode(mode),
-    lang.date(new Date().toISOString().split('T')[0]),
-  ];
+  const parts = [];
+
+  // ─── 1. Core Identity ──────────────────────────────────
+  // Use template if available, otherwise fallback to hardcoded one-liner
+  const baseTemplate = getTemplate('base', effectiveLang);
+  if (baseTemplate) {
+    parts.push(baseTemplate);
+  } else {
+    parts.push(lang.identity);
+  }
 
+  // ─── 2. Mode + Date Metadata ───────────────────────────
+  parts.push(lang.mode(mode));
+  parts.push(lang.date(new Date().toISOString().split('T')[0]));
+
+  // ─── 3. Mode-Specific Instructions ─────────────────────
   if (mode === 'work') {
-    parts.push(lang.work);
+    const workerTemplate = getTemplate('modeWorker', effectiveLang);
+    parts.push(workerTemplate || lang.work);
   } else if (mode === 'dream') {
-    parts.push(lang.dream);
+    const dreamTemplate = getTemplate('modeDream', effectiveLang);
+    parts.push(dreamTemplate || lang.dream);
+  } else if (mode === 'chat') {
+    const chatTemplate = getTemplate('modeChat', effectiveLang);
+    if (chatTemplate) {
+      parts.push(chatTemplate);
+    }
+    // No fallback needed — chat mode previously had no instructions
   }
 
+  // ─── 4. Tools + Tool Guidance ──────────────────────────
   if (toolNames.length > 0) {
     parts.push(lang.tools(toolNames.join(', ')));
+
+    const toolGuidanceTemplate = getTemplate('toolGuidance', effectiveLang);
+    if (toolGuidanceTemplate) {
+      parts.push(toolGuidanceTemplate);
+    }
   }
 
-  // ─── Skills Section ─────────────────────────────────────
+  // ─── 5. Skills Section ─────────────────────────────────
   if (skillContent) {
     parts.push(skillContent);
   }
 
-  // ─── Memory Section ─────────────────────────────────────
+  // ─── 6. Memory Section ─────────────────────────────────
   if (memory && (memory.profile || (memory.entries && memory.entries.length > 0))) {
     const memoryParts = [lang.memoryHeader];
 
@@ -106,7 +236,7 @@ export function buildSystemPrompt({
     parts.push(memoryParts.join('\n\n'));
   }
 
-  // ─── Compact Summary Section ────────────────────────────
+  // ─── 7. Compact Summary Section ────────────────────────
   if (compactSummary) {
     parts.push(`${lang.compactHeader}\n${compactSummary}`);
   }

package/unify/web-bridge.js

@@ -32,6 +32,11 @@ let unifyConversationId = null;
 /** Current query mode: 'chat' or 'work' */
 let currentMode = 'chat';
 
+/** Accumulated conversation messages for context continuity across queries.
+ *  Each entry is { role: 'user'|'assistant', content: string|Array }.
+ *  Cleared on session reset or consolidation. */
+let conversationMessages = [];
+
 /** Whether we've already sent a permission warning to the UI */
 let _permissionDiagnosticSent = false;
 
@@ -133,10 +138,14 @@ export async function handleUnifyChat(msg) {
     resetQueryTimer();
 
     try {
+    // ─── Collect assistant response for conversation history ──
+    let assistantTextParts = [];
+
     // ─── Stream Engine events → claude_output format ──
     for await (const event of session.engine.query({
       prompt,
       mode: currentMode,
+      messages: conversationMessages,
       signal: currentAbort.signal,
     })) {
       // Reset timeout on every event — activity means the query is alive
@@ -144,6 +153,7 @@ export async function handleUnifyChat(msg) {
       switch (event.type) {
         // ── Text streaming ──
         case 'text_delta':
+          assistantTextParts.push(event.text);
           sendUnifyOutput({
             type: 'assistant',
             message: {
@@ -232,6 +242,9 @@ export async function handleUnifyChat(msg) {
 
         // ── Context consolidation ──
         case 'consolidate':
+          // Engine has compressed the context — clear our accumulated history.
+          // The engine's compactSummary will provide context on next query.
+          conversationMessages = [];
           sendUnifyEvent({
             type: 'consolidate',
             archivedCount: event.archivedCount,
@@ -303,7 +316,15 @@ export async function handleUnifyChat(msg) {
       }
     }
 
-    // ─── Query complete — signal turn end ──
+    // ─── Query complete — accumulate messages for context continuity ──
+    conversationMessages.push({ role: 'user', content: prompt });
+
+    const fullText = assistantTextParts.join('');
+    if (fullText) {
+      conversationMessages.push({ role: 'assistant', content: fullText });
+    }
+
+    // ─── Signal turn end to UI ──
     // Finish any streaming text
     sendUnifyOutput({
       type: 'assistant',
@@ -426,4 +447,5 @@ export async function resetUnifySession() {
   }
   unifyConversationId = null;
   currentMode = 'chat';
+  conversationMessages = [];
 }