@remnic/core 9.69.33 → 9.69.35

package/src/adapters/opencode.ts

@@ -0,0 +1,52 @@
+import { headerValue, type AdapterContext, type EngramAdapter, type ResolvedIdentity } from "./types.js";
+
+/**
+ * OpenCode adapter.
+ *
+ * Detection: OpenCode identifies itself as "opencode" in the MCP
+ * clientInfo of its initialize handshake, and sends
+ * User-Agent: opencode/<version> on HTTP requests.
+ *
+ * User-configured identification is also supported via headers in the
+ * OpenCode MCP server config:
+ *      "headers": { "X-Engram-Client-Id": "opencode" }
+ *
+ * Principal overrides are intentionally handled only by the HTTP server's
+ * trustPrincipalHeader gate. Adapters must not independently trust
+ * X-Engram-Principal.
+ */
+export class OpenCodeAdapter implements EngramAdapter {
+  readonly id = "opencode";
+
+  matches(context: AdapterContext): boolean {
+    // Primary: MCP clientInfo from initialize handshake
+    const clientName = context.clientInfo?.name?.toLowerCase() ?? "";
+    if (clientName.includes("opencode")) return true;
+
+    // Fallback: User-Agent header ("opencode/<version>")
+    const ua = headerValue(context.headers, "user-agent");
+    if (ua && ua.toLowerCase().startsWith("opencode/")) return true;
+
+    // Fallback: user-configured client identifier header
+    const clientId = headerValue(context.headers, "x-engram-client-id");
+    if (clientId?.toLowerCase() === "opencode") return true;
+
+    return false;
+  }
+
+  resolveIdentity(context: AdapterContext): ResolvedIdentity {
+    // MCP session ID (standard MCP header, server-assigned)
+    const mcpSessionId = headerValue(context.headers, "mcp-session-id");
+
+    // Namespace: explicit header > default
+    const namespace = headerValue(context.headers, "x-engram-namespace")
+      || "opencode";
+
+    return {
+      namespace,
+      principal: "opencode",
+      sessionKey: mcpSessionId ?? context.sessionKey,
+      adapterId: this.id,
+    };
+  }
+}

package/src/adapters/registry.ts

@@ -1,6 +1,8 @@
 import type { AdapterContext, EngramAdapter, ResolvedIdentity } from "./types.js";
 import { ClaudeCodeAdapter } from "./claude-code.js";
 import { CodexAdapter } from "./codex.js";
+import { GrokAdapter } from "./grok.js";
+import { OpenCodeAdapter } from "./opencode.js";
 import { ReplitAdapter } from "./replit.js";
 import { HermesAdapter } from "./hermes.js";
 
@@ -18,6 +20,8 @@ export class AdapterRegistry {
       new ReplitAdapter(),
       new CodexAdapter(),
       new ClaudeCodeAdapter(),
+      new GrokAdapter(),
+      new OpenCodeAdapter(),
     ];
   }
 

package/src/cli-fallback.ts

