opencode-codex-memory 0.7.1 → 0.7.3

package/README.md

@@ -52,7 +52,7 @@ If you want the mental model — learning, remembering, forgetting — see
 
 ```json
 {
-  "plugin": ["opencode-codex-memory@0.7.1"]
+  "plugin": ["opencode-codex-memory@0.7.3"]
 }
 ```
 
@@ -72,7 +72,7 @@ V2 plugin syntax:
 
 ```jsonc
 {
-  "plugins": [{ "package": "opencode-codex-memory@0.7.1" }],
+  "plugins": [{ "package": "opencode-codex-memory@0.7.3" }],
 }
 ```
 
@@ -198,7 +198,7 @@ To set options, turn the plugin entry into a `[name, options]` pair:
 ```json
 {
   "plugin": [
-    ["opencode-codex-memory@0.7.1", { "disable_on_external_context": true, "min_rollout_idle_hours": 2 }]
+    ["opencode-codex-memory@0.7.3", { "disable_on_external_context": true, "min_rollout_idle_hours": 2 }]
   ]
 }
 ```
@@ -265,7 +265,7 @@ Off by default; no changes to Codex's own config are required.
 {
   "plugin": [
     [
-      "opencode-codex-memory@0.7.1",
+      "opencode-codex-memory@0.7.3",
       { "codex_interop": { "import": true, "export": true } }
     ]
   ]
@@ -322,7 +322,7 @@ from the project memories Claude already keeps on your machine. **One-way only**
 ```json
 {
   "plugin": [
-    ["opencode-codex-memory@0.7.1", { "claude_import": { "enabled": true } }]
+    ["opencode-codex-memory@0.7.3", { "claude_import": { "enabled": true } }]
   ]
 }
 ```
@@ -349,7 +349,7 @@ Claude names each project with an opaque id (a folder under
 {
   "plugin": [
     [
-      "opencode-codex-memory@0.7.1",
+      "opencode-codex-memory@0.7.3",
       {
         "claude_import": {
           "enabled": true,

package/dist/src/git-baseline.js

@@ -29,7 +29,7 @@ async function ensureInit(dir) {
     const gitDir = path.join(dir, ".git");
     let recreate = false;
     try {
-        recreate = containsSymlink(gitDir) || !fs.lstatSync(gitDir).isDirectory();
+        recreate = gitMetadataUnusable(gitDir);
     }
     catch (err) {
         if (err.code !== "ENOENT")
@@ -41,17 +41,14 @@ async function ensureInit(dir) {
         await isogit.init({ fs, dir });
     }
 }
-function containsSymlink(root) {
-    const st = fs.lstatSync(root);
-    if (st.isSymbolicLink())
-        return true;
-    if (!st.isDirectory())
-        return false;
-    for (const name of fs.readdirSync(root)) {
-        if (containsSymlink(path.join(root, name)))
-            return true;
-    }
-    return false;
+/**
+ * Only the `.git` entry itself. A recursive walk of git objects hangs on
+ * Windows junctions / symlink cycles and is not needed: we only refuse a
+ * `.git` that is a symlink or a non-directory.
+ */
+function gitMetadataUnusable(gitDir) {
+    const st = fs.lstatSync(gitDir);
+    return st.isSymbolicLink() || !st.isDirectory();
 }
 // statusMatrix rows are [filepath, head, workdir, stage]; head !== workdir
 // means the working tree differs from HEAD (added, modified, or deleted).

package/dist/src/phase2.js

@@ -2,7 +2,7 @@ import { checkRateLimit, isProviderCapacityError, noteProviderCapacityExhausted
 import { ensureLayout, rebuildRawMemories, writeRolloutSummaries, pruneExtensionResources, writeWorkspaceDiff, validateConsolidationArtifacts, removeMemorySymlinks, } from "./workspace.js";
 import { ensureBaseline, captureWorkspaceDiff, resetBaseline, DIFF_ARTIFACT } from "./git-baseline.js";
 import { consolidateViaSubagent, getPluginInput, SubagentCancelledError, SubagentShutdownError, } from "./llm.js";
-import { hostSessionLiveness } from "./host-client.js";
+import { hostSessionLiveness, withHostTimeout } from "./host-client.js";
 import { invalidateCache } from "./source.js";
 import { memoryRoot } from "./paths.js";
 import { abortPhase2Consolidation, beginPhase2AbortScope, endPhase2AbortScope, isPluginShuttingDown, } from "./lifecycle.js";
@@ -16,6 +16,7 @@ export const DEFAULT_PHASE2_OPTIONS = {
 // Export runs only after a successful phase 2 (fresh, validated artifacts) and
 // must never fail the run — Codex's workspace is best-effort foreign territory.
 const PHASE2_LIVE_CHECK_CONCURRENCY = 8;
+const GIT_TIMEOUT_MS = 120_000;
 /**
  * Codex get_phase2_input_selection re-validates each row against the live
  * threads table. We only drop a row on a confirmed 404 (same as session.deleted);
@@ -132,7 +133,7 @@ export async function runPhase2(store, opts = DEFAULT_PHASE2_OPTIONS) {
             // ad-hoc notes added since then reach consolidation. Stale stage-1
             // output pruning happens in phase 1, before the rate gate (codex
             // start.rs ordering).
-            if (!await ensureBaseline()) {
+            if (!await withHostTimeout(ensureBaseline(), GIT_TIMEOUT_MS, "ensureBaseline")) {
                 store.markPhase2Failed(claim.ownershipToken, "git baseline failed");
                 return { status: "baseline_failed" };
             }
@@ -171,7 +172,7 @@ export async function runPhase2(store, opts = DEFAULT_PHASE2_OPTIONS) {
                     console.warn("[opencode-codex-memory] claude import sync failed:", err);
                 }
             }
-            const diff = await captureWorkspaceDiff();
+            const diff = await withHostTimeout(captureWorkspaceDiff(), GIT_TIMEOUT_MS, "captureWorkspaceDiff");
             if (releaseIfShuttingDown(store, claim.ownershipToken)) {
                 return { status: "shutting_down" };
             }
@@ -273,7 +274,7 @@ export async function runPhase2(store, opts = DEFAULT_PHASE2_OPTIONS) {
                 store.markPhase2Failed(claim.ownershipToken, `failed_invalid_artifacts: ${artifacts.reason}`);
                 return { status: "failed_invalid_artifacts" };
             }
-            if (!await resetBaseline()) {
+            if (!await withHostTimeout(resetBaseline(), GIT_TIMEOUT_MS, "resetBaseline")) {
                 store.markPhase2Failed(claim.ownershipToken, "baseline reset failed");
                 return { status: "baseline_reset_failed" };
             }

package/dist/src/store.d.ts

@@ -101,6 +101,7 @@ export declare class MemoryStore {
     phase2JobSnapshot(): {
         status: string;
         last_error: string | null;
+        started_at: number | null;
         finished_at: number | null;
         retry_at: number | null;
         lease_until: number | null;

package/dist/src/store.js

@@ -434,7 +434,7 @@ export class MemoryStore {
      */
     phase2JobSnapshot() {
         const row = this.db
-            .prepare(`SELECT status, finished_at, last_error, retry_at, lease_until, last_success_watermark FROM memory_jobs
+            .prepare(`SELECT status, started_at, finished_at, last_error, retry_at, lease_until, last_success_watermark FROM memory_jobs
          WHERE kind='memory_consolidate_global' AND job_key='global'`)
             .get();
         if (!row)
@@ -452,6 +452,7 @@ export class MemoryStore {
         return {
             status: row.status,
             last_error: row.last_error,
+            started_at: row.started_at,
             finished_at: row.finished_at,
             retry_at: row.retry_at,
             lease_until: row.lease_until,

package/dist/src/tui.d.ts

@@ -0,0 +1,10 @@
+type PluginSetup = (() => void | Promise<void>) | void;
+declare function setup(ctx: unknown): Promise<PluginSetup>;
+/** OpenCode 1.x TUI host: keep the package loadable. No sidebar on 1.x. */
+declare function tui(): Promise<void>;
+declare const _default: {
+    id: string;
+    setup: typeof setup;
+    tui: typeof tui;
+};
+export default _default;

package/dist/src/tui.js

@@ -0,0 +1,24 @@
+/**
+ * Dual-host `./tui` entry.
+ *
+ * OpenCode 1.18.29+ (and 1.18.30) resolves `exports["./tui"]` and requires
+ * `default.tui()` — `readV1Plugin(..., "tui")` in strict mode. The Memory
+ * sidebar is OpenCode 2-only (`src/v2/tui.tsx`) and must not load until a
+ * V2 host calls setup(): the V2 TUI SDK is an optional peer and is missing
+ * on 1.x, so a static import there is "failed to load plugin".
+ */
+const PLUGIN_ID = "opencode-codex-memory.tui";
+async function setup(ctx) {
+    const { default: plugin } = await import("./v2/tui.js");
+    const fn = plugin.setup;
+    if (typeof fn !== "function")
+        return;
+    return fn(ctx);
+}
+/** OpenCode 1.x TUI host: keep the package loadable. No sidebar on 1.x. */
+async function tui() { }
+export default {
+    id: PLUGIN_ID,
+    setup,
+    tui,
+};

package/dist/tools/control.js

@@ -192,6 +192,16 @@ export const memory_reset = tool({
 function fmtUnixSec(sec) {
     return sec ? new Date(sec * 1000).toISOString() : "none";
 }
+function fmtElapsedSec(startedAtSec) {
+    if (!startedAtSec)
+        return "unknown";
+    const sec = Math.max(0, Math.floor(Date.now() / 1000) - startedAtSec);
+    if (sec < 60)
+        return `${sec}s`;
+    if (sec < 3600)
+        return `${Math.floor(sec / 60)}m ${sec % 60}s`;
+    return `${Math.floor(sec / 3600)}h ${Math.floor((sec % 3600) / 60)}m`;
+}
 function fmtWatermarkMs(ms) {
     if (ms === 0)
         return "0 (no consumed inputs)";
@@ -229,6 +239,9 @@ export const memory_inspect = tool({
                 ? [
                     `phase2_status: ${phase2.status}`,
                     `phase2_last_error: ${phase2.last_error ?? "none"}`,
+                    `phase2_started_at: ${fmtUnixSec(phase2.started_at)}`,
+                    `phase2_running_for: ${phase2.status === "running" ? fmtElapsedSec(phase2.started_at) : "n/a"}`,
+                    `phase2_lease_until: ${fmtUnixSec(phase2.lease_until)}`,
                     `phase2_retry_at: ${fmtUnixSec(phase2.retry_at)}`,
                     `phase2_last_attempt_finished_at: ${fmtUnixSec(phase2.finished_at)}`,
                     `phase2_last_success_watermark: ${fmtWatermarkMs(phase2.last_success_watermark)}`,
@@ -238,6 +251,9 @@ export const memory_inspect = tool({
                 : [
                     "phase2_status: none",
                     "phase2_last_error: none",
+                    "phase2_started_at: none",
+                    "phase2_running_for: n/a",
+                    "phase2_lease_until: none",
                     "phase2_retry_at: none",
                     "phase2_last_attempt_finished_at: none",
                     "phase2_last_success_watermark: none",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-codex-memory",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Persistent memory plugin for opencode — ports codex's two-phase memory system (extraction → consolidation → injection → citation feedback)",
   "type": "module",
   "main": "./dist/src/index.js",
@@ -18,8 +18,8 @@
       "types": "./dist/src/v2/index.d.ts"
     },
     "./tui": {
-      "types": "./dist/src/v2/tui.d.ts",
-      "import": "./dist/src/v2/tui.js"
+      "types": "./dist/src/tui.d.ts",
+      "import": "./dist/src/tui.js"
     },
     "./tools/*": {
       "import": "./dist/tools/*.js",