minicode-ai 0.27.0 → 0.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli/args.ts +120 -16
- package/cli/commands/acp.ts +38 -28
- package/cli/commands/auth.ts +17 -17
- package/cli/commands/config.ts +65 -66
- package/cli/commands/daemon.ts +44 -16
- package/cli/commands/doctor.ts +11 -12
- package/cli/commands/exec.ts +35 -73
- package/cli/commands/mcp.ts +25 -8
- package/cli/commands/memory.ts +16 -24
- package/cli/commands/openwork.ts +6 -2
- package/cli/commands/pricing.ts +14 -12
- package/cli/commands/providers.ts +36 -57
- package/cli/commands/sessions.ts +24 -18
- package/cli/commands/skills.ts +33 -18
- package/cli/commands/stats.ts +15 -30
- package/cli/commands.ts +73 -44
- package/cli/context-command-run.ts +30 -18
- package/cli/index.ts +48 -98
- package/cli/model-manager.ts +7 -2
- package/cli/provider-manager.ts +33 -18
- package/cli/router.ts +41 -12
- package/cli/setup.ts +246 -123
- package/cli/tui.ts +303 -100
- package/docs/TERMINAL_CONTRACT.md +254 -69
- package/docs/UI_RENDER_PIPELINE.md +9 -1
- package/docs/agents.md +2 -2
- package/docs/architecture.md +3 -3
- package/docs/choosing-mode.md +7 -9
- package/docs/cli.md +3 -5
- package/docs/environment.md +1 -2
- package/docs/policy-sandbox.md +3 -3
- package/docs/repl.md +2 -2
- package/docs/tools.md +1 -1
- package/package.json +1 -1
- package/src/app/mentions.ts +60 -13
- package/src/app/rag-layer.ts +17 -20
- package/src/app/session.ts +119 -66
- package/src/app/tool-layer.ts +12 -17
- package/src/config.ts +64 -104
- package/src/constants.ts +4 -6
- package/src/daemon/capability.ts +8 -1
- package/src/daemon/control.ts +3 -2
- package/src/daemon/server.ts +57 -0
- package/src/hooks/run.ts +73 -41
- package/src/lib/db-path.ts +47 -0
- package/src/lib/process-tree.ts +62 -0
- package/src/lib/public-http.ts +88 -23
- package/src/lib/trusted-exec.ts +48 -1
- package/src/lsp/client.ts +62 -17
- package/src/mcp/client.ts +85 -38
- package/src/mcp/http-transport.ts +28 -16
- package/src/mcp/transport.ts +42 -6
- package/src/memory/files.ts +164 -134
- package/src/memory/vector.ts +371 -420
- package/src/policy/approval-binding.ts +122 -45
- package/src/policy/bash-guard.ts +18 -7
- package/src/policy/compaction.ts +51 -18
- package/src/policy/context-window.ts +31 -8
- package/src/policy/context.ts +62 -36
- package/src/policy/executor.ts +17 -7
- package/src/policy/microcompact.ts +4 -3
- package/src/policy/no-progress.ts +103 -22
- package/src/policy/permission.ts +36 -12
- package/src/policy/tool-contract.ts +74 -416
- package/src/policy/usage.ts +24 -2
- package/src/policy/verifier.ts +50 -2
- package/src/policy/work-mode.ts +28 -54
- package/src/presentation/adapter.ts +24 -16
- package/src/providers/provision.ts +6 -56
- package/src/providers/responses.ts +1 -0
- package/src/runtime/execution-journal.ts +4 -29
- package/src/sandbox/docker.ts +58 -34
- package/src/sandbox/mask.ts +157 -0
- package/src/sandbox/os.ts +107 -73
- package/src/session/authority.ts +29 -10
- package/src/session/context-projection.ts +6 -5
- package/src/session/open-work.ts +26 -3
- package/src/session/persistence.ts +25 -58
- package/src/session/verification.ts +170 -20
- package/src/skills/loader.ts +31 -16
- package/src/task/production-scheduler.ts +13 -1
- package/src/task/store.ts +20 -37
- package/src/telemetry/trace.ts +27 -0
- package/src/tools/ask_user.ts +1 -13
- package/src/tools/bash.ts +27 -92
- package/src/tools/code_run.ts +1 -1
- package/src/tools/context.ts +133 -0
- package/src/tools/delete_file.ts +3 -2
- package/src/tools/edit.ts +37 -72
- package/src/tools/git.ts +86 -9
- package/src/tools/glob.ts +26 -51
- package/src/tools/grep.ts +67 -57
- package/src/tools/hashline.ts +4 -0
- package/src/tools/lsp.ts +11 -8
- package/src/tools/mcp_call.ts +9 -6
- package/src/tools/memory.ts +56 -33
- package/src/tools/move_file.ts +36 -10
- package/src/tools/patch.ts +13 -21
- package/src/tools/read_file.ts +18 -25
- package/src/tools/read_image.ts +35 -33
- package/src/tools/submit_result.ts +29 -8
- package/src/tools/task.ts +74 -17
- package/src/tools/todo.ts +181 -74
- package/src/tools/web_fetch.ts +42 -2
- package/src/tools/web_search.ts +47 -8
- package/src/ui/approval/prompt.ts +206 -47
- package/src/ui/assistant/turn-status.ts +14 -5
- package/src/ui/footer.ts +4 -4
- package/src/ui/i18n/en.ts +47 -23
- package/src/ui/i18n/id.ts +76 -51
- package/src/ui/input/input.ts +4 -3
- package/src/ui/input/prompt-engine.ts +35 -5
- package/src/ui/render/activity-panel.ts +4 -2
- package/src/ui/render/hint.ts +7 -4
- package/src/ui/render/list.ts +32 -0
- package/src/ui/render/markdown.ts +6 -3
- package/src/ui/render/notice.ts +19 -0
- package/src/ui/render/table-grid.ts +7 -8
- package/src/ui/render/theme.ts +113 -39
- package/src/ui/runtime/screen.ts +74 -10
- package/src/ui/runtime/spinner.ts +19 -6
- package/src/ui/screens/dialog.ts +19 -1
- package/src/ui/screens/form.ts +80 -35
- package/src/ui/screens/model-manager.ts +82 -61
- package/src/ui/screens/output-window.ts +263 -0
- package/src/ui/screens/picker.ts +94 -81
- package/src/ui/screens/provider-manager.ts +100 -69
- package/src/ui/screens/wizard.ts +117 -28
- package/src/ui/tui/app.ts +196 -33
- package/src/ui/tui/transcript.ts +154 -25
- package/vendor/minicore/src/core/executor.ts +2 -0
- package/vendor/minicore/src/core/loop.ts +17 -6
- package/vendor/minicore/src/core/session.ts +3 -0
- package/vendor/minicore/src/core/tool.ts +1 -0
- package/vendor/minicore/src/providers/openai-compat.ts +28 -19
package/src/memory/vector.ts
CHANGED
|
@@ -1,15 +1,52 @@
|
|
|
1
1
|
import { Database } from "bun:sqlite"
|
|
2
2
|
import { Buffer } from "node:buffer"
|
|
3
3
|
import { randomUUID } from "node:crypto"
|
|
4
|
+
import { chmodSync, existsSync } from "node:fs"
|
|
5
|
+
import { join } from "node:path"
|
|
4
6
|
import { LIMITS } from "../constants.ts"
|
|
5
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
homeDir,
|
|
9
|
+
isSqliteContention,
|
|
10
|
+
resolveDbPath,
|
|
11
|
+
withSqliteBusyRetrySync,
|
|
12
|
+
} from "../lib/db-path.ts"
|
|
6
13
|
import { isPrivateHostWithDns } from "../lib/net.ts"
|
|
7
14
|
import { scrubSecrets } from "../policy/scrub.ts"
|
|
8
15
|
|
|
9
16
|
const dbPath = (cwd?: string) => resolveDbPath("vector.db", cwd)
|
|
17
|
+
const globalVectorPath = () => join(homeDir(), ".minicode", "vector.db")
|
|
10
18
|
|
|
11
19
|
const initializedPaths = new Set<string>()
|
|
12
20
|
|
|
21
|
+
/** Jangan pernah pasangkan DEEPSEEK_API_KEY ke default host api.openai.com. */
|
|
22
|
+
export function resolveEnvEmbeddingAuth(): { baseUrl: string; apiKey: string } {
|
|
23
|
+
const explicitBaseUrl = process.env.AGENT_BASE_URL?.trim()
|
|
24
|
+
if (explicitBaseUrl) {
|
|
25
|
+
return {
|
|
26
|
+
baseUrl: explicitBaseUrl,
|
|
27
|
+
apiKey:
|
|
28
|
+
process.env.OPENAI_API_KEY ??
|
|
29
|
+
process.env.DEEPSEEK_API_KEY ??
|
|
30
|
+
process.env.AGENT_API_KEY ??
|
|
31
|
+
"",
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return {
|
|
35
|
+
baseUrl: "https://api.openai.com/v1",
|
|
36
|
+
apiKey: process.env.OPENAI_API_KEY ?? process.env.AGENT_API_KEY ?? "",
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
function chmodMemoryDbSync(p: string): void {
|
|
41
|
+
try {
|
|
42
|
+
for (const f of [p, `${p}-wal`, `${p}-shm`]) {
|
|
43
|
+
try {
|
|
44
|
+
chmodSync(f, 0o600)
|
|
45
|
+
} catch {}
|
|
46
|
+
}
|
|
47
|
+
} catch {}
|
|
48
|
+
}
|
|
49
|
+
|
|
13
50
|
// [Fase 7 / Live #3] Circuit-breaker embedding per-endpoint.
|
|
14
51
|
// Gateway tanpa endpoint `/embeddings` memicu timeout 3,5 dtk (per-attempt)
|
|
15
52
|
// pada SETIAP operasi memori sebelum jatuh ke fallback FTS5/keyword. Ini
|
|
@@ -114,47 +151,17 @@ function open(cwd?: string): Database {
|
|
|
114
151
|
* didokumentasikan tak pernah dihormati. Global yang belum pernah ada
|
|
115
152
|
* dilewati (fallback resolusi normal) agar baca tak membuat DB kosong.
|
|
116
153
|
*/
|
|
117
|
-
function openGlobalDb(
|
|
154
|
+
function openGlobalDb(): Database | null {
|
|
118
155
|
try {
|
|
119
|
-
const
|
|
120
|
-
const { existsSync } = require("node:fs") as typeof import("node:fs")
|
|
121
|
-
const { homeDir } = require("../lib/db-path.ts") as typeof import("../lib/db-path.ts")
|
|
122
|
-
const g = join(homeDir(), ".minicode", "vector.db")
|
|
156
|
+
const g = globalVectorPath()
|
|
123
157
|
if (existsSync(g)) return openAt(g)
|
|
124
158
|
} catch {}
|
|
125
|
-
return
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
// [Phase 12.2] Predikat + retry sinkron kontensi SQLite transien (buka/WAL di
|
|
129
|
-
// Windows). Sebelumnya vector.db tidak me-retry setup WAL/DDL sama sekali, dan
|
|
130
|
-
// predikat retry tulis hanya mengenali SQLITE_BUSY/"database is locked".
|
|
131
|
-
// SQLITE_IOERR_TRUNCATE / SHMOPEN / LOCK / PROTOCOL / LOCKED (transien, bukan
|
|
132
|
-
// korupsi) kini ikut di-retry. Bun menaruh kode simbolik di `error.code`, teks
|
|
133
|
-
// manusiawi di `error.message`, jadi keduanya diperiksa.
|
|
134
|
-
const SQLITE_CONTENTION_RE =
|
|
135
|
-
/SQLITE_BUSY|database is locked|database table is locked|SQLITE_LOCKED|SQLITE_PROTOCOL|SQLITE_IOERR_TRUNCATE|SQLITE_IOERR_SHMOPEN|SQLITE_IOERR_LOCK|disk I\/O error/i
|
|
136
|
-
|
|
137
|
-
function isSqliteContention(e: unknown): boolean {
|
|
138
|
-
const code = (e as { code?: unknown } | null)?.code
|
|
139
|
-
if (typeof code === "string" && SQLITE_CONTENTION_RE.test(code)) return true
|
|
140
|
-
const msg = e instanceof Error ? String(e.message ?? e) : String(e)
|
|
141
|
-
return SQLITE_CONTENTION_RE.test(msg)
|
|
159
|
+
return null
|
|
142
160
|
}
|
|
143
161
|
|
|
144
162
|
const DB_INIT_ATTEMPTS = 8
|
|
145
|
-
const
|
|
146
|
-
|
|
147
|
-
function withBusyRetrySync<T>(fn: () => T, attempts = DB_INIT_ATTEMPTS): T | null {
|
|
148
|
-
for (let i = 0; i < attempts; i++) {
|
|
149
|
-
try {
|
|
150
|
-
return fn()
|
|
151
|
-
} catch (e) {
|
|
152
|
-
if (!isSqliteContention(e)) throw e
|
|
153
|
-
Bun.sleepSync(DB_INIT_BACKOFF_MS * 2 ** i)
|
|
154
|
-
}
|
|
155
|
-
}
|
|
156
|
-
return null
|
|
157
|
-
}
|
|
163
|
+
const withBusyRetrySync = <T>(fn: () => T, attempts = DB_INIT_ATTEMPTS): T | null =>
|
|
164
|
+
withSqliteBusyRetrySync(fn, { attempts, backoffMs: 15, jitterMaxMs: 15 })
|
|
158
165
|
|
|
159
166
|
function openAt(p: string): Database {
|
|
160
167
|
const db = new Database(p)
|
|
@@ -265,6 +272,8 @@ function openAt(p: string): Database {
|
|
|
265
272
|
db.close()
|
|
266
273
|
} catch {}
|
|
267
274
|
throw err
|
|
275
|
+
} finally {
|
|
276
|
+
chmodMemoryDbSync(p)
|
|
268
277
|
}
|
|
269
278
|
}
|
|
270
279
|
|
|
@@ -469,21 +478,17 @@ function escapeLike(s: string): string {
|
|
|
469
478
|
}
|
|
470
479
|
|
|
471
480
|
export async function deleteMemoryByQuery(query: string, cwd?: string): Promise<number> {
|
|
481
|
+
if (!query.trim()) return 0
|
|
472
482
|
// Hapus dari DB lokal DAN global (bila berkasnya beda): searchHybrid
|
|
473
483
|
// scope=all menggabung keduanya, sehingga hapus satu sisi membuat "lupa"
|
|
474
|
-
// tak tuntas
|
|
475
|
-
// M4; tulisan baru selalu lokal sejak audit #10 P1, tapi data legacy
|
|
476
|
-
// global masih bisa ada). Global yang belum pernah ada dilewati agar
|
|
477
|
-
// forget tak membuat berkas DB kosong sebagai side-effect.
|
|
484
|
+
// tak tuntas. Lewati file yang belum ada agar forget tak membuat DB kosong.
|
|
478
485
|
const pattern = escapeLike(query.toLowerCase())
|
|
479
|
-
const
|
|
486
|
+
const candidates = [dbPath(cwd)]
|
|
480
487
|
try {
|
|
481
|
-
const
|
|
482
|
-
|
|
483
|
-
const { existsSync } = await import("node:fs")
|
|
484
|
-
const g = join(homeDir(), ".minicode", "vector.db")
|
|
485
|
-
if (g !== paths[0] && existsSync(g)) paths.push(g)
|
|
488
|
+
const g = globalVectorPath()
|
|
489
|
+
if (g !== candidates[0]) candidates.push(g)
|
|
486
490
|
} catch {}
|
|
491
|
+
const paths = candidates.filter((p) => existsSync(p))
|
|
487
492
|
let total = 0
|
|
488
493
|
for (const p of paths) {
|
|
489
494
|
const db = openAt(p)
|
|
@@ -551,6 +556,32 @@ export function splitMemoryChunks(text: string): string[] {
|
|
|
551
556
|
return out
|
|
552
557
|
}
|
|
553
558
|
|
|
559
|
+
async function pruneExpiredMemoryRows(db: Database, nowMs: number): Promise<number> {
|
|
560
|
+
let deleted = 0
|
|
561
|
+
const day = 24 * 60 * 60 * 1000
|
|
562
|
+
const cuts = [
|
|
563
|
+
{ cats: ["snippet"], ms: LIMITS.MEMORY_TTL_SNIPPET_DAYS * day },
|
|
564
|
+
{ cats: ["summary"], ms: LIMITS.MEMORY_TTL_SUMMARY_DAYS * day },
|
|
565
|
+
{ cats: ["fact", "decision", "preference", "manual"], ms: LIMITS.MEMORY_TTL_FACT_DAYS * day },
|
|
566
|
+
]
|
|
567
|
+
for (const c of cuts) {
|
|
568
|
+
if (c.ms <= 0) continue
|
|
569
|
+
const ph = c.cats.map(() => "?").join(",")
|
|
570
|
+
const nullCatch = c.cats.includes("fact") ? " OR category IS NULL" : ""
|
|
571
|
+
const result = await withBusyRetry(() =>
|
|
572
|
+
db
|
|
573
|
+
.prepare(`DELETE FROM memory WHERE (category IN (${ph})${nullCatch}) AND created_at < ?`)
|
|
574
|
+
.run(...c.cats, nowMs - c.ms),
|
|
575
|
+
)
|
|
576
|
+
deleted += result.changes ?? 0
|
|
577
|
+
}
|
|
578
|
+
const cnt = (db.prepare("SELECT count(*) as c FROM memory").get() as { c: number } | null)?.c ?? 0
|
|
579
|
+
if (cnt > LIMITS.MEMORY_MAX_ROWS) {
|
|
580
|
+
deleted += await withBusyRetry(() => pruneMemoryCap(db))
|
|
581
|
+
}
|
|
582
|
+
return deleted
|
|
583
|
+
}
|
|
584
|
+
|
|
554
585
|
export async function addMemory(
|
|
555
586
|
text: string,
|
|
556
587
|
opts: {
|
|
@@ -576,17 +607,7 @@ export async function addMemory(
|
|
|
576
607
|
) {
|
|
577
608
|
const clean = scrubSecrets(text)
|
|
578
609
|
const chunks = splitMemoryChunks(clean)
|
|
579
|
-
|
|
580
|
-
// addMemory dari cwd tanpa `.minicode/` jatuh ke DB GLOBAL bersama
|
|
581
|
-
// (resolveDbPath) — memori repo jahat A terbaca di proyek B yang tak
|
|
582
|
-
// terkait. Buat direktori lokal dulu agar resolusi mendarat lokal; baca
|
|
583
|
-
// tetap boleh fallback global (kompatibilitas data lama).
|
|
584
|
-
try {
|
|
585
|
-
const { mkdirSync } = require("node:fs") as typeof import("node:fs")
|
|
586
|
-
const { resolve: resolvePath, join: joinPath } =
|
|
587
|
-
require("node:path") as typeof import("node:path")
|
|
588
|
-
mkdirSync(joinPath(resolvePath(opts.cwd ?? process.cwd()), ".minicode"), { recursive: true })
|
|
589
|
-
} catch {}
|
|
610
|
+
ensureLocalMemoryDir(opts.cwd)
|
|
590
611
|
const embedModel =
|
|
591
612
|
opts.embeddingModel ?? process.env.MINICODE_EMBED_MODEL ?? "text-embedding-3-small"
|
|
592
613
|
// Satu panggilan batch untuk semua chunk — hemat round-trip embedding.
|
|
@@ -597,16 +618,7 @@ export async function addMemory(
|
|
|
597
618
|
const parentId = randomUUID()
|
|
598
619
|
const now = Date.now()
|
|
599
620
|
const db = open(opts.cwd)
|
|
600
|
-
|
|
601
|
-
try {
|
|
602
|
-
const { chmodSync } = require("node:fs") as typeof import("node:fs")
|
|
603
|
-
const p = dbPath(opts.cwd)
|
|
604
|
-
for (const f of [p, `${p}-wal`, `${p}-shm`]) {
|
|
605
|
-
try {
|
|
606
|
-
chmodSync(f, 0o600)
|
|
607
|
-
} catch {}
|
|
608
|
-
}
|
|
609
|
-
} catch {}
|
|
621
|
+
chmodMemoryDbSync(dbPath(opts.cwd))
|
|
610
622
|
try {
|
|
611
623
|
// F8.1 + Live Hardening §7.5: validasi supersedesId + insert semua chunk +
|
|
612
624
|
// tombstone baris lama dalam SATU transaksi SQLite. Sebelumnya tiap INSERT dan
|
|
@@ -675,31 +687,10 @@ export async function addMemory(
|
|
|
675
687
|
// Fakta/keputusan awet 180 hari, ringkasan 90, snippet 14 — snippet basi
|
|
676
688
|
// (mis. "test X lolos") menyesatkan bila dibiarkan selama fakta.
|
|
677
689
|
try {
|
|
678
|
-
|
|
679
|
-
const cuts = [
|
|
680
|
-
{ cats: ["snippet"], ms: LIMITS.MEMORY_TTL_SNIPPET_DAYS * day },
|
|
681
|
-
{ cats: ["summary"], ms: LIMITS.MEMORY_TTL_SUMMARY_DAYS * day },
|
|
682
|
-
{ cats: ["fact", "decision", "preference"], ms: LIMITS.MEMORY_TTL_FACT_DAYS * day },
|
|
683
|
-
]
|
|
684
|
-
for (const c of cuts) {
|
|
685
|
-
if (c.ms <= 0) continue
|
|
686
|
-
const ph = c.cats.map(() => "?").join(",")
|
|
687
|
-
// Bucket fakta juga menampung NULL (DB lama pra-S2) — jangan abadi.
|
|
688
|
-
const nullCatch = c.cats.includes("fact") ? " OR category IS NULL" : ""
|
|
689
|
-
await withBusyRetry(() =>
|
|
690
|
-
db
|
|
691
|
-
.prepare(
|
|
692
|
-
`DELETE FROM memory WHERE (category IN (${ph})${nullCatch}) AND created_at < ?`,
|
|
693
|
-
)
|
|
694
|
-
.run(...c.cats, now - c.ms),
|
|
695
|
-
)
|
|
696
|
-
}
|
|
690
|
+
await pruneExpiredMemoryRows(db, now)
|
|
697
691
|
const cnt =
|
|
698
692
|
(db.prepare("SELECT count(*) as c FROM memory").get() as { c: number } | null)?.c ?? 0
|
|
699
|
-
if (cnt >
|
|
700
|
-
await withBusyRetry(() => pruneMemoryCap(db))
|
|
701
|
-
}
|
|
702
|
-
if (cnt % 1000 === 0) {
|
|
693
|
+
if (cnt > 0 && cnt % 1000 === 0) {
|
|
703
694
|
try {
|
|
704
695
|
db.exec("VACUUM")
|
|
705
696
|
} catch {}
|
|
@@ -1077,14 +1068,14 @@ function textSim(a: string, b: string): number {
|
|
|
1077
1068
|
|
|
1078
1069
|
// P2.1: buang near-duplikat (cosine > MEMORY_DEDUP_COSINE) + MMR λ untuk
|
|
1079
1070
|
// diversitas. Tanpa vektor hanya dedup teks eksak (Map) + MMR via textSim.
|
|
1080
|
-
function mmrRerank(
|
|
1081
|
-
cands:
|
|
1071
|
+
function mmrRerank<T extends { text: string; score: number; vec: number[] | null }>(
|
|
1072
|
+
cands: T[],
|
|
1082
1073
|
topK: number,
|
|
1083
|
-
):
|
|
1074
|
+
): T[] {
|
|
1084
1075
|
const lambda = LIMITS.MEMORY_MMR_LAMBDA
|
|
1085
1076
|
// 1. near-dedup: kandidat skor-rendah yang nyaris identik dengan yang
|
|
1086
1077
|
// skor-lebih-tinggi dibuang (tak ada gunanya di prompt dua-duanya).
|
|
1087
|
-
const kept:
|
|
1078
|
+
const kept: T[] = []
|
|
1088
1079
|
for (const c of cands) {
|
|
1089
1080
|
let dup = false
|
|
1090
1081
|
for (const k of kept) {
|
|
@@ -1101,7 +1092,7 @@ function mmrRerank(
|
|
|
1101
1092
|
if (!dup) kept.push(c)
|
|
1102
1093
|
}
|
|
1103
1094
|
// 2. MMR: tiap putaran pilih kandidat dengan λ*relevansi − (1−λ)*maxSimTerpilih.
|
|
1104
|
-
const selected:
|
|
1095
|
+
const selected: T[] = []
|
|
1105
1096
|
const rest = [...kept]
|
|
1106
1097
|
while (rest.length > 0 && selected.length < topK) {
|
|
1107
1098
|
let best = 0
|
|
@@ -1124,7 +1115,7 @@ function mmrRerank(
|
|
|
1124
1115
|
}
|
|
1125
1116
|
selected.push(rest.splice(best, 1)[0]!)
|
|
1126
1117
|
}
|
|
1127
|
-
return selected
|
|
1118
|
+
return selected
|
|
1128
1119
|
}
|
|
1129
1120
|
|
|
1130
1121
|
// Peringatan dim-mismatch cukup sekali per dimensi agar tidak spam stderr tiap hit.
|
|
@@ -1157,31 +1148,43 @@ export async function searchHybrid(
|
|
|
1157
1148
|
} = {},
|
|
1158
1149
|
): Promise<MemoryHit[]> {
|
|
1159
1150
|
const scope = opts.scope ?? (process.env.MINICODE_MEMORY_SCOPE as string) ?? "cwd"
|
|
1151
|
+
type SourcedMemoryRow = MemoryRow & { _sourceDb?: "local" | "global" }
|
|
1152
|
+
// [Fase 6A / ACE-03] Filter status validasi DI SQL (sebelum LIMIT & Map dedup)
|
|
1153
|
+
// agar baris provisional/rejected tak menggeser fakta valid keluar dari slot.
|
|
1154
|
+
const notSuperseded =
|
|
1155
|
+
opts.includeSuperseded === true ? `1=1` : `(superseded_by IS NULL OR superseded_by = '')`
|
|
1156
|
+
const validatedSql =
|
|
1157
|
+
opts.includeProvisional === true
|
|
1158
|
+
? `1=1`
|
|
1159
|
+
: `(validation_status IS NULL OR validation_status = 'validated')`
|
|
1160
|
+
const whereActive = `${notSuperseded} AND ${validatedSql}`
|
|
1160
1161
|
// helper untuk ambil rows dari satu DB path (dipakai untuk scope all)
|
|
1161
|
-
const fetchRows = (
|
|
1162
|
+
const fetchRows = (
|
|
1163
|
+
db: ReturnType<typeof open>,
|
|
1164
|
+
sourceDb: "local" | "global",
|
|
1165
|
+
): SourcedMemoryRow[] => {
|
|
1162
1166
|
const keywords = query.toLowerCase().split(/\W+/).filter(Boolean).slice(0, 5)
|
|
1163
1167
|
const escKeywords = keywords.map((k) =>
|
|
1164
1168
|
k.replace(/\\/g, "\\\\").replace(/%/g, "\\%").replace(/_/g, "\\_"),
|
|
1165
1169
|
)
|
|
1166
|
-
// F8.1: recall default SENGAJA mengecualikan baris yang sudah di-supersede
|
|
1167
|
-
// (superseded_by IS NOT NULL AND != ''). Hanya `includeSuperseded: true`
|
|
1168
|
-
// yang menampilkannya kembali (untuk forensik/audit).
|
|
1169
|
-
const notSuperseded =
|
|
1170
|
-
opts.includeSuperseded === true ? `1=1` : `(superseded_by IS NULL OR superseded_by = '')`
|
|
1171
1170
|
const cols = `id, text, embedding, dim, model, created_at, category, tags, session_id, turn_id, source_kind, source_ref, validation_status, supersedes, superseded_by`
|
|
1171
|
+
let picked: MemoryRow[]
|
|
1172
1172
|
if (keywords.length > 0) {
|
|
1173
1173
|
const recentRows = db
|
|
1174
1174
|
.prepare(
|
|
1175
|
-
`SELECT ${cols} FROM memory WHERE ${
|
|
1175
|
+
`SELECT ${cols} FROM memory WHERE ${whereActive} ORDER BY created_at DESC LIMIT ${LIMITS.VECTOR_RECENT_LIMIT}`,
|
|
1176
1176
|
)
|
|
1177
1177
|
.all() as MemoryRow[]
|
|
1178
1178
|
let keywordRows: MemoryRow[] = []
|
|
1179
1179
|
const ftsQ = buildFtsQuery(query)
|
|
1180
1180
|
if (ftsQ) {
|
|
1181
|
+
const ftsActive = whereActive
|
|
1182
|
+
.replace(/superseded_by/g, "m.superseded_by")
|
|
1183
|
+
.replace(/validation_status/g, "m.validation_status")
|
|
1181
1184
|
try {
|
|
1182
1185
|
keywordRows = db
|
|
1183
1186
|
.prepare(
|
|
1184
|
-
`SELECT m.id as id, m.text as text, m.embedding as embedding, m.dim as dim, m.model as model, m.created_at as created_at, m.category as category, m.tags as tags, m.session_id as session_id, m.turn_id as turn_id, m.source_kind as source_kind, m.source_ref as source_ref, m.validation_status as validation_status, m.supersedes as supersedes, m.superseded_by as superseded_by FROM memory_fts f JOIN memory m ON m.rowid = f.rowid WHERE ${
|
|
1187
|
+
`SELECT m.id as id, m.text as text, m.embedding as embedding, m.dim as dim, m.model as model, m.created_at as created_at, m.category as category, m.tags as tags, m.session_id as session_id, m.turn_id as turn_id, m.source_kind as source_kind, m.source_ref as source_ref, m.validation_status as validation_status, m.supersedes as supersedes, m.superseded_by as superseded_by FROM memory_fts f JOIN memory m ON m.rowid = f.rowid WHERE ${ftsActive} AND memory_fts MATCH ? ORDER BY rank LIMIT ${LIMITS.VECTOR_KEYWORD_LIMIT}`,
|
|
1185
1188
|
)
|
|
1186
1189
|
.all(ftsQ) as MemoryRow[]
|
|
1187
1190
|
} catch {
|
|
@@ -1194,39 +1197,38 @@ export async function searchHybrid(
|
|
|
1194
1197
|
.join(" OR ")
|
|
1195
1198
|
keywordRows = db
|
|
1196
1199
|
.prepare(
|
|
1197
|
-
`SELECT ${cols} FROM memory WHERE ${
|
|
1200
|
+
`SELECT ${cols} FROM memory WHERE ${whereActive} AND (${likeClauses}) ORDER BY created_at DESC LIMIT ${LIMITS.VECTOR_KEYWORD_LIMIT}`,
|
|
1198
1201
|
)
|
|
1199
1202
|
.all(...escKeywords) as MemoryRow[]
|
|
1200
1203
|
}
|
|
1201
1204
|
const merged = new Map<string, MemoryRow>()
|
|
1202
1205
|
for (const r of [...recentRows, ...keywordRows])
|
|
1203
1206
|
if (!merged.has(r.text)) merged.set(r.text, r)
|
|
1204
|
-
|
|
1207
|
+
picked = [...merged.values()].slice(0, LIMITS.VECTOR_SEARCH_LIMIT)
|
|
1205
1208
|
} else {
|
|
1206
|
-
|
|
1209
|
+
picked = db
|
|
1207
1210
|
.prepare(
|
|
1208
|
-
`SELECT ${cols} FROM memory WHERE ${
|
|
1211
|
+
`SELECT ${cols} FROM memory WHERE ${whereActive} ORDER BY created_at DESC LIMIT ${LIMITS.VECTOR_SEARCH_LIMIT}`,
|
|
1209
1212
|
)
|
|
1210
1213
|
.all() as MemoryRow[]
|
|
1211
1214
|
}
|
|
1215
|
+
return picked.map((r) => ({ ...r, _sourceDb: sourceDb }))
|
|
1212
1216
|
}
|
|
1213
1217
|
|
|
1214
|
-
let rows:
|
|
1215
|
-
const db = scope === "global" ? openGlobalDb(
|
|
1218
|
+
let rows: SourcedMemoryRow[] = []
|
|
1219
|
+
const db = scope === "global" ? openGlobalDb() : open(opts.cwd)
|
|
1220
|
+
if (!db) return []
|
|
1216
1221
|
try {
|
|
1217
|
-
rows = fetchRows(db)
|
|
1222
|
+
rows = fetchRows(db, scope === "global" ? "global" : "local")
|
|
1218
1223
|
if (scope === "all") {
|
|
1219
1224
|
try {
|
|
1220
|
-
const
|
|
1221
|
-
const { homeDir } = await import("../lib/db-path.ts")
|
|
1222
|
-
const { Database } = await import("bun:sqlite")
|
|
1223
|
-
const globalPath = join(homeDir(), ".minicode", "vector.db")
|
|
1225
|
+
const globalPath = globalVectorPath()
|
|
1224
1226
|
const localPath = dbPath(opts.cwd)
|
|
1225
|
-
if (globalPath !== localPath) {
|
|
1226
|
-
const gdb =
|
|
1227
|
+
if (globalPath !== localPath && existsSync(globalPath)) {
|
|
1228
|
+
const gdb = openAt(globalPath)
|
|
1227
1229
|
try {
|
|
1228
|
-
const gRows = fetchRows(gdb
|
|
1229
|
-
const merged = new Map<string,
|
|
1230
|
+
const gRows = fetchRows(gdb, "global")
|
|
1231
|
+
const merged = new Map<string, SourcedMemoryRow>()
|
|
1230
1232
|
for (const r of [...rows, ...gRows]) if (!merged.has(r.text)) merged.set(r.text, r)
|
|
1231
1233
|
rows = [...merged.values()].slice(0, LIMITS.VECTOR_SEARCH_LIMIT)
|
|
1232
1234
|
} finally {
|
|
@@ -1238,12 +1240,6 @@ export async function searchHybrid(
|
|
|
1238
1240
|
} finally {
|
|
1239
1241
|
db.close()
|
|
1240
1242
|
}
|
|
1241
|
-
// [Fase 6A / ACE-03] Gate default: pelajaran kandidat (`provisional`) dan
|
|
1242
|
-
// yang sudah ditolak (`rejected`) TIDAK boleh tampil seolah fakta. NULL
|
|
1243
|
-
// legacy = validated agar DB lama tetap terbaca.
|
|
1244
|
-
if (opts.includeProvisional !== true) {
|
|
1245
|
-
rows = rows.filter((r) => (r.validation_status ?? "validated") === "validated")
|
|
1246
|
-
}
|
|
1247
1243
|
if (rows.length === 0) return []
|
|
1248
1244
|
|
|
1249
1245
|
let queryVec: number[] | null = null
|
|
@@ -1278,67 +1274,57 @@ export async function searchHybrid(
|
|
|
1278
1274
|
const kw = keywordScore(query, r.text)
|
|
1279
1275
|
// hybrid 0.7 vector + 0.3 keyword, if no vector -> keyword only
|
|
1280
1276
|
let score = queryVec ? vecScore * 0.7 + kw * 0.3 : kw
|
|
1281
|
-
// Recency decay (
|
|
1282
|
-
//
|
|
1283
|
-
|
|
1284
|
-
// 6 bulan ≈ 0.12× (jatuh di bawah ambang relevansi, efeknya sama dengan
|
|
1285
|
-
// kadaluwarsa). Fakta fresh (age≈0) tidak berubah → test lama tetap hijau.
|
|
1286
|
-
const ageDays = (Date.now() - r.created_at) / 86_400_000
|
|
1277
|
+
// Recency decay (paruh-hidup 60 hari); clamp ageDays >= 0 agar timestamp masa depan
|
|
1278
|
+
// tak pernah menginflasikan skor melampaui relevansi dasar.
|
|
1279
|
+
const ageDays = Math.max(0, (Date.now() - r.created_at) / 86_400_000)
|
|
1287
1280
|
score *= 0.5 ** (ageDays / 60)
|
|
1288
|
-
//
|
|
1289
|
-
|
|
1290
|
-
|
|
1291
|
-
|
|
1292
|
-
|
|
1293
|
-
|
|
1294
|
-
|
|
1295
|
-
|
|
1296
|
-
|
|
1297
|
-
|
|
1298
|
-
|
|
1299
|
-
|
|
1300
|
-
|
|
1301
|
-
return { text: r.text, score, vec, createdAt: r.created_at }
|
|
1281
|
+
// Boost kategori hanya bila hit punya relevansi nyata (> 0), bukan mempromosikan baris 0-skor.
|
|
1282
|
+
if (score > 0) {
|
|
1283
|
+
if (
|
|
1284
|
+
(r as MemoryRow).category === "decision" &&
|
|
1285
|
+
/fix|decide|decision|perbaiki|keputusan|selesaikan/i.test(query)
|
|
1286
|
+
)
|
|
1287
|
+
score += 0.1
|
|
1288
|
+
if (
|
|
1289
|
+
(r as MemoryRow).category === "preference" &&
|
|
1290
|
+
/prefer|like|preference|suka|ingin/i.test(query)
|
|
1291
|
+
)
|
|
1292
|
+
score += 0.05
|
|
1293
|
+
}
|
|
1294
|
+
return { text: r.text, score, vec, createdAt: r.created_at, row: r }
|
|
1302
1295
|
})
|
|
1303
1296
|
const minScore = queryVec ? LIMITS.MEMORY_MIN_SCORE_HYBRID : LIMITS.MEMORY_MIN_SCORE_KEYWORD
|
|
1304
1297
|
const filtered = scored.filter((s) => s.score >= minScore)
|
|
1305
1298
|
filtered.sort((a, b) => b.score - a.score)
|
|
1306
|
-
// P2.1: MMR di atas kandidat teratas agar
|
|
1299
|
+
// P2.1: MMR di atas kandidat teratas — bawa objek row utuh agar id/provenance tak hilang saat benturan teks.
|
|
1307
1300
|
const pool = filtered.slice(0, LIMITS.MEMORY_MMR_CANDIDATES)
|
|
1308
1301
|
const ranked = mmrRerank(pool, opts.topK ?? 5)
|
|
1309
|
-
const
|
|
1310
|
-
|
|
1311
|
-
|
|
1312
|
-
|
|
1313
|
-
|
|
1314
|
-
|
|
1315
|
-
|
|
1316
|
-
|
|
1317
|
-
|
|
1318
|
-
|
|
1319
|
-
|
|
1320
|
-
|
|
1321
|
-
|
|
1322
|
-
|
|
1323
|
-
validationStatus: row.validation_status ?? "validated",
|
|
1324
|
-
}
|
|
1325
|
-
: undefined,
|
|
1326
|
-
}
|
|
1327
|
-
})
|
|
1328
|
-
// P13 P1 — bukti manfaat per row: hit yang dikembalikan menaikkan
|
|
1329
|
-
// access_count (best-effort; gagal diam — jangan rusak retrieval).
|
|
1330
|
-
// Hanya DB lokal yang disentuh; row global (scope all) tidak dihitung.
|
|
1302
|
+
const hits = ranked.map((h) => ({
|
|
1303
|
+
text: h.text,
|
|
1304
|
+
score: h.score,
|
|
1305
|
+
id: h.row.id,
|
|
1306
|
+
createdAt: h.row.created_at,
|
|
1307
|
+
provenance: {
|
|
1308
|
+
sessionId: h.row.session_id,
|
|
1309
|
+
turnId: h.row.turn_id,
|
|
1310
|
+
sourceKind: h.row.source_kind,
|
|
1311
|
+
sourceRef: h.row.source_ref,
|
|
1312
|
+
validationStatus: h.row.validation_status ?? "validated",
|
|
1313
|
+
},
|
|
1314
|
+
}))
|
|
1315
|
+
// P13 P1 — naikkan access_count hanya untuk baris lokal (berdasarkan id eksak).
|
|
1331
1316
|
// Dilewati bila trackAccess === false (mode readonly/plan).
|
|
1332
|
-
|
|
1317
|
+
const localIds = ranked.filter((h) => h.row._sourceDb === "local").map((h) => h.row.id)
|
|
1318
|
+
if (localIds.length > 0 && opts.trackAccess !== false) {
|
|
1333
1319
|
try {
|
|
1334
1320
|
const db2 = open(opts.cwd)
|
|
1335
1321
|
try {
|
|
1336
|
-
const ph =
|
|
1322
|
+
const ph = localIds.map(() => "?").join(",")
|
|
1337
1323
|
db2
|
|
1338
1324
|
.prepare(
|
|
1339
|
-
`UPDATE memory SET access_count = COALESCE(access_count, 0) + 1 WHERE
|
|
1325
|
+
`UPDATE memory SET access_count = COALESCE(access_count, 0) + 1 WHERE id IN (${ph})`,
|
|
1340
1326
|
)
|
|
1341
|
-
.run(...
|
|
1327
|
+
.run(...localIds)
|
|
1342
1328
|
} finally {
|
|
1343
1329
|
db2.close()
|
|
1344
1330
|
}
|
|
@@ -1382,32 +1368,7 @@ function pruneMemoryCap(db: Database): number {
|
|
|
1382
1368
|
export async function pruneTTL(cwd?: string, nowMs: number = Date.now()): Promise<number> {
|
|
1383
1369
|
const db = open(cwd)
|
|
1384
1370
|
try {
|
|
1385
|
-
|
|
1386
|
-
const day = 24 * 60 * 60 * 1000
|
|
1387
|
-
// Hierarki TTL: snippet (14d), summary (90d), fact/decision/preference (180d)
|
|
1388
|
-
const cuts = [
|
|
1389
|
-
{ cats: ["snippet"], ms: LIMITS.MEMORY_TTL_SNIPPET_DAYS * day },
|
|
1390
|
-
{ cats: ["summary"], ms: LIMITS.MEMORY_TTL_SUMMARY_DAYS * day },
|
|
1391
|
-
{ cats: ["fact", "decision", "preference"], ms: LIMITS.MEMORY_TTL_FACT_DAYS * day },
|
|
1392
|
-
]
|
|
1393
|
-
for (const c of cuts) {
|
|
1394
|
-
if (c.ms <= 0) continue
|
|
1395
|
-
const ph = c.cats.map(() => "?").join(",")
|
|
1396
|
-
const nullCatch = c.cats.includes("fact") ? " OR category IS NULL" : ""
|
|
1397
|
-
const result = await withBusyRetry(() =>
|
|
1398
|
-
db
|
|
1399
|
-
.prepare(`DELETE FROM memory WHERE (category IN (${ph})${nullCatch}) AND created_at < ?`)
|
|
1400
|
-
.run(...c.cats, nowMs - c.ms),
|
|
1401
|
-
)
|
|
1402
|
-
deleted += result.changes ?? 0
|
|
1403
|
-
}
|
|
1404
|
-
// CAP: potong ke MEMORY_MAX_rows bila melebihi batas (per entri utuh)
|
|
1405
|
-
const cnt =
|
|
1406
|
-
(db.prepare("SELECT count(*) as c FROM memory").get() as { c: number } | null)?.c ?? 0
|
|
1407
|
-
if (cnt > LIMITS.MEMORY_MAX_ROWS) {
|
|
1408
|
-
deleted += await withBusyRetry(() => pruneMemoryCap(db))
|
|
1409
|
-
}
|
|
1410
|
-
return deleted
|
|
1371
|
+
return await pruneExpiredMemoryRows(db, nowMs)
|
|
1411
1372
|
} finally {
|
|
1412
1373
|
db.close()
|
|
1413
1374
|
}
|
|
@@ -1416,10 +1377,11 @@ export async function pruneTTL(cwd?: string, nowMs: number = Date.now()): Promis
|
|
|
1416
1377
|
// MEM-01 / Fase 5A: Revoke semua memori berdasarkan provenance (selective poisoning).
|
|
1417
1378
|
// Hapus dari vektor DB + MEMORY.md secara atomik/idempoten. Returns { vectorRows, fileLines }.
|
|
1418
1379
|
export async function revokeByProvenance(
|
|
1419
|
-
criteria: { sessionId?: string; turnId?: string; sourceKind?: string },
|
|
1380
|
+
criteria: { sessionId?: string; turnId?: string; sourceKind?: string; query?: string },
|
|
1420
1381
|
cwd?: string,
|
|
1421
1382
|
): Promise<{ vectorRows: number; fileLines: number }> {
|
|
1422
|
-
const { sessionId, turnId, sourceKind } = criteria
|
|
1383
|
+
const { sessionId, turnId, sourceKind, query } = criteria
|
|
1384
|
+
const textNeedle = query?.trim().toLowerCase() ?? ""
|
|
1423
1385
|
let vectorDeleted = 0
|
|
1424
1386
|
|
|
1425
1387
|
// Dari vektor DB: filter sesuai kriteria provenance yang tersedia
|
|
@@ -1437,6 +1399,10 @@ export async function revokeByProvenance(
|
|
|
1437
1399
|
conditions.push(`source_kind = ?`)
|
|
1438
1400
|
values.push(sourceKind)
|
|
1439
1401
|
}
|
|
1402
|
+
if (textNeedle) {
|
|
1403
|
+
conditions.push(`lower(text) LIKE '%' || ? || '%' ESCAPE '\\'`)
|
|
1404
|
+
values.push(escapeLike(textNeedle))
|
|
1405
|
+
}
|
|
1440
1406
|
|
|
1441
1407
|
if (conditions.length > 0) {
|
|
1442
1408
|
const db = open(cwd)
|
|
@@ -1469,74 +1435,53 @@ export async function revokeByProvenance(
|
|
|
1469
1435
|
}
|
|
1470
1436
|
}
|
|
1471
1437
|
|
|
1472
|
-
// Dari MEMORY.md: hapus baris yang memuat metadata provenance (
|
|
1473
|
-
// FILE_STORE: tags JSON dalam baris → parse dan match terhadap criteria
|
|
1438
|
+
// Dari MEMORY.md: hapus baris yang memuat metadata provenance (dalam lock + jail symlink)
|
|
1474
1439
|
let fileDeleted = 0
|
|
1475
1440
|
try {
|
|
1476
|
-
const { readFile } = await import("node:fs/promises")
|
|
1477
1441
|
const { resolve } = await import("node:path")
|
|
1478
1442
|
const { atomicWriteText } = await import("../lib/atomic-write.ts")
|
|
1479
|
-
const
|
|
1480
|
-
|
|
1481
|
-
|
|
1482
|
-
|
|
1483
|
-
|
|
1484
|
-
txt = await readFile(path, "utf8")
|
|
1485
|
-
} catch {
|
|
1486
|
-
// File belum ada atau tidak bisa dibaca — ok saja
|
|
1487
|
-
return { vectorRows: vectorDeleted, fileLines: fileDeleted }
|
|
1488
|
-
}
|
|
1443
|
+
const { assertSafeMemoryPath, parseMemoryLine, safeReadMemoryFile, withMemLock } = await import(
|
|
1444
|
+
"./files.ts"
|
|
1445
|
+
)
|
|
1446
|
+
const root = cwd ?? process.cwd()
|
|
1447
|
+
const path = resolve(root, ".minicode/MEMORY.md")
|
|
1489
1448
|
|
|
1490
|
-
|
|
1491
|
-
|
|
1492
|
-
let del = 0
|
|
1493
|
-
|
|
1494
|
-
for (const line of lines) {
|
|
1495
|
-
// [Area E / D2] Kriteria provenance AND (sama dengan query vektor). Versi
|
|
1496
|
-
// lama memakai OR gabungan `!criterion`: revoke dengan satu kriteria
|
|
1497
|
-
// menghapus SEMUA baris tanpa tag, termasuk fakta sesi lain. Baris tanpa
|
|
1498
|
-
// tag tak membuktikan provenance → dipertahankan (fail-closed). Regex
|
|
1499
|
-
// greedy sampai `]` akhir baris karena tag berbentuk array JSON.
|
|
1500
|
-
const tagMatch = line.match(/\[tags:\s*(.+)\]\s*$/)
|
|
1501
|
-
if (!tagMatch) {
|
|
1502
|
-
kept.push(line)
|
|
1503
|
-
continue
|
|
1504
|
-
}
|
|
1505
|
-
if (!sessionId && !turnId && !sourceKind) {
|
|
1506
|
-
kept.push(line)
|
|
1507
|
-
continue
|
|
1508
|
-
}
|
|
1509
|
-
let matched = false
|
|
1449
|
+
fileDeleted = await withMemLock(path, async () => {
|
|
1450
|
+
let txt: string
|
|
1510
1451
|
try {
|
|
1511
|
-
|
|
1512
|
-
const hasSessionId = sessionId
|
|
1513
|
-
? tags.some((t: string) => t.includes(`session:${sessionId as string}`))
|
|
1514
|
-
: false
|
|
1515
|
-
const hasTurnId = turnId
|
|
1516
|
-
? tags.some((t: string) => t.includes(`turn:${turnId as string}`))
|
|
1517
|
-
: false
|
|
1518
|
-
const hasSource = sourceKind
|
|
1519
|
-
? tags.some((t: string) => t.includes(`source:${sourceKind as string}`))
|
|
1520
|
-
: false
|
|
1521
|
-
matched =
|
|
1522
|
-
(!sessionId || hasSessionId) && (!turnId || hasTurnId) && (!sourceKind || hasSource)
|
|
1452
|
+
txt = await safeReadMemoryFile(path, root)
|
|
1523
1453
|
} catch {
|
|
1524
|
-
|
|
1525
|
-
kept.push(line)
|
|
1526
|
-
continue
|
|
1454
|
+
return 0
|
|
1527
1455
|
}
|
|
1528
1456
|
|
|
1529
|
-
|
|
1530
|
-
|
|
1531
|
-
|
|
1532
|
-
|
|
1457
|
+
const lines = txt.split("\n")
|
|
1458
|
+
const kept: string[] = []
|
|
1459
|
+
let del = 0
|
|
1460
|
+
|
|
1461
|
+
for (const line of lines) {
|
|
1462
|
+
if (!sessionId && !turnId && !sourceKind) {
|
|
1463
|
+
kept.push(line)
|
|
1464
|
+
continue
|
|
1465
|
+
}
|
|
1466
|
+
const parsed = parseMemoryLine(line)
|
|
1467
|
+
if (!parsed || parsed.tags.length === 0) {
|
|
1468
|
+
kept.push(line)
|
|
1469
|
+
continue
|
|
1470
|
+
}
|
|
1471
|
+
const hasSessionId = sessionId ? parsed.tags.includes(`session:${sessionId}`) : true
|
|
1472
|
+
const hasTurnId = turnId ? parsed.tags.includes(`turn:${turnId}`) : true
|
|
1473
|
+
const hasSource = sourceKind ? parsed.tags.includes(`source:${sourceKind}`) : true
|
|
1474
|
+
const hasQuery = textNeedle ? parsed.text.toLowerCase().includes(textNeedle) : true
|
|
1475
|
+
if (hasSessionId && hasTurnId && hasSource && hasQuery) del++
|
|
1476
|
+
else kept.push(line)
|
|
1533
1477
|
}
|
|
1534
|
-
}
|
|
1535
1478
|
|
|
1536
|
-
|
|
1537
|
-
|
|
1538
|
-
|
|
1539
|
-
|
|
1479
|
+
if (del > 0) {
|
|
1480
|
+
await assertSafeMemoryPath(path, root)
|
|
1481
|
+
await atomicWriteText(path, kept.join("\n"))
|
|
1482
|
+
}
|
|
1483
|
+
return del
|
|
1484
|
+
})
|
|
1540
1485
|
} catch {}
|
|
1541
1486
|
|
|
1542
1487
|
return { vectorRows: vectorDeleted, fileLines: fileDeleted }
|
|
@@ -1622,176 +1567,161 @@ export async function reconcileMemoryStores(cwd?: string): Promise<{
|
|
|
1622
1567
|
legacySuspectLines: number
|
|
1623
1568
|
legacySuspectSamples: string[]
|
|
1624
1569
|
}> {
|
|
1625
|
-
const
|
|
1626
|
-
|
|
1627
|
-
|
|
1628
|
-
|
|
1629
|
-
|
|
1630
|
-
|
|
1631
|
-
|
|
1632
|
-
|
|
1633
|
-
|
|
1634
|
-
|
|
1635
|
-
|
|
1636
|
-
|
|
1637
|
-
|
|
1638
|
-
|
|
1639
|
-
|
|
1640
|
-
const vectorRows = allRows.filter(isLive)
|
|
1641
|
-
const supersededRows = allRows.filter((r) => !isLive(r))
|
|
1642
|
-
const groups = new Map<string, string[]>()
|
|
1643
|
-
for (const row of vectorRows) {
|
|
1644
|
-
const key = row.parent ?? row.id
|
|
1645
|
-
const list = groups.get(key) ?? []
|
|
1646
|
-
list.push(row.text)
|
|
1647
|
-
groups.set(key, list)
|
|
1648
|
-
}
|
|
1649
|
-
const vectorTexts = new Set(vectorRows.map((r) => r.text))
|
|
1650
|
-
// Entri superseded dikelompokkan per parent lalu digabung: file menyimpan
|
|
1651
|
-
// ENTRI utuh, sedangkan DB menyimpan chunk. Pencocokan harus exact agar
|
|
1652
|
-
// baris fakta BARU yang kebetulan memuat teks lama sebagai substring tidak
|
|
1653
|
-
// ikut terhapus.
|
|
1654
|
-
const supersededGroups = new Map<string, string[]>()
|
|
1655
|
-
for (const row of supersededRows) {
|
|
1656
|
-
const key = row.parent ?? row.id
|
|
1657
|
-
const list = supersededGroups.get(key) ?? []
|
|
1658
|
-
list.push(row.text)
|
|
1659
|
-
supersededGroups.set(key, list)
|
|
1660
|
-
}
|
|
1661
|
-
const supersededEntries = new Set<string>()
|
|
1662
|
-
for (const parts of supersededGroups.values()) {
|
|
1663
|
-
const merged = mergeChunkTexts(parts)
|
|
1664
|
-
if (merged) supersededEntries.add(merged)
|
|
1665
|
-
for (const p of parts) if (p) supersededEntries.add(p)
|
|
1570
|
+
const { existsSync } = await import("node:fs")
|
|
1571
|
+
const { join, resolve } = await import("node:path")
|
|
1572
|
+
const root = cwd ?? process.cwd()
|
|
1573
|
+
const localMemPath = resolve(root, ".minicode", "MEMORY.md")
|
|
1574
|
+
const localDbPath = join(resolve(root), ".minicode", "vector.db")
|
|
1575
|
+
// Jangan jatuh ke DB global ~/.minicode/vector.db saat workspace kosong.
|
|
1576
|
+
if (!existsSync(localMemPath) && !existsSync(localDbPath)) {
|
|
1577
|
+
return {
|
|
1578
|
+
reconciled: 0,
|
|
1579
|
+
vectorOnlyAdopted: 0,
|
|
1580
|
+
fileOnlyAdded: 0,
|
|
1581
|
+
supersededFileRemoved: 0,
|
|
1582
|
+
supersededSkipped: 0,
|
|
1583
|
+
legacySuspectLines: 0,
|
|
1584
|
+
legacySuspectSamples: [],
|
|
1666
1585
|
}
|
|
1667
|
-
|
|
1668
|
-
|
|
1669
|
-
|
|
1670
|
-
|
|
1671
|
-
|
|
1672
|
-
|
|
1673
|
-
|
|
1674
|
-
|
|
1586
|
+
}
|
|
1587
|
+
const {
|
|
1588
|
+
appendMemoryUnlocked,
|
|
1589
|
+
deleteMemoryEntryUnlocked,
|
|
1590
|
+
parseMemoryLine,
|
|
1591
|
+
safeReadMemoryFile,
|
|
1592
|
+
withMemLock,
|
|
1593
|
+
} = await import("../memory/files.ts")
|
|
1594
|
+
return await withMemLock(localMemPath, async () => {
|
|
1595
|
+
ensureLocalMemoryDir(cwd)
|
|
1596
|
+
const db = openAt(localDbPath)
|
|
1675
1597
|
try {
|
|
1676
|
-
|
|
1677
|
-
|
|
1678
|
-
//
|
|
1679
|
-
|
|
1680
|
-
|
|
1681
|
-
|
|
1682
|
-
|
|
1683
|
-
|
|
1684
|
-
|
|
1685
|
-
|
|
1686
|
-
|
|
1687
|
-
|
|
1688
|
-
|
|
1689
|
-
|
|
1690
|
-
|
|
1691
|
-
|
|
1692
|
-
|
|
1693
|
-
|
|
1694
|
-
|
|
1695
|
-
|
|
1696
|
-
|
|
1697
|
-
|
|
1698
|
-
|
|
1699
|
-
|
|
1700
|
-
}
|
|
1701
|
-
|
|
1702
|
-
|
|
1703
|
-
|
|
1704
|
-
|
|
1705
|
-
|
|
1706
|
-
|
|
1707
|
-
|
|
1598
|
+
// P1.3 + MEM-01: hanya fakta AKTIF & TERVALIDASI yang boleh hidup ke MEMORY.md.
|
|
1599
|
+
// Baris `provisional`/`rejected` dan baris `superseded` dikecualikan agar
|
|
1600
|
+
// tidak bocor atau hidup ulang.
|
|
1601
|
+
const allRows = db
|
|
1602
|
+
.prepare("SELECT id, text, parent, superseded_by, validation_status FROM memory")
|
|
1603
|
+
.all() as {
|
|
1604
|
+
id: string
|
|
1605
|
+
text: string
|
|
1606
|
+
parent: string | null
|
|
1607
|
+
superseded_by: string | null
|
|
1608
|
+
validation_status?: string | null
|
|
1609
|
+
}[]
|
|
1610
|
+
const isSuperseded = (r: { superseded_by: string | null }): boolean =>
|
|
1611
|
+
r.superseded_by !== null && r.superseded_by !== ""
|
|
1612
|
+
const isValidated = (r: { validation_status?: string | null }): boolean =>
|
|
1613
|
+
(r.validation_status ?? "validated") === "validated"
|
|
1614
|
+
const vectorRows = allRows.filter((r) => !isSuperseded(r) && isValidated(r))
|
|
1615
|
+
const supersededRows = allRows.filter((r) => isSuperseded(r))
|
|
1616
|
+
const groups = new Map<string, string[]>()
|
|
1617
|
+
for (const row of vectorRows) {
|
|
1618
|
+
const key = row.parent ?? row.id
|
|
1619
|
+
const list = groups.get(key) ?? []
|
|
1620
|
+
list.push(row.text)
|
|
1621
|
+
groups.set(key, list)
|
|
1622
|
+
}
|
|
1623
|
+
const vectorTexts = new Set(vectorRows.map((r) => r.text))
|
|
1624
|
+
const supersededGroups = new Map<string, string[]>()
|
|
1625
|
+
for (const row of supersededRows) {
|
|
1626
|
+
const key = row.parent ?? row.id
|
|
1627
|
+
const list = supersededGroups.get(key) ?? []
|
|
1628
|
+
list.push(row.text)
|
|
1629
|
+
supersededGroups.set(key, list)
|
|
1630
|
+
}
|
|
1631
|
+
const supersededEntries = new Set<string>()
|
|
1632
|
+
for (const parts of supersededGroups.values()) {
|
|
1633
|
+
const merged = mergeChunkTexts(parts)
|
|
1634
|
+
if (merged) supersededEntries.add(merged)
|
|
1635
|
+
for (const p of parts) if (p) supersededEntries.add(p)
|
|
1708
1636
|
}
|
|
1709
|
-
}
|
|
1710
1637
|
|
|
1711
|
-
|
|
1712
|
-
|
|
1713
|
-
|
|
1714
|
-
|
|
1715
|
-
|
|
1716
|
-
|
|
1717
|
-
|
|
1718
|
-
Array.from(fileTexts).some((ft) => ft.toLowerCase().includes(text.toLowerCase()))
|
|
1719
|
-
|
|
1720
|
-
// 1. Adopsi entri vector-only ke MEMORY.md — JANGAN hapus. Menghapus baris
|
|
1721
|
-
// vektor karena file tidak memuatnya membuang fakta sah saat crash
|
|
1722
|
-
// "after_vector_before_file" (justru arah yang harus dipulihkan).
|
|
1723
|
-
const { appendMemory, deleteMemoryEntry } = await import("../memory/files.ts")
|
|
1724
|
-
for (const parts of groups.values()) {
|
|
1725
|
-
const present = parts.filter((text) => fileHas(text))
|
|
1726
|
-
if (present.length === parts.length) {
|
|
1727
|
-
reconciled += parts.length
|
|
1728
|
-
continue
|
|
1638
|
+
let txt = ""
|
|
1639
|
+
try {
|
|
1640
|
+
txt = await safeReadMemoryFile(localMemPath, root)
|
|
1641
|
+
} catch (e) {
|
|
1642
|
+
const code = (e as NodeJS.ErrnoException)?.code
|
|
1643
|
+
if (code && code !== "ENOENT") throw e
|
|
1644
|
+
if (String((e as Error)?.message ?? "").includes("unsafe memory")) throw e
|
|
1729
1645
|
}
|
|
1730
|
-
|
|
1731
|
-
|
|
1732
|
-
for (const
|
|
1733
|
-
|
|
1734
|
-
|
|
1735
|
-
} catch {}
|
|
1646
|
+
|
|
1647
|
+
const fileTexts = new Set<string>()
|
|
1648
|
+
for (const line of txt.split("\n")) {
|
|
1649
|
+
const parsed = parseMemoryLine(line)
|
|
1650
|
+
if (parsed?.text) fileTexts.add(parsed.text)
|
|
1736
1651
|
}
|
|
1737
|
-
const full = mergeChunkTexts(parts)
|
|
1738
|
-
if (!full) continue
|
|
1739
|
-
await appendMemory(full, cwd)
|
|
1740
|
-
vectorOnlyAdopted++
|
|
1741
|
-
reconciled += parts.length
|
|
1742
|
-
}
|
|
1743
1652
|
|
|
1744
|
-
|
|
1745
|
-
|
|
1746
|
-
|
|
1747
|
-
|
|
1748
|
-
|
|
1749
|
-
|
|
1750
|
-
)
|
|
1751
|
-
|
|
1752
|
-
|
|
1753
|
-
|
|
1754
|
-
|
|
1755
|
-
|
|
1756
|
-
|
|
1757
|
-
|
|
1758
|
-
|
|
1759
|
-
|
|
1653
|
+
let vectorOnlyAdopted = 0
|
|
1654
|
+
let fileOnlyAdded = 0
|
|
1655
|
+
let reconciled = 0
|
|
1656
|
+
let supersededFileRemoved = 0
|
|
1657
|
+
let legacySuspectLines = 0
|
|
1658
|
+
const legacySuspectSamples: string[] = []
|
|
1659
|
+
const fileHas = (text: string): boolean =>
|
|
1660
|
+
Array.from(fileTexts).some((ft) => ft.toLowerCase().includes(text.toLowerCase()))
|
|
1661
|
+
|
|
1662
|
+
// 1. Adopsi entri vector-only tervalidasi ke MEMORY.md lokal.
|
|
1663
|
+
for (const parts of groups.values()) {
|
|
1664
|
+
const present = parts.filter((text) => fileHas(text))
|
|
1665
|
+
if (present.length === parts.length) {
|
|
1666
|
+
reconciled += parts.length
|
|
1667
|
+
continue
|
|
1668
|
+
}
|
|
1669
|
+
for (const text of present) {
|
|
1670
|
+
try {
|
|
1671
|
+
await deleteMemoryEntryUnlocked(text, cwd)
|
|
1672
|
+
} catch {}
|
|
1673
|
+
}
|
|
1674
|
+
const full = mergeChunkTexts(parts)
|
|
1675
|
+
if (!full) continue
|
|
1676
|
+
await appendMemoryUnlocked(full, cwd)
|
|
1677
|
+
vectorOnlyAdopted++
|
|
1678
|
+
reconciled += parts.length
|
|
1760
1679
|
}
|
|
1761
|
-
|
|
1762
|
-
//
|
|
1763
|
-
|
|
1764
|
-
|
|
1765
|
-
|
|
1766
|
-
|
|
1767
|
-
|
|
1768
|
-
|
|
1769
|
-
|
|
1770
|
-
|
|
1680
|
+
|
|
1681
|
+
// 2. Tambah file-only rows yang belum ada di vector — kecuali yang superseded.
|
|
1682
|
+
for (const text of fileTexts) {
|
|
1683
|
+
const representedByLive = Array.from(vectorTexts).some(
|
|
1684
|
+
(vt) => vt.length > 0 && (vt === text || text.includes(vt) || vt.includes(text)),
|
|
1685
|
+
)
|
|
1686
|
+
if (representedByLive) continue
|
|
1687
|
+
if (supersededEntries.has(text)) {
|
|
1688
|
+
try {
|
|
1689
|
+
await deleteMemoryEntryUnlocked(text, cwd)
|
|
1690
|
+
supersededFileRemoved++
|
|
1691
|
+
} catch {}
|
|
1692
|
+
continue
|
|
1693
|
+
}
|
|
1694
|
+
const partialSuperseded = Array.from(supersededEntries).some(
|
|
1695
|
+
(e) => e.length > 0 && (e.includes(text) || text.includes(e)),
|
|
1696
|
+
)
|
|
1697
|
+
if (partialSuperseded) {
|
|
1698
|
+
legacySuspectLines++
|
|
1699
|
+
if (legacySuspectSamples.length < 5) legacySuspectSamples.push(text.slice(0, 160))
|
|
1700
|
+
continue
|
|
1701
|
+
}
|
|
1702
|
+
await withBusyRetry(() =>
|
|
1703
|
+
db
|
|
1704
|
+
.prepare(
|
|
1705
|
+
"INSERT OR IGNORE INTO memory (id, text, embedding, created_at, category, session_id, turn_id, source_kind, source_ref) VALUES (?, ?, NULL, ?, 'manual', NULL, NULL, NULL, NULL)",
|
|
1706
|
+
)
|
|
1707
|
+
.run(randomUUID(), text, Date.now()),
|
|
1708
|
+
)
|
|
1709
|
+
fileOnlyAdded++
|
|
1771
1710
|
}
|
|
1772
|
-
// Insert into vector (without embedding, keyword-only fallback)
|
|
1773
|
-
await withBusyRetry(() =>
|
|
1774
|
-
db
|
|
1775
|
-
.prepare(
|
|
1776
|
-
"INSERT OR IGNORE INTO memory (id, text, embedding, created_at, category, session_id, turn_id, source_kind, source_ref) VALUES (?, ?, NULL, ?, 'manual', NULL, NULL, NULL, NULL)",
|
|
1777
|
-
)
|
|
1778
|
-
.run(randomUUID(), text, Date.now()),
|
|
1779
|
-
)
|
|
1780
|
-
fileOnlyAdded++
|
|
1781
|
-
}
|
|
1782
1711
|
|
|
1783
|
-
|
|
1784
|
-
|
|
1785
|
-
|
|
1786
|
-
|
|
1787
|
-
|
|
1788
|
-
|
|
1789
|
-
|
|
1790
|
-
|
|
1712
|
+
return {
|
|
1713
|
+
reconciled,
|
|
1714
|
+
vectorOnlyAdopted,
|
|
1715
|
+
fileOnlyAdded,
|
|
1716
|
+
supersededFileRemoved,
|
|
1717
|
+
supersededSkipped: supersededRows.length,
|
|
1718
|
+
legacySuspectLines,
|
|
1719
|
+
legacySuspectSamples,
|
|
1720
|
+
}
|
|
1721
|
+
} finally {
|
|
1722
|
+
db.close()
|
|
1791
1723
|
}
|
|
1792
|
-
}
|
|
1793
|
-
db.close()
|
|
1794
|
-
}
|
|
1724
|
+
})
|
|
1795
1725
|
}
|
|
1796
1726
|
|
|
1797
1727
|
export interface MemoryStats {
|
|
@@ -1809,10 +1739,32 @@ export interface MemoryStats {
|
|
|
1809
1739
|
newest: number | null
|
|
1810
1740
|
}
|
|
1811
1741
|
|
|
1812
|
-
// P2.4: observabilitas untuk `minicode memory status`
|
|
1742
|
+
// P2.4: observabilitas untuk `minicode memory status` / `doctor` — murni baca
|
|
1743
|
+
// tanpa membuat berkas `vector.db` baru di direktori kosong.
|
|
1813
1744
|
export function getMemoryStats(cwd?: string): MemoryStats {
|
|
1814
|
-
const
|
|
1745
|
+
const { existsSync, statSync } = require("node:fs") as typeof import("node:fs")
|
|
1746
|
+
const p = dbPath(cwd)
|
|
1747
|
+
const emptyStats: MemoryStats = {
|
|
1748
|
+
rows: 0,
|
|
1749
|
+
liveRows: 0,
|
|
1750
|
+
supersededRows: 0,
|
|
1751
|
+
dbBytes: 0,
|
|
1752
|
+
walBytes: 0,
|
|
1753
|
+
shmBytes: 0,
|
|
1754
|
+
models: [],
|
|
1755
|
+
dims: [],
|
|
1756
|
+
categories: [],
|
|
1757
|
+
oldest: null,
|
|
1758
|
+
newest: null,
|
|
1759
|
+
}
|
|
1760
|
+
if (!existsSync(p)) return emptyStats
|
|
1761
|
+
const db = new Database(p, { readonly: true })
|
|
1815
1762
|
try {
|
|
1763
|
+
db.exec(`PRAGMA busy_timeout=${LIMITS.SQLITE_BUSY_TIMEOUT_MS}`)
|
|
1764
|
+
const hasTable = db
|
|
1765
|
+
.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='memory'")
|
|
1766
|
+
.get() as { name: string } | null
|
|
1767
|
+
if (!hasTable) return emptyStats
|
|
1816
1768
|
const rows =
|
|
1817
1769
|
(db.prepare("SELECT count(*) as c FROM memory").get() as { c: number } | null)?.c ?? 0
|
|
1818
1770
|
const liveRows =
|
|
@@ -1841,10 +1793,9 @@ export function getMemoryStats(cwd?: string): MemoryStats {
|
|
|
1841
1793
|
"SELECT coalesce(category, 'fact') as category, count(*) as count FROM memory GROUP BY category ORDER BY count DESC",
|
|
1842
1794
|
)
|
|
1843
1795
|
.all() as { category: string; count: number }[]
|
|
1844
|
-
const p = dbPath(cwd)
|
|
1845
1796
|
const sizeOf = (f: string): number => {
|
|
1846
1797
|
try {
|
|
1847
|
-
return
|
|
1798
|
+
return statSync(f).size
|
|
1848
1799
|
} catch {
|
|
1849
1800
|
return 0
|
|
1850
1801
|
}
|