@geravant/sinain 1.6.6 → 1.6.8

package/cli.js

@@ -7,6 +7,9 @@ import path from "path";
 
 const cmd = process.argv[2];
 const IS_WINDOWS = os.platform() === "win32";
+const HOME = os.homedir();
+const SINAIN_DIR = path.join(HOME, ".sinain");
+const PKG_DIR = path.dirname(new URL(import.meta.url).pathname);
 
 switch (cmd) {
   case "start":
@@ -52,6 +55,14 @@ switch (cmd) {
     await import("./install.js");
     break;
 
+  case "export-knowledge":
+    await exportKnowledge();
+    break;
+
+  case "import-knowledge":
+    await importKnowledge();
+    break;
+
   default:
     printUsage();
     break;
@@ -349,6 +360,152 @@ function isProcessRunning(pattern) {
   }
 }
 
+// ── Knowledge export/import ──────────────────────────────────────────────────
+
+function findWorkspace() {
+  const candidates = [
+    process.env.SINAIN_WORKSPACE,
+    path.join(HOME, ".openclaw/workspace"),
+    path.join(HOME, ".sinain/workspace"),
+  ].filter(Boolean);
+  for (const dir of candidates) {
+    const resolved = dir.replace(/^~/, HOME);
+    if (fs.existsSync(resolved)) return resolved;
+  }
+  return null;
+}
+
+async function exportKnowledge() {
+  const BOLD = "\x1b[1m", GREEN = "\x1b[32m", RED = "\x1b[31m", DIM = "\x1b[2m", RESET = "\x1b[0m";
+
+  const workspace = findWorkspace();
+  if (!workspace) {
+    console.error(`${RED}✗${RESET} No knowledge workspace found.`);
+    console.error(`  Checked: SINAIN_WORKSPACE env, ~/.openclaw/workspace, ~/.sinain/workspace`);
+    process.exit(1);
+  }
+
+  const outputIdx = process.argv.indexOf("--output");
+  const outputPath = outputIdx !== -1 && process.argv[outputIdx + 1]
+    ? path.resolve(process.argv[outputIdx + 1])
+    : path.join(HOME, "sinain-knowledge-export.tar.gz");
+
+  // Collect files that exist
+  const includes = [];
+  const check = (rel) => {
+    const full = path.join(workspace, rel);
+    if (fs.existsSync(full)) { includes.push(rel); return true; }
+    return false;
+  };
+
+  check("modules");
+  check("memory/sinain-playbook.md");
+  check("memory/knowledge-graph.db");
+  check("memory/playbook-base.md");
+  check("memory/playbook.md");
+  check("memory/sinain-knowledge.md");
+
+  if (includes.length === 0) {
+    console.error(`${RED}✗${RESET} No knowledge files found in ${workspace}`);
+    process.exit(1);
+  }
+
+  console.log(`${BOLD}[export]${RESET} Exporting from ${DIM}${workspace}${RESET}`);
+  for (const inc of includes) {
+    console.log(`  ${GREEN}+${RESET} ${inc}`);
+  }
+
+  try {
+    execSync(
+      `tar czf "${outputPath}" --exclude="memory/triplestore.db" ${includes.map(i => `"${i}"`).join(" ")}`,
+      { cwd: workspace, stdio: "pipe" }
+    );
+  } catch (e) {
+    console.error(`${RED}✗${RESET} tar failed: ${e.message}`);
+    process.exit(1);
+  }
+
+  const size = fs.statSync(outputPath).size;
+  const sizeStr = size < 1024 * 1024
+    ? `${(size / 1024).toFixed(1)} KB`
+    : `${(size / (1024 * 1024)).toFixed(1)} MB`;
+
+  console.log(`\n${GREEN}✓${RESET} Exported to ${BOLD}${outputPath}${RESET} (${sizeStr})`);
+  console.log(`  Transfer to another machine and run: ${BOLD}sinain import-knowledge ${path.basename(outputPath)}${RESET}`);
+}
+
+async function importKnowledge() {
+  const BOLD = "\x1b[1m", GREEN = "\x1b[32m", RED = "\x1b[31m", YELLOW = "\x1b[33m", DIM = "\x1b[2m", RESET = "\x1b[0m";
+
+  const filePath = process.argv[3];
+  if (!filePath) {
+    console.error(`${RED}✗${RESET} Usage: sinain import-knowledge <file.tar.gz>`);
+    process.exit(1);
+  }
+
+  const resolved = path.resolve(filePath.replace(/^~/, HOME));
+  if (!fs.existsSync(resolved)) {
+    console.error(`${RED}✗${RESET} File not found: ${resolved}`);
+    process.exit(1);
+  }
+
+  const targetWorkspace = path.join(HOME, ".sinain/workspace");
+  fs.mkdirSync(targetWorkspace, { recursive: true });
+
+  console.log(`${BOLD}[import]${RESET} Importing to ${DIM}${targetWorkspace}${RESET}`);
+
+  // Extract
+  try {
+    execSync(`tar xzf "${resolved}" -C "${targetWorkspace}"`, { stdio: "inherit" });
+  } catch (e) {
+    console.error(`${RED}✗${RESET} Extraction failed: ${e.message}`);
+    process.exit(1);
+  }
+
+  // Symlink sinain-memory scripts from npm package
+  const srcMemory = path.join(PKG_DIR, "sinain-memory");
+  const dstMemory = path.join(targetWorkspace, "sinain-memory");
+  if (fs.existsSync(srcMemory)) {
+    try { fs.rmSync(dstMemory, { recursive: true, force: true }); } catch {}
+    fs.symlinkSync(srcMemory, dstMemory, IS_WINDOWS ? "junction" : undefined);
+    console.log(`  ${GREEN}✓${RESET} sinain-memory scripts linked`);
+  }
+
+  // Update ~/.sinain/.env
+  const envPath = path.join(SINAIN_DIR, ".env");
+  const envVars = {
+    SINAIN_WORKSPACE: targetWorkspace,
+    OPENCLAW_WORKSPACE_DIR: targetWorkspace,
+  };
+
+  if (fs.existsSync(envPath)) {
+    let content = fs.readFileSync(envPath, "utf-8");
+    for (const [key, val] of Object.entries(envVars)) {
+      const regex = new RegExp(`^#?\\s*${key}=.*$`, "m");
+      if (regex.test(content)) {
+        content = content.replace(regex, `${key}=${val}`);
+      } else {
+        content += `\n${key}=${val}`;
+      }
+    }
+    fs.writeFileSync(envPath, content);
+  } else {
+    fs.mkdirSync(SINAIN_DIR, { recursive: true });
+    const lines = Object.entries(envVars).map(([k, v]) => `${k}=${v}`);
+    fs.writeFileSync(envPath, lines.join("\n") + "\n");
+  }
+  console.log(`  ${GREEN}✓${RESET} SINAIN_WORKSPACE set in ${DIM}~/.sinain/.env${RESET}`);
+
+  // Summary
+  const items = [];
+  if (fs.existsSync(path.join(targetWorkspace, "modules"))) items.push("modules");
+  if (fs.existsSync(path.join(targetWorkspace, "memory/sinain-playbook.md"))) items.push("playbook");
+  if (fs.existsSync(path.join(targetWorkspace, "memory/knowledge-graph.db"))) items.push("knowledge graph");
+
+  console.log(`\n${GREEN}✓${RESET} Knowledge imported: ${items.join(", ")}`);
+  console.log(`  Workspace: ${BOLD}${targetWorkspace}${RESET}`);
+}
+
 // ── Usage ─────────────────────────────────────────────────────────────────────
 
 function printUsage() {
@@ -362,6 +519,8 @@ Usage:
   sinain setup                 Run interactive setup wizard (~/.sinain/.env)
   sinain setup-overlay         Download pre-built overlay app
   sinain setup-sck-capture     Download sck-capture audio binary (macOS)
+  sinain export-knowledge      Export knowledge for transfer to another machine
+  sinain import-knowledge <file>  Import knowledge from export file
   sinain install               Install OpenClaw plugin (server-side)
 
 Start options:

package/launcher.js

@@ -587,7 +587,34 @@ async function setupWizard(envPath) {
     vars.OPENCLAW_HTTP_URL = "";
   }
 
-  // 6. Agent-specific defaults
+  // 6. Knowledge import (for standalone machines)
+  console.log();
+  const wantImport = await ask(`  Import knowledge from another machine? [y/N]: `);
+  if (wantImport.trim().toLowerCase() === "y") {
+    const filePath = await ask(`  Path to knowledge export (.tar.gz): `);
+    const resolved = filePath.trim().replace(/^~/, HOME);
+    if (resolved && fs.existsSync(resolved)) {
+      const targetWorkspace = path.join(HOME, ".sinain/workspace");
+      fs.mkdirSync(targetWorkspace, { recursive: true });
+      try {
+        execSync(`tar xzf "${resolved}" -C "${targetWorkspace}"`, { stdio: "inherit" });
+        // Symlink sinain-memory scripts from npm package
+        const srcMemory = path.join(PKG_DIR, "sinain-memory");
+        const dstMemory = path.join(targetWorkspace, "sinain-memory");
+        try { fs.rmSync(dstMemory, { recursive: true }); } catch {}
+        fs.symlinkSync(srcMemory, dstMemory);
+        vars.SINAIN_WORKSPACE = targetWorkspace;
+        vars.OPENCLAW_WORKSPACE_DIR = targetWorkspace;
+        ok(`Knowledge imported to ${targetWorkspace}`);
+      } catch (e) {
+        warn(`Import failed: ${e.message}`);
+      }
+    } else if (resolved) {
+      warn(`File not found: ${resolved}`);
+    }
+  }
+
+  // 7. Agent-specific defaults
   vars.SINAIN_POLL_INTERVAL = "5";
   vars.SINAIN_HEARTBEAT_INTERVAL = "900";
   vars.PRIVACY_MODE = "standard";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geravant/sinain",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "description": "Ambient AI overlay invisible to screen capture — real-time insights from audio + screen context",
   "type": "module",
   "bin": {

package/sense_client/__main__.py

@@ -12,7 +12,6 @@ if sys.platform == "win32":
 
 import argparse
 import concurrent.futures
-import copy
 import json
 import os
 import time
@@ -29,7 +28,7 @@ from .capture import ScreenCapture, create_capture
 from .change_detector import ChangeDetector
 from .roi_extractor import ROIExtractor
 from .ocr import OCRResult, create_ocr
-from .gate import DecisionGate, SenseEvent, SenseObservation, SenseMeta
+from .gate import DecisionGate, SenseObservation
 from .sender import SenseSender, package_full_frame, package_roi
 from .app_detector import AppDetector
 from .config import load_config
@@ -129,7 +128,6 @@ def main():
     )
     app_detector = AppDetector()
     ocr_pool = concurrent.futures.ThreadPoolExecutor(max_workers=4)
-    vision_pool = concurrent.futures.ThreadPoolExecutor(max_workers=1, thread_name_prefix="vision")
 
     # Vision provider — routes to Ollama (local) or OpenRouter (cloud) based on config/privacy
     vision_cfg = config.get("vision", {})
@@ -357,28 +355,18 @@ def main():
             title=title, subtitle=subtitle, facts=facts,
         )
 
-        # Vision scene analysis — async: send text event immediately, vision follows
+        # Vision scene analysis (throttled, non-blocking on failure)
         if vision_provider and time.time() - last_vision_time >= vision_throttle_s:
-            last_vision_time = time.time()  # claim slot immediately to prevent concurrent calls
-            _v_frame = use_frame.copy() if isinstance(use_frame, np.ndarray) else use_frame.copy()
-            _v_meta = copy.copy(event.meta)
-            _v_ts = event.ts
-            _v_prompt = vision_prompt
-            def _do_vision(frame, meta, ts, prompt):
-                try:
-                    from PIL import Image as PILImage
-                    pil = PILImage.fromarray(frame) if isinstance(frame, np.ndarray) else frame
-                    scene = vision_provider.describe(pil, prompt=prompt or None)
-                    if scene:
-                        log(f"vision: {scene[:80]}...")
-                        ctx_ev = SenseEvent(type="context", ts=ts)
-                        ctx_ev.observation = SenseObservation(scene=scene)
-                        ctx_ev.meta = meta
-                        ctx_ev.roi = package_full_frame(frame)
-                        sender.send(ctx_ev)
-                except Exception as e:
-                    log(f"vision error: {e}")
-            vision_pool.submit(_do_vision, _v_frame, _v_meta, _v_ts, _v_prompt)
+            try:
+                from PIL import Image as PILImage
+                pil_frame = PILImage.fromarray(use_frame) if isinstance(use_frame, np.ndarray) else use_frame
+                scene = vision_provider.describe(pil_frame, prompt=vision_prompt or None)
+                if scene:
+                    event.observation.scene = scene
+                    last_vision_time = time.time()
+                    log(f"vision: {scene[:80]}...")
+            except Exception as e:
+                log(f"vision error: {e}")
 
         # Send small thumbnail for ALL event types (agent uses vision)
         # Privacy matrix: gate image sending based on PRIVACY_IMAGES_OPENROUTER

package/sinain-core/src/agent/loop.ts

@@ -1,10 +1,9 @@
 import { EventEmitter } from "node:events";
-import fs from "node:fs";
 import type { FeedBuffer } from "../buffers/feed-buffer.js";
 import type { SenseBuffer } from "../buffers/sense-buffer.js";
-import type { AgentConfig, AgentEntry, ContextWindow, EscalationMode, ContextRichness, RecorderStatus, SenseEvent, FeedbackRecord } from "../types.js";
+import type { AgentConfig, AgentEntry, ContextWindow, EscalationMode, ContextRichness, RecorderStatus } from "../types.js";
 import type { Profiler } from "../profiler.js";
-import { buildContextWindow, RICHNESS_PRESETS } from "./context-window.js";
+import { buildContextWindow } from "./context-window.js";
 import { analyzeContext } from "./analyzer.js";
 import { writeSituationMd } from "./situation-writer.js";
 import { calculateEscalationScore } from "../escalation/scorer.js";
@@ -36,10 +35,6 @@ export interface AgentLoopDeps {
   traitEngine?: TraitEngine;
   /** Directory to write per-day trait log JSONL files. */
   traitLogDir?: string;
-  /** Optional: path to sinain-knowledge.md for startup recap. */
-  getKnowledgeDocPath?: () => string | null;
-  /** Optional: feedback store for startup recap context. */
-  feedbackStore?: { queryRecent(n: number): FeedbackRecord[] };
 }
 
 export interface TraceContext {
@@ -74,7 +69,6 @@ export class AgentLoop extends EventEmitter {
   private lastRunTs = 0;
   private running = false;
   private started = false;
-  private firstTick = true;
 
   private lastPushedHud = "";
   private agentNextId = 1;
@@ -118,9 +112,6 @@ export class AgentLoop extends EventEmitter {
     }, this.deps.agentConfig.maxIntervalMs);
 
     log(TAG, `loop started (debounce=${this.deps.agentConfig.debounceMs}ms, max=${this.deps.agentConfig.maxIntervalMs}ms, cooldown=${this.deps.agentConfig.cooldownMs}ms, model=${this.deps.agentConfig.model})`);
-
-    // Fire recap tick: immediate HUD from persistent knowledge (no sense data needed)
-    this.fireRecapTick().catch(e => debug(TAG, "recap skipped:", String(e)));
   }
 
   /** Stop the agent loop. */
@@ -140,13 +131,12 @@ export class AgentLoop extends EventEmitter {
   onNewContext(): void {
     if (!this.started) return;
 
-    // Fast first tick: 500ms debounce on startup, normal debounce after
-    const delay = this.firstTick ? 500 : this.deps.agentConfig.debounceMs;
+    // Debounce: wait N ms after last event before running
     if (this.debounceTimer) clearTimeout(this.debounceTimer);
     this.debounceTimer = setTimeout(() => {
       this.debounceTimer = null;
       this.run().catch(err => error(TAG, "debounce tick error:", err.message));
-    }, delay);
+    }, this.deps.agentConfig.debounceMs);
   }
 
   /** Get agent results history (newest first). */
