@yeaft/webchat-agent 0.1.654 → 0.1.656

package/connection/message-router.js

@@ -36,7 +36,7 @@ import { sendToServer, flushMessageBuffer } from './buffer.js';
 import { handleRestartAgent, handleUpgradeAgent } from './upgrade.js';
 import { loadMcpServers, updateMcpConfig } from '../mcp.js';
 import { getLlmConfig, updateLlmConfig, getUnifySettings, updateUnifySettings } from '../unify/config-api.js';
-import { handleUnifyChat, handleUnifyGroupChat, handleUnifyModeSwitch, handleUnifyModelSwitch, resetUnifySession, handleUnifyLoadHistory, handleUnifyMergeThread, handleUnifyForkThread, handleUnifyAbortThread, handleUnifyAbortAll, handleUnifyVpSubscribe, handleUnifyVpCreate, handleUnifyVpUpdate, handleUnifyVpDelete, handleUnifyVpRead, handleUnifyFeatureMessage, handleUnifyUserMemoryWrite, handleUnifyUserMemoryRemove, handleUnifyMemoryScopeList, handleUnifyMemoryQuery, handleUnifyMemoryTrace, handleUnifyFetchSummaryHistory, handleUnifyFeatureCrud, handleUnifyListGroups, handleUnifyCreateGroup, handleUnifyRenameGroup, handleUnifyArchiveGroup, handleUnifyDeleteGroup, handleUnifyAddMember, handleUnifyRemoveMember, handleUnifySetDefaultVp, handleUnifyDreamTrigger } from '../unify/web-bridge.js';
+import { handleUnifyChat, handleUnifyGroupChat, handleUnifyModeSwitch, handleUnifyModelSwitch, resetUnifySession, handleUnifyLoadHistory, handleUnifyAbortThread, handleUnifyAbortAll, handleUnifyVpSubscribe, handleUnifyVpCreate, handleUnifyVpUpdate, handleUnifyVpDelete, handleUnifyVpRead, handleUnifyFeatureMessage, handleUnifyUserMemoryWrite, handleUnifyUserMemoryRemove, handleUnifyMemoryScopeList, handleUnifyMemoryQuery, handleUnifyMemoryTrace, handleUnifyFetchSummaryHistory, handleUnifyFeatureCrud, handleUnifyListGroups, handleUnifyCreateGroup, handleUnifyRenameGroup, handleUnifyArchiveGroup, handleUnifyDeleteGroup, handleUnifyAddMember, handleUnifyRemoveMember, handleUnifySetDefaultVp, handleUnifyDreamTrigger } from '../unify/web-bridge.js';
 
 export async function handleMessage(msg) {
   switch (msg.type) {
@@ -381,18 +381,10 @@ export async function handleMessage(msg) {
       await resetUnifySession();
       break;
 
-    case 'unify_merge_thread':
-      handleUnifyMergeThread(msg);
-      break;
-
-    case 'unify_fork_thread':
-      handleUnifyForkThread(msg);
-      break;
-
     case 'unify_abort_thread':
-      // task-325c: user-initiated abort of a single thread's in-flight
-      // query. Payload `{ threadId }`. Silent no-op when the thread has
-      // no in-flight controller.
+      // task-325c: user-initiated abort of an in-flight query. The
+      // legacy `threadId` field on the payload is accepted but ignored
+      // (H2.f.5: single-conversation model).
       handleUnifyAbortThread(msg);
       break;
 

package/package.json

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

package/unify/engine.js

@@ -32,7 +32,10 @@ import { buildMemoryInjection } from './memory/layout.js';
 import { buildUserProfile } from './memory/user-memory-store.js';
 import { readSummary as readScopeSummary } from './memory/store-v2.js';
 import { runStopHooks } from './stop-hooks.js';
-import { getThreadStore, MAIN_THREAD_ID } from './threads/store.js';
+// H2.f.5: threads/ retired. Persisted messages still carry a `threadId`
+// field for back-compat with old conversation files; new writes always use
+// the constant 'main'.
+const MAIN_THREAD_ID = 'main';
 import { pickEffort, parseEffortPrefix } from './effort.js';
 import { normalizeEffort } from './models.js';
 import { attachRouterPlan, extractPriorPlan, stripMetaForWire } from './router/continuity.js';
@@ -581,17 +584,9 @@ export class Engine {
     if (!this.#conversationStore) return;
     if (this.#config._readOnly) return;
 
-    // task-299 Phase 1: tag persisted messages with the current thread.
-    // getThreadStore() lazily seeds a default 'main' thread if not yet init'd.
-    let threadId = MAIN_THREAD_ID;
-    let threadStore = null;
-    try {
-      threadStore = getThreadStore();
-      threadId = threadStore.currentId || MAIN_THREAD_ID;
-    } catch {
-      // Defensive: any store failure falls back to 'main' so persistence
-      // never breaks because of thread bookkeeping.
-    }
+    // H2.f.5: threads retired. Persisted messages still carry threadId
+    // for back-compat with old conversation files; new writes always use 'main'.
+    const threadId = MAIN_THREAD_ID;
 
     // Persist user message
     this.#conversationStore.append({
@@ -614,18 +609,6 @@ export class Engine {
       assistantMsg.toolCalls = toolCalls;
     }
     this.#conversationStore.append(assistantMsg);
-
-    // task-299 Phase 1 cached-field update: bump thread counters twice
-    // (once for user, once for assistant). Any exception is swallowed so
-    // bookkeeping never blocks the main persist path.
-    try {
-      if (threadStore) {
-        threadStore.noteMessage(threadId);
-        threadStore.noteMessage(threadId);
-      }
-    } catch {
-      // Non-critical; counters can be rebuilt via rebuildFromMessages().
-    }
   }
 
   /**
@@ -1709,11 +1692,7 @@ export class Engine {
    * @returns {string}
    */
   get currentThreadId() {
-    try {
-      return getThreadStore().currentId || MAIN_THREAD_ID;
-    } catch {
-      return MAIN_THREAD_ID;
-    }
+    return MAIN_THREAD_ID;
   }
 
   /** @returns {string|null} */

package/unify/session.js

@@ -24,17 +24,10 @@ import { SkillManager, createSkillManager } from './skills.js';
 import { MCPManager } from './mcp.js';
 import { createFullRegistry } from './tools/index.js';
 import { initFeatureStore } from './tools/feature-tools.js';
-import { initThreadStore } from './threads/store.js';
 import { Engine } from './engine.js';
-import { createThreadEngineRegistry } from './threads/engine-registry.js';
-import { MAIN_THREAD_ID } from './threads/store.js';
-import { getThreadStore } from './threads/store.js';
-// H2.f.1: intent-classifier (LLM router) is retired. Memory recall now
-// runs through pre-flow (memory/preflow.js) + post-turn adjustMemory
-// (memory/adjust.js); the dispatcher routes every input to the single
-// MAIN_THREAD_ID engine instance.
-import { initInputQueueStore } from './input-queue/store.js';
-import { createDispatcher } from './pipeline/dispatcher.js';
+// H2.f.5: threads/, pipeline/dispatcher and input-queue retired. The
+// session now exposes a single Engine. Memory recall runs through
+// pre-flow (memory/preflow.js) + post-turn adjustMemory (memory/adjust.js).
 import { ensureDefaultGroupIfEmpty } from './groups/group-crud.js';
 import { seedDefaultVps } from './vp/seed-defaults.js';
 import { createDreamScheduler } from './memory/dream-scheduler.js';
@@ -223,16 +216,7 @@ export async function loadSession(options = {}) {
   // ─── 5a. Initialize feature store ──────────────────────
   initFeatureStore(yeaftDir, { readOnly: config._readOnly || false });
 
-  // ─── 5b. Initialize thread store (task-299 Phase 1) ────
-  //         task-307a: now file-backed under ~/.yeaft/threads/. Passing the
-  //         yeaftDir switches on disk persistence; read-only mode is honoured.
-  //         task-318: forward the Unify autoArchiveIdleDays knob so the
-  //         archive pass (owned by task-317) can read it off the store.
-  initThreadStore(yeaftDir, {
-    readOnly: config._readOnly || false,
-    force: true,
-    idleArchiveDays: config.unify?.autoArchiveIdleDays ?? 0,
-  });
+  // ─── 5b. (H2.f.5) thread store retired. Single conversation. ───
 
   // ─── 5c. D1 first-boot seed (task-334m) ─────────────────
   //         When no groups exist on disk AND we're not in read-only mode,
@@ -341,46 +325,10 @@ export async function loadSession(options = {}) {
     });
   }
 
-  // task-308 Phase 2: thread-aware engine registry.
-  // Each thread gets its own EngineInstance (lazy-created) that owns its
-  // messages array and tags all events with the bound threadId. Legacy
-  // single-engine callers keep working via `session.engine`; multi-thread
-  // callers use `session.engineRegistry.ensure(threadId)`.
-  const engineRegistry = createThreadEngineRegistry({
-    adapter,
-    trace,
-    config,
-    conversationStore,
-    memoryStore,
-    memoryShardStore,
-    toolRegistry,
-    skillManager,
-    mcpManager,
-    yeaftDir,
-    // task-318: concurrent-thread cap (UI-adjustable via Settings).
-    maxConcurrent: config.unify?.maxConcurrentThreads ?? null,
-  });
-  // Seed the main-thread instance so listActive() is non-empty from T=0.
-  engineRegistry.ensure(MAIN_THREAD_ID);
-
-  // H2.f.1: the LLM intent-classifier is retired. The dispatcher now
-  // unconditionally routes every input to the MAIN_THREAD_ID engine
-  // instance. Memory recall happens via memory/preflow.js (pre-turn)
-  // and memory/adjust.js (post-turn).
-
-  // task-310 Phase 2 integration: wire InputQueue + Dispatcher so the
-  // web-bridge can submit `unify_chat` inputs through the unified pipeline
-  // (queue → engineRegistry → EngineInstance). In read-only mode the
-  // queue is memory-only (no disk writes).
-  const inputQueue = initInputQueueStore({
-    yeaftDir: config._readOnly ? null : yeaftDir,
-    force: true,
-  });
-  const dispatcher = createDispatcher({
-    inputQueue,
-    engineRegistry,
-    trace,
-  });
+  // H2.f.5: thread engine registry, input queue, and dispatcher retired.
+  // The session exposes a single `engine`; web-bridge calls engine.query()
+  // directly. Memory recall happens via memory/preflow.js (pre-turn) and
+  // memory/adjust.js (post-turn).
 
   // ─── 10. Build session ─────────────────────────────────
   const status = {
@@ -397,11 +345,6 @@ export async function loadSession(options = {}) {
     } catch {
       // Best-effort cleanup
     }
-    try {
-      engineRegistry.terminateAll();
-    } catch {
-      // Best-effort cleanup
-    }
     try {
       await mcpManager.disconnectAll();
     } catch {
@@ -416,13 +359,6 @@ export async function loadSession(options = {}) {
 
   return {
     engine,
-    engineRegistry,
-    // H2.f.1: `router` removed (intent classifier retired). Kept the
-    // property as `null` for any caller doing back-compat existence
-    // checks; the dispatcher now always routes to MAIN_THREAD_ID.
-    router: null,
-    inputQueue,
-    dispatcher,
     adapter,
     config,
     conversationStore,
@@ -434,17 +370,12 @@ export async function loadSession(options = {}) {
     toolRegistry,
     trace,
     yeaftDir,
-    // task-318 rev-1 fix: expose the live ThreadStore handle so callers
-    // (web-bridge, message-router via ctx) can invoke setIdleArchiveDays()
-    // on the exact instance that's wired into the dispatcher. Without this
-    // export the setter was effectively dead code.
-    threadStore: getThreadStore(),
     status,
     shutdown,
     // task-325c: user-initiated abort API. Delegates to web-bridge which
-    // owns the per-thread AbortController registry (`abortByThread`).
-    // Lazy-imported to avoid a hard cycle with web-bridge.js (which already
-    // imports this module to call loadSession).
+    // owns the single AbortController. Lazy-imported to avoid a hard cycle
+    // with web-bridge.js (which already imports this module to call
+    // loadSession).
     async abort(opts = {}) {
       const { abortUnifySession } = await import('./web-bridge.js');
       return abortUnifySession(opts);

package/unify/web-bridge.js

@@ -426,47 +426,6 @@ export function installUnifyRuntimeBridge(s) {
   };
 }
 
-/**
- * Translate a pipeline event (from Dispatcher) into web-bridge outputs.
- * Pipeline events are distinct from engine events — they carry queue /
- * routing state for the UI. Engine events are unwrapped and forwarded.
- */
-function forwardPipelineEvent(ev, pctx) {
-  if (!ev || typeof ev !== 'object') return false;
-  const gid = pctx && pctx.groupId;
-  switch (ev.type) {
-    case 'input_queue_updated':
-      sendUnifyEvent({
-        type: 'input_queue_updated',
-        total: ev.total,
-        pending: ev.pending,
-        routing: ev.routing,
-        dispatched: ev.dispatched,
-        head: ev.head,
-      }, gid);
-      return false;
-    case 'routing_decision':
-      // H2.f.2: still forwarded for wire compat, but frontend treats it as
-      // a no-op marker; targetThreadId is always 'main'.
-      sendUnifyEvent({
-        type: 'routing_decision',
-        entryId: ev.entryId,
-        action: ev.action,
-        source: ev.source,
-        reason: ev.reason,
-      }, gid);
-      return false;
-    case 'engine_event':
-      pctx.onEngineEvent(ev.event);
-      return false;
-    case 'error':
-      pctx.onError(ev.error);
-      return true;
-    default:
-      return false;
-  }
-}
-
 /**
  * Handle a single engine event unwrapped from an `engine_event` envelope.
  * H2.f.2: no longer stamps a threadId on outgoing claude_output frames.
@@ -957,34 +916,24 @@ export async function handleUnifyChat(msg) {
       const toolCallsAccum = [];
       const toolResultsAccum = [];
 
-      const { entry } = session.dispatcher.submit(prompt, {
-        messageId: msg.messageId,
-        queryOpts: buildVpQueryOpts({ vpId, groupCoordinator, groupId }),
-      });
-      sendUnifyEvent({
-        type: 'input_queue_updated',
-        total: 1,
-        pending: 1,
-        routing: 0,
-        dispatched: 0,
-        head: { id: entry.id, status: entry.status, text: entry.text.slice(0, 80) },
-      }, groupId);
-
-      const pipelineCtx = {
+      // H2.f.5: dispatcher + InputQueue retired. Call engine.query() directly,
+      // passing the flat conversation history as `messages` for context continuity.
+      const queryOpts = buildVpQueryOpts({ vpId, groupCoordinator, groupId });
+      const handlerCtx = {
+        assistantTextParts,
+        toolCallsAccum,
+        toolResultsAccum,
+        resetQueryTimer,
         groupId,
-        onEngineEvent: (event) => handleEngineEvent(event, {
-          assistantTextParts,
-          toolCallsAccum,
-          toolResultsAccum,
-          resetQueryTimer,
-          groupId,
-        }),
-        onError: (err) => { throw err; },
       };
-
-      for await (const pev of session.dispatcher.drain({ signal: abortCtrl.signal })) {
+      for await (const event of session.engine.query({
+        prompt,
+        messages: [...conversationMessages],
+        signal: abortCtrl.signal,
+        ...queryOpts,
+      })) {
         resetQueryTimer();
-        forwardPipelineEvent(pev, pipelineCtx);
+        handleEngineEvent(event, handlerCtx);
       }
 
       // Accumulate messages for context continuity.
@@ -1376,33 +1325,6 @@ export async function handleUnifyFeatureCrud(msg = {}) {
   }
 }
 
-/**
- * H2.f.2 stub: thread merge no longer exists. Kept for back-compat with
- * older message-router cases — emits a failed-ack.
- */
-export function handleUnifyMergeThread(msg) {
-  const { sourceId, targetId } = msg || {};
-  sendUnifyEvent({
-    type: 'thread_merge_failed',
-    sourceId,
-    targetId,
-    error: 'thread merge is no longer supported (H2 single-conversation)',
-  });
-}
-
-/**
- * H2.f.2 stub: thread fork no longer exists.
- */
-export function handleUnifyForkThread(msg) {
-  const { sourceThreadId, atMessageId } = msg || {};
-  sendUnifyEvent({
-    type: 'thread_fork_failed',
-    sourceThreadId,
-    atMessageId,
-    error: 'thread fork is no longer supported (H2 single-conversation)',
-  });
-}
-
 /** Handle model switch from the web UI. */
 export function handleUnifyModelSwitch(msg) {
   if (!session || !msg.model) return;