@@ -51,9 +51,18 @@ const VALID_CODEX_CLI_REASONING_EFFORTS = new Set<CodexCliReasoningEffort>([
 let processRunner: CodexCliFallbackRunner | undefined;
 
 /**
- * Registers the process-local Codex CLI transport. Core deliberately does not
- * import child_process so host adapters such as OpenClaw do not ship shell
- * execution in their plugin bundle; benchmark/standalone runtimes opt in.
+ * True when a process-local Codex CLI transport is registered. Lets a default
+ * runner (codex-subscription) register only when no host/benchmark runner has
+ * claimed the seam, so explicit registrations always win.
+ */
+export function isCodexCliFallbackRunnerRegistered(): boolean {
+  return processRunner !== undefined;
+}
+
+/**
+ * Registers the process-local Codex CLI transport. Core itself stays free of
+ * child_process here; hosts and benchmark runtimes opt in, and the
+ * codex-subscription module registers a subprocess runner on demand.
  */
 export function setCodexCliFallbackRunnerForProcess(
   runner: CodexCliFallbackRunner | undefined,
@@ -145,7 +154,7 @@ function normalizeCodexCliReasoningEffort(value: unknown): CodexCliReasoningEffo
   throw new Error("codex-cli reasoningEffort must be one of low, medium, high, xhigh");
 }
 
-function normalizeCodexCliTimeoutMs(value: unknown): number {
+export function normalizeCodexCliTimeoutMs(value: unknown): number {
   const parsed = typeof value === "number"
     ? value
     : typeof value === "string" && value.trim().length > 0

package/src/config.test.ts

@@ -969,6 +969,30 @@ test("parseConfig openaiApiKey string 0 is not treated as a direct OpenAI opt-ou
   }
 });
 
+test("parseConfig localLlmApiKeyEnv resolves a present launch token but tolerates its absence", () => {
+  const variable = "REMNIC_TEST_LOCAL_LLM_TOKEN";
+  const previous = process.env[variable];
+  try {
+    delete process.env[variable];
+    const absent = parseConfig({ localLlmApiKeyEnv: variable });
+    assert.equal(absent.localLlmApiKey, undefined);
+    assert.equal(absent.localLlmApiKeyEnv, variable);
+
+    process.env[variable] = "launch-scoped-local-token";
+    const present = parseConfig({ localLlmApiKeyEnv: variable });
+    assert.equal(present.localLlmApiKey, "launch-scoped-local-token");
+    assert.equal(present.localLlmApiKeyEnv, variable);
+
+    assert.throws(
+      () => parseConfig({ localLlmApiKeyEnv: "not-an-environment-variable" }),
+      /localLlmApiKeyEnv must name a conventional environment variable/,
+    );
+  } finally {
+    if (previous === undefined) delete process.env[variable];
+    else process.env[variable] = previous;
+  }
+});
+
 test("parseConfig localLlmTimeoutMs accepts CLI-style numeric strings for gateway fallback", () => {
   const cfg = parseConfig({ localLlmTimeoutMs: "600000" });
   assert.equal(cfg.localLlmTimeoutMs, 600_000);
@@ -2571,7 +2595,8 @@ test("parseConfig forwards activity source settings", () => {
     maxMemoriesPerDay: 0,
     timeline: {
       enabled: false,
-      journal: { enabled: false, source: "file" },
+      analysis: { enabled: false },
+      journal: { enabled: false, source: "memoryDir", extractionMode: "off" },
       qa: { enabled: false, maxRangeDays: 31 },
       vault: {
         enabled: false,
@@ -2588,6 +2613,7 @@ test("parseConfig forwards activity source settings", () => {
           locations: { enabled: false, target: "daily", section: "Locations" },
         },
         insertUnderHeading: "",
+        readback: { journalSection: "" },
         wikilinks: { places: false, placesFolder: "Places" },
         properties: { mode: "off", prefix: "remnic_" },
         autoPublish: true,

package/src/config.ts

@@ -38,6 +38,7 @@ import { expandTildePath } from "./utils/path.js";
 // config.ts → connectors/index.ts nor the reverse circular import arises.
 import { coerceBool, coerceBooleanLike, coerceInstallExtension, coerceNumber } from "./connectors/coerce.js";
 import { parseSubjectRuntimeConfig } from "./subject-config.js";
+import { parseRecallStateViews } from "./recall-state-view.js";
 import { parseRecallConcurrencyConfig } from "./recall-concurrency-config.js";
 import { parseExtractionLivenessConfig } from "./extraction-liveness.js";
 import { parseReplicaPeersConfig } from "./replica-peers-config.js";
@@ -460,6 +461,14 @@ function parseAgentAccessPrincipal(raw: unknown): string | undefined {
   );
 }
 
+function parseOptionalEnvName(raw: unknown, property: string): string | undefined {
+  if (raw === undefined || raw === null || raw === "") return undefined;
+  if (typeof raw !== "string" || !/^[A-Z_][A-Z0-9_]*$/.test(raw)) {
+    throw new Error(`${property} must name a conventional environment variable`);
+  }
+  return raw;
+}
+
 export function resolveEnvVars(value: string): string {
   const resolved = value.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g, (_, envVar: string) => {
     const envValue = readEnvVar(envVar);
@@ -1545,6 +1554,7 @@ export function parseConfig(
 
   const { wikiMergeIntoRecall, qmdCollection, qmdColdCollection } =
     parseExternalWikiRecallGuard(cfg);
+  const localLlmApiKeyEnv = parseOptionalEnvName(cfg.localLlmApiKeyEnv, "localLlmApiKeyEnv");
 
   return {
     openaiApiKey: apiKey,
@@ -1922,6 +1932,9 @@ export function parseConfig(
     // explicitly opt in.
     recallDirectAnswerEnabled:
       coerceBool(cfg.recallDirectAnswerEnabled) ?? false,
+    // Recall state views (issue #1952). Default false; exact false/0/"false"
+    // disable (parseRecallStateViews → coerceBooleanLike).
+    recallStateViews: parseRecallStateViews(cfg.recallStateViews),
     // Disclosure auto-escalation (issue #677 PR 4/4).  Default `manual`
     // so pre-#677 callers see unchanged behavior.  Reject anything
     // outside the allow-list rather than silently defaulting (CLAUDE.md
@@ -2680,7 +2693,10 @@ export function parseConfig(
     localLlmApiKey:
       typeof cfg.localLlmApiKey === "string" && cfg.localLlmApiKey.length > 0
         ? resolveEnvVars(cfg.localLlmApiKey)
-        : undefined,
+        : localLlmApiKeyEnv === undefined
+          ? undefined
+          : readEnvVar(localLlmApiKeyEnv),
+    localLlmApiKeyEnv,
     localLlmHeaders:
       cfg.localLlmHeaders && typeof cfg.localLlmHeaders === "object" && !Array.isArray(cfg.localLlmHeaders)
         ? Object.fromEntries(