@@ -408,80 +398,7 @@ export class AgentLoop extends EventEmitter {
       traceCtx?.finish({ totalLatencyMs: Date.now() - Date.now(), llmLatencyMs: 0, llmInputTokens: 0, llmOutputTokens: 0, llmCost: 0, escalated: false, escalationScore: 0, contextScreenEvents: 0, contextAudioEntries: 0, contextRichness: richness, digestLength: 0, hudChanged: false });
     } finally {
       this.running = false;
-      this.firstTick = false;
       this.lastRunTs = Date.now();
     }
   }
-
-  // ── Private: startup recap tick from persistent knowledge ──
-
-  private async fireRecapTick(): Promise<void> {
-    if (this.running) return;
-    this.running = true;
-
-    try {
-      const sections: string[] = [];
-      const startTs = Date.now();
-
-      // 1. sinain-knowledge.md (established patterns, user preferences)
-      const knowledgePath = this.deps.getKnowledgeDocPath?.();
-      if (knowledgePath) {
-        const content = await fs.promises.readFile(knowledgePath, "utf-8").catch(() => "");
-        if (content.length > 50) sections.push(content.slice(0, 2000));
-      }
-
-      // 2. SITUATION.md digest (if fresh — less than 5 minutes old)
-      try {
-        const stat = await fs.promises.stat(this.deps.situationMdPath);
-        if (Date.now() - stat.mtimeMs < 5 * 60_000) {
-          const sit = await fs.promises.readFile(this.deps.situationMdPath, "utf-8");
-          const digestMatch = sit.match(/## Digest\n([\s\S]*?)(?=\n##|$)/);
-          if (digestMatch?.[1]?.trim()) {
-            sections.push(`Last session digest:\n${digestMatch[1].trim()}`);
-          }
-        }
-      } catch { /* SITUATION.md missing — fine */ }
-
-      // 3. Recent feedback records (last 5 escalation summaries)
-      const records = this.deps.feedbackStore?.queryRecent(5) ?? [];
-      if (records.length > 0) {
-        const recaps = records.slice(0, 5).map(r => `- ${r.currentApp}: ${r.hud}`).join("\n");
-        sections.push(`Recent activity:\n${recaps}`);
-      }
-
-      if (sections.length === 0) { return; }
-
-      const recapContext = sections.join("\n\n");
-
-      // Build synthetic ContextWindow with knowledge as screen entry
-      const recapWindow: ContextWindow = {
-        audio: [],
-        screen: [{
-          ts: Date.now(),
-          ocr: recapContext,
-          meta: { app: "sinain-recap", windowTitle: "startup" },
-          type: "context",
-        } as unknown as SenseEvent],
-        images: [],
-        currentApp: "sinain-recap",
-        appHistory: [],
-        audioCount: 0,
-        screenCount: 1,
-        windowMs: 0,
-        newestEventTs: Date.now(),
-        preset: RICHNESS_PRESETS.lean,
-      };
-
-      const result = await analyzeContext(recapWindow, this.deps.agentConfig, null);
-      if (result?.hud && result.hud !== "—" && result.hud !== "Idle") {
-        this.deps.onHudUpdate(result.hud);
-        log(TAG, `recap tick (${Date.now() - startTs}ms, ${result.tokensIn}in+${result.tokensOut}out tok) hud="${result.hud}"`);
-      }
-    } catch (err: any) {
-      debug(TAG, "recap tick error:", err.message || err);
-    } finally {
-      this.running = false;
-      // Do NOT update lastRunTs — normal cooldown should not be affected by recap
-    }
-  }
 }

package/sinain-core/src/index.ts

@@ -25,12 +25,6 @@ import { initPrivacy, levelFor, applyLevel } from "./privacy/index.js";
 
 const TAG = "core";
 
-/** Resolve workspace path, expanding leading ~ to HOME. */
-function resolveWorkspace(): string {
-  const raw = process.env.SINAIN_WORKSPACE || `${process.env.HOME}/.openclaw/workspace`;
-  return raw.startsWith("~") ? raw.replace("~", process.env.HOME || "") : raw;
-}
-
 async function main() {
   log(TAG, "sinain-core starting...");
 
@@ -86,7 +80,7 @@ async function main() {
     profiler,
     feedbackStore: feedbackStore ?? undefined,
     queryKnowledgeFacts: async (entities: string[], maxFacts: number) => {
-      const workspace = resolveWorkspace();
+      const workspace = process.env.SINAIN_WORKSPACE || `${process.env.HOME}/.openclaw/workspace`;
       const dbPath = `${workspace}/memory/knowledge-graph.db`;
       const scriptPath = `${workspace}/sinain-memory/graph_query.py`;
       try {
@@ -162,13 +156,6 @@ async function main() {
     } : undefined,
     traitEngine,
     traitLogDir: config.traitConfig.logDir,
-    getKnowledgeDocPath: () => {
-      const workspace = resolveWorkspace();
-      const p = `${workspace}/memory/sinain-knowledge.md`;
-      try { if (existsSync(p)) return p; } catch {}
-      return null;
-    },
-    feedbackStore: feedbackStore ?? undefined,
   });
 
   // ── Wire learning signal collector (needs agentLoop) ──
@@ -413,13 +400,13 @@ async function main() {
 
     // Knowledge graph integration
     getKnowledgeDocPath: () => {
-      const workspace = resolveWorkspace();
+      const workspace = process.env.SINAIN_WORKSPACE || `${process.env.HOME}/.openclaw/workspace`;
       const p = `${workspace}/memory/sinain-knowledge.md`;
       try { if (existsSync(p)) return p; } catch {}
       return null;
     },
     queryKnowledgeFacts: async (entities: string[], maxFacts: number) => {
-      const workspace = resolveWorkspace();
+      const workspace = process.env.SINAIN_WORKSPACE || `${process.env.HOME}/.openclaw/workspace`;
       const dbPath = `${workspace}/memory/knowledge-graph.db`;
       const scriptPath = `${workspace}/sinain-memory/graph_query.py`;
       try {